Tianyi Cui
|
e4840c5a88
|
Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card
|
2026-07-22 17:09:28 +08:00 |
|
Tianyi Cui
|
248d7bb81e
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-22 17:07:49 +08:00 |
|
Tianyi Cui
|
4cd5f21c08
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
|
2026-07-22 17:05:38 +08:00 |
|
Tianyi Cui
|
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 |
|
Tianyi Cui
|
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 |
|
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
|
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
|
f8008b571d
|
fix(tui): preserve footer truncation after merge
|
2026-07-21 23:47:14 +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
|
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
|
3a895ce815
|
Merge master into codex/session-title
|
2026-07-21 21:11:32 +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
|
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 |
|
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
|
e134e7cc38
|
test(snapshot): refresh unified tool schema fixtures
|
2026-07-21 19:06:52 +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
|
449e3cf298
|
fix(tools): make code result cards authoritative
|
2026-07-21 18:38:22 +08:00 |
|
Tianyi Cui
|
f9b938a4a8
|
Merge branch 'codex/code-mode-typed-results' into codex/code-mode-complete-result-card
|
2026-07-21 18:23:03 +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
|
92180069ea
|
test(acp-snapshot): sync Windows goal command transcript
|
2026-07-21 17:26:36 +08:00 |
|
Tianyi Cui
|
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 |
|
Tianyi Cui
|
2fd995bf3c
|
fix(lsp): align operations and harden lifecycle
|
2026-07-21 13:29:40 +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 |
|
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
|
7c2fb0a6fe
|
fix: keep Code Mode result cards complete
|
2026-07-21 04:55:56 +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
|
bb7db52941
|
Merge remote-tracking branch 'origin/master' into codex/session-title
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/bash-spill/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-edit/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-policy-reject/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read-window/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-terminal-card/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write-overwrite/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-deny/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-pretool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/model-switching/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/multi-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/parallel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/repeat-tool-guard/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/skill-load/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/text-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/todo-plan/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/tool-call-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-edit/stdout.expected.jsonl
# examples/headless-agent/tests/headless.snapshot.ts
# packages/examples/README.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/ui/README.md
# packages/ui/acp/README.md
|
2026-07-21 02:13:10 +08:00 |
|
Tianyi Cui
|
f71f96d292
|
feat(session-title): integrate queries ACP and TUI
|
2026-07-21 01:53:37 +08:00 |
|
Tianyi Cui
|
8500974fd4
|
feat: unify JSON value schema DSL
|
2026-07-21 01:11:55 +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
|
22fa51845e
|
Merge branch 'codex/goal-session' into codex/commands
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# packages/ui/acp/README.md
# packages/ui/tui/README.md
|
2026-07-20 23:03:55 +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 |
|
Yichen Jiang
|
a5404ec25e
|
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/tsconfig.json
|
2026-07-20 22:47:55 +08:00 |
|
Yichen Jiang
|
2c075711eb
|
feat(tui): add session controls and compact views
|
2026-07-20 22:44:01 +08:00 |
|
Tianyi Cui
|
62b40e8634
|
Merge master into worktree-windows-runtime
|
2026-07-20 22:30:29 +08:00 |
|