@task0/cli 0.11.0 → 0.12.0

package/dist/main.js

@@ -4763,6 +4763,9 @@ function emitAgentRunStatus(runId, status, opts = {}) {
     phase: opts.phase ?? null,
     exit_code: opts.exitCode ?? null,
     error: opts.error ?? null,
+    agent_session_id: opts.agentSessionId ?? null,
+    agent_project: opts.agentProject ?? null,
+    metadata: opts.metadata ?? null,
     ts: (/* @__PURE__ */ new Date()).toISOString()
   });
   if (status === "completed" || status === "failed" || status === "killed") {
@@ -4872,6 +4875,28 @@ function checkTmuxAvailable() {
     return { ok: false, reason: `tmux not available: ${err instanceof Error ? err.message : String(err)}` };
   }
 }
+function injectNodeBin(scriptContent) {
+  const nodeBin = process.execPath;
+  const nodeDir = path25.dirname(nodeBin);
+  const home = process.env.HOME ?? "";
+  const extraPath = [
+    nodeDir,
+    home ? `${home}/.local/share/mise/shims` : "",
+    home ? `${home}/.local/bin` : "",
+    home ? `${home}/bin` : "",
+    home ? `${home}/.cargo/bin` : ""
+  ].filter(Boolean).join(":");
+  const injected = [
+    `NODE_BIN=${JSON.stringify(nodeBin)}`,
+    `export PATH=${JSON.stringify(extraPath)}:"$PATH"`,
+    ""
+  ].join("\n");
+  const shebangMatch = scriptContent.match(/^(#![^\n]*\n)/);
+  if (shebangMatch) {
+    return shebangMatch[1] + injected + scriptContent.slice(shebangMatch[1].length);
+  }
+  return injected + scriptContent;
+}
 function isSessionAlive2(sessionName) {
   try {
     execFileSync(getTmuxBin(), ["has-session", "-t", sessionName], {
@@ -4911,7 +4936,17 @@ function deriveStatus(parsed) {
   else if (raw === "error" || raw === "failed") status = "failed";
   const phase = typeof parsed.phase === "string" ? parsed.phase : null;
   const error2 = typeof parsed.error === "string" && parsed.error ? parsed.error : null;
-  return { status, phase, error: error2 };
+  const agentSessionId = typeof parsed.agentSessionId === "string" && parsed.agentSessionId ? parsed.agentSessionId : null;
+  const agentProject = typeof parsed.agentProject === "string" && parsed.agentProject ? parsed.agentProject : null;
+  let metadata = null;
+  if (parsed.metadata && typeof parsed.metadata === "object") {
+    const out = {};
+    for (const [k, v] of Object.entries(parsed.metadata)) {
+      if (typeof k === "string" && typeof v === "string") out[k] = v;
+    }
+    if (Object.keys(out).length > 0) metadata = out;
+  }
+  return { status, phase, error: error2, agentSessionId, agentProject, metadata };
 }
 function launchAgentRun(params) {
   const tmuxCheck = checkTmuxAvailable();
@@ -4926,9 +4961,11 @@ function launchAgentRun(params) {
   }
   const runDir = ensureAgentRunDir(params.runId);
   const scriptPath = path25.join(runDir, "script.sh");
-  fs27.writeFileSync(scriptPath, params.scriptContent, { mode: 493 });
+  const scriptWithNode = injectNodeBin(params.scriptContent);
+  fs27.writeFileSync(scriptPath, scriptWithNode, { mode: 493 });
   if (params.promptContent !== void 0) {
-    fs27.writeFileSync(path25.join(runDir, "prompt.txt"), params.promptContent, "utf-8");
+    const expanded = params.promptContent.replace(/__TASK0_AGENT_RUN_DIR__/g, runDir);
+    fs27.writeFileSync(path25.join(runDir, "prompt.txt"), expanded, "utf-8");
   }
   for (const [name, content] of Object.entries(params.auxFiles ?? {})) {
     if (name.includes("/") || name.includes("\\") || name === ".." || name === ".") {
@@ -4970,7 +5007,20 @@ function launchAgentRun(params) {
       return;
     }
     if (!isSessionAlive2(cur.sessionName)) {
-      finishRun(params.runId, "killed", { error: "tmux session disappeared" });
+      const final = readStatusFile(params.runId);
+      const derived = final ? deriveStatus(final.parsed) : null;
+      if (derived && (derived.status === "completed" || derived.status === "failed")) {
+        emitAgentRunStatus(params.runId, derived.status, {
+          phase: derived.phase,
+          error: derived.error,
+          agentSessionId: derived.agentSessionId,
+          agentProject: derived.agentProject,
+          metadata: derived.metadata
+        });
+        finishRun(params.runId, derived.status, { phase: derived.phase, error: derived.error });
+      } else {
+        finishRun(params.runId, "killed", { error: "tmux session disappeared" });
+      }
       clearInterval(sessionProbe);
     }
   }, SESSION_PROBE_MS);
@@ -4983,10 +5033,16 @@ function pollOne(runId) {
   if (!current) return;
   if (current.raw === entry.lastStatusJson) return;
   entry.lastStatusJson = current.raw;
-  const { status, phase, error: error2 } = deriveStatus(current.parsed);
-  emitAgentRunStatus(runId, status, { phase, error: error2 });
-  if (status === "completed" || status === "failed") {
-    finishRun(runId, status, { phase, error: error2 });
+  const derived = deriveStatus(current.parsed);
+  emitAgentRunStatus(runId, derived.status, {
+    phase: derived.phase,
+    error: derived.error,
+    agentSessionId: derived.agentSessionId,
+    agentProject: derived.agentProject,
+    metadata: derived.metadata
+  });
+  if (derived.status === "completed" || derived.status === "failed") {
+    finishRun(runId, derived.status, { phase: derived.phase, error: derived.error });
   }
 }
 function finishRun(runId, status, opts = {}) {
@@ -6093,6 +6149,55 @@ function run2(cmd, args) {
   const res = spawnSync6(cmd, args, { encoding: "utf-8" });
   return { code: res.status ?? -1, stdout: res.stdout ?? "", stderr: res.stderr ?? "" };
 }
+function sleep2(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function launchdServicePid(scope) {
+  const res = run2("launchctl", ["print", serviceTarget(scope)]);
+  if (res.code !== 0) return null;
+  const m = res.stdout.match(/\bpid\s*=\s*(\d+)/);
+  if (!m) return null;
+  const pid = parseInt(m[1], 10);
+  return Number.isFinite(pid) && pid > 0 ? pid : null;
+}
+function pidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err.code === "EPERM";
+  }
+}
+function findOrphanDaemonPids(mainPath, excludePid) {
+  const res = run2("ps", ["-Ewwo", "pid=,command="]);
+  if (res.code !== 0) return [];
+  const expectedHome = process.env.TASK0_HOME ?? "";
+  const pids = [];
+  for (const line of res.stdout.split("\n")) {
+    const m = line.match(/^\s*(\d+)\s+(.*)$/);
+    if (!m) continue;
+    const pid = parseInt(m[1], 10);
+    if (!Number.isFinite(pid) || pid <= 0) continue;
+    if (excludePid !== null && pid === excludePid) continue;
+    if (pid === process.pid) continue;
+    const cmd = m[2];
+    if (!cmd.includes(mainPath)) continue;
+    if (!/\bdaemon\s+run\b/.test(cmd)) continue;
+    const homeMatch = cmd.match(/\bTASK0_HOME=([^\s]*)/);
+    const actualHome = homeMatch ? homeMatch[1] : "";
+    if (actualHome !== expectedHome) continue;
+    pids.push(pid);
+  }
+  return pids;
+}
+async function waitForPidExit(pid, timeoutMs) {
+  const start = Date.now();
+  while (Date.now() - start < timeoutMs) {
+    if (!pidAlive(pid)) return true;
+    await sleep2(100);
+  }
+  return false;
+}
 function createLaunchdManager(scope) {
   const file = unitPath(scope);
   const logs = logPaths();
@@ -6141,19 +6246,65 @@ function createLaunchdManager(scope) {
     }
   }
   async function start() {
-    const res = run2("launchctl", ["kickstart", "-k", serviceTarget(scope)]);
-    if (res.code !== 0) {
-      const load = run2("launchctl", ["load", "-w", file]);
-      if (load.code !== 0) {
-        throw new Error(`launchctl start failed: ${res.stderr || load.stderr}`);
+    if (!fs30.existsSync(file)) {
+      throw new Error(
+        `service unit ${file} is missing \u2014 run \`task0 daemon register\` first to install it`
+      );
+    }
+    const kick = run2("launchctl", ["kickstart", "-k", serviceTarget(scope)]);
+    if (kick.code !== 0) {
+      const bootstrap = run2("launchctl", ["bootstrap", domainTarget(scope), file]);
+      if (bootstrap.code !== 0) {
+        const legacy = run2("launchctl", ["load", "-w", file]);
+        if (legacy.code !== 0) {
+          throw new Error(
+            `launchctl start failed: ${kick.stderr || bootstrap.stderr || legacy.stderr}`
+          );
+        }
       }
     }
+    for (let i = 0; i < 30; i += 1) {
+      if (launchdServicePid(scope) != null) return;
+      await sleep2(100);
+    }
+    throw new Error(
+      `daemon did not start within 3s \u2014 check logs at ${logs.err}`
+    );
   }
   async function stop() {
-    const res = run2("launchctl", ["kill", "SIGTERM", serviceTarget(scope)]);
-    if (res.code !== 0) {
+    const launchdPid = launchdServicePid(scope);
+    const bootout = run2("launchctl", ["bootout", serviceTarget(scope)]);
+    if (bootout.code !== 0) {
       run2("launchctl", ["unload", file]);
     }
+    if (launchdPid !== null) {
+      const exited = await waitForPidExit(launchdPid, 5e3);
+      if (!exited) {
+        try {
+          process.kill(launchdPid, "SIGKILL");
+        } catch {
+        }
+      }
+    }
+    const inv = resolveTask0Invocation();
+    const orphans = findOrphanDaemonPids(inv.main, launchdPid);
+    for (const pid of orphans) {
+      try {
+        process.kill(pid, "SIGTERM");
+      } catch {
+      }
+    }
+    if (orphans.length > 0) {
+      await sleep2(500);
+      for (const pid of orphans) {
+        if (pidAlive(pid)) {
+          try {
+            process.kill(pid, "SIGKILL");
+          } catch {
+          }
+        }
+      }
+    }
   }
   async function status() {
     if (!fs30.existsSync(file)) return "absent";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@task0/cli",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "task0 — task-centric agent workflow CLI",
   "homepage": "https://github.com/cy0-labs/task0#readme",
   "repository": {