Yichen Jiang
11ffab7400
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-31 01:06:55 +08:00
Yichen Jiang
a37a90548a
Merge latest master into worktree-llm-web-config
2026-07-31 01:06:28 +08:00
Tianyi Cui
26ef1b7e6c
Merge commit '557cff8871e86a7a9be85c2ee2d8225db8b439fe' into worktree/pr977-merge-20260731
2026-07-31 00:52:43 +08:00
Tianyi Cui
dc0c52bb03
Merge commit 'aab64371402d93293bde384139aaa607906928a8' into worktree/pr977-merge-20260731
2026-07-31 00:32:10 +08:00
Yichen Jiang
52c997d01d
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-31 00:22:45 +08:00
Yichen Jiang
ce3a75ecca
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
2026-07-31 00:21:49 +08:00
Yichen Jiang
564f04e2e2
Merge latest master into worktree-llm-dynamic-config
2026-07-31 00:20:57 +08:00
Yichen Jiang
39072f8c58
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-31 00:07:11 +08:00
Yichen Jiang
307fea8ae9
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
2026-07-31 00:06:29 +08:00
imccyu
bf11016bc1
Merge remote-tracking branch 'origin/master' into worktree/approval-panel-max-height
2026-07-31 00:05:48 +08:00
Yichen Jiang
1ff8bb3422
Merge latest master into worktree-llm-dynamic-config
2026-07-31 00:05:13 +08:00
Yichen Jiang
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
Yichen Jiang
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
imccyu
f332ebab16
Merge branch 'master' into worktree/approval-panel-max-height
2026-07-30 23:57:47 +08:00
imccyu
236fd794f9
Merge branch 'master' into worktree/plan-review-layout
2026-07-30 23:57:20 +08:00
Yichen Jiang
86ae2b70d5
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
2026-07-30 23:57:01 +08:00
Yichen Jiang
2a9a5ff412
Merge latest master into worktree-llm-dynamic-config
2026-07-30 23:55:50 +08:00
imccyu
c6c0f5de6a
Merge branch 'master' into worktree/approval-panel-max-height
2026-07-30 23:49:19 +08:00
imccyu
7c086e40be
Merge branch 'master' into worktree/plan-review-layout
2026-07-30 23:48:19 +08:00
imccyu
57845e02ee
Merge branch 'master' into xtr/trajectory-timeline-click-focus
2026-07-30 23:44:32 +08:00
Yichen Jiang
b05b0a80fd
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-30 23:33:14 +08:00
Yichen Jiang
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
Tianyi Cui
284ec8095e
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
2026-07-30 23:29:15 +08:00
Yichen Jiang
9ebf7424f7
Merge latest master into worktree-llm-dynamic-config
2026-07-30 23:28:58 +08:00
Tianyi Cui
38a7c823d7
Merge branch 'master' into feature/directory-listing-tool
2026-07-30 23:17:12 +08:00
imccyu
da9f02221e
Merge remote-tracking branch 'origin/master' into worktree-forkweb
2026-07-30 22:53:07 +08:00
Tianyi Cui
233486691f
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
2026-07-30 22:42:42 +08:00
Tianyi Cui
16a287d726
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
2026-07-30 22:41:07 +08:00
Yichen Jiang
55ae4751b7
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-30 22:21:05 +08:00
Yichen Jiang
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
Tianyi Cui
8f275cbf5a
Merge branch 'master' into xtr/trajectory-timeline-click-focus
2026-07-30 22:19:42 +08:00
Tianyi Cui
dc5f270ae2
Merge branch 'master' into codex/queue-collapse
2026-07-30 22:18:44 +08:00
Yichen Jiang
80c36ff0d3
Merge latest master into worktree-llm-dynamic-config
2026-07-30 22:18:16 +08:00
Tianyi Cui
95293e58b6
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
2026-07-30 22:14:28 +08:00
Tianyi Cui
b5f5a01dcb
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
2026-07-30 22:14:08 +08:00
imccyu
f2bbc0f453
Merge branch 'master' into worktree-forkweb
2026-07-30 22:12:50 +08:00
creatixchu
1102cfc1f3
Merge remote-tracking branch 'origin/master' into worktree/plan-review-layout
2026-07-30 22:10:56 +08:00
Yichen Jiang
e5d7fa4cef
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-30 21:52:25 +08:00
Yichen Jiang
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
imccyu
3b370549a1
feat(client): increment forked session titles
2026-07-30 21:28:17 +08:00
imccyu
213de9a737
feat(ui-conversation): wire assistant session forks
2026-07-30 21:28:17 +08:00
imccyu
7d27c92851
test(web): cover row fork in the real app
2026-07-30 21:28:16 +08:00
imccyu
36f1489398
fix(web): address session fork review findings
2026-07-30 21:28:13 +08:00
Yichen Jiang
7022ab4a75
Merge worktree-llm-dynamic-config (884) into worktree-llm-web-config
2026-07-30 21:19:17 +08:00
Yichen Jiang
2243e35846
Merge worktree-config-settings-seam (870) into worktree-llm-dynamic-config
2026-07-30 21:17:07 +08:00
Tianyi Cui
6777e4fab9
fix(fs-search): make glob sampling an explicit choice
2026-07-30 21:14:03 +08:00
Yichen Jiang
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
imccyu
d67b80f2fd
Merge branch 'master' into xtr/trajectory-timeline-click-focus
2026-07-30 20:27:47 +08:00
Yichen Jiang
990d1bbc35
fix(cli): declare the config-plane providers the shared base config mounts
...
The master merge moved the TUI composition into `apps/cli/config/base.cordis.yml`
and I carried the `settings-local` / `credentials-local` rows across without
adding them to the resolver manifest. Bare specifiers in an app config resolve
through that manifest's dependencies, so the whole tree failed to boot:
dsh: plugin(s) failed to load: @deepseek-ai/dsh-settings-local,
@deepseek-ai/dsh-credentials-local
which took every TUI PTY smoke with it. `verify-cordis-config` did not catch
it, so the boot smoke was the first signal.
2026-07-30 20:25:13 +08:00
Tianyi Cui
bdc21717c0
Merge branch 'master' into worktree/fix-macos-web-replay
2026-07-30 20:22:12 +08:00
