opencara 0.105.1 → 0.105.3

package/dist/bin.js

@@ -13,6 +13,7 @@ import {
   uptime
 } from "node:os";
 import { statfsSync } from "node:fs";
+import { spawn as spawn3 } from "node:child_process";
 
 // src/config/store.ts
 import { readFileSync, writeFileSync, mkdirSync, existsSync, unlinkSync } from "node:fs";
@@ -1205,7 +1206,7 @@ function resolveLocalAcpAdapter(command, args) {
 }
 
 // src/commands/run.ts
-var PKG_VERSION = "0.105.1";
+var PKG_VERSION = "0.105.3";
 var LOG_FLUSH_MS = 800;
 var MAX_CHUNK_SIZE = 4 * 1024;
 async function run(opts = {}) {
@@ -1281,6 +1282,11 @@ async function executeJob(job, client) {
     if (flushTimer) return;
     flushTimer = setTimeout(flush, LOG_FLUSH_MS);
   };
+  if (isInternalCommand(job.spec)) {
+    flush();
+    await runInternalCommand(job, client);
+    return;
+  }
   if (!job.spec.acp) {
     flush();
     const message = `legacy stdin-JSON dispatch removed in v0.30 \u2014 orchestrator must send spec.acp. Got command: ${job.spec.command}.`;
@@ -1322,6 +1328,63 @@ async function executeJob(job, client) {
     acpControllers.delete(runId);
   }
 }
+function isInternalCommand(spec) {
+  return spec.command === "opencara" && Array.isArray(spec.args) && spec.args[0] === "internal";
+}
+async function runInternalCommand(job, client, opts = {}) {
+  const runId = job.run.id;
+  const args = job.spec.args ?? [];
+  const binPath = opts.binPath ?? process.argv[1];
+  const nodePath = opts.nodePath ?? process.execPath;
+  if (!binPath) {
+    client.send({
+      type: "done",
+      runId,
+      status: "failed",
+      errorMessage: "internal: process.argv[1] missing \u2014 cannot re-invoke bin"
+    });
+    return;
+  }
+  let seq = 0;
+  const emit = (stream, chunk) => {
+    let remaining = chunk;
+    while (remaining.length > 0) {
+      const take = remaining.slice(0, MAX_CHUNK_SIZE);
+      client.send({ type: "log", runId, seq: seq++, stream, chunk: take });
+      remaining = remaining.slice(MAX_CHUNK_SIZE);
+    }
+  };
+  const child = spawn3(nodePath, [binPath, ...args], {
+    cwd: job.spec.cwd,
+    env: job.spec.env ? { ...process.env, ...job.spec.env } : process.env,
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  child.stdout.setEncoding("utf8");
+  child.stdout.on("data", (c) => emit("stdout", c));
+  child.stderr.setEncoding("utf8");
+  child.stderr.on("data", (c) => emit("stderr", c));
+  const { exitCode, errorMessage } = await new Promise((resolve) => {
+    let done = false;
+    child.on("error", (err) => {
+      if (done) return;
+      done = true;
+      resolve({ exitCode: 1, errorMessage: `internal spawn error: ${err.message}` });
+    });
+    child.on("close", (code, signal) => {
+      if (done) return;
+      done = true;
+      resolve({ exitCode: code ?? (signal ? 1 : 0) });
+    });
+  });
+  client.send({
+    type: "done",
+    runId,
+    status: exitCode === 0 ? "succeeded" : "failed",
+    exitCode,
+    ...errorMessage ? { errorMessage } : {}
+  });
+  console.log(`[opencara] job ${runId.slice(-8)} (internal) \u2192 exit=${exitCode}`);
+}
 function collectSystemInfo() {
   try {
     const cpuList = cpus();
@@ -1470,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"];
@@ -1572,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.1",
+  "version": "0.105.3",
   "description": "OpenCara agent-host CLI: register a machine as an agent host and run dispatched agents.",
   "license": "MIT",
   "repository": {
@@ -38,7 +38,7 @@
     "dev": "tsx watch src/bin.ts",
     "start": "node dist/bin.js",
     "typecheck": "tsc -b",
-    "test": "node --import tsx --test --test-reporter=spec src/acp/__tests__/*.test.ts src/mcp/__tests__/*.test.ts src/runner/__tests__/*.test.ts src/bin/__tests__/*.test.ts",
+    "test": "node --import tsx --test --test-reporter=spec src/acp/__tests__/*.test.ts src/mcp/__tests__/*.test.ts src/runner/__tests__/*.test.ts src/bin/__tests__/*.test.ts src/commands/__tests__/*.test.ts",
     "acp:spike": "tsx src/acp/spike.ts",
     "mcp:smoke": "tsx src/mcp/smoke.ts",
     "clean": "rm -rf dist *.tsbuildinfo"