@wrongstack/acp 1.0.3 → 1.0.5

package/dist/wrongstack-acp-agent.js

@@ -1,9 +1,9 @@
 // src/agent/wrongstack-acp-agent.ts
-import { timingSafeEqual } from "node:crypto";
 import { createServer } from "node:http";
 import { isIP } from "node:net";
 import { fileURLToPath } from "node:url";
 import { expandIPv6, writeErr as writeErr2 } from "@wrongstack/core/utils";
+import { timingSafeTokenEqual } from "@wrongstack/primitives";
 
 // src/agent/protocol-handler.ts
 import { randomUUID } from "node:crypto";
@@ -53,6 +53,64 @@ var DEFAULT_MODES = [
     description: "Default agent mode for code-generation tasks."
   }
 ];
+function parseMcpServers(raw, onSkipped) {
+  if (!Array.isArray(raw)) return [];
+  const out = [];
+  for (const entry of raw) {
+    if (typeof entry !== "object" || entry === null) {
+      onSkipped?.("entry is not an object");
+      continue;
+    }
+    const e = entry;
+    const name = typeof e.name === "string" ? e.name.trim() : "";
+    if (name === "") {
+      onSkipped?.("entry has no name");
+      continue;
+    }
+    const type = typeof e.type === "string" ? e.type : "stdio";
+    if (type === "http" || type === "sse") {
+      if (typeof e.url !== "string" || e.url === "") {
+        onSkipped?.(`"${name}": ${type} server has no url`);
+        continue;
+      }
+      const headers = parseNameValuePairs(e.headers);
+      const url = e.url;
+      out.push(
+        type === "http" ? { type: "http", name, url, ...headers ? { headers } : {} } : { type: "sse", name, url, ...headers ? { headers } : {} }
+      );
+      continue;
+    }
+    if (type !== "stdio") {
+      onSkipped?.(`"${name}": unknown transport "${type}"`);
+      continue;
+    }
+    if (typeof e.command !== "string" || e.command === "") {
+      onSkipped?.(`"${name}": stdio server has no command`);
+      continue;
+    }
+    const args = Array.isArray(e.args) ? e.args.filter((a) => typeof a === "string") : void 0;
+    const env = parseNameValuePairs(e.env);
+    out.push({
+      name,
+      command: e.command,
+      ...args && args.length > 0 ? { args } : {},
+      ...env ? { env } : {}
+    });
+  }
+  return out;
+}
+function parseNameValuePairs(raw) {
+  if (!Array.isArray(raw)) return void 0;
+  const out = [];
+  for (const pair of raw) {
+    if (typeof pair !== "object" || pair === null) continue;
+    const p = pair;
+    if (typeof p.name === "string" && p.name !== "" && typeof p.value === "string") {
+      out.push({ name: p.name, value: p.value });
+    }
+  }
+  return out.length > 0 ? out : void 0;
+}
 async function resolveSessionCwd(requested) {
   if (!path.isAbsolute(requested)) return null;
   const resolved = path.resolve(requested);
@@ -135,9 +193,16 @@ function buildInitializeResult(agentName, modes, configOptions) {
         audio: false,
         embeddedContext: true
       },
+      // All three ACP transports are supported. stdio is mandatory per spec
+      // and cannot be declined; http and sse are declared here because the
+      // agent now actually connects them (see `parseMcpServers` above and the
+      // per-session MCP registry in `buildAcpServerAgentFactory`). Before that
+      // wiring existed the array was destructured and thrown away at every
+      // entry point, so a client got a successful `session/new` and no tools —
+      // flip these back to false if that connection path is ever removed.
       mcpCapabilities: {
-        http: false,
-        sse: false
+        http: true,
+        sse: true
       },
       sessionCapabilities: {
         close: {},
@@ -177,6 +242,8 @@ async function handleSessionNewOp(ctx, id, params) {
     }
     cwd = resolved;
   }
+  const skipped = [];
+  const mcpServers = parseMcpServers(p.mcpServers, (reason) => skipped.push(reason));
   const sessionId = `sess_${ctx.allocId()}`;
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const state = {
@@ -185,7 +252,8 @@ async function handleSessionNewOp(ctx, id, params) {
     abort: new AbortController(),
     modeId: DEFAULT_MODE_ID,
     createdAt: now,
-    updatedAt: now
+    updatedAt: now,
+    ...mcpServers.length > 0 ? { mcpServers } : {}
   };
   ctx.sessions.set(sessionId, state);
   ctx.onSessionNew(state);
@@ -206,6 +274,7 @@ async function handleSessionNewOp(ctx, id, params) {
       }
     });
   }
+  await reportSkippedMcpServers(ctx, sessionId, skipped);
   await ctx.sendResult(id, {
     sessionId,
     modes: ctx.modes,
@@ -217,6 +286,8 @@ async function handleSessionLoadOp(ctx, id, params) {
   const p = params ?? {};
   const sessionId = typeof p.sessionId === "string" ? p.sessionId : null;
   const loadCwd = typeof p.cwd === "string" ? p.cwd : void 0;
+  const loadSkipped = [];
+  const loadMcpServers = parseMcpServers(p.mcpServers, (reason) => loadSkipped.push(reason));
   const existing = sessionId ? ctx.sessions.get(sessionId) : void 0;
   if (!existing && sessionId && ctx.store) {
     const persisted = await ctx.store.load(sessionId);
@@ -238,7 +309,8 @@ async function handleSessionLoadOp(ctx, id, params) {
         modeId: persisted.modeId ?? DEFAULT_MODE_ID,
         createdAt: persisted.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
         updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-        ...persisted.title !== void 0 ? { title: persisted.title } : {}
+        ...persisted.title !== void 0 ? { title: persisted.title } : {},
+        ...loadMcpServers.length > 0 ? { mcpServers: loadMcpServers } : {}
       };
       ctx.sessions.set(sessionId, restored);
       ctx.seedFor?.(sessionId, persisted.history ?? []);
@@ -249,6 +321,7 @@ async function handleSessionLoadOp(ctx, id, params) {
         sessionId,
         update: { sessionUpdate: "current_mode_update", modeId: restored.modeId }
       });
+      await reportSkippedMcpServers(ctx, sessionId, loadSkipped);
       await ctx.sendResult(id, {
         initialMode: { currentModeId: restored.modeId, availableModes: ctx.modes }
       });
@@ -257,6 +330,9 @@ async function handleSessionLoadOp(ctx, id, params) {
   }
   if (existing) {
     existing.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    if (loadMcpServers.length > 0) {
+      existing.mcpServers = loadMcpServers;
+    }
     const replay = ctx.replayFor?.(sessionId);
     if (replay) {
       for (const update of replay) {
@@ -277,6 +353,7 @@ async function handleSessionLoadOp(ctx, id, params) {
         modeId: existing.modeId
       }
     });
+    await reportSkippedMcpServers(ctx, sessionId, loadSkipped);
     await ctx.sendResult(id, {
       initialMode: {
         currentModeId: existing.modeId,
@@ -309,6 +386,9 @@ async function handleSessionForkOp(ctx, id, params) {
     }
     forkCwd = resolved;
   }
+  const forkSkipped = [];
+  const forkRequested = parseMcpServers(p.mcpServers, (reason) => forkSkipped.push(reason));
+  const forkMcpServers = forkRequested.length > 0 ? forkRequested : source.mcpServers;
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const sessionId = `sess_${ctx.allocId()}`;
   const forked = {
@@ -318,7 +398,8 @@ async function handleSessionForkOp(ctx, id, params) {
     modeId: source.modeId,
     createdAt: now,
     updatedAt: now,
-    ...source.title !== void 0 ? { title: source.title } : {}
+    ...source.title !== void 0 ? { title: source.title } : {},
+    ...forkMcpServers && forkMcpServers.length > 0 ? { mcpServers: forkMcpServers } : {}
   };
   const history = (ctx.replayFor?.(sourceId) ?? []).map((update) => ({
     sessionUpdate: update.sessionUpdate,
@@ -332,6 +413,7 @@ async function handleSessionForkOp(ctx, id, params) {
     sessionId,
     update: { sessionUpdate: "current_mode_update", modeId: forked.modeId }
   });
+  await reportSkippedMcpServers(ctx, sessionId, forkSkipped);
   await ctx.sendResult(id, {
     sessionId,
     modes: ctx.modes,
@@ -371,7 +453,13 @@ async function handleSessionPromptOp(ctx, id, params) {
   };
   try {
     result = await ctx.runTurn(
-      { sessionId, prompt: p.prompt, signal: turnSignal.signal },
+      {
+        sessionId,
+        prompt: p.prompt,
+        signal: turnSignal.signal,
+        cwd: session.cwd,
+        ...session.mcpServers ? { mcpServers: session.mcpServers } : {}
+      },
       emit,
       api
     );
@@ -429,6 +517,22 @@ async function handleSetConfigOptionOp(ctx, id, params) {
   await ctx.sendResult(id, { configOptions: [...ctx.configOptions] });
   return false;
 }
+async function reportSkippedMcpServers(ctx, sessionId, skipped) {
+  if (skipped.length === 0) return;
+  try {
+    await ctx.sendNotification({
+      sessionId,
+      update: {
+        sessionUpdate: "agent_message_chunk",
+        content: {
+          type: "text",
+          text: `Ignored ${skipped.length} malformed mcpServers entr${skipped.length === 1 ? "y" : "ies"}: ${skipped.join("; ")}`
+        }
+      }
+    });
+  } catch {
+  }
+}
 
 // src/agent/protocol-handler.ts
 var ACPProtocolHandler = class {
@@ -627,7 +731,7 @@ var ACPProtocolHandler = class {
     return false;
   }
   async handleAuthenticate(id, _params) {
-    await this.sendResult(id, { outcome: "unauthenticated" });
+    await this.sendResult(id, {});
     return false;
   }
   async handleLogout(id, _params) {
@@ -640,6 +744,10 @@ var ACPProtocolHandler = class {
     const existing = sessionId ? this.sessions.get(sessionId) : void 0;
     if (existing) {
       existing.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      const resumeServers = parseMcpServers(p.mcpServers);
+      if (resumeServers.length > 0) {
+        existing.mcpServers = resumeServers;
+      }
       await this.sendResult(id, {
         initialMode: {
           currentModeId: existing.modeId,
@@ -1175,13 +1283,6 @@ var WrongStackACPServer = class {
 var defaultEchoRunTurn = async (_input, _emit) => {
   return { stopReason: "end_turn" };
 };
-function timingSafeTokenEqual(supplied, expected) {
-  if (!supplied || !expected) return false;
-  const a = Buffer.from(supplied);
-  const b = Buffer.from(expected);
-  if (a.length !== b.length) return false;
-  return timingSafeEqual(a, b);
-}
 function isLoopbackPeer(req) {
   const address = req.socket.remoteAddress?.replace(/^::ffff:/i, "");
   return address !== void 0 && isLoopbackHost(address);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrongstack/acp",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "license": "MIT",
   "description": "ACP (Agent Client Protocol) integration for WrongStack — client + agent support",
   "keywords": [
@@ -52,7 +52,8 @@
   ],
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.4.0",
-    "@wrongstack/core": "1.0.3"
+    "@wrongstack/core": "1.0.5",
+    "@wrongstack/primitives": "1.0.5"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",