Yichen Jiang
|
40ce342d81
|
Merge remote-tracking branch 'origin/master' into worktree/tui-file-autocomplete
# Conflicts:
# docs/config-catalog.md
|
2026-07-23 19:32:13 +08:00 |
|
Tianyi Cui
|
fa5c3fa0b9
|
Merge origin/master into codex/code-mode-complete-result-card
|
2026-07-23 17:59:58 +08:00 |
|
Yichen Jiang
|
23fc9cc226
|
feat(tui): add path-only @file autocomplete
|
2026-07-23 17:39:30 +08:00 |
|
Tianyi Cui
|
be62eecc60
|
test(acp): require a real sandbox denial
|
2026-07-23 16:39:02 +08:00 |
|
Tianyi Cui
|
3f547a83d1
|
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
|
2026-07-23 00:03:56 +08:00 |
|
Tianyi Cui
|
8dbea80294
|
Merge branch 'codex/canonical-tool-output' into codex/code-mode-typed-results
|
2026-07-22 23:55:07 +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 |
|
Tianyi Cui
|
065d20c249
|
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
# Conflicts:
# scripts/type-equiv.manifest.json
|
2026-07-22 23:34:17 +08:00 |
|
Tianyi Cui
|
d5d6960184
|
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
# Conflicts:
# docs/architecture.i18n.yaml
# docs/module-graph.md
|
2026-07-22 23:17:02 +08:00 |
|
Tianyi Cui
|
fed32c767d
|
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
|
2026-07-22 23:12:20 +08:00 |
|
Tianyi Cui
|
a03ed8d60b
|
test(schema): refresh PTY tool header fixture
|
2026-07-22 23:08:22 +08:00 |
|
Tianyi Cui
|
1429c5d22f
|
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
|
2026-07-22 23:03:02 +08:00 |
|
Tianyi Cui
|
b65afd320a
|
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
|
2026-07-22 23:00:05 +08:00 |
|
Tianyi Cui
|
d1564f062b
|
Merge refreshed typed Code Mode results into result card fix
|
2026-07-22 22:54:55 +08:00 |
|
Tianyi Cui
|
cf5dfe46e7
|
Merge remote-tracking branch 'origin/rfc/pty' into worktree/pr467-retarget-latest-master
|
2026-07-22 22:50:55 +08:00 |
|
Tianyi Cui
|
d92bb12963
|
Merge refreshed canonical outputs into typed Code Mode results
|
2026-07-22 22:50:28 +08:00 |
|
Tianyi Cui
|
3d9240e423
|
Merge refreshed schema DSL into canonical tool outputs
|
2026-07-22 22:46:10 +08:00 |
|
Tianyi Cui
|
d99094b1ac
|
Merge updated rfc/pty into feature/persistent-pty-sessions
# Conflicts:
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.md
# pnpm-lock.yaml
# scripts/gen-cordis-catalog.ts
|
2026-07-22 22:43:20 +08:00 |
|
Tianyi Cui
|
c51c02cafa
|
Merge latest master into schema DSL
|
2026-07-22 22:42:43 +08:00 |
|
Tianyi Cui
|
59e325f571
|
Merge refreshed typed Code Mode results into result card fix
|
2026-07-22 22:38:23 +08:00 |
|
Tianyi Cui
|
e962642926
|
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
# Conflicts:
# docs/architecture.i18n.yaml
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/examples/acp-demo/README.md
# packages/examples/acp-demo/src/index.ts
# packages/examples/acp-demo/tests/built-bin.e2e.ts
# packages/examples/tui-demo/package.json
# packages/examples/tui-demo/src/index.ts
# packages/examples/tui-demo/tests/tui-agent.spec.ts
|
2026-07-22 22:38:17 +08:00 |
|
Tianyi Cui
|
b0f5d9e313
|
Merge commit 'refs/codex-unblock/20260722-pr338-master' into HEAD
# Conflicts:
# docs/event-producer-consumer.md
# examples/acp-agent/tests/acp.snapshot.ts
# packages/core/session/src/index.ts
# packages/examples/acp-demo/src/index.ts
# packages/session-persistence/session-persistence-jsonl/src/format.ts
# vitest.config.ts
|
2026-07-22 22:37:16 +08:00 |
|
Tianyi Cui
|
101fcdd319
|
Merge refreshed canonical outputs into typed Code Mode results
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-22 22:34:52 +08:00 |
|
Tianyi Cui
|
8930a63b18
|
Merge refreshed schema DSL into canonical tool outputs
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-22 22:28:50 +08:00 |
|
Tianyi Cui
|
93263ed519
|
Merge latest master into schema DSL
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-22 22:21:50 +08:00 |
|
Tianyi Cui
|
e51b2fd834
|
Merge refreshed typed Code Mode results into result card fix
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-20-canonical-tool-output-contract.i18n.yaml
# .agents/notes/implemented/feature/2026-07-20-code-mode-typed-tool-returns.i18n.yaml
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
# examples/tui-agent/tests/snapshots/code-mode/terminal.expected.txt
|
2026-07-22 22:17:05 +08:00 |
|
Tianyi Cui
|
53c3ab135d
|
test(snapshot): cover all packed chunk row kinds
|
2026-07-22 22:14:16 +08:00 |
|
Tianyi Cui
|
ecb77f5e0c
|
test(ci): stabilize cancellation and crash checkpoints
|
2026-07-22 22:14:14 +08:00 |
|
Tianyi Cui
|
8370365c01
|
Merge refreshed canonical outputs into typed Code Mode results
|
2026-07-22 22:10:44 +08:00 |
|
Tianyi Cui
|
92f4a3341e
|
test(snapshots): record canonical diff metadata
|
2026-07-22 22:07:02 +08:00 |
|
Tianyi Cui
|
a838af896e
|
Merge refreshed schema DSL into canonical tool outputs
# Conflicts:
# packages/bash/tool-bash/tests/tools.spec.ts
|
2026-07-22 22:03:54 +08:00 |
|
Tianyi Cui
|
ad4c37013a
|
test(snapshot): await cancelled turn durability
|
2026-07-22 22:00:48 +08:00 |
|
Tianyi Cui
|
277b65aa8c
|
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
# Conflicts:
# pnpm-lock.yaml
|
2026-07-22 22:00:00 +08:00 |
|
Tianyi Cui
|
ec51c1acb0
|
Merge latest master into schema DSL
|
2026-07-22 21:54:32 +08:00 |
|
Tianyi Cui
|
ce970bd31c
|
Merge refreshed canonical outputs into typed Code Mode results
# Conflicts:
# docs/module-graph.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/session.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/system-prompt.expected.md
# packages/core/tools/src/ts-types.ts
|
2026-07-22 21:49:35 +08:00 |
|
Tianyi Cui
|
3679b4d829
|
Merge master into worktree/semantic-session-checkpoints
|
2026-07-22 21:49:24 +08:00 |
|
Tianyi Cui
|
7e5d5795a5
|
test(sandbox): adapt scenarios to latest master
|
2026-07-22 21:41:25 +08:00 |
|
Tianyi Cui
|
10a55d7a27
|
Merge remote-tracking branch 'origin/master' into codex/session-scoped-sandbox-roots
# Conflicts:
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.i18n.yaml
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.md
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.zh.md
# examples/acp-agent/README.md
# packages/examples/agent-spine-demo/package.json
# packages/fs/fs-sandbox/src/index.ts
# packages/fs/tool-fs-search/tests/tools.spec.ts
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/suite.ts
# pnpm-lock.yaml
# scripts/type-equiv.manifest.json
|
2026-07-22 21:37:30 +08:00 |
|
Tianyi Cui
|
54bc084e5d
|
Merge refreshed schema DSL into canonical tool output
# Conflicts:
# docs/config-catalog.md
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.jsonl
# packages/context/workspace-context/tests/workspace-context.spec.ts
# packages/core/tools/tests/tools.spec.ts
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/tui.snapshot.ts
|
2026-07-22 21:31:16 +08:00 |
|
Tianyi Cui
|
479e590029
|
fix(snapshot): align packed refresh by logical event
|
2026-07-22 21:28:38 +08:00 |
|
Tianyi Cui
|
3787bef665
|
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/examples/tui-demo/src/index.ts
# packages/examples/tui-demo/tests/tui-agent.spec.ts
# packages/ui/tui/README.md
# 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
# vitest.config.ts
|
2026-07-22 21:27:18 +08:00 |
|
Tianyi Cui
|
1167ea71b7
|
Merge latest master through rfc/pty into feature/persistent-pty-sessions
# Conflicts:
# docs/module-graph.md
|
2026-07-22 21:21:58 +08:00 |
|
Tianyi Cui
|
c848c7b15e
|
Merge refreshed rfc/pty into feature/persistent-pty-sessions
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/module-graph.md
# docs/tool-catalog.md
# examples/acp-agent/tests/acp.snapshot.ts
# examples/headless-agent/tests/headless.snapshot.ts
# examples/package.json
# packages/README.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/tests/gen-tool-catalog.spec.ts
# pnpm-lock.yaml
# pnpm-workspace.yaml
# scripts/gen-tool-catalog.ts
# scripts/type-equiv.manifest.json
# website/.vitepress/config/api-sidebar.json
|
2026-07-22 21:12:16 +08:00 |
|
Tianyi Cui
|
edba5e861a
|
Merge latest master into tool JSON schema DSL
# Conflicts:
# examples/tui-agent/tests/snapshots/cordis-dynamic-toolchain/terminal.expected.txt
|
2026-07-22 21:11:49 +08:00 |
|
Tianyi Cui
|
6613f43178
|
Merge remote-tracking branch 'origin/master' into worktree/pr468-retarget-latest-master
# Conflicts:
# docs/architecture.i18n.yaml
# docs/capability-seams.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/goal-snapshots/goal-session/stdout.expected.jsonl
# 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/config-options/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/escalation-approved/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-edit/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/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/goal-command-status/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/handshake/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-block/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-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/lsp-definition/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/permission-switching/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
# packages/ui/acp/acp-feature-support.md
# packages/ui/acp/src/index.ts
# packages/ui/acp/tests/harness.ts
# packages/ui/tui/README.md
# scripts/type-equiv.manifest.json
|
2026-07-22 21:06:50 +08:00 |
|
Tianyi Cui
|
c8389ccecf
|
Merge latest master into tool JSON schema DSL
# Conflicts:
# 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
|
2026-07-22 20:58:17 +08:00 |
|
Tianyi Cui
|
c1ced41cdd
|
test(snapshot): include plan mode in checkpoint recovery
|
2026-07-22 20:58:09 +08:00 |
|
Tianyi Cui
|
78c2741d3e
|
Merge remote-tracking branch 'origin/master' into worktree/pr504-retarget-latest-master
# Conflicts:
# docs/event-producer-consumer.md
# examples/tui-agent/README.md
# examples/tui-agent/composition.md
# examples/tui-agent/cordis.yml
# examples/tui-agent/tests/snapshots/multi-turn-conversation/terminal.expected.txt
# examples/tui-agent/tests/tui-keyless-smoke.e2e.ts
# packages/ui/tui/README.md
# vitest.config.ts
|
2026-07-22 20:55:12 +08:00 |
|
Tianyi Cui
|
2478ef7d6d
|
Merge master into worktree/semantic-session-checkpoints
|
2026-07-22 20:50:46 +08:00 |
|
ZiyaZhang
|
1167e91409
|
fix(tui): polish /status diagnostics card
|
2026-07-22 03:29:59 -07:00 |
|