d81760f8a0
Merge pull request #327 from deepseek-harness/codex/acp-agent-auto-compaction
...
feat(acp): enable automatic compaction
2026-07-20 12:08:10 +08:00
f9a152409e
Merge master into codex/grep-glob-require-rg
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-09-bash-backed-grep-glob-discovery.md
# packages/fs/tool-fs-search/README.md
2026-07-20 11:53:03 +08:00
247526d4ca
fix(acp): adapt compaction wiring to token meter
2026-07-20 11:47:17 +08:00
80cdcce085
Merge origin/master into codex/acp-agent-auto-compaction
2026-07-20 11:45:13 +08:00
2e7cdddb89
Merge remote-tracking branch 'origin/master' into cross-family-fs-sandbox
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.i18n.yaml
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.md
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.zh.md
# docs/capability-seams.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/persistence-catalog.md
# docs/rfc/INDEX.md
# examples/acp-agent/README.md
# examples/acp-agent/fs.cordis.snapshot.yml
# examples/acp-agent/fs.cordis.yml
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/workspace-context/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/workspace-edit/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/workspace-edit/tool-schemas.expected.json
# packages/bash/bash/src/index.ts
# packages/bash/tool-bash/package.json
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/fs/README.md
# packages/fs/tool-fs/src/edit.ts
# packages/fs/tool-fs/src/write.ts
# packages/sandbox/README.md
# pnpm-lock.yaml
2026-07-20 11:44:37 +08:00
58a8612118
Merge branch 'master' into worktree/acp-default-fs-suite
2026-07-20 11:43:11 +08:00
ee1af10c52
docs(acp): note per-model compaction config
2026-07-20 11:38:55 +08:00
48f19044de
Merge remote-tracking branch 'origin/master' into chore/import-landlock-run
...
Conflict: doc-budgets manifest — master raised the AGENTS.md ceiling to 1600
(superseding this branch's 1377 bump for the native/ line), take master's
values.
2026-07-20 11:11:09 +08:00
5833d70447
Merge remote-tracking branch 'origin/master' into worktree/docs-website
...
# Conflicts:
# .agents/notes/implemented/process/2026-07-13-documentation-site-projection.md
# docs/AGENTS.md
# docs/rfc/INDEX.md
# docs/user/develop/basic/index.zh.md
# docs/user/develop/basic/tool.zh.md
# docs/user/develop/framework/index.zh.md
# docs/user/develop/framework/service.zh.md
# docs/user/develop/practice/index.zh.md
# docs/user/guide/index.zh.md
# docs/user/guide/quickstart.zh.md
# knip.json
# package.json
# pnpm-lock.yaml
# scripts/doc-typecheck.ts
# scripts/gen-website-api.ts
# scripts/translation-pairing.manifest.json
# scripts/verify-type-equiv.ts
# website/zh-CN/api/cordis/context.md
# website/zh-CN/api/cordis/events.md
# website/zh-CN/api/cordis/fiber.md
# website/zh-CN/api/cordis/registry.md
# website/zh-CN/api/cordis/service.md
# website/zh-CN/api/harness/agent-loop.md
# website/zh-CN/api/harness/agents.md
# website/zh-CN/api/harness/approval.md
# website/zh-CN/api/harness/bash-env.md
# website/zh-CN/api/harness/bash.md
# website/zh-CN/api/harness/code-runtime.md
# website/zh-CN/api/harness/compact.md
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/fs.md
# website/zh-CN/api/harness/llm.md
# website/zh-CN/api/harness/permission.md
# website/zh-CN/api/harness/sandbox.md
# website/zh-CN/api/harness/session-persistence.md
# website/zh-CN/api/harness/session-query.md
# website/zh-CN/api/harness/sessions.md
# website/zh-CN/api/harness/skills.md
# website/zh-CN/api/harness/spill-store.md
# website/zh-CN/api/harness/subagents.md
# website/zh-CN/api/harness/system-prompt.md
# website/zh-CN/api/harness/tasks.md
# website/zh-CN/api/harness/token-meter.md
# website/zh-CN/api/harness/tools.md
# website/zh-CN/api/harness/user-interaction.md
# website/zh-CN/api/harness/web.md
# website/zh-CN/api/harness/workflows.md
# website/zh-CN/api/index.md
# website/zh-CN/design/effects-coeffects.md
# website/zh-CN/design/index.md
# website/zh-CN/guide/config.md
2026-07-20 10:21:36 +08:00
023bed1a83
Merge pull request #414 from deepseek-harness/codex/require-agent-notes
...
Require Agent Notes for non-trivial changes
2026-07-19 23:58:32 +08:00
b1b57a0ac5
Require Agent Notes for non-trivial changes
2026-07-19 23:29:55 +08:00
4b7765c774
Merge pull request #410 from deepseek-harness/codex/agent-notes
...
Rename RFCs to Agent Notes
2026-07-19 23:26:15 +08:00
3a36064dc6
Merge remote-tracking branch 'origin/master' into codex/agent-notes
2026-07-19 23:15:37 +08:00
4779d04af8
Remove generated Agent Note index
2026-07-19 23:15:23 +08:00
13433025f2
Merge pull request #411 from deepseek-harness/codex/jsonrpc-max-tokens-success-env
...
Make jsonrpc-agent max-token success env-configurable
2026-07-19 23:12:38 +08:00
642b1c29d3
feat(examples): configure max-token success via env
2026-07-19 23:03:08 +08:00
e8eddc7ef8
Rename RFCs to Agent Notes
2026-07-19 22:52:03 +08:00
b736889ac7
Merge pull request #389 from deepseek-harness/worktree/dsbench-patch
...
feat(jsonrpc): add evaluation-ready coding-agent composition
2026-07-19 22:34:15 +08:00
f0c812794c
Merge branch 'master' into worktree/dsbench-patch
2026-07-19 22:31:38 +08:00
35f96add4e
Merge pull request #367 from deepseek-harness/worktree/pi-ai-manual-e2e
...
ci: add manual pi-ai Azure OpenAI and Anthropic e2e workflow
2026-07-19 22:22:24 +08:00
235f39a898
Merge remote-tracking branch 'origin/master' into worktree/dsbench-patch
2026-07-19 22:20:34 +08:00
a1c85447b8
refactor(examples): rename DSBench composition to jsonrpc-agent
2026-07-19 22:19:42 +08:00
3d6d0de07c
Merge branch 'master' into worktree/pi-ai-manual-e2e
2026-07-19 22:19:36 +08:00
114896ee6a
Merge pull request #370 from deepseek-harness/worktree-sdk-followup
...
SDK follow-up: headless create, dsh-sdk create <source>, launcher telemetry
2026-07-19 22:19:16 +08:00
a19dcf40ef
Merge remote-tracking branch 'origin/master' into codex/pr370-review-20260719
2026-07-19 22:00:45 +08:00
c225b4956e
docs(telemetry): document cache effect
2026-07-19 21:53:31 +08:00
38c2b5a6ec
docs(rfc): preserve SDK telemetry scope
2026-07-19 21:49:41 +08:00
4c0bdc7180
Merge remote-tracking branch 'origin/master' into worktree/acp-default-fs-suite
2026-07-19 21:49:06 +08:00
299059665d
Merge branch 'master' into worktree/pi-ai-manual-e2e
2026-07-19 21:47:04 +08:00
43d036ca41
Merge remote-tracking branch 'origin/master' into worktree/dsbench-patch
2026-07-19 21:46:17 +08:00
8a5792187b
Merge branch 'master' into worktree/contain-result-observer-rejections
2026-07-19 21:40:22 +08:00
f2d708511a
Merge pull request #397 from deepseek-harness/codex/rename-golden-files-to-expected
...
Rename golden snapshot filenames to expected
2026-07-19 21:33:30 +08:00
b7cdad6360
ci: reject golden filenames on matching PRs
2026-07-19 21:24:42 +08:00
2bc4791f84
Merge remote-tracking branch 'origin/master' into codex/pr370-review-20260719
2026-07-19 21:21:53 +08:00
fe5c3e2a7a
docs(rfc): formalize SDK follow-up design
2026-07-19 21:21:39 +08:00
546f2ae478
Merge remote-tracking branch 'origin/master' into codex/rename-golden-files-to-expected
2026-07-19 21:09:20 +08:00
f84092045c
Merge pull request #396 from deepseek-harness/codex/package-readme-kv-cache-effect
...
docs: standardize package Model Experience fields
2026-07-19 21:01:30 +08:00
9c28960b7f
Merge remote-tracking branch 'origin/master' into codex/package-readme-kv-cache-effect
2026-07-19 20:52:56 +08:00
27cb50ad46
Merge pull request #398 from deepseek-harness/codex/model-experience-field-headings
...
docs: structure Model Experience fields
2026-07-19 20:49:46 +08:00
d49808c6dd
fix(tools): avoid retaining result executions
2026-07-19 20:14:32 +08:00
55a66024fa
fix: contain result observer rejections and correct bundle attribution
2026-07-19 18:38:35 +08:00
07b15f014a
Merge remote-tracking branch 'origin/master' into worktree/acp-default-fs-suite
2026-07-19 18:28:07 +08:00
1cb63c7a18
fix(acp-agent): enable default filesystem suite
2026-07-19 18:27:44 +08:00
1cd999b3fe
Merge remote-tracking branch 'origin/master' into codex/pr353-retarget-master-20260719
2026-07-19 18:12:09 +08:00
6e790b95f2
fix(compact): complete master retarget integration
...
Declare the tool-result pruning plugin in the examples workspace so the repl Cordis configuration resolves through plain Node and the Loader metadata gate.
Express the validated single-node surface rewrite without a non-null assertion or an unreachable defensive branch, preserving both the runtime contract and per-file 100% coverage.
2026-07-19 18:11:48 +08:00
a278374e8f
docs: structure model experience fields
2026-07-19 18:08:42 +08:00
f756fcb7d3
Merge pull request #395 from deepseek-harness/codex/code-review-prevention
...
docs(agents): promote review principles
2026-07-19 18:00:09 +08:00
6500de8402
Merge remote-tracking branch 'origin/master' into codex/pr353-retarget-master-20260719
2026-07-19 17:56:03 +08:00
9c5b86051b
Merge master into tool-result pruning
...
Retarget the pruning feature onto the merged compaction foundation.
Adapt content-only tool-result rewrite validation to the session-owned surface manager, migrate the demo wiring to repl-agent, and refresh generated type, catalog, and website contracts while preserving pressure and overflow pruning behavior.
2026-07-19 17:54:55 +08:00
8733f365a4
Merge remote-tracking branch 'origin/master' into codex/code-review-prevention
2026-07-19 17:54:35 +08:00
Tianyi Cui