Repository navigation
[PR] fix(dsh): silence the doomed CLI-channel attempts for the Desktop-owned desktop profile (#1575) - #1581
[PR] fix(dsh): silence the doomed CLI-channel attempts for the Desktop-owned desktop profile (#1575)#1581ranxianglei wants to merge 1 commit into
Conversation
a4b7fba to
397c8e8
Compare
📦 Built Package ArtifactBranch: Option A — Install this exact build (recommended)npm install -g billion-context@0.0.1866-pr.1581.d1ba0b4This exact version is immutable and reproducible. The rolling Option B — Download artifact
tar xzf billion-context-pr1581.tgz
npm install -g packageInstall instructions are refreshed on each push. |
[bot] 🏷 Review complete — mergeable. I reviewed this PR (it's my own prior work per the ework-agent-pr marker, so I verified rather than redid it), found one real problem — stale base — and fixed it directly on the branch. ① Issue direction (#1575): correct. Root cause is a second writer on a host-owned lane — bili drove ② Regression review (existing behaviors touched):
③ Code: clean. ④ Tests: real teeth — exact ⑤ Diff / what I fixed directly: the branch was based on b371bd0, 188 commits behind master, and upstream had moved the doc sections this PR edits (single-writer table → TECHNICAL-NOTES.md, dsh deep-dive bullets → CLIENTS.md, both +zh). I rebased onto current master (e258bc8), resolved the README conflicts by relocating the doc edits to their new homes — CLIENTS.md / CLIENTS.zh-CN.md bullets, TECHNICAL-NOTES.md / .zh-CN.md table-row exception (zh translation added for sync) — and re-ran everything on the rebased head: typecheck clean, 3067 tests / 0 failures, build success. Branch force-pushed, PR head is now 397c8e8. 中文摘要:修复了 bili 对 Desktop 应用独占的 dsh |
397c8e8 to
01832dd
Compare
[bot] 🏷 分支更新:追加 2 个带标注 commit(来自 #1600 的生产证据核对),head #1600(#1592 日志分析)确认了本 PR 修的同根因并给出首个生产实锤。核对 #1581 实现时发现两处残余缺口,已按「小问题直接修」补进本分支:
预检(rebase 到当前 master 68d1b92 = v0.1.169 后的 head):typecheck 干净;3130 tests / 0 fail(16 skipped 为默认 gate);build 成功。无配置面/持久化/wire/跨仓变更;未触碰 src/update.ts。 中文摘要:#1600 核对发现 owner 提示仍每周期重复、错误消息双写 plugin 子命令两处残余,已在分支上直接补两个带回归测试的 commit 并 rebase 到 v0.1.169 全量预检通过,可以合并。 |
4e291e0 to
082f275
Compare
|
Parking this PR for now — recording why, since the fix itself is real (#1575 second-writer conflict): The direction conflicts with where the dsh desktop product is heading. The desktop host is moving toward a standalone app / service model rather than a pure native plugin inside dsh. The likely packaging split is two artifacts — a client and a server — where the server will be split out and will not be under dsh's jurisdiction at all ( Under that split, "who owns the desktop profile" is answered by the app itself on both sides; having bili unilaterally declare the lane host-managed (or dsh drive it) bakes in the wrong boundary. The #1575 conflict should be resolved by the upcoming client/server packaging split, not by this ownership carve-out. Keeping the branch green as reference; will revisit when the split lands. |
[bot] 🏷 Understood — parked as reference, not merged or closed. Branch state confirmed: rebased onto current master ( One anchor for the revisit: this PR's carve-out keys on the profile name ( |
…d desktop profile (#1575)
082f275 to
0a750b2
Compare
|
(ai: zhipuai-lb/glm-5.3) 孤儿票清理:标题指向的 issue 已关闭,修复已由其他路径落地。关单;误判请 reopen。 |
Completes #1575 together with #1872 (owner decision 2026-10-01: bili takes ownership of the desktop copy and updates it in place — 「否决 直接按照自己覆盖自己的方式更新」).
What this PR does
The deepseek-harness dsh CLI refuses
--profile desktopoutright ("managed exclusively by the Electron application"), so every channel-driven operation against that profile was a guaranteed failure: each global self-update, each #1196 profile-copy self-refresh cycle, and everybili plugin install/remove/update dshspawneddsh plugin --profile desktop add …only to log a failure (or an ENOENT warn on pure-desktop machines without a CLI). This PR makes all channel-driven paths skip the profile with an info-level explanation instead:refreshDshProfileBundles(src/dsh-channel.ts): filters thedesktopprofile out of the refresh targets; logs an info hint when that profile carries billion-context. Covers both triggers transitively — post-global-self-update AND the dsh plugin-market installs never auto-update: the refresh chain's only trigger is a global bili self-update #1196 self-refresh from the copy's own proxy.bili plugin install dsh: skips the profile in both the legacy-block strip loop and the channel add-loop; reports it in the result notes.bili plugin remove dsh: no remove, no legacy-block stripping in that dir; reports "left in place" when a copy is present; a desktop-only carrier yields "nothing removed from CLI profiles — …".bili plugin update dsh(updateLane): excluded from targets; a desktop-only dependency yields a dedicated message instead of a doomed attempt.dshStatus,dshNativeInstalled, lane presence reporting, third-party scan still enumerate the desktop profile.Behavior changes (old → new)
dsh plugin --profile desktop add <ver>→ logged failure every cycle (ENOENT warn when no CLI)bili plugin install dshbili plugin remove dshbili plugin update dshThe desktop copy's live update path is the in-place self-update shipped by #1872 (junction-safe swap;
hostManagedInstall()exemption scoped to<dshHome>/profiles/desktop/node_modules/billion-context). Accepted residuals per owner: second-writer race with the app's own plugin manager;pnpm-lock.yamldivergence after a swap (a later host-side pnpm op could rebuild the layout and undo the overwrite — the next bili update heals it back).Pre-flight