e4840c5a88
Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card
2026-07-22 17:09:28 +08:00
248d7bb81e
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
2026-07-22 17:07:49 +08:00
4cd5f21c08
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
2026-07-22 17:05:38 +08:00
c3fb3de64f
Merge PR #500 into codex/tool-json-schema-dsl
...
# Conflicts:
# docs/cordis-catalog/services.md
# scripts/type-equiv.manifest.json
2026-07-22 16:57:45 +08:00
d68126c3fe
Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-20-code-mode-typed-tool-returns.i18n.yaml
2026-07-22 02:19:35 +08:00
f2d86b232e
fix(code-runtime): accept deeply nested JSON
2026-07-22 02:13:37 +08:00
6d57986f33
Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-20-code-mode-typed-tool-returns.i18n.yaml
2026-07-22 01:48:17 +08:00
bb6709b14a
fix(code-runtime): bound completion measurement
2026-07-22 01:42:41 +08:00
00e55db2d7
Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-20-canonical-tool-output-contract.i18n.yaml
# .agents/notes/implemented/feature/2026-07-20-code-mode-typed-tool-returns.i18n.yaml
2026-07-22 01:32:01 +08:00
865d7de858
fix(code-runtime): drain late worker pipe output
2026-07-22 01:27:03 +08:00
5c783f3677
Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card
...
# Conflicts:
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/stream-json.expected.jsonl
# examples/tui-agent/tests/snapshots/code-mode/terminal.expected.txt
2026-07-22 00:36:06 +08:00
ec8e3065ce
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
...
# Conflicts:
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
2026-07-22 00:29:00 +08:00
0dfd9545a6
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
...
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/persistence-catalog.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/fs-write/session.jsonl
# packages/ui/tui/src/index.ts
# scripts/type-equiv.manifest.json
2026-07-22 00:23:00 +08:00
4072673c03
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
...
# Conflicts:
# packages/cordis/tool-cordis/src/api-catalog.ts
2026-07-22 00:05:23 +08:00
b636e0e007
Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card
2026-07-21 23:54:55 +08:00
9753efcd48
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
...
# Conflicts:
# docs/config-catalog.md
# docs/cookbook/adding-a-tool.i18n.yaml
# docs/cookbook/adding-a-tool.md
# docs/cookbook/adding-a-tool.zh.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# packages/core/tools/tests/code-mode.spec.ts
2026-07-21 23:51:20 +08:00
53615c91e7
Merge master into worktree-windows-runtime
2026-07-21 23:39:14 +08:00
7d3cb39047
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
...
# Conflicts:
# .agents/notes/implemented/feature/2026-06-30-interception-seams.md
# docs/config-catalog.md
# docs/cookbook/adding-a-tool.i18n.yaml
# docs/cookbook/adding-a-tool.md
# docs/cookbook/adding-a-tool.zh.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/tools.md
# docs/event-producer-consumer.md
# docs/persistence-catalog.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# packages/bash/tool-bash/src/index.ts
# packages/core/agent-loop/src/tool-calls.ts
# packages/core/agent-loop/tests/cancel.spec.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
# packages/core/agent-loop/tests/tool-calls.spec.ts
# packages/core/tools/README.md
# packages/core/tools/src/index.ts
# packages/core/tools/tests/code-mode.spec.ts
# packages/core/tools/tests/tools.spec.ts
# packages/fs/tool-fs-search/tests/integration.spec.ts
# packages/fs/tool-fs-search/tests/tools.spec.ts
# packages/fs/tool-fs/tests/integration.spec.ts
# packages/mcp/mcp-client/src/tools.ts
# packages/timeout/timeout-policy/tests/timeout-policy.spec.ts
# packages/web/tool-web/tests/integration.spec.ts
# packages/web/tool-web/tests/tool-web.spec.ts
2026-07-21 23:39:03 +08:00
5d514ccdb2
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
...
# Conflicts:
# docs/config-catalog.md
# docs/cookbook/adding-a-tool.i18n.yaml
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# packages/core/tools/tests/tools.spec.ts
2026-07-21 23:04:32 +08:00
3176d232b8
Merge master into codex/session-title
2026-07-21 22:59:41 +08:00
57cd9ce2bf
Merge master into feat/xdg-single-root-home
2026-07-21 22:14:45 +08:00
af1e40e7c6
Merge master into feat/xdg-single-root-home
2026-07-21 21:20:43 +08:00
3a895ce815
Merge master into codex/session-title
2026-07-21 21:11:32 +08:00
60a88114c2
docs(code-mode): align result presentation contract
2026-07-21 21:10:45 +08:00
278bf8cb38
Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card
2026-07-21 20:11:12 +08:00
b34a43cf7e
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
2026-07-21 20:11:07 +08:00
779d8f112a
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
2026-07-21 20:11:04 +08:00
911abf73c8
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
2026-07-21 20:10:57 +08:00
33866af9b9
Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card
2026-07-21 20:09:59 +08:00
eed5ff4dcf
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
...
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/code-runtime/code-runtime-worker/package.json
# packages/spill/spill-policy/package.json
# pnpm-lock.yaml
2026-07-21 20:06:02 +08:00
73ccb67469
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
2026-07-21 20:03:47 +08:00
0004b8675f
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
...
# Conflicts:
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/bash-spill/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# packages/context/workspace-context/tests/workspace-context.spec.ts
# packages/core/agent/src/index.ts
# packages/support/invariants/tests/invariants.spec.ts
# packages/ui/acp/src/index.ts
# packages/ui/tui/tests/harness.ts
# packages/ui/tui/tests/tui.spec.ts
2026-07-21 20:03:00 +08:00
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
21721bf3b1
Merge branch 'master' into fix/compaction-kv-cache-reuse
...
# Conflicts:
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/src/summarizer.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
2026-07-21 19:45:43 +08:00
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
72c6696e4f
Merge branch 'master' into worktree/routed-model-compaction-policy
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-21 19:23:54 +08:00
6635a63bc5
Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-20-canonical-tool-output-contract.i18n.yaml
# examples/tui-agent/tests/snapshots/code-mode/terminal.expected.txt
2026-07-21 19:18:01 +08:00
650a9cd82c
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
...
# Conflicts:
# docs/module-graph.md
2026-07-21 19:16:10 +08:00
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
7d9ed9f70a
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
2026-07-21 19:03:15 +08:00
449e3cf298
fix(tools): make code result cards authoritative
2026-07-21 18:38:22 +08:00
39eb6e21cd
Merge current master into invariant service seam
2026-07-21 18:35:24 +08:00
78f8a3f5d9
Merge branch 'master' into worktree/routed-model-compaction-policy
2026-07-21 18:30:57 +08:00
071fe76755
Merge latest master into invariant service seam
2026-07-21 18:27:46 +08:00
8a93072537
Merge origin/master into worktree/tui-session-controls
2026-07-21 18:12:11 +08:00
b024ebabed
Merge origin/master into worktree-windows-runtime
...
# Conflicts:
# .agents/notes/implemented/simplification/2026-07-04-fold-stdio-ui-helper.md
# packages/support/acp-snapshot/src/harness.ts
# packages/support/acp-snapshot/src/normalize.ts
# packages/support/acp-snapshot/tests/harness.spec.ts
# packages/support/acp-snapshot/tests/normalize.spec.ts
2026-07-21 17:14:44 +08:00
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
04117b58bd
docs(subagent): align the parent contract with ACP cwd inheritance
...
SubagentStartRequest.parent, its core-data type-equiv mirror, and the
ACP backend Agent Note still said the out-of-process backend ignores
request.parent — no longer true: with cwd unconfigured it reads exactly
the session header's cwd, and a parent session without one now rejects
at start. State the one-field read at each owning contract, record the
workspace-resolution decision in the Agent Note, and align the README's
accessibility wording with the search-permission guard.
2026-07-21 16:51:49 +08:00
5261ebab38
fix(compact-basic): fence surface changes only
2026-07-21 16:34:28 +08:00
6475e51825
fix(goal-session): discriminate plugin turn triggers
2026-07-21 16:08:53 +08:00
Tianyi Cui