opencara 0.108.0 → 0.108.2

package/dist/bin.js

@@ -1153,6 +1153,7 @@ function runAcpJob(opts) {
       const mcpServers = [host.acpServerEntry()];
       const shimSupportsLoad = initResult.agentCapabilities?.loadSession === true;
       let sessionId;
+      let resumed = false;
       if (acpSpec.priorSessionId && shimSupportsLoad) {
         await client.loadSession({
           sessionId: acpSpec.priorSessionId,
@@ -1160,6 +1161,7 @@ function runAcpJob(opts) {
           mcpServers
         });
         sessionId = acpSpec.priorSessionId;
+        resumed = true;
       } else {
         const session = await client.newSession({ cwd, mcpServers });
         sessionId = session.sessionId;
@@ -1173,7 +1175,10 @@ function runAcpJob(opts) {
         result = { exitCode: 1, stopReason: "cancelled", sessionId };
         return result;
       }
-      const prompt = buildPromptContent(acpSpec);
+      const prompt = buildPromptContent({
+        ...acpSpec,
+        history: resumed ? [] : acpSpec.history
+      });
       const promptResult = await client.prompt({
         sessionId,
         prompt,
@@ -1307,7 +1312,7 @@ function resolveLocalAcpAdapter(command, args) {
 }
 
 // src/commands/run.ts
-var PKG_VERSION = "0.108.0";
+var PKG_VERSION = "0.108.2";
 var LOG_FLUSH_MS = 800;
 var MAX_CHUNK_SIZE = 4 * 1024;
 async function run(opts = {}) {
@@ -1683,20 +1688,34 @@ function worktreeCreate(args) {
       mkdirSync2(join2(cacheDir, ".git", "lfs", "objects"), { recursive: true });
     }
   }
+  let reused = false;
   if (existsSync4(join2(checkoutDir, ".git"))) {
-    git(checkoutDir, ["fetch", "origin"], gitEnv);
-    if (refExists(checkoutDir, `refs/remotes/origin/${branch}`)) {
-      git(checkoutDir, ["checkout", "-B", branch, `origin/${branch}`], gitEnv);
-    } else if (refExists(checkoutDir, `refs/heads/${branch}`)) {
-      git(checkoutDir, ["checkout", branch], gitEnv);
-    } else if (fromBranch) {
-      git(checkoutDir, ["checkout", "-B", branch, `origin/${fromBranch}`], gitEnv);
-    } else {
-      fail(
-        `worktree create: '${branch}' missing locally and on origin/, no --from-branch to fall back to`
+    try {
+      git(checkoutDir, ["reset", "--hard", "HEAD"], gitEnv);
+      git(checkoutDir, ["clean", "-fdx"], gitEnv);
+      git(checkoutDir, ["fetch", "origin"], gitEnv);
+      if (refExists(checkoutDir, `refs/remotes/origin/${branch}`)) {
+        git(checkoutDir, ["checkout", "-B", branch, `origin/${branch}`], gitEnv);
+      } else if (refExists(checkoutDir, `refs/heads/${branch}`)) {
+        git(checkoutDir, ["checkout", branch], gitEnv);
+      } else if (fromBranch) {
+        git(checkoutDir, ["checkout", "-B", branch, `origin/${fromBranch}`], gitEnv);
+      } else {
+        fail(
+          `worktree create: '${branch}' missing locally and on origin/, no --from-branch to fall back to`
+        );
+      }
+      reused = true;
+    } catch (err) {
+      console.warn(
+        `[worktree] reuse of ${checkoutDir} failed (${err.message}); re-cloning`
       );
+      rmSync(checkoutDir, { recursive: true, force: true });
     }
-  } else {
+  } else if (existsSync4(checkoutDir)) {
+    rmSync(checkoutDir, { recursive: true, force: true });
+  }
+  if (!reused) {
     mkdirSync2(checkoutDir, { recursive: true });
     const cloneArgs = ["-c", `credential.helper=${HELPER_SNIPPET}`, "clone"];
     if (cacheDir) {

package/dist/claude-acp.js

@@ -61,6 +61,43 @@ function replyError(id, code, message) {
 function notify(method, params) {
   send({ jsonrpc: "2.0", method, params });
 }
+function normalizeMcpServers(raw) {
+  if (!Array.isArray(raw)) return [];
+  const out = [];
+  for (const entry of raw) {
+    if (!entry || typeof entry !== "object") continue;
+    const e = entry;
+    if (e["type"] !== "stdio") continue;
+    if (typeof e["name"] !== "string" || typeof e["command"] !== "string") continue;
+    const args = Array.isArray(e["args"]) ? e["args"].map(String) : [];
+    const env = [];
+    if (Array.isArray(e["env"])) {
+      for (const kv of e["env"]) {
+        if (!kv || typeof kv !== "object") continue;
+        const r = kv;
+        if (typeof r["name"] !== "string" || typeof r["value"] !== "string") continue;
+        env.push({ name: r["name"], value: r["value"] });
+      }
+    }
+    out.push({
+      type: "stdio",
+      name: e["name"],
+      command: e["command"],
+      args,
+      env
+    });
+  }
+  return out;
+}
+function buildClaudeMcpConfig(servers) {
+  const mcpServers = {};
+  for (const s of servers) {
+    const env = {};
+    for (const kv of s.env) env[kv.name] = kv.value;
+    mcpServers[s.name] = { command: s.command, args: s.args, env };
+  }
+  return JSON.stringify({ mcpServers });
+}
 var sessions = /* @__PURE__ */ new Map();
 async function runClaudeTurn(sessionId, state, promptText, permissionMode) {
   return new Promise((resolve, reject) => {
@@ -82,6 +119,13 @@ async function runClaudeTurn(sessionId, state, promptText, permissionMode) {
     } else {
       args.push("--dangerously-skip-permissions");
     }
+    if (state.mcpServers && state.mcpServers.length > 0) {
+      args.push(
+        "--mcp-config",
+        buildClaudeMcpConfig(state.mcpServers),
+        "--strict-mcp-config"
+      );
+    }
     const child = spawn("claude", args, {
       cwd: state.cwd,
       env: process.env,
@@ -202,9 +246,9 @@ function handleInitialize(_params) {
     agentCapabilities: {
       // 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).
+      // replays its own JSONL internally. ACP's mcpServers are bridged
+      // to Claude via `--mcp-config <inline-json> --strict-mcp-config`
+      // on each turn (see SessionState.mcpServers / runClaudeTurn).
       loadSession: true,
       mcpCapabilities: {},
       promptCapabilities: { embeddedContext: false, image: false, audio: false }
@@ -214,14 +258,24 @@ function handleInitialize(_params) {
 }
 function handleNewSession(params) {
   const sessionId = randomUUID();
-  sessions.set(sessionId, { cwd: params.cwd ?? process.cwd(), resume: false });
+  const mcpServers = normalizeMcpServers(params.mcpServers);
+  sessions.set(sessionId, {
+    cwd: params.cwd ?? process.cwd(),
+    resume: false,
+    ...mcpServers.length > 0 ? { mcpServers } : {}
+  });
   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(), resume: true });
+  const mcpServers = normalizeMcpServers(params.mcpServers);
+  sessions.set(params.sessionId, {
+    cwd: params.cwd ?? process.cwd(),
+    resume: true,
+    ...mcpServers.length > 0 ? { mcpServers } : {}
+  });
   return {};
 }
 async function handlePrompt(params) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencara",
-  "version": "0.108.0",
+  "version": "0.108.2",
   "description": "OpenCara agent-host CLI: register a machine as an agent host and run dispatched agents.",
   "license": "MIT",
   "repository": {