opencara 0.108.1 → 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.1";
+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/package.json

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