 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
|
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
|
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
|
18bd8082fc
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-21 22:48:17 +08:00 |
|
|
Tianyi Cui
|
ef697a12e7
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
|
2026-07-21 22:44:50 +08:00 |
|
|
Tianyi Cui
|
87f4e0b28e
|
fix(session): identify intrinsic JSON prototypes
|
2026-07-21 22:41:37 +08:00 |
|
|
Tianyi Cui
|
4d7d5d4527
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-21 22:18:32 +08:00 |
|
|
Tianyi Cui
|
59ff1186b6
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
|
2026-07-21 22:15:08 +08:00 |
|
|
Tianyi Cui
|
384cc8c157
|
fix(schema): harden realm-safe JSON validation
|
2026-07-21 22:11:41 +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
|
acc628f3af
|
fix(tools): preserve literal and realm-safe schemas
|
2026-07-21 21:37:11 +08:00 |
|
|
Tianyi Cui
|
5d2f6da843
|
Merge remote-tracking branch 'origin/codex/enforce-tool-cancellation' into codex/enforce-tool-cancellation
# Conflicts:
# packages/core/scope/tests/invariant.spec.ts
# packages/ui/tui/tests/harness.ts
|
2026-07-21 20:27:58 +08:00 |
|
|
Tianyi Cui
|
70e50cd9be
|
Merge commit 'refs/codex/unblock/master-current' into HEAD
# 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:20:53 +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
|
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
|
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
|
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
|
7d9ed9f70a
|
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
|
2026-07-21 19:03:15 +08:00 |
|
|
Tianyi Cui
|
39eb6e21cd
|
Merge current master into invariant service seam
|
2026-07-21 18:35:24 +08:00 |
|
|
Tianyi Cui
|
071fe76755
|
Merge latest master into invariant service seam
|
2026-07-21 18:27:46 +08:00 |
|
|
Tianyi Cui
|
38eaa05be9
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-21 18:22:48 +08:00 |
|
|
Tianyi Cui
|
1f4f147699
|
test(tools): close canonical output coverage gaps
|
2026-07-21 18:22:14 +08:00 |
|
|
Tianyi Cui
|
80603b22f9
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
|
2026-07-21 18:20:32 +08:00 |
|
|
Tianyi Cui
|
72693a346e
|
test(tools): cover adversarial JSON containers
|
2026-07-21 18:20:18 +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
|
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 |
|
|
Tianyi Cui
|
d6bebc18f8
|
Merge remote-tracking branch 'origin/codex/enforce-tool-cancellation' into worktree/explicit-turn-signal
# Conflicts:
# docs/architecture.md
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/agent.ts
# packages/core/agent/README.md
# packages/core/agent/src/types.ts
# packages/ui/acp/src/index.ts
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/harness.ts
|
2026-07-21 12:48:46 +08:00 |
|
|
Tianyi Cui
|
43d50a38b1
|
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
# Conflicts:
# docs/architecture.md
# packages/core/agent-loop/README.md
|
2026-07-21 12:30:08 +08:00 |
|
|
Tianyi Cui
|
c6e1d35a99
|
fix(core): close turn cancellation contract gaps
|
2026-07-21 12:14:53 +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
|
c1d7b0df81
|
feat: return typed values from Code Mode
|
2026-07-21 04:37:09 +08:00 |
|
|
Tianyi Cui
|
66c36e7325
|
feat: add canonical typed tool outputs
|
2026-07-21 03:22:14 +08:00 |
|
|
Tianyi Cui
|
7eee0b48b7
|
Merge codex/invariant-service-seam into codex/invariant-service-review-fixes
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-19-package-invariant-runtime-contracts.i18n.yaml
# scripts/test-invariants.ts
|
2026-07-21 01:25:18 +08:00 |
|
|
Tianyi Cui
|
d3ae708384
|
Merge origin/master into codex/invariant-service-seam
# Conflicts:
# docs/module-graph.md
|
2026-07-21 01:23:19 +08:00 |
|
|
Tianyi Cui
|
55ef21d9d5
|
Merge origin/master into codex/invariant-service-seam
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/src/index.ts
# packages/examples/tui-demo/package.json
# packages/support/invariants/src/scoped-events.generated.ts
# packages/ui/acp/package.json
# packages/ui/tui/package.json
# packages/ui/tui/tests/tui.spec.ts
# pnpm-lock.yaml
|
2026-07-21 01:13:28 +08:00 |
|
|
Tianyi Cui
|
8500974fd4
|
feat: unify JSON value schema DSL
|
2026-07-21 01:11:55 +08:00 |
|
|
Tianyi Cui
|
167a5e95e0
|
Merge codex/invariant-service-seam into codex/invariant-service-review-fixes
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-19-package-invariant-runtime-contracts.i18n.yaml
# scripts/test-invariants.spec.ts
# scripts/test-invariants.ts
|
2026-07-21 00:47:02 +08:00 |
|
|
Tianyi Cui
|
4e7a687c0b
|
Merge origin/master into codex/invariant-service-seam
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/support/invariants/package.json
# packages/support/invariants/src/scoped-events.generated.ts
# packages/support/invariants/tests/invariants.spec.ts
# packages/support/invariants/tsconfig.json
# pnpm-lock.yaml
|
2026-07-21 00:44:39 +08:00 |
|
|
Tianyi Cui
|
0c08e34a4a
|
fix(invariants): harden runtime contracts and gates
|
2026-07-21 00:25:38 +08:00 |
|
|
Tianyi Cui
|
72f0019c4e
|
Merge remote-tracking branch 'origin/codex/enforce-tool-cancellation' into worktree/explicit-turn-signal
# Conflicts:
# docs/architecture.md
# docs/cordis-catalog/events.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/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/loop.ts
# packages/core/agent/README.md
# packages/examples/cli-demo/src/cli.ts
# packages/ui/tui/tests/tui.spec.ts
|
2026-07-21 00:02:17 +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
|
4311aaabb0
|
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
# Conflicts:
# docs/cookbook/adding-a-tool.i18n.yaml
# 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/README.md
# packages/core/tools/README.md
# packages/core/tools/tests/scoped.spec.ts
# packages/fs/tool-fs-search/tests/tools.spec.ts
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/tools.md
|
2026-07-20 23:00:21 +08:00 |
|