@kirkchinese/dsh-capability-catalog 0.1.1 → 0.1.3

package/README.md

@@ -71,8 +71,9 @@ Lazy capability catalog for DeepSeek Harness: one compact index plus three fixed
 
 - 全局：「插件」页本插件（或整合包）详情中的设置卡片。
 - 会话：输入框左侧「能力」按钮，每项「默认 / 开 / 关」。
-- 生效顺序：会话 > 全局 > 配置（`mcp[].enabled`，skill 默认开启）。全局关闭的服务器不运行；会话关闭只对该会话隐藏。
-- 状态文件：`cacheDir/toggles.json`，最多保留最近 500 个会话的覆盖。
+- 生效顺序：会话 > 全局 > 配置（`mcp[].enabled`，skill 默认开启）。全局关闭的服务器断开且不在启动时运行，也不进其他会话的索引；某会话单独设为「开」时，只为该会话按需发现和启动。会话关闭只对该会话隐藏。
+- 状态文件：`cacheDir/toggles.json`，最多保留最近 500 个会话的覆盖。插件只在启动时读取它，请通过界面修改；直接编辑文件需重启 DSH。
+- 界面在窗口重新获得焦点、弹窗每次打开时重新读取状态，因此其他浏览器或主机重启后的变化会被拾取。
 
 ## 行为细节
 

package/client/client.js

@@ -51,6 +51,7 @@ window.__ModuleLoader__.load({
         filterOff: '已关闭',
         allOn: '全开',
         allOff: '全关',
+        familyScope: '只作用于当前列表中显示的条目',
         disabled: '能力目录已关闭（配置 enabled: false）：不注册工具、不进索引，MCP 服务器不运行。',
         globalNote: '这里的开关作用于所有会话，立即生效。单个会话可以在输入框左侧的「能力」按钮中覆盖。关闭的服务器会停止运行。',
         noTakeover: '未接管 skill 目录（skills.takeOverCatalog 为 false）：skill 开关不会影响 DSH 原生的 skill 目录。',
@@ -84,6 +85,7 @@ window.__ModuleLoader__.load({
         filterOff: 'Off',
         allOn: 'All on',
         allOff: 'All off',
+        familyScope: 'Applies to the rows currently shown',
         disabled: 'The capability catalog is switched off (enabled: false): no tools, no index, no MCP servers running.',
         globalNote: 'These switches apply to every session immediately. A session can override them from the Capabilities button left of the input box. A server switched off stops running.',
         noTakeover: 'The skill catalog is not taken over (skills.takeOverCatalog is false): skill switches do not affect the native skill catalog.',
@@ -199,6 +201,17 @@ window.__ModuleLoader__.load({
       }, [api, sessionId])
       useEffect(() => (active ? load() : undefined), [load, active])
       useEffect(() => api.onChange(() => { if (active) load() }), [api, load, active])
+      // Other browsers and host restarts change the state behind this view; refresh on return.
+      useEffect(() => {
+        if (!active) return undefined
+        const onVisible = () => { if (document.visibilityState === 'visible') load() }
+        window.addEventListener('focus', load)
+        document.addEventListener('visibilitychange', onVisible)
+        return () => {
+          window.removeEventListener('focus', load)
+          document.removeEventListener('visibilitychange', onVisible)
+        }
+      }, [load, active])
       const set = useCallback(async (request) => {
         const data = await api.request({ action: 'set', ...request, ...(sessionId ? { sessionId } : {}) })
         generation.current++
@@ -307,8 +320,8 @@ window.__ModuleLoader__.load({
               h('div', { className: 'cc-family' },
                 h('span', null, `${family} (${skills.length})`),
                 h('span', { className: 'cc-toolbar' },
-                  h('button', { type: 'button', className: 'cc-btn', disabled: busy, onClick: () => run(skills.map((skill) => ({ kind: 'skill', name: skill.name, value: null }))) }, t.allOn),
-                  h('button', { type: 'button', className: 'cc-btn', disabled: busy, onClick: () => run(skills.map((skill) => ({ kind: 'skill', name: skill.name, value: false }))) }, t.allOff))),
+                  h('button', { type: 'button', className: 'cc-btn', disabled: busy, title: t.familyScope, onClick: () => run(skills.map((skill) => ({ kind: 'skill', name: skill.name, value: null }))) }, t.allOn),
+                  h('button', { type: 'button', className: 'cc-btn', disabled: busy, title: t.familyScope, onClick: () => run(skills.map((skill) => ({ kind: 'skill', name: skill.name, value: false }))) }, t.allOff))),
               skills.map((skill) => h('div', { className: 'cc-row', key: skill.name },
                 h('div', { className: 'cc-row-main' },
                   h('div', { className: 'cc-row-name' }, skill.name),
@@ -325,9 +338,10 @@ window.__ModuleLoader__.load({
       const [open, setOpen] = useState(false)
       const [query, setQuery] = useState('')
       const anchor = useRef(null)
-      const { data, error, set } = useOverview(api, sessionId, true)
+      const { data, error, set, reload } = useOverview(api, sessionId, true)
       const [actionError, setActionError] = useState(null)
 
+      useEffect(() => { if (open) reload() }, [open, reload])
       useEffect(() => {
         if (!open) return undefined
         const onKey = (event) => { if (event.key === 'Escape') setOpen(false) }

package/lib/catalog.d.ts

@@ -30,6 +30,8 @@ export declare class Catalog {
     private cache;
     /** Decides whether an entry is enabled for a viewer; everything is enabled by default. */
     isEnabled: (entry: CapabilityEntry, view: ViewContext) => boolean;
+    /** Decides whether a whole source is switched on for a viewer; a switched-off source leaves the index. */
+    isSourceEnabled: (source: CapabilitySource, view: ViewContext) => boolean;
     /**
      * Add a source; returns its disposer.
      * @param source - capability source with a unique key.

package/lib/catalog.js

@@ -43,6 +43,8 @@ export class Catalog {
     cache;
     /** Decides whether an entry is enabled for a viewer; everything is enabled by default. */
     isEnabled = () => true;
+    /** Decides whether a whole source is switched on for a viewer; a switched-off source leaves the index. */
+    isSourceEnabled = () => true;
     /**
      * Add a source; returns its disposer.
      * @param source - capability source with a unique key.
@@ -110,6 +112,7 @@ export class Catalog {
     /** Index blocks of every source, in registration order. */
     indexes(view) {
         return this.list()
+            .filter((source) => this.isSourceEnabled(source, view))
             .map((source) => source.index(view, source.entries(view).filter((entry) => this.isEnabled(entry, view))))
             .filter((index) => index !== undefined);
     }

package/lib/index.js

@@ -137,7 +137,12 @@ export async function apply(rawCtx, config) {
     catalog.isEnabled = (entry, view) => entry.kind === 'skill'
         ? toggles.enabled('skill', entry.name, view.sessionId)
         : toggles.enabled('server', entry.source.replace(/^mcp:/u, ''), view.sessionId, serverOf(entry.source)?.configuredEnabled ?? true);
-    // MCP sources. A server switched off globally is listed but never started.
+    catalog.isSourceEnabled = (source, view) => {
+        const server = serverOf(source.key);
+        return server === undefined || toggles.enabled('server', server.name, view.sessionId, server.configuredEnabled);
+    };
+    // MCP sources. A server switched off globally does not start at launch; a session that
+    // switches it on discovers and runs it on demand for that session only.
     const startIfEnabled = async (source) => {
         if (toggles.globallyEnabled(source.name, source.configuredEnabled))
             await source.start();
@@ -148,6 +153,7 @@ export async function apply(rawCtx, config) {
         if (servers.has(server.name))
             throw new Error(`capability-catalog: MCP server "${server.name}" is configured twice`);
         const source = new McpSource(server, cacheDir, logger);
+        source.isWanted = (view) => toggles.enabled('server', server.name, view.sessionId, server.enabled);
         const remove = catalog.add(source);
         servers.set(server.name, source);
         const dispose = async () => {
@@ -225,19 +231,32 @@ export async function apply(rawCtx, config) {
                 dispose();
             owned.clear();
         }, 'capability-catalog.skill-shadows');
-        ctx.on('agent/created', ({ agent }) => {
+        const shadow = (agent) => {
             const agentCtx = agent.ctx;
-            if (agentCtx === undefined)
+            if (agentCtx === undefined || owned.has(agent.id))
                 return;
-            const dispose = agentCtx.effect(() => {
-                const unregister = agentCtx.tools.register(tools.skill);
-                return () => {
-                    unregister();
-                    owned.delete(agent.id);
-                };
-            }, 'capability-catalog.skill');
-            owned.set(agent.id, dispose);
-        });
+            try {
+                const dispose = agentCtx.effect(() => {
+                    const unregister = agentCtx.tools.register(tools.skill);
+                    return () => {
+                        unregister();
+                        owned.delete(agent.id);
+                    };
+                }, 'capability-catalog.skill');
+                owned.set(agent.id, dispose);
+            }
+            catch (error) {
+                logger.warn(`capability-catalog: could not shadow the skill tool for ${agent.id}`, error);
+            }
+        };
+        ctx.on('agent/created', ({ agent }) => shadow(agent));
+        // A reload (plugin update, HMR) finds agents that are already live; shadow them too, or
+        // the native catalog would come back for every open session.
+        const liveAgents = ctx.get('agents');
+        for (const agent of liveAgents?.list() ?? []) {
+            shadow(agent);
+            void viewFor(agent, AbortSignal.timeout(30_000)).then((view) => catalog.refresh(view, AbortSignal.timeout(30_000))).catch(() => undefined);
+        }
     }
     // Settings page and per-session controls.
     const agents = ctx.get('agents');

package/lib/sources/mcp.d.ts

@@ -1,5 +1,5 @@
 import { type FamilyRule } from '../families.js';
-import type { CallOutcome, CapabilityEntry, CapabilitySource, SourceIndex } from '../types.js';
+import type { CallOutcome, CapabilityEntry, CapabilitySource, SourceIndex, ViewContext } from '../types.js';
 /** Resolved configuration of one MCP server. */
 export interface McpServerConfig {
     readonly name: string;
@@ -49,6 +49,10 @@ export declare class McpSource implements CapabilitySource {
     private started;
     /** Whether discovery has been allowed to run (the server is not switched off). */
     get discovered(): boolean;
+    /** Decides whether a viewer wants this server; set by the plugin from the switches. */
+    isWanted: (view: ViewContext) => boolean;
+    /** Discover lazily for a viewer that switched on a server that did not start globally. */
+    refresh(view: ViewContext): Promise<void>;
     constructor(config: McpServerConfig, cacheDir: string, logger: Logger);
     private get cachePath();
     /**

package/lib/sources/mcp.js

@@ -74,6 +74,13 @@ export class McpSource {
     get discovered() {
         return this.started;
     }
+    /** Decides whether a viewer wants this server; set by the plugin from the switches. */
+    isWanted = () => true;
+    /** Discover lazily for a viewer that switched on a server that did not start globally. */
+    async refresh(view) {
+        if (!this.started && !this.disposed && this.isWanted(view))
+            await this.start();
+    }
     constructor(config, cacheDir, logger) {
         this.config = config;
         this.cacheDir = cacheDir;
@@ -255,12 +262,20 @@ export class McpSource {
                 throw new Error(`${this.key}: streamable-http transport requires "url"`);
             transport = new StreamableHTTPClientTransport(new URL(config.url), { requestInit: { headers: { ...config.headers } } });
         }
-        const client = new Client({ name: 'dsh-capability-catalog', version: '0.1.1' });
+        const client = new Client({ name: 'dsh-capability-catalog', version: '0.1.3' });
         client.onclose = () => {
             if (this.client === client)
                 this.client = undefined;
         };
-        await withTimeout(client.connect(transport), this.config.discoveryTimeoutMs, `${this.key} connect`);
+        try {
+            await withTimeout(client.connect(transport), this.config.discoveryTimeoutMs, `${this.key} connect`);
+        }
+        catch (error) {
+            // A timed-out or failed handshake must not leave the child process behind.
+            await client.close().catch(() => undefined);
+            await transport.close().catch(() => undefined);
+            throw error;
+        }
         if (this.disposed) {
             await client.close().catch(() => undefined);
             throw new Error(`${this.key} was unloaded while connecting`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kirkchinese/dsh-capability-catalog",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Lazy capability catalog for DeepSeek Harness: one compact index plus search/describe/call meta-tools for MCP tools and skills, instead of every schema on every request",
   "keywords": [
     "deepseek-harness",