opencara 0.105.2 → 0.105.4

package/dist/bin.js

@@ -1070,7 +1070,8 @@ function runAcpJob(opts) {
     env: spec.env,
     cwd: spec.cwd
   });
-  client.onSessionUpdate((p) => translateUpdate(p.update, handlers.onLog));
+  const translator = createUpdateTranslator(handlers.onLog);
+  client.onSessionUpdate((p) => translator.handle(p.update));
   client.onStderr((chunk) => handlers.onLog("stderr", chunk));
   const controller = {
     onAgentCallResult(msg) {
@@ -1110,6 +1111,7 @@ function runAcpJob(opts) {
       };
       return result;
     } finally {
+      translator.flush();
       bridge.shutdown("acp run ended");
       await Promise.race([
         host.stop().catch(() => void 0),
@@ -1152,37 +1154,61 @@ ${turns}`);
 ${acp.userPromptMd}`);
   return [{ type: "text", text: parts.join("\n\n---\n\n") }];
 }
-function translateUpdate(update, onLog) {
-  if (isMessageChunk(update)) {
-    if (update.sessionUpdate === "user_message_chunk") {
-      return;
+function createUpdateTranslator(onLog) {
+  let inThought = false;
+  const enterThought = () => {
+    if (!inThought) {
+      onLog("stdout", "\n[think]\n");
+      inThought = true;
     }
-    const text = textOfContent(update.content);
-    if (!text) return;
-    if (update.sessionUpdate === "agent_thought_chunk") {
-      onLog("stdout", `[think] ${text}`);
-      return;
+  };
+  const leaveThought = () => {
+    if (inThought) {
+      onLog("stdout", "\n[/think]\n");
+      inThought = false;
     }
-    onLog("stdout", text);
-    return;
-  }
-  if (isToolCallStart(update)) {
-    const status2 = update.status ?? "?";
-    onLog("stdout", `
+  };
+  return {
+    handle(update) {
+      if (isMessageChunk(update)) {
+        if (update.sessionUpdate === "user_message_chunk") {
+          return;
+        }
+        const text = textOfContent(update.content);
+        if (!text) return;
+        if (update.sessionUpdate === "agent_thought_chunk") {
+          enterThought();
+          onLog("stdout", text);
+          return;
+        }
+        leaveThought();
+        onLog("stdout", text);
+        return;
+      }
+      if (isToolCallStart(update)) {
+        leaveThought();
+        const status2 = update.status ?? "?";
+        onLog("stdout", `
 [tool] ${update.title} (${status2})
 `);
-    return;
-  }
-  if (isToolCallProgress(update)) {
-    const status2 = update.status ?? "?";
-    const title = update.title ?? "(tool)";
-    onLog("stdout", `
+        return;
+      }
+      if (isToolCallProgress(update)) {
+        leaveThought();
+        const status2 = update.status ?? "?";
+        const title = update.title ?? "(tool)";
+        onLog("stdout", `
 [tool] ${title} \u2192 ${status2}
 `);
-    return;
-  }
-  onLog("stderr", `[acp] unmodeled update: ${update.sessionUpdate}
+        return;
+      }
+      onLog("stderr", `[acp] unmodeled update: ${update.sessionUpdate}
 `);
+    },
+    flush() {
+      leaveThought();
+    }
+  };
 }
 function textOfContent(content) {
   if (content.type !== "text") return "";
@@ -1206,7 +1232,7 @@ function resolveLocalAcpAdapter(command, args) {
 }
 
 // src/commands/run.ts
-var PKG_VERSION = "0.105.2";
+var PKG_VERSION = "0.105.4";
 var LOG_FLUSH_MS = 800;
 var MAX_CHUNK_SIZE = 4 * 1024;
 async function run(opts = {}) {
@@ -1533,7 +1559,17 @@ function worktreeCreate(args) {
   mkdirSync2(sessionDir, { recursive: true });
   if (existsSync4(join2(checkoutDir, ".git"))) {
     git(checkoutDir, ["fetch", "origin"]);
-    git(checkoutDir, ["checkout", "-B", branch, `origin/${branch}`]);
+    if (refExists(checkoutDir, `refs/remotes/origin/${branch}`)) {
+      git(checkoutDir, ["checkout", "-B", branch, `origin/${branch}`]);
+    } else if (refExists(checkoutDir, `refs/heads/${branch}`)) {
+      git(checkoutDir, ["checkout", branch]);
+    } else if (fromBranch) {
+      git(checkoutDir, ["checkout", "-B", branch, `origin/${fromBranch}`]);
+    } else {
+      fail(
+        `worktree create: '${branch}' missing locally and on origin/, no --from-branch to fall back to`
+      );
+    }
   } else {
     mkdirSync2(checkoutDir, { recursive: true });
     const cloneArgs = ["-c", `credential.helper=${HELPER_SNIPPET}`, "clone"];
@@ -1635,6 +1671,17 @@ function worktreeRemove(args) {
 function git(cwd, args) {
   execFileSync("git", args, { cwd, stdio: ["ignore", "ignore", "inherit"] });
 }
+function refExists(cwd, ref) {
+  try {
+    execFileSync("git", ["rev-parse", "--verify", "--quiet", ref], {
+      cwd,
+      stdio: ["ignore", "ignore", "ignore"]
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function pickFlag(argv, name) {
   const i = argv.indexOf(name);
   if (i === -1) return void 0;

package/package.json

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