dsh-plugin-capabilities 0.3.8 → 0.3.9

package/src/mcp.ts

@@ -343,3 +343,81 @@ export function removeMcp(dirPath: string, id: string): boolean {
   savePatch(dirPath, doc)
   return true
 }
+
+/** Rebuild a create request from an existing row (id emptied; identity fields
+ *  carried over) — used to copy a row into the other patch layer. */
+export function mcpRowToInput(row: McpRow): McpInput {
+  return {
+    id: '',
+    serverName: row.serverName,
+    transport: row.transport,
+    disabled: row.disabled,
+    ...(row.transport === 'stdio'
+      ? {
+          command: row.command,
+          ...(row.args !== undefined ? { args: row.args } : {}),
+          ...(row.env !== undefined ? { env: row.env } : {}),
+          ...(row.cwd !== undefined ? { cwd: row.cwd } : {}),
+        }
+      : {
+          url: row.url,
+          ...(row.headers !== undefined ? { headers: row.headers } : {}),
+        }),
+  }
+}
+
+/**
+ * Whether a stdio command would resolve at spawn time: a bare name is looked
+ * up in the PATH entries (with the Windows executable extensions), anything
+ * with a path separator must exist as given. Pure filesystem reads — no
+ * process is spawned, so no console-window or side-effect concerns.
+ */
+export function resolveCommandOnPath(command: string, pathEnv: string, platform: string = process.platform): boolean {
+  if (command.includes('/') || command.includes('\\')) return existsSync(command)
+  const exts = platform === 'win32' ? ['', '.com', '.exe', '.bat', '.cmd'] : ['']
+  const separator = platform === 'win32' ? ';' : ':'
+  for (const rawDir of pathEnv.split(separator)) {
+    const dir = rawDir.trim().replace(/^"|"$/g, '')
+    if (dir === '') continue
+    for (const ext of exts) {
+      if (existsSync(join(dir, command + ext))) return true
+    }
+  }
+  return false
+}
+
+/** Outcome of a connectivity check, as the browser renders it. */
+export interface McpCheckResult {
+  ok: boolean
+  /** Short technical detail for the hint line ("HTTP 200", "not found on PATH"). */
+  detail?: string
+}
+
+/**
+ * Probe one server row without starting it: stdio rows are validated against
+ * the PATH (a spawn would leave console windows and side effects behind),
+ * streamable-http rows get a short GET — any HTTP status proves reachability,
+ * since MCP endpoints legitimately answer 405 to plain GETs.
+ */
+export async function checkMcpRow(row: McpRow, options: { timeoutMs?: number; pathEnv?: string; platform?: string } = {}): Promise<McpCheckResult> {
+  const pathEnv = options.pathEnv ?? process.env.PATH ?? ''
+  if (row.transport === 'stdio') {
+    const command = row.command ?? ''
+    if (command === '') return { ok: false, detail: 'row has no command' }
+    return resolveCommandOnPath(command, pathEnv, options.platform)
+      ? { ok: true, detail: command }
+      : { ok: false, detail: `${command} not found on PATH` }
+  }
+  if (row.url === undefined || !/^https?:\/\//.test(row.url)) return { ok: false, detail: 'row has no http url' }
+  try {
+    const response = await fetch(row.url, {
+      headers: { accept: 'application/json, text/event-stream' },
+      signal: AbortSignal.timeout(options.timeoutMs ?? 5000),
+    })
+    return { ok: true, detail: `HTTP ${response.status}` }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    const cause = (error as { cause?: { code?: unknown } }).cause?.code
+    return { ok: false, detail: cause !== undefined ? String(cause) : message }
+  }
+}

package/src/routes.ts

@@ -12,7 +12,7 @@ import { dshLaunch, restartOwnedByShell, scheduleRestart, trustedRestartRequest
 import { deleteSkill, setSkillPolicy, updateSkillFile, userSkillsDir, validateSkillInput, writeSkill, type SkillInput } from './skills.ts'
 import { findRootByUrl, loadState, pluginStateDir, removeSkillRoot, type SkillRootEntry } from './state.ts'
 import { removeTree } from './rmtree.ts'
-import { listMcpScoped, mcpScopeDir, removeMcp, setMcpDisabled, upsertMcp, validateMcpInput, type McpInput, type McpScope } from './mcp.ts'
+import { checkMcpRow, listMcp, listMcpScoped, mcpRowToInput, mcpScopeDir, removeMcp, setMcpDisabled, upsertMcp, validateMcpInput, type McpInput, type McpScope } from './mcp.ts'
 import type { CapabilitiesHost, HostSkill } from './types.ts'
 
 /**
@@ -465,7 +465,7 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
           return
         }
         try {
-          const body = (await readJsonBody(request)) as { id?: unknown }
+          const body = (await readJsonBody(request)) as { id?: unknown; scope?: unknown }
           if (typeof body.id !== 'string') {
             sendJson(response, 400, { error: 'id is required' })
             return
@@ -493,8 +493,9 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
             sendJson(response, 400, { error: invalid })
             return
           }
-          const id = upsertMcp(config.profileDirPath, input)
-          sendJson(response, 200, { ok: true, id, restartNeeded: true })
+          const scope = readScope(body.scope)
+          const id = upsertMcp(mcpScopeDir(scope, config.profileDirPath, config.dshHomePath), input)
+          sendJson(response, 200, { ok: true, id, scope, restartNeeded: true })
         } catch (error) {
           sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) })
         }
@@ -603,6 +604,80 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
         }
       },
     }),
+
+    host.webServer.register({
+      kind: 'exact',
+      path: '/dsh-plugin-capabilities/mcp/check',
+      handler: async (request: IncomingMessage, response: ServerResponse) => {
+        if (request.method !== 'POST') {
+          response.writeHead(405, { allow: 'POST' })
+          response.end()
+          return
+        }
+        if (!sameOrigin(request)) {
+          sendJson(response, 403, { error: 'untrusted origin' })
+          return
+        }
+        try {
+          const body = (await readJsonBody(request)) as { id?: unknown; scope?: unknown }
+          if (typeof body.id !== 'string') {
+            sendJson(response, 400, { error: 'id is required' })
+            return
+          }
+          const dir = mcpScopeDir(readScope(body.scope), config.profileDirPath, config.dshHomePath)
+          const row = listMcp(dir).find(item => item.id === body.id)
+          if (row === undefined) {
+            sendJson(response, 404, { error: 'server row not found' })
+            return
+          }
+          // No host-level timeout override needed: the probe is bounded
+          // (5s) and side-effect-free (PATH reads or a plain GET).
+          sendJson(response, 200, await checkMcpRow(row))
+        } catch (error) {
+          sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) })
+        }
+      },
+    }),
+
+    host.webServer.register({
+      kind: 'exact',
+      path: '/dsh-plugin-capabilities/mcp/copy',
+      handler: async (request: IncomingMessage, response: ServerResponse) => {
+        if (request.method !== 'POST') {
+          response.writeHead(405, { allow: 'POST' })
+          response.end()
+          return
+        }
+        if (!sameOrigin(request)) {
+          sendJson(response, 403, { error: 'untrusted origin' })
+          return
+        }
+        try {
+          const body = (await readJsonBody(request)) as { id?: unknown; scope?: unknown; toScope?: unknown }
+          if (typeof body.id !== 'string') {
+            sendJson(response, 400, { error: 'id is required' })
+            return
+          }
+          const scope = readScope(body.scope)
+          const toScope: McpScope = readScope(body.toScope)
+          const sourceRow = listMcp(mcpScopeDir(scope, config.profileDirPath, config.dshHomePath)).find(item => item.id === body.id)
+          if (sourceRow === undefined) {
+            sendJson(response, 404, { error: 'server row not found' })
+            return
+          }
+          const input = mcpRowToInput(sourceRow)
+          const invalid = validateMcpInput(input)
+          if (invalid !== null) {
+            sendJson(response, 400, { error: invalid })
+            return
+          }
+          const id = upsertMcp(mcpScopeDir(toScope, config.profileDirPath, config.dshHomePath), input)
+          sendJson(response, 200, { ok: true, id, scope: toScope, restartNeeded: true })
+        } catch (error) {
+          sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) })
+        }
+      },
+    }),
     host.webServer.register({
       kind: 'exact',
       path: '/dsh-plugin-capabilities/import/scan',
@@ -639,7 +714,7 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
           return
         }
         try {
-          const body = (await readJsonBody(request)) as { items?: unknown }
+          const body = (await readJsonBody(request)) as { items?: unknown; scope?: unknown }
           const wanted = new Set(
             (Array.isArray(body.items) ? body.items : [])
               .filter((item): item is { agent: string; name: string } =>
@@ -666,7 +741,7 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
               results.push({ name: server.name, ok: false, error: invalid })
               continue
             }
-            upsertMcp(config.profileDirPath, input)
+            upsertMcp(mcpScopeDir(readScope(body.scope), config.profileDirPath, config.dshHomePath), input)
             results.push({ name: server.name, ok: true })
           }
           sendJson(response, 200, { ok: results.every(item => item.ok), results, restartNeeded: true })