 Tianyi Cui
|
3f93d4ddbd
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
|
2026-07-22 02:07:23 +08:00 |
|
|
Tianyi Cui
|
6c887e8bcf
|
docs(tools): refresh generated catalogs
|
2026-07-22 02:05:02 +08:00 |
|
|
Tianyi Cui
|
0708bd5ef2
|
docs(code-runtime): refresh config catalog
|
2026-07-22 01:29:14 +08:00 |
|
|
Tianyi Cui
|
e1c5832d21
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-22 01:13:56 +08:00 |
|
|
Tianyi Cui
|
6250c103b6
|
docs(tools): sync bounded output contracts
|
2026-07-22 01:11:47 +08:00 |
|
|
Tianyi Cui
|
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 |
|
|
Tianyi Cui
|
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 |
|
|
Tianyi Cui
|
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 |
|
|
Tianyi Cui
|
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 |
|
|
Tianyi Cui
|
3ed74d5476
|
docs: refresh merged contract references
|
2026-07-21 23:44:08 +08:00 |
|
|
Tianyi Cui
|
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 |
|
|
Tianyi Cui
|
2c36792b6c
|
docs(architecture): synchronize Chinese pair
|
2026-07-21 23:10:47 +08:00 |
|
|
Tianyi Cui
|
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 |
|
|
Tianyi Cui
|
3176d232b8
|
Merge master into codex/session-title
|
2026-07-21 22:59:41 +08:00 |
|
|
Tianyi Cui
|
57cd9ce2bf
|
Merge master into feat/xdg-single-root-home
|
2026-07-21 22:14:45 +08:00 |
|
|
Tianyi Cui
|
af1e40e7c6
|
Merge master into feat/xdg-single-root-home
|
2026-07-21 21:20:43 +08:00 |
|
|
Tianyi Cui
|
3a895ce815
|
Merge master into codex/session-title
|
2026-07-21 21:11:32 +08:00 |
|
|
Tianyi Cui
|
2c6c565647
|
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
|
2026-07-21 20:40:52 +08:00 |
|
|
Tianyi Cui
|
e646106232
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-21 20:39:50 +08:00 |
|
|
Tianyi Cui
|
0273af40bf
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
|
2026-07-21 20:39:49 +08:00 |
|
|
Tianyi Cui
|
0feeecbfbd
|
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
|
2026-07-21 20:39:49 +08:00 |
|
|
Tianyi Cui
|
5acd0c6305
|
Merge commit 'refs/codex/unblock/master-current' into HEAD
# Conflicts:
# package.json
|
2026-07-21 20:31:42 +08:00 |
|
|
Tianyi Cui
|
b34a43cf7e
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-21 20:11:07 +08:00 |
|
|
Tianyi Cui
|
779d8f112a
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
|
2026-07-21 20:11:04 +08:00 |
|
|
Tianyi Cui
|
911abf73c8
|
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
|
2026-07-21 20:10:57 +08:00 |
|
|
Tianyi Cui
|
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 |
|
|
Tianyi Cui
|
73ccb67469
|
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
|
2026-07-21 20:03:47 +08:00 |
|
|
Tianyi Cui
|
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 |
|
|
Tianyi Cui
|
8ae6e1ffbd
|
docs(architecture): retain canonical output budget
|
2026-07-21 20:00:09 +08:00 |
|
|
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
|
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 |
|
|
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
|
1ff0332ea0
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-21 19:28:23 +08:00 |
|
|
Tianyi Cui
|
5b36be339d
|
docs(architecture): keep canonical output map concise
|
2026-07-21 19:26:52 +08:00 |
|
|
Tianyi Cui
|
72c6696e4f
|
Merge branch 'master' into worktree/routed-model-compaction-policy
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-21 19:23:54 +08:00 |
|
|
Tianyi Cui
|
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 |
|
|
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
|
373bf333ac
|
docs: refresh config catalog for replay capacity
|
2026-07-21 19:05:40 +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
|
9a96d7c341
|
docs(code-runtime): refresh config catalog
|
2026-07-21 18:50:15 +08:00 |
|
|
Tianyi Cui
|
39eb6e21cd
|
Merge current master into invariant service seam
|
2026-07-21 18:35:24 +08:00 |
|
|
Tianyi Cui
|
78f8a3f5d9
|
Merge branch 'master' into worktree/routed-model-compaction-policy
|
2026-07-21 18:30:57 +08:00 |
|
|
Tianyi Cui
|
071fe76755
|
Merge latest master into invariant service seam
|
2026-07-21 18:27:46 +08:00 |
|
|
Tianyi Cui
|
8a93072537
|
Merge origin/master into worktree/tui-session-controls
|
2026-07-21 18:12:11 +08:00 |
|
|
Tianyi Cui
|
9e01fb060e
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/system-prompt.expected.md
# packages/core/tools/README.md
|
2026-07-21 18:08:56 +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
|
504fbf59f3
|
fix(invariants): replay histories and pack companions
|
2026-07-21 17:46:43 +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 |
|