opencara 0.108.1 → 0.109.0

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.1";
+var PKG_VERSION = "0.109.0";
 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

@@ -182,27 +182,43 @@ async function runClaudeTurn(sessionId, state, promptText, permissionMode) {
     });
   });
 }
-function handleClaudeEvent(sessionId, raw, done) {
-  if (raw === null || typeof raw !== "object" || Array.isArray(raw)) return;
+function translateClaudeEvent(sessionId, raw) {
+  const out = [];
+  if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
+    return { notifications: out };
+  }
   const msg = raw;
   const type = typeof msg["type"] === "string" ? msg["type"] : "";
   if (type === "assistant") {
-    return;
+    const message = msg["message"];
+    if (message && typeof message === "object" && !Array.isArray(message)) {
+      const content = message.content;
+      if (Array.isArray(content)) {
+        for (const block of content) {
+          const translated = translateAssistantBlock(sessionId, block);
+          if (translated) out.push(...translated);
+        }
+      }
+    }
+    return { notifications: out };
   }
   if (type === "stream_event") {
     const event = msg["event"];
-    if (event?.type !== "content_block_delta") return;
-    if (event.delta?.type !== "text_delta") return;
+    if (event?.type !== "content_block_delta") return { notifications: out };
+    if (event.delta?.type !== "text_delta") return { notifications: out };
     const text = typeof event.delta.text === "string" ? event.delta.text : "";
-    if (text.length === 0) return;
-    notify("session/update", {
-      sessionId,
-      update: {
-        sessionUpdate: "agent_message_chunk",
-        content: { type: "text", text }
+    if (text.length === 0) return { notifications: out };
+    out.push({
+      method: "session/update",
+      params: {
+        sessionId,
+        update: {
+          sessionUpdate: "agent_message_chunk",
+          content: { type: "text", text }
+        }
       }
     });
-    return;
+    return { notifications: out };
   }
   if (type === "result") {
     const subtype = typeof msg["subtype"] === "string" ? msg["subtype"] : "";
@@ -210,30 +226,102 @@ function handleClaudeEvent(sessionId, raw, done) {
     if (isError) {
       const resultText = typeof msg["result"] === "string" ? msg["result"] : "";
       if (resultText.length > 0) {
-        notify("session/update", {
-          sessionId,
-          update: {
-            sessionUpdate: "agent_message_chunk",
-            content: { type: "text", text: `
+        out.push({
+          method: "session/update",
+          params: {
+            sessionId,
+            update: {
+              sessionUpdate: "agent_message_chunk",
+              content: { type: "text", text: `
 
 [claude error: ${resultText}]` }
+            }
           }
         });
       }
-      done("refusal");
-      return;
+      return { notifications: out, stopReason: "refusal" };
     }
     if (subtype === "error_max_turns") {
-      done("max_turn_requests");
-      return;
+      return { notifications: out, stopReason: "max_turn_requests" };
     }
     if (subtype === "error_max_tokens") {
-      done("max_tokens");
-      return;
+      return { notifications: out, stopReason: "max_tokens" };
     }
-    done("end_turn");
-    return;
+    return { notifications: out, stopReason: "end_turn" };
+  }
+  return { notifications: out };
+}
+function translateAssistantBlock(sessionId, block) {
+  if (!block || typeof block !== "object" || Array.isArray(block)) return null;
+  const b = block;
+  if (b["type"] !== "tool_use") return null;
+  if (b["name"] !== "AskUserQuestion") return null;
+  const input = b["input"];
+  if (!input || typeof input !== "object" || Array.isArray(input)) return null;
+  const questions = input.questions;
+  if (!Array.isArray(questions)) return null;
+  const chunks = [];
+  for (const q of questions) {
+    const rendered = renderAskUserQuestionItem(q);
+    if (rendered) chunks.push(rendered);
   }
+  if (chunks.length === 0) return null;
+  const text = `
+
+${chunks.join("\n\n")}
+`;
+  return [
+    {
+      method: "session/update",
+      params: {
+        sessionId,
+        update: {
+          sessionUpdate: "agent_message_chunk",
+          content: { type: "text", text }
+        }
+      }
+    }
+  ];
+}
+function renderAskUserQuestionItem(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
+  const q = raw;
+  const question = typeof q["question"] === "string" ? q["question"].trim() : "";
+  if (!question) return null;
+  const header = typeof q["header"] === "string" ? q["header"].trim() : "";
+  const multiSelect = q["multiSelect"] === true;
+  const rawOptions = Array.isArray(q["options"]) ? q["options"] : [];
+  const options = [];
+  for (const opt of rawOptions) {
+    if (!opt || typeof opt !== "object" || Array.isArray(opt)) continue;
+    const o = opt;
+    const label = typeof o["label"] === "string" ? o["label"].trim() : "";
+    if (!label) continue;
+    const value = header ? `${header}: ${label}` : label;
+    options.push({ label, value });
+  }
+  if (options.length === 0) return null;
+  const promptParts = [`**${question}**`];
+  if (multiSelect) {
+    promptParts.push(
+      "_(Multiple answers expected \u2014 click one, then type any others.)_"
+    );
+  } else {
+    promptParts.push(
+      "_(Pick an option, or type your own answer below.)_"
+    );
+  }
+  const payload = {
+    type: "options",
+    text: promptParts.join(" "),
+    options
+  };
+  return "```json\n" + JSON.stringify(payload, null, 2) + "\n```";
+}
+function handleClaudeEvent(sessionId, raw, done) {
+  const { notifications, stopReason } = translateClaudeEvent(sessionId, raw);
+  for (const n of notifications) notify(n.method, n.params);
+  if (stopReason) done(stopReason);
 }
 function handleInitialize(_params) {
   return {
@@ -376,5 +464,6 @@ export {
   handleInitialize,
   handleLoadSession,
   handleNewSession,
-  sessions
+  sessions,
+  translateClaudeEvent
 };

package/package.json

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