@kirkchinese/dsh-capability-catalog 0.1.2 → 0.1.4

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.',
@@ -150,7 +152,7 @@ window.__ModuleLoader__.load({
 .cc-trigger:hover,.cc-trigger[aria-expanded=true]{background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary)}
 .cc-trigger-badge{color:var(--dsw-alias-state-warn-primary)}
 .cc-anchor{position:relative;display:inline-flex}
-.cc-popover{position:absolute;bottom:calc(100% + 8px);left:0;z-index:50;width:380px;max-width:calc(100vw - 32px);max-height:min(560px,70vh);display:flex;flex-direction:column;gap:10px;padding:14px;border-radius:12px;border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-overlay);box-shadow:0 8px 28px rgba(0,0,0,.18);color:var(--dsw-alias-label-primary);font-size:13px}
+.cc-popover{position:fixed;z-index:1000;box-sizing:border-box;width:380px;max-width:calc(100vw - 32px);display:flex;flex-direction:column;gap:10px;padding:14px;border-radius:12px;border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-overlay);box-shadow:0 8px 28px rgba(0,0,0,.18);color:var(--dsw-alias-label-primary);font-size:13px}
 .cc-popover-head{display:flex;align-items:center;justify-content:space-between;gap:8px;font-weight:600}
 .cc-popover-body{overflow:auto;display:flex;flex-direction:column;gap:12px;margin:0 -4px;padding:0 4px}
 .cc-sub{font-size:12px;font-weight:600;color:var(--dsw-alias-label-secondary);margin-bottom:4px}
@@ -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),
@@ -324,10 +337,45 @@ window.__ModuleLoader__.load({
     function SessionControl({ api, t, sessionId }) {
       const [open, setOpen] = useState(false)
       const [query, setQuery] = useState('')
+      const [placement, setPlacement] = useState(null)
       const anchor = useRef(null)
-      const { data, error, set } = useOverview(api, sessionId, true)
+      // Open toward the side with more room and stay inside the window. The popover is fixed to
+      // the viewport so scroll and clip containers of the composer cannot cut it off; the
+      // composer sits at the bottom in a session but in the middle of the window on a new one.
+      const place = useCallback(() => {
+        const node = anchor.current
+        if (!node) return
+        const rect = node.getBoundingClientRect()
+        const margin = 12
+        const gap = 8
+        const above = rect.top - margin - gap
+        const below = window.innerHeight - rect.bottom - margin - gap
+        const up = above >= 320 || above >= below
+        const room = Math.max(160, Math.min(560, up ? above : below))
+        const width = Math.min(380, window.innerWidth - 2 * margin)
+        const left = Math.max(margin, Math.min(rect.left, window.innerWidth - width - margin))
+        setPlacement({
+          position: 'fixed',
+          left: `${left}px`,
+          width: `${width}px`,
+          ...(up ? { bottom: `${window.innerHeight - rect.top + gap}px` } : { top: `${rect.bottom + gap}px` }),
+          maxHeight: `${room}px`,
+        })
+      }, [])
+      useEffect(() => {
+        if (!open) return undefined
+        place()
+        window.addEventListener('resize', place)
+        window.addEventListener('scroll', place, true)
+        return () => {
+          window.removeEventListener('resize', place)
+          window.removeEventListener('scroll', place, true)
+        }
+      }, [open, place])
+      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) }
@@ -368,7 +416,7 @@ window.__ModuleLoader__.load({
             h('rect', { x: 2, y: 9, width: 5, height: 5, rx: 1 }), h('rect', { x: 9, y: 9, width: 5, height: 5, rx: 1 })),
           t.button,
           offCount > 0 ? h('span', { className: 'cc-trigger-badge' }, `−${offCount}`) : null),
-        open ? h('div', { className: 'cc-popover', role: 'dialog', 'aria-label': t.sessionTitle },
+        open ? h('div', { className: 'cc-popover', role: 'dialog', 'aria-label': t.sessionTitle, style: placement || { visibility: 'hidden' } },
           h('div', { className: 'cc-popover-head' },
             h('span', null, t.sessionTitle),
             h('span', { className: 'cc-toolbar' },

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 () => {

package/lib/schema-view.d.ts

@@ -23,7 +23,7 @@ export interface CompactOptions {
  * @param pointer - pointer such as `/properties/filters`; empty means the root.
  * @returns the subtree, or undefined when the pointer does not resolve.
  */
-export declare function resolvePointer(schema: unknown, pointer: string): unknown;
+export declare function resolvePointer(schema: unknown, rawPointer: string): unknown;
 /**
  * Derive a compact, TypeScript-like signature from an object schema.
  * @param name - tool name used as the signature head.

package/lib/schema-view.js

@@ -5,7 +5,9 @@ const DEFAULT_OPTIONS = { maxDepth: 2, maxDescription: 160, maxEnum: 12 };
  * @param pointer - pointer such as `/properties/filters`; empty means the root.
  * @returns the subtree, or undefined when the pointer does not resolve.
  */
-export function resolvePointer(schema, pointer) {
+export function resolvePointer(schema, rawPointer) {
+    // Accept a pointer copied with a trailing array marker, as earlier signatures rendered it.
+    const pointer = rawPointer.trim().replace(/(\[\])+$/u, '');
     if (pointer === '' || pointer === '/')
         return schema;
     if (!pointer.startsWith('/'))
@@ -96,7 +98,20 @@ function typeOf(schema, pointer, depth, options, lines, indent) {
     const type = Array.isArray(schema.type) ? schema.type.join(' | ') : schema.type;
     if (type === 'array') {
         const items = asSchema(schema.items);
-        return items === undefined ? 'unknown[]' : `${wrap(typeOf(items, `${pointer}/items`, depth, options, lines, indent))}[]`;
+        if (items === undefined)
+            return 'unknown[]';
+        const inner = typeOf(items, `${pointer}/items`, depth, options, lines, indent);
+        // Keep exactly one pointer, last and clean: `{…3 fields}[] → /a/items`, never `→ /a/items[]`.
+        const arrows = inner.split(' → ').length - 1;
+        if (arrows === 0)
+            return `${wrap(inner)}[]`;
+        if (arrows === 1 && !inner.includes(' | ')) {
+            const arrow = inner.indexOf(' → ');
+            return `${inner.slice(0, arrow)}[]${inner.slice(arrow)}`;
+        }
+        // A union with collapsed branches: point at the item schema as a whole.
+        const branches = Array.isArray(items.anyOf) ? items.anyOf.length : Array.isArray(items.oneOf) ? items.oneOf.length : 0;
+        return `${branches > 0 ? `union<${branches}>` : 'item'}[] → ${pointer}/items`;
     }
     if (type === 'object' || schema.properties !== undefined) {
         const properties = asSchema(schema.properties);
@@ -132,7 +147,8 @@ function fields(schema, pointer, depth, options, lines, indent) {
             lines.push(`${indent}}`);
             continue;
         }
-        type = `${type}${constraints(node)}`;
+        const arrow = type.lastIndexOf(' → ');
+        type = arrow >= 0 ? `${type.slice(0, arrow)}${constraints(node)}${type.slice(arrow)}` : `${type}${constraints(node)}`;
         lines.push(`${indent}${key}${optional}: ${type}${defaultText}${description}`);
         lines.push(...nested);
     }

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.2' });
+        const client = new Client({ name: 'dsh-capability-catalog', version: '0.1.4' });
         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.2",
+  "version": "0.1.4",
   "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",