dsh-server-connector 0.1.0 → 0.2.1

package/lib/tools.js

@@ -55,7 +55,7 @@ export const TOOL_NAMES = Object.freeze([
  * Machine-readable error codes (§5.5). `INVALID_ARGUMENT` is the one addition:
  * it marks a malformed tool argument, which the §5.5 table does not enumerate
  * because it describes transport and policy failures.
- * @typedef {'CONNECT_FAILED'|'HOST_KEY_UNKNOWN'|'AUTH_FAILED'|'POLICY_BLOCKED'|'POLICY_DENIED_BY_USER'|'TIMEOUT'|'EXIT_NONZERO'|'UNKNOWN_SERVER'|'AMBIGUOUS_SERVER'|'NO_CREDENTIAL'|'INVALID_ARGUMENT'} ToolErrorCode
+ * @typedef {'CONNECT_FAILED'|'HOST_KEY_UNKNOWN'|'AUTH_FAILED'|'POLICY_BLOCKED'|'POLICY_DENIED_BY_USER'|'TIMEOUT'|'EXIT_NONZERO'|'UNKNOWN_SERVER'|'AMBIGUOUS_SERVER'|'SERVER_DISABLED'|'NO_CREDENTIAL'|'INVALID_ARGUMENT'} ToolErrorCode
  */
 
 /**
@@ -164,6 +164,10 @@ export function renderServerSection(servers, options = {}) {
       `高危策略：内置 ${RULES.length} 条规则（${blocked} 条 block、${confirmed} 条 confirm），未做逐台覆盖（可用 srv_policy_check 预检）`,
     )
   }
+  // Custom rules are counted, not listed (doc §4.4.4): the model needs to know a
+  // server is stricter than the catalog, not what its private regexes say.
+  const customCount = servers.reduce((total, server) => total + (server.customRules ?? []).length, 0)
+  if (customCount > 0) lines.push(`另有 ${customCount} 条自定义规则（可用 srv_policy_check 预检具体命令）`)
   return lines.join('\n')
 }
 
@@ -413,9 +417,13 @@ export class ToolSurface {
         // deployment, and neither is session-scoped.
         order: systemPromptOrder(ctx, 'MCP_SERVERS'),
         text: () =>
-          renderServerSection(this.#loaded ? this.#servers : [], {
-            maxListedServers: this.#config.maxListedServers,
-          }),
+          renderServerSection(
+            // Disabled servers are invisible here too (doc §5.1): the prompt is
+            // the model's map of what it may address, so listing a target that
+            // every call would reject only invites wasted attempts.
+            (this.#loaded ? this.#servers : []).filter((server) => server.enabled !== false),
+            { maxListedServers: this.#config.maxListedServers },
+          ),
       }),
     )
   }
@@ -468,7 +476,11 @@ export class ToolSurface {
       async execute() {
         await surface.refresh()
         const connected = new Set(surface.poolConnectedIds())
-        return surface.servers.map((server) => ({
+        // A disabled server is invisible to the model (doc §5.1): it is not
+        // returned here, not listed in the system prompt, and any attempt to use
+        // it fails in #resolveServer. Showing it only to reject it would make the
+        // model retry a target it cannot reach.
+        return surface.servers.filter((server) => server.enabled !== false).map((server) => ({
           id: server.id,
           name: server.name,
           host: server.host,
@@ -681,7 +693,7 @@ export class ToolSurface {
           },
         ],
       },
-      async execute(args) {
+      async execute(args, exec) {
         const jobs = surface.#jobs
         if (jobs === null || jobs === undefined) {
           throw new ToolError(
@@ -691,7 +703,11 @@ export class ToolSurface {
           )
         }
         const id = String(args.jobId)
-        const caller = surface.#ownerOf(undefined)
+        // The owner is the calling session, so it must come from this call's
+        // `exec`. Passing `undefined` here made every read look unowned, and the
+        // registry — which fences owned jobs by session — then rejected it with
+        // "belongs to another session" even for the session that started it.
+        const caller = surface.#ownerOf(exec)
         if (typeof args.offset === 'number') {
           if (!Number.isFinite(args.offset) || args.offset < 0) {
             throw new ToolError('INVALID_ARGUMENT', 'offset must be a non-negative byte offset.')
@@ -752,7 +768,7 @@ export class ToolSurface {
           },
         ],
       },
-      async execute(args) {
+      async execute(args, exec) {
         const jobs = surface.#jobs
         if (jobs === null || jobs === undefined) {
           throw new ToolError(
@@ -762,7 +778,8 @@ export class ToolSurface {
           )
         }
         const id = String(args.jobId)
-        const caller = surface.#ownerOf(undefined)
+        // Same owner fence as srv_job_output: the caller is this call's session.
+        const caller = surface.#ownerOf(exec)
         const outcome = jobs.kill(id, caller)
         const job = jobs.get(id, caller)
         /** @type {'cancellation-requested'|'already-finished'} */
@@ -844,8 +861,10 @@ export class ToolSurface {
    * @returns {Promise<import('./registry.js').ServerRecord>}
    */
   async #resolveServer(query) {
+    /** @type {import('./registry.js').ServerRecord} */
+    let server
     try {
-      return await this.#registry.resolve(String(query ?? ''))
+      server = await this.#registry.resolve(String(query ?? ''))
     } catch (error) {
       const code = /** @type {{code?: string, message?: string}} */ (error).code
       if (code === 'UNKNOWN_SERVER' || code === 'AMBIGUOUS_SERVER' || code === 'INVALID_SERVER') {
@@ -857,6 +876,19 @@ export class ToolSurface {
       }
       throw error
     }
+    // The enable switch (doc §5.1). Every srv_* tool resolves its target here,
+    // so one check covers srv_exec, srv_connect, srv_policy_check and the job
+    // tools alike. A disabled server is still addressable by id/name/prefix —
+    // that is how the panel names it — so the check belongs after resolution,
+    // not inside it.
+    if (server.enabled === false) {
+      throw new ToolError(
+        'SERVER_DISABLED',
+        `server ${server.id} (${server.name}) is disabled.`,
+        'Enable it in the "服务器" panel of this plugin, then retry.',
+      )
+    }
+    return server
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-server-connector",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "DSH plugin: SSH execution for servers configured on this machine, with a built-in high-risk command policy (block / confirm / allow).",
   "type": "module",
   "main": "lib/index.js",
@@ -18,7 +18,8 @@
     "lib",
     "locale",
     "icon.svg",
-    "cordis.patch.yml"
+    "cordis.patch.yml",
+    "CHANGELOG.md"
   ],
   "icon": "./icon.svg",
   "engines": {