dsh-plugin-capabilities 0.3.7 → 0.3.9

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 { listMcp, removeMcp, setMcpDisabled, upsertMcp, validateMcpInput, type McpInput } 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'
 
 /**
@@ -57,10 +57,17 @@ function toRootView(entry: SkillRootEntry): SkillRootEntry & { live: boolean } {
 
 export interface CapabilitiesRoutesConfig {
   profileDirPath: string
+  /** The dsh home directory: holds the machine-wide `cordis.patch.yml`. */
+  dshHomePath: string
   /** Remount the host-plane skill provider after root-set changes. */
   remountProvider: () => Promise<void>
 }
 
+/** The request's target patch layer; unknown values fall back to the profile. */
+function readScope(value: unknown): McpScope {
+  return value === 'global' ? 'global' : 'profile'
+}
+
 /** Register the manager's routes; returns the disposer removing them all. */
 export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: CapabilitiesRoutesConfig): () => void {
   const disposers = [
@@ -408,7 +415,7 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
           sendJson(response, 502, { error: 'market index unavailable (offline?)' })
           return
         }
-        const existing = new Set(listMcp(config.profileDirPath).map(row => row.serverName))
+        const existing = new Set(listMcpScoped(config.profileDirPath, config.dshHomePath).servers.map(row => row.serverName))
         sendJson(response, 200, {
           source: index.source,
           servers: (index.servers ?? []).map(server => ({ ...server, installed: existing.has(server.id) })),
@@ -458,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
@@ -469,7 +476,7 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
             sendJson(response, 404, { error: 'server not found in the market index' })
             return
           }
-          if (listMcp(config.profileDirPath).some(row => row.serverName === server.id)) {
+          if (listMcpScoped(config.profileDirPath, config.dshHomePath).servers.some(row => row.serverName === server.id)) {
             sendJson(response, 409, { error: 'already installed' })
             return
           }
@@ -486,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) })
         }
@@ -503,7 +511,12 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
           response.end()
           return
         }
-        sendJson(response, 200, { servers: listMcp(config.profileDirPath), restartNeeded: true })
+        const listing = listMcpScoped(config.profileDirPath, config.dshHomePath)
+        sendJson(response, 200, {
+          servers: listing.servers,
+          ...(listing.globalError !== undefined ? { globalError: listing.globalError } : {}),
+          restartNeeded: true,
+        })
       },
     }),
 
@@ -521,14 +534,15 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
           return
         }
         try {
-          const input = (await readJsonBody(request)) as McpInput
+          const input = (await readJsonBody(request)) as McpInput & { scope?: unknown }
           const invalid = validateMcpInput(input)
           if (invalid !== null) {
             sendJson(response, 400, { error: invalid })
             return
           }
-          const id = upsertMcp(config.profileDirPath, input)
-          sendJson(response, 200, { ok: true, id, restartNeeded: true })
+          const scope = readScope(input.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) })
         }
@@ -549,12 +563,13 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
           return
         }
         try {
-          const body = (await readJsonBody(request)) as { id?: unknown; disabled?: unknown }
+          const body = (await readJsonBody(request)) as { id?: unknown; disabled?: unknown; scope?: unknown }
           if (typeof body.id !== 'string' || typeof body.disabled !== 'boolean') {
             sendJson(response, 400, { error: 'id and disabled are required' })
             return
           }
-          const ok = setMcpDisabled(config.profileDirPath, body.id, body.disabled)
+          const dir = mcpScopeDir(readScope(body.scope), config.profileDirPath, config.dshHomePath)
+          const ok = setMcpDisabled(dir, body.id, body.disabled)
           sendJson(response, ok ? 200 : 404, ok ? { ok: true, restartNeeded: true } : { error: 'server row not found' })
         } catch (error) {
           sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) })
@@ -576,18 +591,93 @@ 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
           }
-          const ok = removeMcp(config.profileDirPath, body.id)
+          const dir = mcpScopeDir(readScope(body.scope), config.profileDirPath, config.dshHomePath)
+          const ok = removeMcp(dir, body.id)
           sendJson(response, ok ? 200 : 404, ok ? { ok: true, restartNeeded: true } : { error: 'server row not found' })
         } catch (error) {
           sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) })
         }
       },
     }),
+
+    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',
@@ -597,13 +687,14 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
           response.end()
           return
         }
-        try {
-          sendJson(response, 200, {
-            servers: scanAllMcp(),
-            // Profile serverNames, so the browser can grey out existing ones.
-            existing: listMcp(config.profileDirPath).map(row => row.serverName),
-          })
-        } catch (error) {
+          try {
+            sendJson(response, 200, {
+              servers: scanAllMcp(),
+              // ServerNames present in either patch layer, so the browser can
+              // grey out existing ones.
+              existing: listMcpScoped(config.profileDirPath, config.dshHomePath).servers.map(row => row.serverName),
+            })
+          } catch (error) {
           sendJson(response, 500, { error: error instanceof Error ? error.message : String(error) })
         }
       },
@@ -623,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 } =>
@@ -633,9 +724,8 @@ export function mountCapabilitiesRoutes(host: CapabilitiesHost, config: Capabili
           const results: Array<{ name: string; ok: boolean; error?: string }> = []
           for (const server of scanAllMcp()) {
             if (!wanted.has(`${server.agent}/${server.name}`)) continue
-            const existing = listMcp(config.profileDirPath).some(row => row.serverName === server.name)
-            if (existing) {
-              results.push({ name: server.name, ok: false, error: 'already in profile' })
+            if (listMcpScoped(config.profileDirPath, config.dshHomePath).servers.some(row => row.serverName === server.name)) {
+              results.push({ name: server.name, ok: false, error: 'already configured' })
               continue
             }
             const input: McpInput = {
@@ -651,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 })