opencara 0.104.1 → 0.105.1

package/dist/bin.js

@@ -85,7 +85,8 @@ var AcpSpecSchema = z3.object({
   systemPromptMd: z3.string(),
   userPromptMd: z3.string(),
   history: z3.array(AcpHistoryTurnSchema).default([]),
-  pageContextJson: z3.string().optional()
+  pageContextJson: z3.string().optional(),
+  priorSessionId: z3.string().optional()
 });
 var AgentSpecSchema = z3.object({
   kind: z3.string(),
@@ -184,7 +185,12 @@ var RunDoneSchema = z4.object({
   runId: z4.string(),
   status: z4.enum(["succeeded", "failed", "cancelled"]),
   exitCode: z4.number().int().nullable().optional(),
-  errorMessage: z4.string().optional()
+  errorMessage: z4.string().optional(),
+  /** ACP session id the agent ran under (fresh from session/new, or
+   *  echoed from session/load). The orchestrator persists this per
+   *  (repo, branch) so the next iteration can resume via session/load.
+   *  Null/absent for non-ACP runs (worktree-allocate, write-session). */
+  acpSessionId: z4.string().nullable().optional()
 });
 var HelloAckSchema = z4.object({
   type: z4.literal("hello-ack"),
@@ -273,7 +279,6 @@ var DeviceToServerMessageSchema = z4.union([
   LogFrameSchema,
   RunDoneSchema,
   PongSchema,
-  AgentCallSchema,
   AgentCallRequestSchema
 ]);
 var HostRegisterRequestSchema = z4.object({
@@ -455,9 +460,6 @@ var WsClient = class {
   }
 };
 
-// src/runner/spawn.ts
-import { spawn as spawn3 } from "node:child_process";
-
 // src/runner/acpRunner.ts
 import { existsSync as existsSync3 } from "node:fs";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
@@ -565,6 +567,9 @@ var AcpConnection = class {
   newSession(req) {
     return this.request(ACP_METHODS.session_new, req);
   }
+  loadSession(req) {
+    return this.request(ACP_METHODS.session_load, req);
+  }
   prompt(req) {
     return this.request(ACP_METHODS.session_prompt, req);
   }
@@ -726,6 +731,9 @@ var AcpClient = class {
   newSession(req) {
     return this.must().newSession(req);
   }
+  loadSession(req) {
+    return this.must().loadSession(req);
+  }
   prompt(req) {
     return this.must().prompt(req);
   }
@@ -1069,26 +1077,35 @@ function runAcpJob(opts) {
     }
   };
   const promise = (async () => {
-    let result = { exitCode: 1, stopReason: "uninitialized" };
+    let result = { exitCode: 1, stopReason: "uninitialized", sessionId: "" };
     try {
       await host.start();
       client.start();
-      await client.initialize({
+      const initResult = await client.initialize({
         protocolVersion: ACP_PROTOCOL_VERSION,
         clientCapabilities: {}
       });
-      const session = await client.newSession({
-        cwd: spec.cwd ?? process.cwd(),
-        mcpServers: [host.acpServerEntry()]
-      });
+      const cwd = spec.cwd ?? process.cwd();
+      const mcpServers = [host.acpServerEntry()];
+      const shimSupportsLoad = initResult.agentCapabilities?.loadSession === true;
+      let sessionId;
+      if (acpSpec.priorSessionId && shimSupportsLoad) {
+        await client.loadSession({
+          sessionId: acpSpec.priorSessionId,
+          cwd,
+          mcpServers
+        });
+        sessionId = acpSpec.priorSessionId;
+      } else {
+        const session = await client.newSession({ cwd, mcpServers });
+        sessionId = session.sessionId;
+      }
       const prompt = buildPromptContent(acpSpec);
-      const promptResult = await client.prompt({
-        sessionId: session.sessionId,
-        prompt
-      });
+      const promptResult = await client.prompt({ sessionId, prompt });
       result = {
         exitCode: promptResult.stopReason === "end_turn" ? 0 : 1,
-        stopReason: promptResult.stopReason
+        stopReason: promptResult.stopReason,
+        sessionId
       };
       return result;
     } finally {
@@ -1187,100 +1204,8 @@ function resolveLocalAcpAdapter(command, args) {
   return { command, args: [...args] };
 }
 
-// src/runner/spawn.ts
-function runJob(spec, stdinJson, handlers) {
-  return new Promise((resolve, reject) => {
-    const child = spawn3(spec.command, spec.args ?? [], {
-      env: { ...process.env, ...spec.env ?? {} },
-      cwd: spec.cwd,
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-    child.stdout.setEncoding("utf8");
-    child.stderr.setEncoding("utf8");
-    child.stdout.on("data", (c) => handlers.onLog("stdout", c));
-    child.stderr.on("data", (c) => handlers.onLog("stderr", c));
-    child.on("error", reject);
-    child.on("close", (code) => resolve({ exitCode: code ?? -1 }));
-    if (stdinJson !== void 0) {
-      try {
-        child.stdin.end(JSON.stringify(stdinJson));
-      } catch (err) {
-        child.kill();
-        reject(err);
-        return;
-      }
-    } else {
-      child.stdin.end();
-    }
-  });
-}
-
-// src/runner/agentCallParser.ts
-import { z as z6 } from "zod";
-var MAX_BUFFER_BYTES = 64 * 1024;
-var FENCE_RE = /```opencara-call\r?\n([\s\S]*?)\r?\n```/;
-var VARIANT_SCHEMAS = {
-  "issue.body.set": IssueBodySetCallSchema.omit({ type: true, runId: true }),
-  "flow.node.config.set": FlowNodeConfigSetCallSchema.omit({
-    type: true,
-    runId: true
-  }),
-  "template.node.config.set": TemplateNodeConfigSetCallSchema.omit({
-    type: true,
-    runId: true
-  })
-};
-var KindSchema = z6.enum([
-  "issue.body.set",
-  "flow.node.config.set",
-  "template.node.config.set"
-]);
-var AgentCallParser = class {
-  constructor(emit) {
-    this.emit = emit;
-  }
-  emit;
-  buffer = "";
-  feed(chunk) {
-    this.buffer += chunk;
-    if (this.buffer.length > MAX_BUFFER_BYTES) {
-      const cutoff = Math.floor(MAX_BUFFER_BYTES / 2);
-      const nl = this.buffer.indexOf("\n", this.buffer.length - cutoff);
-      this.buffer = nl >= 0 ? this.buffer.slice(nl + 1) : this.buffer.slice(-cutoff);
-    }
-    while (true) {
-      const m = FENCE_RE.exec(this.buffer);
-      if (!m) break;
-      const inner = m[1] ?? "";
-      const consumedTo = m.index + m[0].length;
-      this.buffer = this.buffer.slice(consumedTo);
-      this.tryEmit(inner);
-    }
-  }
-  tryEmit(inner) {
-    let parsed;
-    try {
-      parsed = JSON.parse(inner);
-    } catch {
-      return;
-    }
-    if (!parsed || typeof parsed !== "object") return;
-    const raw = parsed;
-    const kindResult = KindSchema.safeParse(raw.kind);
-    if (!kindResult.success) return;
-    const withCallId = {
-      ...raw,
-      callId: typeof raw.callId === "string" && raw.callId.length > 0 ? raw.callId : `call_${Date.now().toString(36)}`
-    };
-    const schema = VARIANT_SCHEMAS[kindResult.data];
-    const result = schema.safeParse(withCallId);
-    if (!result.success) return;
-    this.emit(result.data);
-  }
-};
-
 // src/commands/run.ts
-var PKG_VERSION = "0.104.1";
+var PKG_VERSION = "0.105.1";
 var LOG_FLUSH_MS = 800;
 var MAX_CHUNK_SIZE = 4 * 1024;
 async function run(opts = {}) {
@@ -1300,12 +1225,11 @@ async function run(opts = {}) {
         type: "hello",
         platform: platform(),
         version: PKG_VERSION,
-        // Advertise the new opencara-call stdout protocol so the
-        // server can later gate the skill prompt to capable CLIs.
-        // Older CLIs without this capability would still be sent the
-        // skill markdown today (it doesn't crash; the fenced block
-        // just shows up in stdout unparsed).
-        capabilities: ["agent-call"],
+        // Advertise ACP transport support. Pre-v0.30 devices reported
+        // "agent-call" (the fenced-stdout-block protocol); since the
+        // legacy path was removed, this version reports "acp" so the
+        // orchestrator knows the device can handle `spec.acp` jobs.
+        capabilities: ["acp"],
         systemInfo: collectSystemInfo()
       });
     },
@@ -1357,79 +1281,45 @@ async function executeJob(job, client) {
     if (flushTimer) return;
     flushTimer = setTimeout(flush, LOG_FLUSH_MS);
   };
-  if (job.spec.acp) {
-    const handle = runAcpJob({
-      runId,
-      spec: job.spec,
-      handlers: {
-        onLog: (stream, chunk) => {
-          pending[stream] += chunk;
-          scheduleFlush();
-        },
-        sendAgentCall: (req) => client.send(req)
-      }
-    });
-    acpControllers.set(runId, handle.controller);
-    try {
-      const result = await handle.promise;
-      flush();
-      client.send({
-        type: "done",
-        runId,
-        status: result.exitCode === 0 ? "succeeded" : "failed",
-        exitCode: result.exitCode
-      });
-      console.log(
-        `[opencara] job ${runId.slice(-8)} (acp) \u2192 ${result.stopReason} exit=${result.exitCode}`
-      );
-    } catch (err) {
-      flush();
-      const message = err instanceof Error ? err.message : String(err);
-      client.send({ type: "done", runId, status: "failed", errorMessage: message });
-      console.error(`[opencara] job ${runId.slice(-8)} (acp) failed`, message);
-    } finally {
-      acpControllers.delete(runId);
-    }
+  if (!job.spec.acp) {
+    flush();
+    const message = `legacy stdin-JSON dispatch removed in v0.30 \u2014 orchestrator must send spec.acp. Got command: ${job.spec.command}.`;
+    client.send({ type: "done", runId, status: "failed", errorMessage: message });
+    console.error(`[opencara] job ${runId.slice(-8)} rejected: ${message}`);
     return;
   }
-  const callParser = new AgentCallParser((call) => {
-    switch (call.kind) {
-      case "issue.body.set":
-        client.send({ type: "agent-call", runId, ...call });
-        return;
-      case "flow.node.config.set":
-        client.send({ type: "agent-call", runId, ...call });
-        return;
-      case "template.node.config.set":
-        client.send({ type: "agent-call", runId, ...call });
-        return;
-      default: {
-        const exhaustive = call;
-        void exhaustive;
-      }
-    }
-  });
-  try {
-    const result = await runJob(job.spec, job.stdinJson, {
+  const handle = runAcpJob({
+    runId,
+    spec: job.spec,
+    handlers: {
       onLog: (stream, chunk) => {
         pending[stream] += chunk;
         scheduleFlush();
-        if (stream === "stdout") callParser.feed(chunk);
-      }
-    });
+      },
+      sendAgentCall: (req) => client.send(req)
+    }
+  });
+  acpControllers.set(runId, handle.controller);
+  try {
+    const result = await handle.promise;
     flush();
     client.send({
       type: "done",
       runId,
       status: result.exitCode === 0 ? "succeeded" : "failed",
-      exitCode: result.exitCode
+      exitCode: result.exitCode,
+      acpSessionId: result.sessionId || null
     });
-    console.log(`[opencara] job ${runId.slice(-8)} \u2192 exit ${result.exitCode}`);
+    console.log(
+      `[opencara] job ${runId.slice(-8)} (acp) \u2192 ${result.stopReason} exit=${result.exitCode}`
+    );
   } catch (err) {
     flush();
     const message = err instanceof Error ? err.message : String(err);
     client.send({ type: "done", runId, status: "failed", errorMessage: message });
-    console.error(`[opencara] job ${runId.slice(-8)} failed`, message);
+    console.error(`[opencara] job ${runId.slice(-8)} (acp) failed`, message);
+  } finally {
+    acpControllers.delete(runId);
   }
 }
 function collectSystemInfo() {

package/dist/claude-acp.js

@@ -74,23 +74,25 @@ async function runClaudeTurn(sessionId, state, promptText) {
       "--include-partial-messages",
       "--verbose",
       "--session-id",
-      state.claudeSessionId,
+      sessionId,
       // Headless: no human in the loop to approve tool use. Matches the
       // legacy `claudeAdapter` posture in agents/kinds.ts.
-      "--dangerously-skip-permissions",
-      promptText
+      "--dangerously-skip-permissions"
     ];
     const child = spawn("claude", args, {
       cwd: state.cwd,
       env: process.env,
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    child.stdin.on("error", () => {
     });
-    const decoder2 = new FrameDecoder();
+    child.stdin.end(promptText);
+    const decoder = new FrameDecoder();
     let resolved = false;
     let stopReason = "end_turn";
     child.stdout.setEncoding("utf8");
     child.stdout.on("data", (chunk) => {
-      const { messages, malformed } = decoder2.feed(chunk);
+      const { messages, malformed } = decoder.feed(chunk);
       for (const line of malformed) {
         stderr.write(`[claude-acp] malformed: ${line}
 `);
@@ -189,10 +191,12 @@ function handleInitialize(_params) {
       version: "0.0.1"
     },
     agentCapabilities: {
-      // No session resume yet (follow-up). MCP via stdio works because
-      // the `claude` CLI itself supports `mcpServers` in settings.json
-      // but we don't propagate ACP's mcpServers config in this MVP.
-      loadSession: false,
+      // Session resume works by passing the ACP sessionId back as
+      // `claude --session-id <uuid>` on the next prompt — Claude CLI
+      // replays its own JSONL internally. MCP via stdio is not yet
+      // propagated from ACP's mcpServers config (the `claude` CLI uses
+      // settings.json for that today; bridging is a separate change).
+      loadSession: true,
       mcpCapabilities: {},
       promptCapabilities: { embeddedContext: false, image: false, audio: false }
     },
@@ -201,12 +205,16 @@ function handleInitialize(_params) {
 }
 function handleNewSession(params) {
   const sessionId = randomUUID();
-  sessions.set(sessionId, {
-    claudeSessionId: randomUUID(),
-    cwd: params.cwd ?? process.cwd()
-  });
+  sessions.set(sessionId, { cwd: params.cwd ?? process.cwd() });
   return { sessionId };
 }
+function handleLoadSession(params) {
+  if (typeof params.sessionId !== "string" || params.sessionId.length === 0) {
+    throw new Error("session/load: sessionId required");
+  }
+  sessions.set(params.sessionId, { cwd: params.cwd ?? process.cwd() });
+  return {};
+}
 async function handlePrompt(params) {
   const state = sessions.get(params.sessionId);
   if (!state) {
@@ -219,19 +227,22 @@ async function handlePrompt(params) {
   const result = await runClaudeTurn(params.sessionId, state, promptText);
   return { stopReason: result.stopReason };
 }
-var decoder = new FrameDecoder();
-stdin.setEncoding("utf8");
-stdin.on("data", (chunk) => {
-  const { messages, malformed } = decoder.feed(chunk);
-  for (const line of malformed) {
-    stderr.write(`[claude-acp] malformed inbound: ${line}
+var isMainModule = import.meta.url === `file://${process.argv[1]}` || process.argv[1]?.endsWith("claude-acp.ts") === true || process.argv[1]?.endsWith("claude-acp.js") === true;
+if (isMainModule) {
+  const decoder = new FrameDecoder();
+  stdin.setEncoding("utf8");
+  stdin.on("data", (chunk) => {
+    const { messages, malformed } = decoder.feed(chunk);
+    for (const line of malformed) {
+      stderr.write(`[claude-acp] malformed inbound: ${line}
 `);
-  }
-  for (const msg of messages) void dispatch(msg);
-});
-stdin.on("end", () => {
-  exit(0);
-});
+    }
+    for (const msg of messages) void dispatch(msg);
+  });
+  stdin.on("end", () => {
+    exit(0);
+  });
+}
 async function dispatch(msg) {
   if (!("id" in msg) || msg.id == null) return;
   if ("result" in msg || "error" in msg) return;
@@ -244,6 +255,9 @@ async function dispatch(msg) {
       case "session/new":
         reply(req.id, handleNewSession(req.params));
         return;
+      case "session/load":
+        reply(req.id, handleLoadSession(req.params));
+        return;
       case "session/prompt": {
         const result = await handlePrompt(req.params);
         reply(req.id, result);
@@ -258,10 +272,17 @@ async function dispatch(msg) {
     }
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
+    const isParamsError = err instanceof Error && (message.startsWith("session/prompt:") || message.startsWith("session/load:"));
     replyError(
       req.id,
-      err instanceof Error && message.startsWith("session/prompt:") ? JSON_RPC_ERROR_INVALID_PARAMS : JSON_RPC_ERROR_INTERNAL,
+      isParamsError ? JSON_RPC_ERROR_INVALID_PARAMS : JSON_RPC_ERROR_INTERNAL,
       message
     );
   }
 }
+export {
+  handleInitialize,
+  handleLoadSession,
+  handleNewSession,
+  sessions
+};

package/dist/opencara-mcp.js

@@ -127,7 +127,8 @@ var AcpSpecSchema = z2.object({
   systemPromptMd: z2.string(),
   userPromptMd: z2.string(),
   history: z2.array(AcpHistoryTurnSchema).default([]),
-  pageContextJson: z2.string().optional()
+  pageContextJson: z2.string().optional(),
+  priorSessionId: z2.string().optional()
 });
 var AgentSpecSchema = z2.object({
   kind: z2.string(),
@@ -226,7 +227,12 @@ var RunDoneSchema = z3.object({
   runId: z3.string(),
   status: z3.enum(["succeeded", "failed", "cancelled"]),
   exitCode: z3.number().int().nullable().optional(),
-  errorMessage: z3.string().optional()
+  errorMessage: z3.string().optional(),
+  /** ACP session id the agent ran under (fresh from session/new, or
+   *  echoed from session/load). The orchestrator persists this per
+   *  (repo, branch) so the next iteration can resume via session/load.
+   *  Null/absent for non-ACP runs (worktree-allocate, write-session). */
+  acpSessionId: z3.string().nullable().optional()
 });
 var HelloAckSchema = z3.object({
   type: z3.literal("hello-ack"),
@@ -315,7 +321,6 @@ var DeviceToServerMessageSchema = z3.union([
   LogFrameSchema,
   RunDoneSchema,
   PongSchema,
-  AgentCallSchema,
   AgentCallRequestSchema
 ]);
 var HostRegisterRequestSchema = z3.object({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencara",
-  "version": "0.104.1",
+  "version": "0.105.1",
   "description": "OpenCara agent-host CLI: register a machine as an agent host and run dispatched agents.",
   "license": "MIT",
   "repository": {
@@ -38,7 +38,7 @@
     "dev": "tsx watch src/bin.ts",
     "start": "node dist/bin.js",
     "typecheck": "tsc -b",
-    "test": "node --import tsx --test --test-reporter=spec src/acp/__tests__/*.test.ts src/mcp/__tests__/*.test.ts src/runner/__tests__/*.test.ts",
+    "test": "node --import tsx --test --test-reporter=spec src/acp/__tests__/*.test.ts src/mcp/__tests__/*.test.ts src/runner/__tests__/*.test.ts src/bin/__tests__/*.test.ts",
     "acp:spike": "tsx src/acp/spike.ts",
     "mcp:smoke": "tsx src/mcp/smoke.ts",
     "clean": "rm -rf dist *.tsbuildinfo"