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
ecb77f5e0c
test(ci): stabilize cancellation and crash checkpoints
2026-07-22 22:14:14 +08:00
Tianyi Cui
a3d17feb8c
Merge latest master into worktree/semantic-session-checkpoints
2026-07-22 22:01:38 +08:00
Tianyi Cui
ad4c37013a
test(snapshot): await cancelled turn durability
2026-07-22 22:00:48 +08:00
Tianyi Cui
f967537177
Merge remote-tracking branch 'origin/master' into worktree/web-bind-address
...
# Conflicts:
# apps/cli/src/bin.ts
2026-07-22 21:51:05 +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
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
6d756fd4c9
test(web): add race-free loopback smoke
2026-07-22 21:35:32 +08:00
Tianyi Cui
479e590029
fix(snapshot): align packed refresh by logical event
2026-07-22 21:28:38 +08:00
Tianyi Cui
325cd61644
test(tui): make elapsed refresh deterministic
2026-07-22 21:27: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
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
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
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
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
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
imccyu
b649304fe4
Revert "fix: remove redudant export for client plugin"
...
This reverts commit 48b259100b9cfe2e372eb9fe0924a783988f5a8e.
2026-07-22 18:26:48 +08:00
imccyu
0bd7dbc6b5
fix: remove redudant export for client plugin
2026-07-22 18:24:51 +08:00
ZiyaZhang
280207c824
feat(tui): add /status session diagnostics
2026-07-22 03:10:14 -07:00
imccyu
3c6a987057
ci: coverage skip part of server
2026-07-22 18:06:06 +08:00
Tianyi Cui
c5d1f5c4ae
Merge branch 'master' into feat/plan-mode
2026-07-22 18:05:28 +08:00
imccyu
27fd75a314
ci: coverage skip part of web
2026-07-22 17:54:25 +08:00
Tianyi Cui
41609c4ce4
ci: consolidate primary checks on one larger runner
2026-07-22 17:53:01 +08:00
imccyu
ae44063a51
Merge remote-tracking branch 'origin/master' into worktree-dshweb
2026-07-22 17:35:49 +08:00
Tianyi Cui
b72410b152
chore: extract vendored Cordis hot-reload fix
2026-07-22 17:30:45 +08:00
Tianyi Cui
ec533d0a77
Merge latest master into tui-staging-merge-1
2026-07-22 17:25:35 +08:00
Tianyi Cui
842164553d
fix(plan): reject legacy mode events on load
2026-07-22 17:25:25 +08:00
imccyu
0a91d2cff0
ci: coverage
2026-07-22 17:23:59 +08:00
Tianyi Cui
319005d56b
Merge latest origin/master into worktree/ci-under-minute
2026-07-22 17:20:09 +08:00
Tianyi Cui
8739abdbfe
Merge origin/master into worktree/ci-under-minute
2026-07-22 17:15:46 +08:00
imccyu
2431caa9ab
fix: ci docs/lint
...
fix: ci docs/lint
ci: coverage
2026-07-22 17:03:10 +08:00
Tianyi Cui
f4185122dc
refactor(plan): remove generic mode abstraction
2026-07-22 16:57:23 +08:00
Turtle
7b46e1f73c
fix: address PR #504 review warnings
...
- workspace-context: a transiently unavailable but still-effective candidate
keeps its cached trimmed digest in the directory's dedup slot, so an
identical later sibling is not emitted as a duplicate set until the next
successful reconciliation
- app-boot: --resume rejects a following token that is itself resume syntax
instead of accepting it as a session id
- tui: the queued-steering badge tracks per-entry sources and a drain removes
one matching entry, so loop-authored steering (no agent/queued) cannot
consume a pending user message's slot
2026-07-22 16:49:50 +08:00
