Tianyi Cui
7b803be4ae
Merge branch 'master' into worktree/session-reference
2026-07-22 21:33:21 +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
325cd61644
test(tui): make elapsed refresh deterministic
2026-07-22 21:27:17 +08:00
Tianyi Cui
7575e4a351
Merge remote-tracking branch 'origin/master' into worktree/pr504-vendored-cordis-hot-reload
2026-07-22 21:23:25 +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
4529a22e85
fix(snapshot): preserve packed chunk timing on refresh
2026-07-22 20:56:27 +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
38f7d4e1d1
Merge latest master into worktree/semantic-session-checkpoints
2026-07-22 20:52:11 +08:00
Tianyi Cui
82c6a7a349
Merge remote-tracking branch 'origin/worktree/web-bind-address' into worktree/web-bind-address
2026-07-22 20:51:28 +08:00
Tianyi Cui
34194f0cd5
fix(tools): make schema traversal stack-safe
2026-07-22 20:51:13 +08:00
Tianyi Cui
cdcc83277b
test(web): avoid wildcard socket binding
2026-07-22 20:50:50 +08:00
Tianyi Cui
2478ef7d6d
Merge master into worktree/semantic-session-checkpoints
2026-07-22 20:50:46 +08:00
Tianyi Cui
a3ffe9e3cc
Merge branch 'tui-staging-merge-1' into worktree/pr504-vendored-cordis-hot-reload
2026-07-22 20:49:34 +08:00
Tianyi Cui
e03a1102bb
Merge branch 'master' into worktree/web-bind-address
2026-07-22 20:46:49 +08:00
Tianyi Cui
b44f8539e6
Merge latest master into tui-staging-merge-1
2026-07-22 20:45:24 +08:00
Tianyi Cui
d849a06cb6
Merge remote-tracking branch 'origin/master' into worktree/web-bind-address
2026-07-22 20:35:48 +08:00
Tianyi Cui
c949a52627
fix(web): default to loopback binding
2026-07-22 20:35:38 +08:00
Tianyi Cui
35056ad179
Merge current master into CI optimization
2026-07-22 20:34:44 +08:00
Tianyi Cui
712c070cde
Merge latest master into CI optimization
2026-07-22 20:33:58 +08:00
Yichen Jiang
93f1eaa972
fix(gui): keep sidebar controls when collapsed
2026-07-22 20:28:40 +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
4d4d0c4bab
Merge latest typed Code Mode results into result card
2026-07-22 19:11:04 +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
e49ec0914c
Merge refreshed typed Code Mode results into result card
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-20-code-mode-typed-tool-returns.i18n.yaml
2026-07-22 19:10:31 +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
26166658e2
Merge branch 'master' into jhz_compact_header
2026-07-22 18:45:05 +08:00
Tianyi Cui
8425e1d494
Merge deep-worker timeout fix into result card branch
2026-07-22 18:40:42 +08:00
Tianyi Cui
d6f478488d
test: allow deep worker checks under Windows coverage
2026-07-22 18:40:24 +08:00
Jinhua Zhu
e1562160c5
Merge branch 'master' into jhz_compact_header
2026-07-22 18:37:52 +08:00
Jinhua Zhu
66e5f8eecd
feat(llm): mark compaction requests with x-deepseek-harness-compact header
2026-07-22 18:35:32 +08:00
Tianyi Cui
e9d3821578
Merge PR #500 into CI optimization
2026-07-22 18:31:28 +08:00
ZiyaZhang
1167e91409
fix(tui): polish /status diagnostics card
2026-07-22 03:29:59 -07:00
Tianyi Cui
667d6473c0
Merge latest typed Code Mode base updates into result card fix
2026-07-22 18:29:38 +08:00
Tianyi Cui
b7f988c2ad
Merge latest canonical tool output base updates into typed Code Mode results
2026-07-22 18:29:15 +08:00
Tianyi Cui
7dce8932d3
Merge latest JSON schema DSL base updates into canonical tool outputs
2026-07-22 18:28:47 +08:00
Tianyi Cui
47c93f5926
Merge latest PR #500 client export revert into JSON schema DSL
2026-07-22 18:28:28 +08:00
Tianyi Cui
7d55ed4eb8
Merge typed Code Mode client fixes into result card fix
2026-07-22 18:27:13 +08:00
Tianyi Cui
9d22c47f8b
Merge canonical tool output client fixes into typed Code Mode results
2026-07-22 18:26:52 +08:00
Tianyi Cui
Yichen Jiang
kingwl
Jinhua Zhu
ZiyaZhang