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
80fc984ee2
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
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
5b814652b3
Merge remote-tracking branch 'origin/master' into codex/simp-drop-unused-schema-default
2026-07-15 17:07:50 +08:00
Tianyi Cui
9f96b74e21
Merge remote-tracking branch 'origin/master' into codex/simp-hide-web-provider-helpers
2026-07-15 17:07:46 +08:00
Tianyi Cui
29a47a1fba
Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers
2026-07-15 17:07:42 +08:00
Tianyi Cui
70e01ab96c
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
2026-07-15 17:07:39 +08:00
Tianyi Cui
7f53340f41
Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface
2026-07-15 17:07:35 +08:00
Tianyi Cui
0da51d416e
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-15 17:06:48 +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
Yichen Jiang
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
Hypatia May
dffe51dbf0
Merge token-meter-service into compact-post-step-overflow-recovery
...
# Conflicts:
# docs/cookbook/extension-cookbook.i18n.yaml
2026-07-15 17:03:46 +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
Hypatia May
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
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
ba4b802d17
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-15 16:57:38 +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
Yichen Jiang
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
Yichen Jiang
56d533f917
Merge remote-tracking branch 'origin/codex/agent-session-jsonl-location' into codex/agent-session-jsonl-location
2026-07-15 16:56:45 +08:00
Yichen Jiang
e0a0b8b06d
Merge remote-tracking branch 'origin/master' into worktree/docs-website
...
# Conflicts:
# pnpm-lock.yaml
2026-07-15 16:56:28 +08:00
Tianyi Cui
9530a4ccfc
Merge remote-tracking branch 'origin/master' into HEAD
2026-07-15 16:56:19 +08:00
Tianyi Cui
53fadcce8a
docs(i18n): preserve modal emphasis across pair
2026-07-15 16:56:15 +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
Yichen Jiang
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
Hypatia May
94346513ec
Merge origin/master into compact-tool-pairing
2026-07-15 16:52:50 +08:00
Hypatia May
12484104c8
feat(compact): recover context overflow (PR3 phase 2)
2026-07-15 16:50:44 +08:00
Tianyi Cui
5ee9217146
Merge pull request #325 from deepseek-harness/worktree-demo-move
...
refactor: relocate demo app bundles to packages/examples/*-demo
2026-07-15 16:49:41 +08:00
Tianyi Cui
eb7e25ce5a
Merge remote-tracking branch 'origin/master' into codex/simp-drop-unused-schema-default
2026-07-15 16:49:21 +08:00
Tianyi Cui
45a6f94d8c
Merge remote-tracking branch 'origin/master' into codex/simp-hide-web-provider-helpers
2026-07-15 16:49:20 +08:00
Tianyi Cui
b567997573
Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers
2026-07-15 16:49:20 +08:00
Tianyi Cui
2f23b05c0e
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
2026-07-15 16:49:20 +08:00
Tianyi Cui
edb5fbeb31
Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface
2026-07-15 16:49:20 +08:00
Tianyi Cui
d6bd160f5d
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
2026-07-15 16:49:14 +08:00
Tianyi Cui
1f3a4b662b
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
2026-07-15 16:49:14 +08:00
Tianyi Cui
716f7db820
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
2026-07-15 16:49:07 +08:00
Tianyi Cui
5dfd635998
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
2026-07-15 16:49:07 +08:00
Tianyi Cui
fec25892ba
Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state
2026-07-15 16:49:07 +08:00
Tianyi Cui
11a0f612bd
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
2026-07-15 16:49:07 +08:00
Tianyi Cui
125586625d
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
2026-07-15 16:49:07 +08:00
Tianyi Cui
a6f64f559d
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
2026-07-15 16:49:07 +08:00
Tianyi Cui
d724992a4c
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
2026-07-15 16:49:07 +08:00
Tianyi Cui
c7a16a1bbd
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
2026-07-15 16:49:07 +08:00
Hypatia May
5ca3eab6ce
fix(acp): use 256k compaction window
2026-07-15 16:46:43 +08:00
imccyu
6c2b86b5f2
fix: point node-mode launcher at the renamed dsh-jsonrpc-demo package
...
_node_launch_args builds the launcher path from segments, so the package
rename to dsh-jsonrpc-demo did not reach it via the path sweep. A freshly
deployed node closure ships @deepseek-ai/dsh-jsonrpc-demo, so node mode
raised FileNotFoundError. The docstring and exe ENTRY_BIN already use the
new name.
2026-07-15 16:46:05 +08:00
Tianyi Cui
Yichen Jiang
Hypatia May
imccyu