hansjone/dsh-search-mcp
1
0
Fork 0
mirror of https://github.com/hansjone/dsh-search-mcp.git synced 2026-10-18 13:40:47 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove settings.plugin.item inject that crashes Desktop 0.2 boot.

Browse source 
Align with dsh-im-ops: settings.section only, plus optional plugins.item after configForms (0.2.5).

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-10-10 01:44:24 +08:00
parent ae0353dd12
commit 1d9a8e75c9
4 changed files with 116 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -98,8 +98,7 @@ RC2 的 `credentials/reference-updated` 事件会刷新设置卡片中的“已
## DSH 0.1.1-rc.2 适配 ## DSH 0.1.1-rc.2 适配
- DSH host 依赖精确锁定为 `0.1.1-rc.2`，不使用可能落到旧版本线的子包 `latest`。 - DSH host 依赖精确锁定为 `0.1.1-rc.2`，不使用可能落到旧版本线的子包 `latest`。
- Settings 侧栏：`settings.section` + `id: "search-mcp"`（Desktop 0.2 主入口）。 - Settings 侧栏：`settings.section` + `id: "search-mcp"`（Desktop 0.2 / Web 主入口，与 dsh-im-ops 相同）。
- 设置卡片继续使用 keyed slot：`settings.plugin.item` + `key: "search-mcp"`（Web 插件配置页）。
- 新密钥通过 `credentials.set` 单向写入，凭据状态通过 `credentials.describe` 读取。 - 新密钥通过 `credentials.set` 单向写入，凭据状态通过 `credentials.describe` 读取。
- 监听 RC2 的 `credentials/reference-updated`，外部凭据变更后刷新状态 badge。 - 监听 RC2 的 `credentials/reference-updated`，外部凭据变更后刷新状态 badge。
- RC6/RC7 遗留的字面 `apiKey` 仍可由 Host 使用；涉及服务器数组的编辑会阻止不可见旧密钥被意外删除，并要求先迁移。 - RC6/RC7 遗留的字面 `apiKey` 仍可由 Host 使用；涉及服务器数组的编辑会阻止不可见旧密钥被意外删除，并要求先迁移。

248
lib/client.browser.js
View file

@ -1,13 +1,11 @@
/* /*
* dsh-search-mcp — browser half. * dsh-search-mcp — browser half.
* *
* Surfaces (dual-stack), matching netxops / Desktop 0.2: * Surfaces (matching dsh-im-ops / netxops on Desktop 0.2):
* - Always register `settings.section` (Settings sidebar) — never gate the * - Always register `settings.section` (Settings sidebar).
* nav entry on configForms.whileServed (Desktop often never serves our ns). * - Soft-attach real form scopes into a deferred memory scope for Save.
* - Soft-attach real form scopes into a deferred memory scope so Save still * - Optional `plugins.item` when configForms attaches.
* writes the host entry when the transport is ready. * - Do NOT use `settings.plugin.item` — missing on Desktop 0.2 and kills boot.
* - Also keep `settings.plugin.item` / `plugins.item` when forms attach (web
* Plugins tab / Desktop plugins card).
* *
* Form: structured (no raw JSON) — default server, max results, timeout, * Form: structured (no raw JSON) — default server, max results, timeout,
* quick-add presets, collapsible server rows. * quick-add presets, collapsible server rows.
@ -1247,157 +1245,135 @@ window.__ModuleLoader__.load({
} }
function apply(ctx) { function apply(ctx) {
const t = ctx.locale.bind(NS); // Match dsh-im-ops / netxops: only `settings.section` (+ optional plugins.item).
ctx.effect(() => { // Never inject `settings.plugin.item` — Desktop 0.2 lacks that slot and
try { // injecting it fails the client fiber (web boot: dsh-search-mcp: failed),
return ctx.locale.register(NS, { zh, en }); // including when configForms attaches synchronously during apply.
} catch {
const offZh = ctx.locale.register(NS, "zh", zh);
const offEn = ctx.locale.register(NS, "en", en);
return () => { offZh?.(); offEn?.(); };
}
}, "dsh-search-mcp: section dictionaries");
const deferred = createDeferredScope(createMemoryScope(MEMORY_DEFAULTS));
const remote = resolveRemote(ctx);
let controller;
try {
controller = new SearchMcpCardController(deferred, remote, noopDescribeFace());
} catch (error) {
ctx.logger?.error?.("dsh-search-mcp: controller init failed: %s", error);
return;
}
let pluginsItemId;
let pluginCardMounted = false;
try { try {
const t = ctx.locale.bind(NS);
ctx.effect(() => { ctx.effect(() => {
if (typeof remote.$on !== "function") return () => {}; try {
return remote.$on("credentials/reference-updated", (ref) => { return ctx.locale.register(NS, { zh, en });
const used = controller.baseDraft().servers.some((row) => row.apiKeyEnv.trim() === ref); } catch {
if (used) controller.readSecretState(); const offZh = ctx.locale.register(NS, "zh", zh);
}); const offEn = ctx.locale.register(NS, "en", en);
}, "dsh-search-mcp: credential status invalidation"); return () => { offZh?.(); offEn?.(); };
} catch { /* optional */ } }
}, "dsh-search-mcp: section dictionaries");
/** Settings sidebar — unconditional (Desktop 0.2 primary surface). */ const deferred = createDeferredScope(createMemoryScope(MEMORY_DEFAULTS));
try { const remote = resolveRemote(ctx);
ctx.slots.inject("settings.section", () => ctx.slots.register({ let controller;
name: "settings.section",
id: NS,
order: 30,
label: () => t("title"),
locale: NS,
inject: () => controller.inject(),
}, SearchMcpSection));
} catch (error) {
ctx.logger?.warn?.("dsh-search-mcp: settings.section unavailable: %s", error);
}
/**
* Web Plugins → 插件配置 card. Do NOT register this unconditionally:
* Desktop 0.2 may lack `settings.plugin.item`, and injecting a missing
* slot fails the whole client fiber (web boot: dsh-search-mcp: failed).
* Mount only after configForms / settingsScope attaches (web path).
*/
const mountPluginCard = () => {
if (pluginCardMounted) return;
pluginCardMounted = true;
try { try {
ctx.slots.inject("settings.plugin.item", function* () { controller = new SearchMcpCardController(deferred, remote, noopDescribeFace());
yield ctx.slots.register({
name: "settings.plugin.item",
key: NS,
order: 30,
locale: NS,
inject: () => controller.inject(),
}, SearchMcpCard);
});
} catch (error) { } catch (error) {
ctx.logger?.warn?.("dsh-search-mcp: settings.plugin.item unavailable: %s", error); ctx.logger?.error?.("dsh-search-mcp: controller init failed: %s", error);
return;
} }
}; let pluginsItemId;
const registerPluginsItem = (id) => {
if (pluginsItemId === id) return () => {};
try { try {
const off = ctx.slots.inject("plugins.item", () => ctx.slots.register({ ctx.effect(() => {
name: "plugins.item", if (typeof remote.$on !== "function") return () => {};
id, return remote.$on("credentials/reference-updated", (ref) => {
const used = controller.baseDraft().servers.some((row) => row.apiKeyEnv.trim() === ref);
if (used) controller.readSecretState();
});
}, "dsh-search-mcp: credential status invalidation");
} catch { /* optional */ }
try {
ctx.slots.inject("settings.section", () => ctx.slots.register({
name: "settings.section",
id: NS,
order: 30, order: 30,
label: () => t("title"), label: () => t("title"),
locale: NS, locale: NS,
inject: () => controller.inject(), inject: () => controller.inject(),
}, SearchMcpSection)); }, SearchMcpSection));
pluginsItemId = id;
return () => {
if (pluginsItemId === id) pluginsItemId = undefined;
off();
};
} catch (error) { } catch (error) {
ctx.logger?.warn?.("dsh-search-mcp: plugins.item unavailable: %s", error); ctx.logger?.warn?.("dsh-search-mcp: settings.section unavailable: %s", error);
return () => {};
} }
};
const tryGetForm = (forms, candidates) => { const registerPluginsItem = (id) => {
if (typeof forms.get !== "function") return undefined; if (pluginsItemId === id) return () => {};
for (const ns of candidates) {
try { try {
const scope = forms.get(ns); const off = ctx.slots.inject("plugins.item", () => ctx.slots.register({
if (scope && typeof scope.getSnapshot === "function") return { ns, scope }; name: "plugins.item",
} catch { /* try next */ } id,
} order: 30,
return undefined; label: () => t("title"),
}; locale: NS,
inject: () => controller.inject(),
}, SearchMcpSection));
pluginsItemId = id;
return () => {
if (pluginsItemId === id) pluginsItemId = undefined;
off();
};
} catch (error) {
ctx.logger?.warn?.("dsh-search-mcp: plugins.item unavailable: %s", error);
return () => {};
}
};
const attachForm = (hit, source) => { const tryGetForm = (forms, candidates) => {
ctx.logger?.info?.("dsh-search-mcp: attach form via %s (%s)", source, hit.ns); if (typeof forms.get !== "function") return undefined;
deferred.attach(hit.scope); for (const ns of candidates) {
mountPluginCard(); try {
const offPlugins = registerPluginsItem(hit.ns); const scope = forms.get(ns);
return () => { offPlugins(); }; if (scope && typeof scope.getSnapshot === "function") return { ns, scope };
}; } catch { /* try next */ }
}
return undefined;
};
// DSH ≥0.1.7 / 0.2.0 — configForms (persist + plugins.item). const attachForm = (hit, source) => {
ctx.inject(["configForms"], (formsCtx) => { ctx.logger?.info?.("dsh-search-mcp: attach form via %s (%s)", source, hit.ns);
const forms = formsCtx.configForms || formsCtx.get?.("configForms"); deferred.attach(hit.scope);
if (!forms) { return registerPluginsItem(hit.ns);
formsCtx.logger?.warn?.("dsh-search-mcp: configForms inject fired but service missing"); };
return;
}
const candidates = namespaceCandidates(formsCtx);
formsCtx.logger?.info?.("dsh-search-mcp: configForms candidates=%s", candidates.join(","));
if (typeof forms.whileServed === "function") { ctx.inject(["configForms"], (formsCtx) => {
formsCtx.effect(() => forms.whileServed(candidates, (served) => { const forms = formsCtx.configForms || formsCtx.get?.("configForms");
const ns = candidates.find((id) => served.has(id)); if (!forms) {
if (!ns) return () => {}; formsCtx.logger?.warn?.("dsh-search-mcp: configForms inject fired but service missing");
const hit = tryGetForm(forms, [ns, ...candidates]); return;
if (!hit) return () => {}; }
return attachForm(hit, "whileServed"); const candidates = namespaceCandidates(formsCtx);
}), "dsh-search-mcp: configForms whileServed"); formsCtx.logger?.info?.("dsh-search-mcp: configForms candidates=%s", candidates.join(","));
}
const immediate = tryGetForm(forms, candidates); if (typeof forms.whileServed === "function") {
if (immediate) { formsCtx.effect(() => forms.whileServed(candidates, (served) => {
formsCtx.effect( const ns = candidates.find((id) => served.has(id));
() => attachForm(immediate, "eager"), if (!ns) return () => {};
"dsh-search-mcp: configForms eager attach", const hit = tryGetForm(forms, [ns, ...candidates]);
); if (!hit) return () => {};
} return attachForm(hit, "whileServed");
}); }), "dsh-search-mcp: configForms whileServed");
}
// DSH ≤0.1.5 — settingsScope binder. const immediate = tryGetForm(forms, candidates);
ctx.inject(["settingsScope"], (scopeCtx) => { if (immediate) {
const binder = scopeCtx.settingsScope || scopeCtx.get?.("settingsScope"); formsCtx.effect(
if (!binder || typeof binder.bind !== "function") { () => attachForm(immediate, "eager"),
scopeCtx.logger?.warn?.("dsh-search-mcp: settingsScope present but .bind missing"); "dsh-search-mcp: configForms eager attach",
return; );
} }
scopeCtx.logger?.info?.("dsh-search-mcp: attach form via settingsScope"); });
deferred.attach(binder.bind({ namespace: NS }));
}); ctx.inject(["settingsScope"], (scopeCtx) => {
const binder = scopeCtx.settingsScope || scopeCtx.get?.("settingsScope");
if (!binder || typeof binder.bind !== "function") {
scopeCtx.logger?.warn?.("dsh-search-mcp: settingsScope present but .bind missing");
return;
}
scopeCtx.logger?.info?.("dsh-search-mcp: attach form via settingsScope");
deferred.attach(binder.bind({ namespace: NS }));
});
} catch (error) {
ctx.logger?.error?.("dsh-search-mcp: apply aborted: %s", error);
}
} }
//#endregion //#endregion

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "dsh-search-mcp", "name": "dsh-search-mcp",
"version": "0.2.4", "version": "0.2.5",
"description": "Replace dsh's built-in web search with search MCP servers (Tavily / Brave / Exa / Perplexity / DuckDuckGo / custom), configured from the web Settings page. When this plugin is enabled the built-in DeepSeek search provider is disabled.", "description": "Replace dsh's built-in web search with search MCP servers (Tavily / Brave / Exa / Perplexity / DuckDuckGo / custom), configured from the web Settings page. When this plugin is enabled the built-in DeepSeek search provider is disabled.",
"type": "module", "type": "module",
"main": "lib/index.js", "main": "lib/index.js",

5
test/compatibility.test.js
View file

@ -12,7 +12,7 @@ test('package exports resolve and peerDependencies stay open', async () => {
assert.equal(pkg.exports['.'], './lib/index.js'); assert.equal(pkg.exports['.'], './lib/index.js');
assert.equal(pkg.exports['./client'], './lib/client.browser.js'); assert.equal(pkg.exports['./client'], './lib/client.browser.js');
assert.equal(pkg.engines.node, '>=20'); assert.equal(pkg.engines.node, '>=20');
assert.equal(pkg.version, '0.2.4'); assert.equal(pkg.version, '0.2.5');
for (const name of [ for (const name of [
'@deepseek-ai/dsh-api-remotes', '@deepseek-ai/dsh-api-remotes',
@ -35,8 +35,7 @@ test('browser half registers Settings sidebar + deferred form attach', async ()
assert.match(client, /SearchMcpSection/); assert.match(client, /SearchMcpSection/);
assert.match(client, /createDeferredScope/); assert.match(client, /createDeferredScope/);
assert.match(client, /createMemoryScope/); assert.match(client, /createMemoryScope/);
assert.match(client, /name: "settings\.plugin\.item",\s+key: NS,/); assert.doesNotMatch(client, /settings\.plugin\.item/);
assert.doesNotMatch(client, /name: "settings\.plugin\.item",\s+id:/);
assert.match(client, /name: "plugins\.item"/); assert.match(client, /name: "plugins\.item"/);
assert.match(client, /configForms/); assert.match(client, /configForms/);
assert.match(client, /whileServed/); assert.match(client, /whileServed/);