f93b134c44
fix: tests
2026-07-31 00:04:45 +08:00
fe59dd3530
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
...
# Conflicts:
# apps/web/tests/scaffold.ts
2026-07-31 00:01:28 +08:00
4ef128cd50
test(web): drop the host-skill context row from the conversation goldens
...
These goldens were recorded on a machine with personal skills under ~/.dsh and
~/.agents, so every one of them pinned a context-injection row a clean runner
cannot produce — which is why the browser lane failed on CI and passed
locally. master's scaffold fix confines skill-local's host-level roots to the
temp world; re-recording against it removes the row and nothing else.
seeded-history keeps its row: that scenario seeds the event itself.
2026-07-31 00:00:31 +08:00
f332ebab16
Merge branch 'master' into worktree/approval-panel-max-height
2026-07-30 23:57:47 +08:00
236fd794f9
Merge branch 'master' into worktree/plan-review-layout
2026-07-30 23:57:20 +08:00
86ae2b70d5
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
2026-07-30 23:57:01 +08:00
2a9a5ff412
Merge latest master into worktree-llm-dynamic-config
2026-07-30 23:55:50 +08:00
6842a2826f
Merge branch 'master' into worktree/command-row-copy
2026-07-30 23:52:49 +08:00
c6c0f5de6a
Merge branch 'master' into worktree/approval-panel-max-height
2026-07-30 23:49:19 +08:00
7c086e40be
Merge branch 'master' into worktree/plan-review-layout
2026-07-30 23:48:19 +08:00
5c4398c96c
Merge branch 'master' into worktree/command-row-copy
2026-07-30 23:45:49 +08:00
57845e02ee
Merge branch 'master' into xtr/trajectory-timeline-click-focus
2026-07-30 23:44:32 +08:00
b05b0a80fd
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-30 23:33:14 +08:00
8c0d626cd5
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
...
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
2026-07-30 23:32:31 +08:00
284ec8095e
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
2026-07-30 23:29:15 +08:00
9ebf7424f7
Merge latest master into worktree-llm-dynamic-config
2026-07-30 23:28:58 +08:00
19d8d81cf3
Merge origin/master into feature/tui-first-run-welcome
2026-07-30 23:19:23 +08:00
05b84f4458
fix(tui): publish welcome acknowledgement atomically
2026-07-30 23:18:51 +08:00
38a7c823d7
Merge branch 'master' into feature/directory-listing-tool
2026-07-30 23:17:12 +08:00
605136d18a
test(tui): complete welcome coverage
2026-07-30 23:14:15 +08:00
377be07512
Merge origin/master into feature/tui-first-run-welcome
2026-07-30 23:10:23 +08:00
31f66dbd54
fix(tui): tighten welcome layout and acceptance
2026-07-30 23:09:58 +08:00
da9f02221e
Merge remote-tracking branch 'origin/master' into worktree-forkweb
2026-07-30 22:53:07 +08:00
233486691f
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
2026-07-30 22:42:42 +08:00
16a287d726
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
2026-07-30 22:41:07 +08:00
eda7a4a3a7
Merge origin/master into feature/tui-first-run-welcome
2026-07-30 22:29:52 +08:00
890343751a
feat(tui): add versioned first-run welcome
2026-07-30 22:29:35 +08:00
55ae4751b7
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-30 22:21:05 +08:00
9a0ee6fbfe
Merge branch 'master' into worktree/deepseek-max-tokens-defaults
2026-07-30 22:20:47 +08:00
015b065e9d
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
...
# Conflicts:
# apps/web/tests/scaffold.ts
2026-07-30 22:19:53 +08:00
8f275cbf5a
Merge branch 'master' into xtr/trajectory-timeline-click-focus
2026-07-30 22:19:42 +08:00
dc5f270ae2
Merge branch 'master' into codex/queue-collapse
2026-07-30 22:18:44 +08:00
80c36ff0d3
Merge latest master into worktree-llm-dynamic-config
2026-07-30 22:18:16 +08:00
95293e58b6
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
2026-07-30 22:14:28 +08:00
b5f5a01dcb
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
2026-07-30 22:14:08 +08:00
f2bbc0f453
Merge branch 'master' into worktree-forkweb
2026-07-30 22:12:50 +08:00
1102cfc1f3
Merge remote-tracking branch 'origin/master' into worktree/plan-review-layout
2026-07-30 22:10:56 +08:00
e5d7fa4cef
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-30 21:52:25 +08:00
5fd34f9109
fix(agent-loop): rematerialize adapter defaults
2026-07-30 21:49:58 +08:00
5b29d04c21
test(web): re-record the goldens for master's context-injection disclosure
...
Merging master swapped the plain "▸ 上下文注入" button for the shared
DisclosureRow, which every conversation golden carrying an injected-context
row renders. The only change in all twelve files is that row.
2026-07-30 21:40:34 +08:00
3b370549a1
feat(client): increment forked session titles
2026-07-30 21:28:17 +08:00
213de9a737
feat(ui-conversation): wire assistant session forks
2026-07-30 21:28:17 +08:00
7d27c92851
test(web): cover row fork in the real app
2026-07-30 21:28:16 +08:00
36f1489398
fix(web): address session fork review findings
2026-07-30 21:28:13 +08:00
7022ab4a75
Merge worktree-llm-dynamic-config (884) into worktree-llm-web-config
2026-07-30 21:19:17 +08:00
2243e35846
Merge worktree-config-settings-seam (870) into worktree-llm-dynamic-config
2026-07-30 21:17:07 +08:00
6777e4fab9
fix(fs-search): make glob sampling an explicit choice
2026-07-30 21:14:03 +08:00
daf70f3660
feat(llm-deepseek): configure max token defaults
2026-07-30 21:04:00 +08:00
b6130b178d
Merge remote-tracking branch 'origin/worktree-llm-web-config' into worktree/onboarding-deepseek-config
...
# Conflicts:
# packages/client/ui-models/README.i18n.yaml
# packages/client/ui-models/README.md
# packages/client/ui-models/README.zh.md
# packages/client/ui-models/src/client/store.ts
# packages/client/ui-models/tests/components.spec.tsx
2026-07-30 20:55:12 +08:00
d67b80f2fd
Merge branch 'master' into xtr/trajectory-timeline-click-focus
2026-07-30 20:27:47 +08:00
imccyu