39072f8c58
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-31 00:07:11 +08:00
307fea8ae9
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
2026-07-31 00:06:29 +08:00
1ff8bb3422
Merge latest master into worktree-llm-dynamic-config
2026-07-31 00:05:13 +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
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
7c086e40be
Merge branch 'master' into worktree/plan-review-layout
2026-07-30 23:48:19 +08:00
7cc784388b
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
2026-07-30 23:40:25 +08:00
493c49aeab
Merge pull request #1012 from deepseek-harness/fix/tui-prompt-source-resolution
...
fix(cli): resolve @deepseek-ai/dsh-tui/prompt in the source plane
2026-07-30 23:38:13 +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
38a7c823d7
Merge branch 'master' into feature/directory-listing-tool
2026-07-30 23:17:12 +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
55ae4751b7
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
2026-07-30 22:21:05 +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
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
dea8f31273
Merge branch 'master' into worktree/fix-macos-web-replay
...
# Conflicts:
# .agents/notes/implemented/testing/2026-07-24-web-gui-browser-e2e-lane.i18n.yaml
2026-07-30 22:00:50 +08:00
6f2e8fb6aa
Merge branch 'master' into worktree-forkweb
2026-07-30 21:53:03 +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
0670cb5af8
Merge branch 'master' into codex/queue-collapse
2026-07-30 21:51:49 +08:00
45e6a6c31d
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
2026-07-30 21:50:43 +08:00
97d79e3ee0
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
2026-07-30 21:49:33 +08:00
cd6027125c
Merge latest master into worktree-llm-dynamic-config
2026-07-30 21:49:30 +08:00
b43e392be7
Merge remote-tracking branch 'origin/master' into feature/directory-listing-tool
2026-07-30 21:49:30 +08:00
37116d0b0a
test(scripts): gate source-plane resolution of configured plugins
...
verify-cordis-config now requires every configured specifier of a local
workspace package to resolve through the tsconfig.base.json paths facade
to a .ts/.tsx source file. A failed resolution or a .d.ts hit (the exports
fallback into built lib/types) fails the gate, so a missing paths mapping
is a red gate instead of a clean-tree-only startup crash masked by built
trees in CI. Removing the dsh-tui/prompt mapping reproduces the failure.
Agent Note records the decision and alternatives.
2026-07-30 21:47:13 +08:00
a1c8fa06a0
Merge branch 'master' into codex/queue-collapse
2026-07-30 21:46:37 +08:00
a5e0c5e7e7
Merge latest master into worktree-llm-web-config
...
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
2026-07-30 21:45:55 +08:00
26f0dc1aef
Merge branch 'master' into worktree/ci-independent-consumer-build
2026-07-30 21:44:31 +08:00
ddc4adb7a3
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
2026-07-30 21:42:30 +08:00
ec9ff784fa
Merge remote-tracking branch 'origin/master' into feature/directory-listing-tool
2026-07-30 21:41:25 +08:00
99db7e8fc3
Merge remote-tracking branch 'origin/master' into feature/directory-listing-tool
2026-07-30 21:35:08 +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
2f8f47e500
feat(ui-workspace): flatten session fork rows
2026-07-30 21:28:17 +08:00
36f1489398
fix(web): address session fork review findings
2026-07-30 21:28:13 +08:00
8d864c9549
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
2026-07-30 21:22:28 +08:00
81e5eb9800
Merge latest master into worktree-config-settings-seam
2026-07-30 21:21:35 +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
Yichen Jiang