Commit Graph

1199 Commits

Author SHA1 Message Date
Tianyi Cui
b636e0e007 Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card 2026-07-21 23:54:55 +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
53615c91e7 Merge master into worktree-windows-runtime 2026-07-21 23:39:14 +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
1050711e6d Merge origin/master into worktree/ci-under-minute
# Conflicts:
#	packages/support/acp-snapshot/README.md
2026-07-21 23:34:29 +08:00
Tianyi Cui
9568f9ee27 ci: split Windows build and site validation 2026-07-21 23:18:49 +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
06f3b246b5 ci: add serial cross-platform reference runs 2026-07-21 23:03:52 +08:00
Tianyi Cui
3176d232b8 Merge master into codex/session-title 2026-07-21 22:59:41 +08:00
Tianyi Cui
821e9b6bef Merge origin/master into worktree/ci-under-minute 2026-07-21 22:51:07 +08:00
Tianyi Cui
04d7b435d2 docs(scope): record shared scoped-layer decision 2026-07-21 22:24:45 +08:00
Tianyi Cui
57cd9ce2bf Merge master into feat/xdg-single-root-home 2026-07-21 22:14:45 +08:00
Tianyi Cui
71f5015c61 docs(code-mode): clarify result content ownership 2026-07-21 22:03:46 +08:00
Tianyi Cui
089894fbce Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card 2026-07-21 22:01:13 +08:00
Tianyi Cui
e4c56b35e8 ci: add tail-lane headroom 2026-07-21 22:00:34 +08:00
Yichen Jiang
b964e81c11 Merge remote-tracking branch 'origin/master' into worktree/session-reference
# Conflicts:
#	docs/cordis-catalog/events.md
#	docs/event-producer-consumer.md
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
#	packages/cordis/tool-cordis/src/api-catalog.ts
#	packages/core/agent-loop/src/loop.ts
#	packages/core/agent-loop/tests/contract-regressions.spec.ts
#	packages/core/agent/src/types.ts
#	packages/ui/tui/tests/harness.ts
#	scripts/type-equiv.manifest.json
2026-07-21 21:57:21 +08:00
Tianyi Cui
d80dc21387 docs(agent-note): refresh shared scoped-layer proposal 2026-07-21 21:54:37 +08:00
Tianyi Cui
311cbe1e4c ci: rebalance final boundary lanes 2026-07-21 21:49:35 +08:00
Tianyi Cui
dcda5114de Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results 2026-07-21 21:47:51 +08:00
Tianyi Cui
3d6c3ec2a1 Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
# Conflicts:
#	packages/core/tools/src/schema.ts
2026-07-21 21:44:00 +08:00
Tianyi Cui
e4c5d4d6d8 Merge remote-tracking branch 'origin/master' into scoped-layers-store
# Conflicts:
#	.agents/notes/proposed/architecture/2026-07-12-scoped-layers-store.i18n.yaml
#	.agents/notes/proposed/architecture/2026-07-12-scoped-layers-store.md
#	.agents/notes/proposed/architecture/2026-07-12-scoped-layers-store.zh.md
#	docs/rfc/INDEX.md
2026-07-21 21:42:32 +08:00
Tianyi Cui
89add445fe ci: split boundary lanes 2026-07-21 21:39:51 +08:00
Tianyi Cui
acc628f3af fix(tools): preserve literal and realm-safe schemas 2026-07-21 21:37:11 +08:00
Tianyi Cui
30789a45ee Merge origin/master into worktree/ci-under-minute 2026-07-21 21:29:04 +08:00
Tianyi Cui
ca0c9a7c48 ci: restore hosted lane headroom 2026-07-21 21:28:49 +08:00
Tianyi Cui
aaee0c0c22 Merge branch 'master' into codex/session-scoped-sandbox-roots 2026-07-21 21:22:54 +08:00
Tianyi Cui
af1e40e7c6 Merge master into feat/xdg-single-root-home 2026-07-21 21:20:43 +08:00
Tianyi Cui
7813dbcf0f ci: bound hosted fanout 2026-07-21 21:14:55 +08:00
Tianyi Cui
3a895ce815 Merge master into codex/session-title 2026-07-21 21:11:32 +08:00
Tianyi Cui
60a88114c2 docs(code-mode): align result presentation contract 2026-07-21 21:10:45 +08:00
Yichen Jiang
8bc62e1013 Merge remote-tracking branch 'origin/master' into worktree/session-reference
# Conflicts:
#	.agents/notes/implemented/feature/2026-06-18-compaction-capability-seam.md
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
#	docs/module-graph.md
#	packages/compact/compact-basic/src/region.ts
#	packages/compact/compact/README.md
#	packages/compact/compact/tests/compact.spec.ts
#	packages/examples/acp-demo/package.json
#	packages/ui/tui/README.md
#	packages/ui/tui/package.json
#	packages/ui/tui/src/index.ts
#	packages/ui/tui/tests/harness.ts
#	packages/ui/tui/tests/tui.spec.ts
2026-07-21 21:10:42 +08:00
Tianyi Cui
25f9035ecd ci: split remaining one-minute lanes 2026-07-21 21:05:39 +08:00
Tianyi Cui
3d96508244 ci: restore hosted-run headroom 2026-07-21 20:51:28 +08:00
Tianyi Cui
d9eef06051 fix(fs): align symlinked parent traversal 2026-07-21 20:49:14 +08:00
Tianyi Cui
c0831f0e99 Merge origin/master into worktree/ci-under-minute 2026-07-21 20:40:58 +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
a13c316d2f Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card 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
ec1e1394ed Merge commit 'refs/codex/unblock/master-current' into HEAD
# Conflicts:
#	docs/config-catalog.md
#	packages/session-persistence/session-persistence-jsonl/README.md
#	packages/session-persistence/session-persistence-jsonl/src/index.ts
#	packages/session-persistence/session-persistence-jsonl/tests/jsonl.spec.ts
2026-07-21 20:28:30 +08:00
Yichen Jiang
8c6e28cef8 fix(session): simplify reference byte limits 2026-07-21 20:16:18 +08:00
Tianyi Cui
e0775de689 Merge origin/master into worktree/ci-under-minute 2026-07-21 20:15:19 +08:00
Tianyi Cui
f1202d0dd8 ci: enforce bounded build lanes 2026-07-21 20:15:09 +08:00
Tianyi Cui
278bf8cb38 Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card 2026-07-21 20:11:12 +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
33866af9b9 Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card 2026-07-21 20:09:59 +08:00