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
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
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
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
34194f0cd5
fix(tools): make schema traversal stack-safe
2026-07-22 20:51:13 +08:00
b44f8539e6
Merge latest master into tui-staging-merge-1
2026-07-22 20:45:24 +08:00
35056ad179
Merge current master into CI optimization
2026-07-22 20:34:44 +08:00
712c070cde
Merge latest master into CI optimization
2026-07-22 20:33:58 +08:00
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
93f1610eb7
Merge latest schema DSL base into canonical tool output
2026-07-22 19:11:04 +08:00
c05b684d52
Merge latest master into schema DSL branch
2026-07-22 19:11:04 +08:00
5234a40f9c
refactor(llm): classify auxiliary request purpose
2026-07-22 18:59:49 +08:00
f432f25203
fix(llm): sync compact option catalogs
2026-07-22 18:55:21 +08:00
26166658e2
Merge branch 'master' into jhz_compact_header
2026-07-22 18:45:05 +08:00
e1562160c5
Merge branch 'master' into jhz_compact_header
2026-07-22 18:37:52 +08:00
66e5f8eecd
feat(llm): mark compaction requests with x-deepseek-harness-compact header
2026-07-22 18:35:32 +08:00
e9d3821578
Merge PR #500 into CI optimization
2026-07-22 18:31:28 +08:00
1167e91409
fix(tui): polish /status diagnostics card
2026-07-22 03:29:59 -07:00
7dce8932d3
Merge latest JSON schema DSL base updates into canonical tool outputs
2026-07-22 18:28:47 +08:00
47c93f5926
Merge latest PR #500 client export revert into JSON schema DSL
2026-07-22 18:28:28 +08:00
b649304fe4
Revert "fix: remove redudant export for client plugin"
...
This reverts commit 48b259100b9cfe2e372eb9fe0924a783988f5a8e.
2026-07-22 18:26:48 +08:00
5fd5c49d36
Merge JSON schema DSL client fixes into canonical tool outputs
2026-07-22 18:26:23 +08:00
a26e6ff0dc
Merge PR #500 client fixes into JSON schema DSL
2026-07-22 18:25:38 +08:00
0bd7dbc6b5
fix: remove redudant export for client plugin
2026-07-22 18:24:51 +08:00
832e42fc8d
Merge JSON schema DSL base updates into canonical tool outputs
2026-07-22 18:12:28 +08:00
f2ba06a039
Merge PR #500 server coverage updates into JSON schema DSL
2026-07-22 18:12:06 +08:00
280207c824
feat(tui): add /status session diagnostics
2026-07-22 03:10:14 -07:00
84f752234d
test: make LSP canonical fixture cross-platform
2026-07-22 18:09:53 +08:00
3c6a987057
ci: coverage skip part of server
2026-07-22 18:06:06 +08:00
c5d1f5c4ae
Merge branch 'master' into feat/plan-mode
2026-07-22 18:05:28 +08:00
110de215fc
Merge JSON schema DSL updates into canonical tool outputs
2026-07-22 18:00:05 +08:00
ab59d72f2d
Merge PR #500 updates into JSON schema DSL
...
# Conflicts:
# packages/client/connection/tests/fixture.spec.ts
2026-07-22 17:59:45 +08:00
27fd75a314
ci: coverage skip part of web
2026-07-22 17:54:25 +08:00
41609c4ce4
ci: consolidate primary checks on one larger runner
2026-07-22 17:53:01 +08:00
8b1f9a4697
Merge current codex/tool-json-schema-dsl into codex/canonical-tool-output
2026-07-22 17:48:46 +08:00
400e7021fc
Merge current PR #500 into codex/tool-json-schema-dsl
2026-07-22 17:48:22 +08:00
ae44063a51
Merge remote-tracking branch 'origin/master' into worktree-dshweb
2026-07-22 17:35:49 +08:00
bde76cf838
Merge latest codex/tool-json-schema-dsl into codex/canonical-tool-output
2026-07-22 17:32:35 +08:00
b72410b152
chore: extract vendored Cordis hot-reload fix
2026-07-22 17:30:45 +08:00
c47b7c5428
Merge latest PR #500 into codex/tool-json-schema-dsl
2026-07-22 17:30:13 +08:00
ec533d0a77
Merge latest master into tui-staging-merge-1
2026-07-22 17:25:35 +08:00
842164553d
fix(plan): reject legacy mode events on load
2026-07-22 17:25:25 +08:00
41e8d6c862
Merge updated codex/tool-json-schema-dsl into codex/canonical-tool-output
2026-07-22 17:24:45 +08:00
b8a9b42726
Merge updated PR #500 into codex/tool-json-schema-dsl
2026-07-22 17:24:13 +08:00
0a91d2cff0
ci: coverage
2026-07-22 17:23:59 +08:00
319005d56b
Merge latest origin/master into worktree/ci-under-minute
2026-07-22 17:20:09 +08:00
8739abdbfe
Merge origin/master into worktree/ci-under-minute
2026-07-22 17:15:46 +08:00
4cd5f21c08
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
2026-07-22 17:05:38 +08:00
2431caa9ab
fix: ci docs/lint
...
fix: ci docs/lint
ci: coverage
2026-07-22 17:03:10 +08:00
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