ad18165668
Merge remote-tracking branch 'origin/master' into HEAD
...
# Conflicts:
# package.json
2026-07-15 16:40:54 +08:00
9082cebc56
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-15 16:27:37 +08:00
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
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
551b665d0f
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 16:05:02 +08:00
75fc4a9dce
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-15 16:04:56 +08:00
2ae7f6ac3f
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
...
# Conflicts:
# packages/support/README.md
# packages/support/acp-snapshot/README.md
2026-07-15 16:04:40 +08:00
dc00509910
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
...
# Conflicts:
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/suite.ts
# packages/support/acp-snapshot/tests/suite.spec.ts
2026-07-15 16:03:33 +08:00
d0cf9cd411
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
2026-07-15 15:56:11 +08:00
281eed3e57
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
...
# Conflicts:
# docs/cordis-catalog/services.md
# docs/rfc/INDEX.md
# docs/rfc/implemented/testing/2026-07-06-pin-request-header-content-in-one-scenario.md
# docs/rfc/proposed/simplification/2026-07-12-simplify-session-log-representation.md
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/normalize.ts
# packages/support/acp-snapshot/src/suite.ts
# packages/support/acp-snapshot/tests/fixtures/suite/pin-turn/session.jsonl
# packages/support/acp-snapshot/tests/suite.spec.ts
2026-07-15 15:53:56 +08:00
905b8ead9f
Merge branch 'master' into feat/mcp-client
2026-07-15 15:22:32 +08:00
c2c38b18c4
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# packages/core/agent/src/types.ts
2026-07-15 15:08:10 +08:00
130140feda
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-15 15:07:35 +08:00
10f50c1b55
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
...
# Conflicts:
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# packages/core/agent/src/types.ts
2026-07-15 15:07:11 +08:00
af267aa8c0
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 15:04:47 +08:00
a2acfb858e
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-15 15:04:47 +08:00
188698723c
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-15 15:04:47 +08:00
17693d20c4
Merge remote-tracking branch 'origin/codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
...
# Conflicts:
# packages/support/acp-snapshot/src/suite.ts
2026-07-15 15:04:29 +08:00
649865043d
docs: preserve prose cleanup in session simplification
2026-07-15 14:59:20 +08:00
40336f945a
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
2026-07-15 13:38:22 +08:00
3285b77d3c
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-15 13:30:39 +08:00
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
3eb8c15b36
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
2026-07-15 13:14:56 +08:00
eccaf2e2f7
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
2026-07-15 13:10:16 +08:00
517964fe84
Merge branch 'master' into refactor/agent-leaf-dependencies
2026-07-15 13:09:33 +08:00
06452b11a9
Merge latest PR #219 head into review fixes
...
The PR branch advanced after the local blocker fixes with a merge of current origin/master. Merge that moving parent into this child fix branch instead of rewriting either pushed lineage, so the fixes are validated against the exact PR head and master state that would land.
The only conflicts were an already-paired adding-a-tool translation and nondeterministic approval UUIDs in replay snapshots. Keep the parent versions because the English source and replay behavior are unchanged, avoiding child-only documentation and generated-artifact churn while preserving the parent semantic-gate updates.
2026-07-15 11:48:19 +08:00
d462348556
fix(tasks): contain async completion listeners
...
TaskService contained synchronous listener throws but discarded returned promises. An async TaskDoneListener could therefore reject as an unhandled process rejection even though the API promises per-listener containment.
Allow listeners to return PromiseLike<void> and attach a rejection handler to each result without awaiting it. This logs asynchronous failures independently while preserving the observation-only contract: later listeners, task waiters, and teardown are not delayed. Add a regression test and synchronize the public docs and generated API declaration.
2026-07-15 11:40:47 +08:00
1a69a3debe
fix(tasks): bind cleanup and notices to exact owners
...
Task records previously retained only ownerSession. If an old agent scope unwound after another agent reused the same agent and session ids, cleanup selected both records and could cancel replacement work. The completion surface also re-resolved the session at settlement, which could inject an old task notice into the replacement agent.
Retain the exact Agent instance for lifecycle work, select owner cleanup by object identity, and pass that exact owner to completion listeners. Keep read, list, kill, and wait authorization session-based as the runtime RFC intends. Add regressions for cleanup and notice routing under id reuse, then update the public docs and generated API catalogs.
2026-07-15 11:40:37 +08:00
c2d5a5be80
Merge origin/master into PR #219 review branch
...
Bring PR #219 onto current master before re-evaluating review findings so fixes are tested against the code that would actually land.
Resolve generated catalogs by regeneration, preserve the new ACP tool-schema sidecar format while refreshing affected snapshots keylessly, and update the newly paired Chinese adding-a-tool document to match the background-task guidance. This keeps generated and bilingual artifacts authoritative instead of choosing one conflict side blindly.
2026-07-15 11:40:26 +08:00
ac820b68a6
Merge branch 'master' into feat/mcp-client
2026-07-15 11:35:45 +08:00
df8fe3bde4
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
...
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# packages/README.md
2026-07-15 11:17:55 +08:00
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
77de6497b4
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-15 01:49:41 +08:00
9b8b17b6fa
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
2026-07-15 01:49:00 +08:00
da75ed9056
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
2026-07-15 01:48:59 +08:00
13255ceb15
docs: add rfc
2026-07-15 00:42:08 +08:00
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
606337f2f7
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
2026-07-14 23:44:39 +08:00
177144917d
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
2026-07-14 23:44:38 +08:00
a673ee4888
Merge remote-tracking branch 'origin/master' into codex/pr202-merge-review
2026-07-14 23:42:36 +08:00
c67c3d9413
refactor: derive event graphs and scope invariants from TypeScript
2026-07-14 23:37:56 +08:00
7b50c573ca
Merge branch 'master' into codex/fix-acp-snapshot-fs-registration
2026-07-14 23:32:41 +08:00
7cbed547c7
Merge remote-tracking branch 'origin/master' into codex/pr202-merge-review
2026-07-14 23:21:47 +08:00
18a643f543
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-14 23:19:58 +08:00
9ed59df02b
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-14 23:19:52 +08:00
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
98c12676af
Merge remote-tracking branch 'origin/master' into feat/mcp-client
2026-07-14 23:16:43 +08:00
380a4d6dbc
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-14 23:16:41 +08:00
332edfeee7
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-14 23:16:41 +08:00
3b26fb8e1e
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-14 23:16:41 +08:00
Tianyi Cui