 Tianyi Cui
|
debd4ae5c8
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
|
2026-07-15 16:26:12 +08:00 |
|
|
Tianyi Cui
|
6d1870c8c1
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/bash/tool-bash/src/index.ts
# packages/ui/stdio-agent/README.md
# packages/ui/stdio-agent/src/index.ts
# packages/ui/stdio/src/index.ts
# packages/workflow/workflow-workerthread/tests/workflow-workerthread.spec.ts
# packages/workflow/workflow/package.json
# scripts/gen-doc-graphs.ts
|
2026-07-15 16:24:43 +08:00 |
|
|
Tianyi Cui
|
e7bae3aa3b
|
Merge branch 'master' into feat/mcp-client
|
2026-07-15 15:50:59 +08:00 |
|
|
Tianyi Cui
|
dbae83d573
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
|
2026-07-15 15:31:29 +08:00 |
|
 TianleLin
|
905b8ead9f
|
Merge branch 'master' into feat/mcp-client
|
2026-07-15 15:22:32 +08:00 |
|
|
Tianyi Cui
|
0239ac3752
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
|
2026-07-15 14:05:54 +08:00 |
|
|
Tianyi Cui
|
627738c4ed
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-code-runtime-surface
|
2026-07-15 13:58:44 +08:00 |
|
|
Tianyi Cui
|
96851da571
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
# Conflicts:
# docs/rfc/INDEX.md
|
2026-07-15 13:28:40 +08:00 |
|
|
Tianyi Cui
|
fe2d61198f
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
|
2026-07-15 13:23:16 +08:00 |
|
|
Tianyi Cui
|
e6edee1d54
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
|
2026-07-15 13:21:06 +08:00 |
|
|
Tianyi Cui
|
38ea10eee0
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-code-runtime-surface
|
2026-07-15 13:20:08 +08:00 |
|
|
Tianyi Cui
|
3eb8c15b36
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
|
2026-07-15 13:14:56 +08:00 |
|
|
Tianyi Cui
|
eccaf2e2f7
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
|
2026-07-15 13:10:16 +08:00 |
|
 imccyu
|
8aa4c8f660
|
Merge branch 'master' into refactor/agent-leaf-dependencies
|
2026-07-15 13:10:14 +08:00 |
|
|
imccyu
|
517964fe84
|
Merge branch 'master' into refactor/agent-leaf-dependencies
|
2026-07-15 13:09:33 +08:00 |
|
|
Tianyi Cui
|
4d29e8b5d7
|
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
|
2026-07-15 13:03:53 +08:00 |
|
|
imccyu
|
4593bf6ed4
|
Merge remote-tracking branch 'origin/master' into refactor/agent-leaf-dependencies
|
2026-07-15 12:54:06 +08:00 |
|
|
Tianyi Cui
|
cb682af117
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
|
2026-07-15 12:53:29 +08:00 |
|
|
imccyu
|
80fbeefbd6
|
refactor(ui): extract stdio plugin package
Move the readline front door from stdio-agent into @deepseek-ai/dsh-stdio, keeping the loader shape and the stdio coverage with the new package.
|
2026-07-15 10:04:40 +08:00 |
|
|
Tianyi Cui
|
89bb0c47c3
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
|
2026-07-14 23:45:40 +08:00 |
|
|
Tianyi Cui
|
aba1b18eac
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
|
2026-07-14 23:45:39 +08:00 |
|
|
Tianyi Cui
|
73b34e5c4d
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
# Conflicts:
# docs/rfc/implemented/architecture/2026-06-18-session-surface.md
# packages/core/session/src/surface.ts
# packages/core/session/tests/surface.spec.ts
|
2026-07-14 23:45:25 +08:00 |
|
|
Tianyi Cui
|
0bbb2a5426
|
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
|
2026-07-14 23:44:40 +08:00 |
|
|
Tianyi Cui
|
ebf2fb763a
|
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
|
2026-07-14 23:44:40 +08:00 |
|
|
Tianyi Cui
|
d8cced2602
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
|
2026-07-14 23:44:39 +08:00 |
|
|
Tianyi Cui
|
177144917d
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
|
2026-07-14 23:44:38 +08:00 |
|
|
Tianyi Cui
|
7993f41da3
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
|
2026-07-14 23:39:05 +08:00 |
|
|
Tianyi Cui
|
9ed59df02b
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
|
2026-07-14 23:19:52 +08:00 |
|
|
Tianyi Cui
|
b656bef59a
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/module-graph.md
|
2026-07-14 23:19:41 +08:00 |
|
|
Tianyi Cui
|
98c12676af
|
Merge remote-tracking branch 'origin/master' into feat/mcp-client
|
2026-07-14 23:16:43 +08:00 |
|
|
Tianyi Cui
|
528f9cba62
|
fix: default time context to system zone
|
2026-07-14 21:45:54 +08:00 |
|
|
Tianyi Cui
|
bd0a1855b9
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
|
2026-07-14 19:06:25 +08:00 |
|
|
Tianyi Cui
|
59c5010283
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-prune-code-runtime-surface
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/rfc/implemented/feature/2026-06-15-code-mode.md
|
2026-07-14 19:05:23 +08:00 |
|
|
Tianyi Cui
|
8a5ebb1cde
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/feature/2026-07-06-approval-seam.md
# packages/ui/acp/README.md
# packages/ui/acp/src/index.ts
# packages/ui/jsonrpc/README.md
# packages/ui/jsonrpc/src/server.ts
|
2026-07-14 18:55:51 +08:00 |
|
|
Tianyi Cui
|
83271191d1
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/architecture/2026-06-18-agent-lifecycle-and-ownership-seams.md
# docs/rfc/implemented/architecture/2026-06-20-branded-ids.md
# docs/rfc/implemented/simplification/2026-06-20-remove-agent-boundary-mirror-events.md
# docs/rfc/proposed/feature/2026-07-07-claude-code-and-codex-subagent-backends.md
# docs/rfc/proposed/simplification/2026-06-20-unify-agent-and-session-id.md
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/tests/properties.spec.ts
# packages/core/agent/README.md
# packages/core/agent/src/index.ts
# packages/guard/repeat-tool-guard/src/index.ts
# packages/hooks/hooks-claude/tests/bridge.spec.ts
# packages/subagent/subagent-acp/tests/mock-acp-server.ts
# packages/ui/acp/tests/dispose.spec.ts
# packages/ui/stdio-agent/src/index.ts
# packages/ui/stdio-agent/src/stdio-chat.ts
# packages/ui/stdio-agent/tests/stdio-chat.spec.ts
# packages/util/brand/src/index.ts
|
2026-07-14 18:51:24 +08:00 |
|
|
Tianyi Cui
|
dbf4bebe83
|
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
# Conflicts:
# examples/AGENTS.md
# examples/coding-agent/tests/code-mode-keyless-smoke.e2e.ts
# examples/coding-agent/tests/keyless-smoke.e2e.ts
# examples/cordis-agent/tests/keyless-smoke.e2e.ts
# examples/echo-agent/tests/echo.e2e.ts
|
2026-07-14 18:30:10 +08:00 |
|
|
Tianyi Cui
|
92c52eec20
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/web.md
# docs/rfc/implemented/simplification/2026-07-04-drop-unconsumed-web-observation-surface.md
# packages/web/tool-web/tests/integration.spec.ts
# packages/web/web-fetch-local/README.md
# packages/web/web-fetch-local/src/provider.ts
# packages/web/web/src/types.ts
|
2026-07-14 17:57:50 +08:00 |
|
|
Tianyi Cui
|
d9d9487e0e
|
docs: align time-context prose standard
|
2026-07-14 17:44:32 +08:00 |
|
|
Tianyi Cui
|
f1a3484cca
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
# Conflicts:
# docs/config-catalog.md
|
2026-07-14 17:41:20 +08:00 |
|
|
Tianyi Cui
|
3c1470046a
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
# Conflicts:
# docs/config-catalog.md
# packages/bash/tool-bash/src/index.ts
|
2026-07-14 17:38:15 +08:00 |
|
|
Tianyi Cui
|
89aedb5ea6
|
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
# Conflicts:
# docs/config-catalog.md
|
2026-07-14 17:33:52 +08:00 |
|
|
Tianyi Cui
|
32ed403500
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# packages/core/agent-loop/src/loop.ts
# packages/core/session/README.md
# packages/core/session/tests/derived-cache.spec.ts
|
2026-07-14 17:30:34 +08:00 |
|
|
Tianyi Cui
|
498de7f042
|
Merge remote-tracking branch 'origin/master' into codex/time-context-plugin
|
2026-07-14 17:26:20 +08:00 |
|
|
Tianyi Cui
|
71790b7047
|
Merge remote-tracking branch 'origin/master' into codex/simp-share-loader-smoke-harness
# Conflicts:
# packages/support/README.md
|
2026-07-14 16:10:26 +08:00 |
|
|
Tianyi Cui
|
a9d74932b1
|
feat: add optional time context plugin
|
2026-07-14 16:04:34 +08:00 |
|
|
Tianyi Cui
|
b79520ab87
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
# Conflicts:
# packages/web/tool-web/README.md
# packages/web/web/README.md
|
2026-07-14 15:56:42 +08:00 |
|
|
Tianyi Cui
|
989539d3ed
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-workflow-worker-surface
|
2026-07-14 15:44:40 +08:00 |
|
|
Tianyi Cui
|
f119de8b2e
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
# Conflicts:
# packages/bash/tool-bash/README.md
|
2026-07-14 15:44:25 +08:00 |
|
|
Tianyi Cui
|
e4a08fff9e
|
Merge remote-tracking branch 'origin/master' into codex/simp-hide-fs-internals
# Conflicts:
# packages/fs/fs-local/README.md
# packages/fs/tool-fs/README.md
|
2026-07-14 15:43:35 +08:00 |
|
|
Tianyi Cui
|
6cbb3270c3
|
Merge branch 'codex/simp-prune-tools-prompt-surface' into codex/simp-drop-assembled-section-order
|
2026-07-14 15:42:52 +08:00 |
|