opencara 0.105.2 → 0.105.3

package/dist/bin.js

@@ -1206,7 +1206,7 @@ function resolveLocalAcpAdapter(command, args) {
 }
 
 // src/commands/run.ts
-var PKG_VERSION = "0.105.2";
+var PKG_VERSION = "0.105.3";
 var LOG_FLUSH_MS = 800;
 var MAX_CHUNK_SIZE = 4 * 1024;
 async function run(opts = {}) {
@@ -1533,7 +1533,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 +1645,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.3",
   "description": "OpenCara agent-host CLI: register a machine as an agent host and run dispatched agents.",
   "license": "MIT",
   "repository": {