opencara 0.105.3 → 0.106.0

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.3";
+var PKG_VERSION = "0.106.0";
 var LOG_FLUSH_MS = 800;
 var MAX_CHUNK_SIZE = 4 * 1024;
 async function run(opts = {}) {
@@ -1479,13 +1505,15 @@ import {
   existsSync as existsSync4,
   realpathSync,
   writeFileSync as writeFileSync2,
-  renameSync
+  renameSync,
+  symlinkSync
 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { join as join2, sep } from "node:path";
 var OPENCARA_ROOT = join2(homedir2(), ".opencara");
 var WORK_ROOT = join2(OPENCARA_ROOT, "work");
 var SESSION_ROOT = join2(OPENCARA_ROOT, "sessions");
+var CACHE_ROOT = join2(OPENCARA_ROOT, "cache");
 async function internal(argv) {
   const sub = argv[0];
   const rest = argv.slice(1);
@@ -1528,17 +1556,51 @@ function worktreeCreate(args) {
   if (!key) fail(`invalid --key '${rawKey}'`);
   const sessionDir = join2(SESSION_ROOT, key);
   const checkoutDir = join2(WORK_ROOT, key, "checkout");
+  const useCache = hasFlag(args, "--cache-repo");
+  const useLfs = hasFlag(args, "--lfs");
+  if (useLfs && !useCache) {
+    fail("--lfs requires --cache-repo");
+  }
+  const cacheDir = useCache ? join2(CACHE_ROOT, safeKey(repo)) : null;
+  const gitEnv = useCache && !useLfs ? { ...process.env, GIT_LFS_SKIP_SMUDGE: "1" } : void 0;
   const HELPER_SNIPPET = '!f() { echo username=x-access-token; echo "password=$GH_TOKEN"; }; f';
   const cleanUrl = `https://github.com/${repo}.git`;
   mkdirSync2(sessionDir, { recursive: true });
+  if (cacheDir) {
+    if (existsSync4(join2(cacheDir, ".git"))) {
+      git(cacheDir, ["fetch", "--all", "--prune"], gitEnv);
+    } else {
+      mkdirSync2(cacheDir, { recursive: true });
+      try {
+        git(
+          cacheDir,
+          ["-c", `credential.helper=${HELPER_SNIPPET}`, "clone", cleanUrl, "."],
+          gitEnv
+        );
+        git(cacheDir, ["config", "credential.helper", HELPER_SNIPPET]);
+      } catch (err) {
+        try {
+          if (!existsSync4(join2(cacheDir, ".git", "HEAD"))) {
+            rmSync(cacheDir, { recursive: true, force: true });
+          }
+        } catch {
+        }
+        throw err;
+      }
+    }
+    if (useLfs) {
+      git(cacheDir, ["lfs", "fetch", "--all"], gitEnv);
+      mkdirSync2(join2(cacheDir, ".git", "lfs", "objects"), { recursive: true });
+    }
+  }
   if (existsSync4(join2(checkoutDir, ".git"))) {
-    git(checkoutDir, ["fetch", "origin"]);
+    git(checkoutDir, ["fetch", "origin"], gitEnv);
     if (refExists(checkoutDir, `refs/remotes/origin/${branch}`)) {
-      git(checkoutDir, ["checkout", "-B", branch, `origin/${branch}`]);
+      git(checkoutDir, ["checkout", "-B", branch, `origin/${branch}`], gitEnv);
     } else if (refExists(checkoutDir, `refs/heads/${branch}`)) {
-      git(checkoutDir, ["checkout", branch]);
+      git(checkoutDir, ["checkout", branch], gitEnv);
     } else if (fromBranch) {
-      git(checkoutDir, ["checkout", "-B", branch, `origin/${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`
@@ -1547,18 +1609,29 @@ function worktreeCreate(args) {
   } else {
     mkdirSync2(checkoutDir, { recursive: true });
     const cloneArgs = ["-c", `credential.helper=${HELPER_SNIPPET}`, "clone"];
+    if (cacheDir) {
+      cloneArgs.push("--no-checkout", "--reference", cacheDir);
+    }
     if (fromBranch) {
       cloneArgs.push("--branch", fromBranch);
     }
     cloneArgs.push(cleanUrl, ".");
     try {
-      git(checkoutDir, cloneArgs);
+      git(checkoutDir, cloneArgs, gitEnv);
+      if (cacheDir && useLfs) {
+        const checkoutLfsDir = join2(checkoutDir, ".git", "lfs");
+        mkdirSync2(checkoutLfsDir, { recursive: true });
+        symlinkSync(
+          join2(cacheDir, ".git", "lfs", "objects"),
+          join2(checkoutLfsDir, "objects")
+        );
+      }
       if (fromBranch && branch === fromBranch) {
-        git(checkoutDir, ["checkout", branch]);
+        git(checkoutDir, ["checkout", branch], gitEnv);
       } else {
-        git(checkoutDir, ["checkout", "-b", branch]);
+        git(checkoutDir, ["checkout", "-b", branch], gitEnv);
       }
-      git(checkoutDir, ["config", "credential.helper", HELPER_SNIPPET]);
+      git(checkoutDir, ["config", "credential.helper", HELPER_SNIPPET], gitEnv);
     } catch (err) {
       try {
         rmSync(checkoutDir, { recursive: true, force: true });
@@ -1642,8 +1715,12 @@ function worktreeRemove(args) {
     rmSync(resolved, { recursive: true, force: true });
   }
 }
-function git(cwd, args) {
-  execFileSync("git", args, { cwd, stdio: ["ignore", "ignore", "inherit"] });
+function git(cwd, args, env) {
+  execFileSync("git", args, {
+    cwd,
+    stdio: ["ignore", "ignore", "inherit"],
+    env: env ?? process.env
+  });
 }
 function refExists(cwd, ref) {
   try {
@@ -1661,6 +1738,9 @@ function pickFlag(argv, name) {
   if (i === -1) return void 0;
   return argv[i + 1];
 }
+function hasFlag(argv, name) {
+  return argv.indexOf(name) !== -1;
+}
 function fail(msg) {
   console.error(msg);
   process.exit(1);

package/dist/claude-acp.js

@@ -64,6 +64,7 @@ function notify(method, params) {
 var sessions = /* @__PURE__ */ new Map();
 async function runClaudeTurn(sessionId, state, promptText) {
   return new Promise((resolve, reject) => {
+    const idFlag = state.resume ? "--resume" : "--session-id";
     const args = [
       "-p",
       "--output-format",
@@ -73,7 +74,7 @@ async function runClaudeTurn(sessionId, state, promptText) {
       // sense only when stdin can be partial too.
       "--include-partial-messages",
       "--verbose",
-      "--session-id",
+      idFlag,
       sessionId,
       // Headless: no human in the loop to approve tool use. Matches the
       // legacy `claudeAdapter` posture in agents/kinds.ts.
@@ -205,14 +206,14 @@ function handleInitialize(_params) {
 }
 function handleNewSession(params) {
   const sessionId = randomUUID();
-  sessions.set(sessionId, { cwd: params.cwd ?? process.cwd() });
+  sessions.set(sessionId, { cwd: params.cwd ?? process.cwd(), resume: false });
   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() });
+  sessions.set(params.sessionId, { cwd: params.cwd ?? process.cwd(), resume: true });
   return {};
 }
 async function handlePrompt(params) {
@@ -225,6 +226,7 @@ async function handlePrompt(params) {
     throw new Error("session/prompt: no text content blocks");
   }
   const result = await runClaudeTurn(params.sessionId, state, promptText);
+  state.resume = true;
   return { stopReason: result.stopReason };
 }
 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;

package/package.json

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