From 49cc5ab838bb9bcd955d81f7ac0fbf9925faebc8 Mon Sep 17 00:00:00 2001 From: sansheng Date: Tue, 10 Nov 2026 18:35:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(ds-bot):=20settings.trigger=20=E6=A7=BD?= =?UTF-8?q?=E4=BD=8D=E5=86=B2=E7=AA=81=E4=B8=8D=E5=86=8D=E8=AE=A9=E6=95=B4?= =?UTF-8?q?=E4=B8=AA=E6=8F=92=E4=BB=B6=20failed=EF=BC=88M-03=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ds-bot/PATCHES.md | 22 ++++++++++++++++++++++ ds-bot/client.js | 10 +++++++++- ds-bot/package.json | 5 ++++- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/ds-bot/PATCHES.md b/ds-bot/PATCHES.md index b22a3d4..cc1a267 100644 --- a/ds-bot/PATCHES.md +++ b/ds-bot/PATCHES.md @@ -45,6 +45,28 @@ const rt = ctx.get('dsbot-runtime', false) // 未安装打过补丁的 ds-bot 新装、还没有 Bot 时,侧栏就一个设置入口都没有,用户会以为设置页被删了。 本补丁保留宿主原生设置页;DS Bot 自己的设置仍可在其页面里使用。 +## M-03:浏览器端 slots 冲突不再让整个插件「failed」 + +`client.js`(构建产物)里,`settings.trigger` 的注册没有兜底: + +```diff +- slots.inject("settings.trigger", () => slots.register({ name: "settings.trigger" }, TriggerContent)) ++ slots.inject("settings.trigger", () => { ++ try { ++ return slots.register({ name: "settings.trigger" }, TriggerContent) ++ } catch (error) { ++ console.warn("[ds-bot] settings.trigger already registered by the host shell; DS Bot trigger skipped", error) ++ return () => {} ++ } ++ }) +``` + +原因:宿主原生设置壳(我们保留的 M-02)已经占用了 `settings.trigger`,ds-bot 再注册会抛 +`single slot ... already has a registration at priority 0`;该异常从 `apply` 抛出后,宿主把它记为 +`ds-bot: failed`,整个插件(含 Bot 页面)都不加载,随后宿主把 profile 回退成只挂 base + web-app, +表现就是"插件全没了 / 启动崩溃"。`sidebar.settings` 那处上游本来就有 try/catch,不必改。 +改的是构建产物,重新构建上游后需重放本补丁。 + ## 升级步骤 1. 取新版本 npm tarball,解压覆盖本目录(保留本文件与 `NOTICE`)。 diff --git a/ds-bot/client.js b/ds-bot/client.js index 7def82c..2103ba0 100644 --- a/ds-bot/client.js +++ b/ds-bot/client.js @@ -22624,7 +22624,15 @@ function installSettingsShell(ctx, { face, actions, ui: ui2, held }) { }; } }), - slots.inject("settings.trigger", () => slots.register({ name: "settings.trigger" }, TriggerContent)) + slots.inject("settings.trigger", () => { + try { + return slots.register({ name: "settings.trigger" }, TriggerContent); + } catch (error) { + console.warn("[ds-bot] settings.trigger already registered by the host shell; DS Bot trigger skipped", error); + return () => { + }; + } + }) ]; if (carrier?.protocolVersion === 1) { disposers.push(slots.inject("sidebar.toggle.badge", () => slots.register({ diff --git a/ds-bot/package.json b/ds-bot/package.json index f1b8e23..722caaf 100644 --- a/ds-bot/package.json +++ b/ds-bot/package.json @@ -57,7 +57,10 @@ }, "dsh": { "client": { - "platform": "web" + "platform": "web", + "inject": [ + "@deepseek-ai/dsh-client-ui-primitives" + ] }, "bundle": { "patch": "./cordis.patch.yml"