Tianyi Cui
|
26bfd37da0
|
Merge commit 'refs/codex-unblock/20260723/master' into worktree/pty-review-fixes
# Conflicts:
# .agents/notes/implemented/feature/2026-06-30-interception-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/tools.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/tools/README.md
# packages/core/tools/src/index.ts
# packages/core/tools/src/schema.ts
# packages/core/tools/tests/tools.spec.ts
# packages/pty/tool-pty/README.md
# packages/pty/tool-pty/src/index.ts
# packages/pty/tool-pty/src/render.ts
# packages/tasks/tool-tasks/README.md
# packages/tasks/tool-tasks/src/index.ts
|
2026-07-23 20:50:45 +08:00 |
|
Tianyi Cui
|
2821826e2c
|
fix(pty): close final review gaps
|
2026-07-23 02:53:43 +08:00 |
|
Tianyi Cui
|
8d42d3c979
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
# Conflicts:
# docs/config-catalog.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/tests/contract-regressions.spec.ts
# packages/ui/acp/src/index.ts
# packages/ui/tui/src/index.ts
|
2026-07-22 23:50:41 +08:00 |
|
Yichen Jiang
|
da8c0ab092
|
fix(session-reference): bind snapshots to prompts
|
2026-07-22 17:34:31 +08:00 |
|
Yichen Jiang
|
951967217a
|
Merge remote-tracking branch 'origin/master' into worktree/session-reference
# Conflicts:
# docs/capability-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/ui/acp/README.md
# packages/ui/acp/package.json
# packages/ui/acp/tsconfig.json
# packages/ui/tui/package.json
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/tui.spec.ts
# packages/ui/tui/tsconfig.json
# pnpm-lock.yaml
# python/sdk-runtime/package.json
# scripts/gen-doc-graphs.ts
# scripts/type-equiv.manifest.json
|
2026-07-22 10:21:17 +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
|
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
|
3176d232b8
|
Merge master into codex/session-title
|
2026-07-21 22:59:41 +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
|
3a895ce815
|
Merge master into codex/session-title
|
2026-07-21 21:11:32 +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
|
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
|
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
|
1f4f147699
|
test(tools): close canonical output coverage gaps
|
2026-07-21 18:22:14 +08:00 |
|
Tianyi Cui
|
e1633fbc3f
|
fix(tools): preserve canonical output boundaries
|
2026-07-21 18:03:01 +08:00 |
|
Yichen Jiang
|
32d786c439
|
feat(session): add cross-session references
|
2026-07-21 16:46:48 +08:00 |
|
Tianyi Cui
|
b3ba4345f5
|
fix(session-title): respect request and config boundaries
|
2026-07-21 14:09:17 +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 |
|
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
|
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
|
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
|
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 |
|
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 |
|
Tianyi Cui
|
023cde5d82
|
Merge latest master into invariant service seam
|
2026-07-20 22:49:27 +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
|
cc2e14f76e
|
fix: close recovery review gaps
|
2026-07-20 22:11:26 +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 |
|
Yichen Jiang
|
a92d2e5f34
|
Merge origin/master into worktree/explicit-turn-signal
|
2026-07-20 21:38:49 +08:00 |
|
Tianyi Cui
|
7345a68845
|
Merge latest invariant service seam
# Conflicts:
# docs/module-graph.md
# package.json
# packages/examples/tui-demo/package.json
# packages/examples/tui-demo/src/invariant.ts
# packages/ui/stdio/package.json
# packages/ui/stdio/tests/stdio.spec.ts
# packages/ui/stdio/tsconfig.json
# pnpm-lock.yaml
|
2026-07-20 21:02:52 +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
|
6a9e52acbc
|
Merge latest master into invariant service seam
# Conflicts:
# .agents/notes/implemented/feature/2026-06-18-compaction-capability-seam.md
# docs/capability-seams.md
# docs/event-producer-consumer.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/tests/built-bin.e2e.ts
# scripts/gen-doc-graphs.ts
|
2026-07-20 20:58:46 +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
|
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
|
b5ee0561f4
|
Merge latest invariant service seam
|
2026-07-20 20:29:24 +08:00 |
|
Tianyi Cui
|
08ee06cdaf
|
Merge latest master into invariant service seam
|
2026-07-20 20:29:19 +08:00 |
|
Tianyi Cui
|
a86b4c19f5
|
Merge remote-tracking branch 'origin/master' into codex/remove-stdio-agent
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/tests/config-session-id.spec.ts
# packages/ui/stdio/README.md
# packages/ui/stdio/src/index.ts
# packages/ui/stdio/tests/stdio.spec.ts
|
2026-07-20 20:29:08 +08:00 |
|
Tianyi Cui
|
5f806b96f0
|
Merge latest invariant service seam
|
2026-07-20 20:19:14 +08:00 |
|
Tianyi Cui
|
2c04056348
|
Merge latest master into invariant service seam
|
2026-07-20 20:19:01 +08:00 |
|
Tianyi Cui
|
710c62474a
|
Merge branch 'master' into fetch-failed-diagnostics
|
2026-07-20 20:10:57 +08:00 |
|
Tianyi Cui
|
2191d45ece
|
Merge origin/master into codex/remove-stdio-agent
# Conflicts:
# examples/repl-agent/cordis.yml
|
2026-07-20 19:58:40 +08:00 |
|
Tianyi Cui
|
9c4cc05da6
|
Merge branch 'codex/invariant-service-seam' into codex/invariant-package-registration-gate
|
2026-07-20 19:48:51 +08:00 |
|
Tianyi Cui
|
2f3ca3027b
|
Merge remote-tracking branch 'origin/master' into codex/invariant-service-seam
|
2026-07-20 19:42:41 +08:00 |
|
Tianyi Cui
|
4cadf096ce
|
Remove the stdio agent
|
2026-07-20 19:26:04 +08:00 |
|
Tianyi Cui
|
3293d56a06
|
fix: clarify provider retry delay contract
|
2026-07-20 18:38:22 +08:00 |
|
Tianyi Cui
|
8e95f305b0
|
refactor(agent-loop): reuse loaded session metadata
|
2026-07-20 18:26:19 +08:00 |
|