Tianyi Cui
72a48fede6
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
...
# Conflicts:
# docs/event-producer-consumer.md
# packages/context/time-context/tests/time-context.spec.ts
# packages/context/workspace-context/tests/workspace-context.spec.ts
2026-07-21 19:56:43 +08:00
Tianyi Cui
6a45e6e16b
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
...
# Conflicts:
# docs/event-producer-consumer.md
# packages/cordis/tool-cordis/src/api-catalog.ts
2026-07-21 19:44:49 +08:00
Tianyi Cui
0cc5009f58
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
...
# Conflicts:
# docs/config-catalog.md
# examples/acp-agent/tests/snapshots/fs-escalation-approved/session.jsonl
2026-07-21 19:15:18 +08:00
Tianyi Cui
e134e7cc38
test(snapshot): refresh unified tool schema fixtures
2026-07-21 19:06:52 +08:00
Tianyi Cui
7d9ed9f70a
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
2026-07-21 19:03:15 +08:00
Tianyi Cui
78f8a3f5d9
Merge branch 'master' into worktree/routed-model-compaction-policy
2026-07-21 18:30:57 +08:00
Tianyi Cui
8a93072537
Merge origin/master into worktree/tui-session-controls
2026-07-21 18:12:11 +08:00
Tianyi Cui
e1633fbc3f
fix(tools): preserve canonical output boundaries
2026-07-21 18:03:01 +08:00
Tianyi Cui
c9a8c58467
Merge origin/master into lsp
2026-07-21 17:58:46 +08:00
Tianyi Cui
8f3aca4128
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
2026-07-21 17:45:00 +08:00
Tianyi Cui
4574340d7a
fix(tools): harden unified JSON value boundaries
2026-07-21 17:44:46 +08:00
Yichen Jiang
c0d7ef22ec
fix(subagent-acp): repair the composition fixture for the merged depth budget
...
Master landed the tool-subagent depth budget while this branch was in
flight: the numeric default maxDepth now fails the mount against the
ACP provider's depthLimit: false, so the composition fixture must state
maxDepth: 'provider-managed' — the documented opt-out for a provider
whose recursion budget lives in the child harness. The fixture also
moves off the retired stdio-demo REPL onto the current app-boot driver
pattern (runLoaderSmoke + one-shot cli), and the split isDirectory
statements gain the file-not-a-directory case the single-expression
form used to cover implicitly.
2026-07-21 17:14:10 +08:00
Yichen Jiang
6fe8cfb5d1
Merge branch 'fix/acp-subagent-cwd' of github.com:deepseek-harness/deepseek-harness into fix/acp-subagent-cwd
2026-07-21 16:53:46 +08:00
Yichen Jiang
822651a2c7
test(subagent-acp): cover inherited cwd through a Loader composition
...
The inheritance branch ran only under hand-mounted plugin tests, and
the with-key e2e always configures an explicit cwd. Add a test-only
cordis.yml (scripted delegating model + the scripted mock ACP child)
booting the stdio app through the real Loader with cwd omitted: the
child proves it ran in — and was announced — the parent session's
workspace, keylessly.
2026-07-21 16:53:26 +08:00
Tianyi Cui
2fd995bf3c
fix(lsp): align operations and harden lifecycle
2026-07-21 13:29:40 +08:00
Yichen Jiang
b6f6c58435
Merge remote-tracking branch 'origin/master' into worktree/routed-model-compaction-policy
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-10-after-call-compaction-pressure-and-overflow-recovery.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-10-after-call-compaction-pressure-and-overflow-recovery.md
# .agents/notes/implemented/architecture/2026-07-10-after-call-compaction-pressure-and-overflow-recovery.zh.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# examples/headless-agent/tests/harness.ts
# examples/repl-agent/cordis.yml
# packages/compact/compact-basic/README.md
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/compact/compact-basic/tests/loader-composition.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/llm/README.md
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm-pi-ai/src/adapter.ts
# packages/llm/llm/README.md
# packages/llm/llm/src/index.ts
# scripts/gen-cordis-catalog.ts
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/llm.md
# website/zh-CN/api/harness/token-meter.md
# website/zh-CN/guide/config.md
2026-07-21 10:17:55 +08:00
Yichen Jiang
a37e2e0f16
Merge remote-tracking branch 'origin/master' into worktree/tui-session-controls
...
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/ui/acp/src/index.ts
# packages/ui/tui/README.md
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/harness.ts
# packages/ui/tui/tests/plugin-shape.spec.ts
# packages/ui/tui/tests/snapshots/disposed-terminal.expected.txt
# packages/ui/tui/tests/snapshots/errors-and-help.expected.txt
# packages/ui/tui/tests/tui.spec.ts
2026-07-21 10:15:49 +08:00
Dudu-0223
2a55f6b684
Merge origin/master into lsp
2026-07-21 09:57:36 +08:00
Tianyi Cui
66c36e7325
feat: add canonical typed tool outputs
2026-07-21 03:22:14 +08:00
Tianyi Cui
8500974fd4
feat: unify JSON value schema DSL
2026-07-21 01:11:55 +08:00
Tianyi Cui
cbae54c184
Merge branch 'codex/goal-commands' into codex/ralph-tool
...
# Conflicts:
# docs/module-graph.md
2026-07-20 23:15:34 +08:00
Tianyi Cui
a9a9d40cb1
Merge branch 'codex/commands' into codex/goal-commands
...
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# packages/examples/acp-demo/README.md
# packages/examples/acp-demo/src/index.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/src/index.ts
2026-07-20 23:10:33 +08:00
Tianyi Cui
22fa51845e
Merge branch 'codex/goal-session' into codex/commands
...
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# packages/ui/acp/README.md
# packages/ui/tui/README.md
2026-07-20 23:03:55 +08:00
Tianyi Cui
f98f0e9838
Merge branch 'codex/goal-tools' into codex/goal-session
...
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/README.md
# packages/core/agent/README.md
2026-07-20 22:57:14 +08:00
Yichen Jiang
a5404ec25e
Merge remote-tracking branch 'origin/master' into worktree/tui-session-controls
...
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/ui/acp/src/index.ts
# packages/ui/tui/README.md
# packages/ui/tui/src/index.ts
# packages/ui/tui/tsconfig.json
2026-07-20 22:47:55 +08:00
Yichen Jiang
2c075711eb
feat(tui): add session controls and compact views
2026-07-20 22:44:01 +08:00
Tianyi Cui
1b04e8eb2b
Merge branch 'codex/goal-commands' into codex/ralph-tool
...
# Conflicts:
# examples/repl-agent/README.md
# examples/repl-agent/composition.md
# examples/repl-agent/cordis.yml
2026-07-20 22:25:16 +08:00
Tianyi Cui
5c301febbf
Merge branch 'codex/commands' into codex/goal-commands
...
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/module-graph.md
# packages/examples/README.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
2026-07-20 22:18:20 +08:00
Tianyi Cui
78472196c8
Merge branch 'codex/goal-session' into codex/commands
...
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/module-graph.md
# knip.json
# packages/examples/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/tui-demo/package.json
# packages/ui/README.md
# packages/ui/tui/src/index.ts
2026-07-20 22:05:51 +08:00
Tianyi Cui
41196b7e4f
Merge branch 'codex/goal-tools' into codex/goal-session
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-20 21:55:13 +08:00
Tianyi Cui
30d2ec4a95
Merge branch 'codex/goal-commands' into codex/ralph-tool
...
# Conflicts:
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/both-mode-turn/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/model-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/permission-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/skill-load/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/text-turn/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
# scripts/gen-tool-catalog.ts
2026-07-20 21:05:05 +08:00
Tianyi Cui
8c12f8945e
Merge latest master into codex/llm-error-recovery-rfc
...
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/persistence-catalog.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/src/loop.ts
# packages/core/agent/src/types.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/llm/llm-deepseek/README.md
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm-deepseek/tests/adapter.spec.ts
# packages/llm/llm/README.md
# packages/llm/llm/src/error.ts
# packages/llm/llm/tests/service.spec.ts
# packages/sandbox/sandbox-policy/tsconfig.json
# packages/ui/stdio/README.md
# packages/ui/stdio/src/index.ts
# packages/ui/stdio/tests/stdio.spec.ts
# packages/ui/tui/src/index.ts
# pnpm-lock.yaml
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/llm.md
2026-07-20 20:59:11 +08:00
Tianyi Cui
d121f87def
Merge branch 'codex/commands' into codex/goal-commands
...
# Conflicts:
# .agents/notes/implemented/feature/2026-06-30-interception-seams.md
# docs/core-data-structures/core.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/both-mode-turn/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/model-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/permission-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/skill-load/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/text-turn/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
2026-07-20 20:55:50 +08:00
Tianyi Cui
9ef673a5a3
test(commands): cover current ACP scenarios
2026-07-20 20:47:24 +08:00
Tianyi Cui
dfc401a66a
Merge branch 'codex/goal-session' into codex/commands
...
# Conflicts:
# docs/event-producer-consumer.md
# website/.vitepress/config/api-sidebar.json
# website/zh-CN/api/harness/events.md
2026-07-20 20:43:02 +08:00
Tianyi Cui
eb5ae54a79
Merge branch 'codex/goal-tools' into codex/goal-session
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-19-persisted-same-session-goal-domain.i18n.yaml
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/package.json
# packages/core/agent/README.md
# packages/core/agent/src/types.ts
# website/zh-CN/api/harness/events.md
2026-07-20 20:35:15 +08:00
Tianyi Cui
153e4b47bd
Merge branch 'master' into codex/jsonl-zstd-persistence
2026-07-20 19:58:41 +08:00
Tianyi Cui
82ce9dfe0e
Merge branch 'master' into codex/jsonl-zstd-persistence
2026-07-20 19:52:47 +08:00
Tianyi Cui
94a6a95c8e
Merge PR #415 into Ralph tool stack
2026-07-20 18:10:21 +08:00
Tianyi Cui
283c78eec8
test(goal): refresh shipped ACP goal snapshots
2026-07-20 18:06:34 +08:00
Tianyi Cui
08b37399d1
Merge command and goal feedback fixes into goal commands
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-19-model-facing-goal-tools.i18n.yaml
# docs/glossary.md
2026-07-20 18:04:03 +08:00
Tianyi Cui
75e98d6974
test(acp): drop obsolete transcript rerecordings
2026-07-20 18:02:38 +08:00
Tianyi Cui
41d3e78d3a
test(snapshots): require explicit delegation depth
2026-07-20 17:59:13 +08:00
Tianyi Cui
46d60d6d90
fix(tool-subagent): enforce depth only at runtime
2026-07-20 17:58:57 +08:00
Tianyi Cui
78560dbc91
test(commands): refresh ACP goal lifecycle snapshot
2026-07-20 17:52:21 +08:00
Tianyi Cui
bbdd92ebc1
Merge goal-session snapshot fixes into commands
2026-07-20 17:46:05 +08:00
Tianyi Cui
4e74794236
test(goal): isolate the ACP lifecycle snapshot
2026-07-20 17:44:57 +08:00
Tianyi Cui
a87d3e7e55
Merge branch 'codex/goal-session' into codex/commands
2026-07-20 17:24:39 +08:00
Tianyi Cui
51f8bef112
Merge remote-tracking branch 'origin/master' into fix/subagent-depth-budget
2026-07-20 17:24:09 +08:00
Tianyi Cui
77ab5516a9
Merge goal tool fixes and align same-session blockers
2026-07-20 17:23:55 +08:00
