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
c51c02cafa
Merge latest master into schema DSL
2026-07-22 22:42:43 +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
8370365c01
Merge refreshed canonical outputs into typed Code Mode results
2026-07-22 22:10:44 +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
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
db21dcfeae
Merge remote-tracking branch 'origin/master' into codex/session-scoped-sandbox-roots
2026-07-22 21:41:53 +08:00
Tianyi Cui
4444768521
Merge refreshed schema DSL into canonical tool output
2026-07-22 21:38:41 +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
906dad12f7
Merge latest master into schema DSL
2026-07-22 21:35:03 +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
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
9c6099fbbd
Merge branch 'master' into worktree/run-all-gates
2026-07-22 21:10:45 +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
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
Tianyi Cui
b44f8539e6
Merge latest master into tui-staging-merge-1
2026-07-22 20:45:24 +08:00
Tianyi Cui
b2b63b5b2e
Merge latest master into check-all recovery
2026-07-22 20:42:28 +08:00
Tianyi Cui
db21840a43
Merge latest master into check-all recovery
2026-07-22 20:34:54 +08:00
Tianyi Cui
994bb4b07c
fix(code-mode): render deep results iteratively
2026-07-22 19:57:44 +08:00
kingwl
fd5a76160d
Merge remote-tracking branch 'origin/master' into feat/plan-mode
...
17 master merges (GUI host/web stack, compact header, dshweb, fast local
hooks, windows coverage skips, worktree runtime). Conflicts:
- packages/ui/user-interaction/src/index.ts: master extracted the question
types to types.ts; took the re-export and grafted our detail field (the
plan-review payload) into the extracted AskUserQuestionItem.
- generated catalogs regenerated over both sides.
The module graph crossed mermaid's default 500-edge render guard with the
GUI packages plus our plan-mode edges; raised maxEdges in verify-mermaid
(a secure config settable only at initialize).
Note: the remote branch also renamed packages/mode -> packages/plan
(PR #512 plan-mode-simplification, fast-forwarded before this merge).
2026-07-22 19:42:14 +08:00
kingwl
5eb4297758
Merge remote-tracking branch 'origin/master' into jsonl-packed-chunk-rows
...
Conflict: the generated event-producer-consumer doc — regenerated over merged
sources. Also strips the trailing whitespace / extra EOF blank line that
master's vitest.config.ts and client api.ts arrived with (the pre-commit
whitespace hook rejects any commit touching them otherwise).
2026-07-22 19:38:42 +08:00
Tianyi Cui
93f1610eb7
Merge latest schema DSL base into canonical tool output
2026-07-22 19:11:04 +08:00
Tianyi Cui
c05b684d52
Merge latest master into schema DSL branch
2026-07-22 19:11:04 +08:00
Tianyi Cui
68c511bf2c
Merge latest canonical tool output base into typed Code Mode results
2026-07-22 19:11:04 +08:00
Tianyi Cui
ef2de530ff
fix(code-runtime): flatten worker JSON transport
2026-07-22 19:09:27 +08:00
Yichen Jiang
5234a40f9c
refactor(llm): classify auxiliary request purpose
2026-07-22 18:59:49 +08:00
Yichen Jiang
f432f25203
fix(llm): sync compact option catalogs
2026-07-22 18:55:21 +08:00
Tianyi Cui
fe273bd9dd
refactor: name the all-gates mode check-all
2026-07-22 18:27:31 +08:00
Tianyi Cui
c5d1f5c4ae
Merge branch 'master' into feat/plan-mode
2026-07-22 18:05:28 +08:00
Tianyi Cui
197cae8bdd
fix: expose the manual gate set without changing hooks
2026-07-22 18:01:54 +08:00
Tianyi Cui
6d054fd31b
Merge PR #500 head into all-gates recovery
...
# Conflicts:
# package.json
# scripts/run-gates.ts
2026-07-22 17:56:29 +08:00
Tianyi Cui
8e34d87b08
Merge current codex/canonical-tool-output into codex/code-mode-typed-results
2026-07-22 17:49:09 +08:00
Tianyi Cui
8b1f9a4697
Merge current codex/tool-json-schema-dsl into codex/canonical-tool-output
2026-07-22 17:48:46 +08:00
Tianyi Cui
400e7021fc
Merge current PR #500 into codex/tool-json-schema-dsl
2026-07-22 17:48:22 +08:00
Tianyi Cui
d38b27ef65
docs(core): remove stale mode option contract
2026-07-22 17:45:58 +08:00
Tianyi Cui
2405570ac8
chore: restore opt-in all-gates command
2026-07-22 17:42:23 +08:00
imccyu
ae44063a51
Merge remote-tracking branch 'origin/master' into worktree-dshweb
2026-07-22 17:35:49 +08:00
Tianyi Cui
ec533d0a77
Merge latest master into tui-staging-merge-1
2026-07-22 17:25:35 +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
f4185122dc
refactor(plan): remove generic mode abstraction
2026-07-22 16:57:23 +08:00
Tianyi Cui
31c0589439
chore: keep local git hooks fast
2026-07-22 16:37:20 +08:00
