Tianyi Cui
d06500fe9b
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 17:55:57 +08:00
Tianyi Cui
02da758a68
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 17:55:57 +08:00
Tianyi Cui
6245094fe1
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-15 17:55:57 +08:00
Tianyi Cui
d48edf818f
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 17:55:57 +08:00
Tianyi Cui
87c900dfb2
Document compaction result diagnostics
2026-07-15 17:55:48 +08:00
Tianyi Cui
2176e25910
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 17:55:13 +08:00
Tianyi Cui
0b585e1d27
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-15 17:55:06 +08:00
Tianyi Cui
e2c9048c16
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-15 17:55:05 +08:00
Tianyi Cui
25a5dc35ba
Refresh Cordis event API summaries
2026-07-15 17:53:51 +08:00
Tianyi Cui
e1c0d0b579
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 17:37:08 +08:00
Tianyi Cui
cdeec6fc1d
Update built JSON-RPC probe path
2026-07-15 17:36:51 +08:00
Tianyi Cui
3460f9c10b
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-15 17:26:29 +08:00
Tianyi Cui
6ee2655cab
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 17:26:29 +08:00
Tianyi Cui
9035ef1f98
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 17:26:29 +08:00
Tianyi Cui
f20f5c2958
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 17:26:28 +08:00
Tianyi Cui
8eccd5416e
Document restored compaction result fields
2026-07-15 17:26:28 +08:00
Tianyi Cui
7fd7261bcd
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 17:24:08 +08:00
Tianyi Cui
d6ba1fef26
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-15 17:24:07 +08:00
Tianyi Cui
6edb44657c
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 17:24:07 +08:00
Tianyi Cui
623c2fa8d2
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 17:24:07 +08:00
Tianyi Cui
d25a56b431
Restore CompactionResult diagnostics
2026-07-15 17:23:39 +08:00
Tianyi Cui
41e711c01e
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-15 17:09:32 +08:00
Tianyi Cui
54485f7767
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 17:09:32 +08:00
Tianyi Cui
c2081d8abf
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 17:09:32 +08:00
Tianyi Cui
5a2f9182f6
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 17:09:32 +08:00
Tianyi Cui
4c2ed42f48
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 17:09:32 +08:00
Tianyi Cui
8e7cf8cc10
Update ACP launcher example path
2026-07-15 17:09:18 +08:00
Tianyi Cui
92bf506fb0
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
...
# Conflicts:
# docs/config-catalog.md
# packages/core/README.md
2026-07-15 17:06:39 +08:00
Tianyi Cui
3d26e83930
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
...
# Conflicts:
# AGENTS.md
# knip.json
# packages/ui/jsonrpc/README.md
# scripts/run-gates.ts
2026-07-15 17:06:13 +08:00
Tianyi Cui
5ef3dd979f
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
...
# Conflicts:
# docs/config-catalog.md
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/module-graph.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# pnpm-lock.yaml
2026-07-15 17:01:59 +08:00
Tianyi Cui
edd990c5d9
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 16:57:39 +08:00
Tianyi Cui
3ce477123c
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 16:57:39 +08:00
Tianyi Cui
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
Tianyi Cui
c6731b4db3
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-15 16:56:14 +08:00
Tianyi Cui
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
imccyu
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
imccyu
e4691a2f79
fix: register the examples/ group in the tsconfig paths map
...
The @deepseek-ai/dsh-* wildcard maps each package name to its group's
src; the new packages/examples/ group needs its own glob, or the four
moved packages fall back to unbuilt lib/ and vitest cannot resolve them.
Also update the moved specs' plugin export-name assertions (acp-agent ->
acp-demo, stdio-agent -> stdio-demo, agent-core -> agent-spine-demo).
2026-07-15 16:46:05 +08:00
imccyu
2a48b31306
docs: rewrite group maps for the examples/ relocation
...
Add the packages/examples/ group README, drop the moved packages from the
core/ and ui/ group READMEs, and add the examples/ row to the packages
hierarchy table and the repo-layout in AGENTS.md.
2026-07-15 16:46:05 +08:00
imccyu
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
Tianyi Cui
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
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
d42cea85c7
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 16:05:07 +08:00
Tianyi Cui
551b665d0f
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 16:05:02 +08:00
Tianyi Cui
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
Tianyi Cui
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
Tianyi Cui
d0cf9cd411
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
2026-07-15 15:56:11 +08:00
Tianyi Cui
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
Tianyi Cui
e7bae3aa3b
Merge branch 'master' into feat/mcp-client
2026-07-15 15:50:59 +08:00
lintianle
b9eeb2162c
Fix lockfile broken by hand-resolved merge conflict
...
The web-editor conflict resolution renamed the cordis snapshot keys to
rc.7 but left the mcp-client importer pointing at the deleted
cordis@4.0.0-rc.6(...rc.4) key, so every CI lane failed at
'pnpm install --frozen-lockfile' with ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY.
Align the mcp-client cordis range with the repo-wide ^4.0.0-rc.7 sweep
from master and re-resolve the lockfile with pnpm.
2026-07-15 15:40:02 +08:00