70e01ab96c
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
2026-07-15 17:07:39 +08:00
ff3d893f74
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
...
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# docs/module-graph.md
# examples/echo-agent/composition.md
# packages/README.md
# packages/core/README.md
# packages/examples/acp-demo/package.json
# packages/examples/acp-demo/src/index.ts
# packages/examples/acp-demo/tests/acp-agent.spec.ts
# packages/examples/acp-demo/tests/built-bin.e2e.ts
# packages/examples/acp-demo/tsconfig.json
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/tests/agent-core.spec.ts
# packages/examples/stdio-demo/package.json
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/built-bin.e2e.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# packages/examples/stdio-demo/tsconfig.json
# pnpm-lock.yaml
# python/sdk-runtime/README.i18n.yaml
# python/sdk-runtime/src/deepseek_harness_runtime/runtime/cordis.yml
# python/sdk/tests/test_bundled_runtime.py
2026-07-15 17:04:16 +08:00
9d8f81c8e0
Merge compact-tool-pairing into token-meter-service
...
# Conflicts:
# examples/coding-agent/composition.md
# pnpm-lock.yaml
2026-07-15 16:57:53 +08:00
d4bb9ce2c3
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
...
# Conflicts:
# examples/acp-agent/tests/acp.e2e.ts
# examples/acp-agent/tests/escalation.e2e.ts
# examples/acp-agent/tests/hooks.e2e.ts
# packages/support/README.md
# packages/support/acp-snapshot/src/harness.ts
2026-07-15 16:57:26 +08:00
306b79fa2c
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
...
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# examples/coding-agent/README.md
# examples/coding-agent/cordis.yml
# packages/README.md
# packages/examples/acp-demo/README.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/src/index.ts
# packages/examples/stdio-demo/README.md
# pnpm-lock.yaml
# scripts/doc-budgets.manifest.json
# scripts/verify-package-readme-model-experience.ts
2026-07-15 16:57:03 +08:00
9530a4ccfc
Merge remote-tracking branch 'origin/master' into HEAD
2026-07-15 16:56:19 +08:00
c6731b4db3
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-15 16:56:14 +08:00
7d4fd14a1c
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
...
# Conflicts:
# docs/rfc/implemented/feature/2026-07-14-time-context-plugin.i18n.yaml
2026-07-15 16:56:04 +08:00
20572f8468
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
...
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# packages/README.md
# packages/examples/acp-demo/README.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/README.md
# pnpm-lock.yaml
2026-07-15 16:53:56 +08:00
94346513ec
Merge origin/master into compact-tool-pairing
2026-07-15 16:52:50 +08:00
6dde9f70f0
fix: satisfy doc gates after the examples/ relocation
...
Repair cross-group README links whose targets changed groups
(ui/jsonrpc, ui/app-boot -> examples; examples/* -> ui seams),
re-record the bilingual-pair consistency hashes for the docs the
rename touched on both language sides, and condense the AGENTS.md and
packages/README.md group entries. The packages/README ceiling rises
710 -> 760 for the mandated new examples/ hierarchy row (5% headroom).
2026-07-15 16:46:05 +08:00
6f77da4c8c
refactor: relocate demo app bundles to packages/examples/*-demo
...
Move the agent-spine bundle and the stdio/ACP/JSON-RPC app packages out of
core/ and ui/ into a new packages/examples/ group, renamed with a -demo
suffix so the npm name marks them as non-product surface:
core/agent-core -> examples/agent-spine-demo (dsh-agent-spine-demo)
ui/stdio-agent -> examples/stdio-demo (dsh-stdio-demo)
ui/acp-agent -> examples/acp-demo (dsh-acp-demo)
ui/jsonrpc-agent -> examples/jsonrpc-demo (dsh-jsonrpc-demo)
Update every code/config/test reference and reference-only doc mentions, and
regenerate module-graph, config-catalog, and doc-graphs. The jsonrpc bin
(dsh-jsonrpc-agent) and single-file exe (dsh-jsonrpc-agent-pkg) keep their
names; the SDK runtime-startup surface is reconciled separately.
2026-07-15 16:46:05 +08:00
d24e212f96
Merge branch 'master' into worktree/provider-routed-llm-adapters
2026-07-15 16:40:55 +08:00
ad18165668
Merge remote-tracking branch 'origin/master' into HEAD
...
# Conflicts:
# package.json
2026-07-15 16:40:54 +08:00
f14c576fb7
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
2026-07-15 16:38:21 +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
9cddfe7fd7
Merge remote-tracking branch 'origin/master' into debug-pangwenjie
...
# Conflicts:
# docs/event-producer-consumer.md
# packages/core/agent-loop/src/loop.ts
2026-07-15 15:31:27 +08:00
e55e96eec6
Merge compact-tool-pairing into token-meter-service
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-15 15:27:10 +08:00
63330ac638
Merge origin/master into compact-tool-pairing
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-15 15:24:59 +08:00
905b8ead9f
Merge branch 'master' into feat/mcp-client
2026-07-15 15:22:32 +08:00
99dccf559a
fix(compact): preserve replay ownership (PR2 round 2)
2026-07-15 15:13:57 +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
f038780ff6
feat(llm): add replay token metering (PR2 round 1)
2026-07-15 14:47:29 +08:00
c122c2f0e6
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
2026-07-15 14:02:55 +08:00
3c7f4d4162
Merge branch 'master' into worktree/provider-routed-llm-adapters
2026-07-15 13:59:52 +08:00
40336f945a
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
2026-07-15 13:38:22 +08:00
aa284e0802
Merge branch 'master' into codex/project-instruction-files
2026-07-15 13:36:53 +08:00
28344ac124
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
2026-07-15 13:35:54 +08:00
f1d39921c9
feat(acp): advertise and switch llm models
2026-07-15 13:33:42 +08:00
75331f03a6
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-15 13:30:40 +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
c9efdf68f9
Merge remote-tracking branch 'origin/master' into codex/compact-tool-pairing
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-15 13:26:57 +08:00
9e6a2827c6
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/README.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/README.md
# packages/core/tools/src/index.ts
# packages/ui/stdio-agent/tests/built-bin.e2e.ts
2026-07-15 13:25:44 +08:00
6edd4a205b
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
...
# Conflicts:
# packages/README.md
2026-07-15 13:25:29 +08:00
cc546c4580
feat(compact): move pairing helpers (PR1 round 1)
2026-07-15 13:22:44 +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
ca14bcc34b
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
...
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# packages/fs/fs-local/src/index.ts
# pnpm-lock.yaml
2026-07-15 13:07:11 +08:00
edfc4dc4ac
Preserve interrupted post-tool context
2026-07-15 12:49:50 +08:00
28144077f3
Fix deferred injection lifecycle
2026-07-15 12:22:39 +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
Tianyi Cui