@oxagen/cli 2.1.4-965 → 2.1.4-976

package/oxagen.mjs

@@ -5307,7 +5307,22 @@ var init_envelope = __esm({
       // like `proof.observed`. Its strict schema is
       // `hostEgressRefusedMessageSchema` in `@oxagen/oxagen/sandbox-host/protocol`,
       // which this leaf package cannot import.
-      "oxagen:egress_refused": external_exports.object({}).catchall(json)
+      "oxagen:egress_refused": external_exports.object({}).catchall(json),
+      // The in-app assistant's frames (#5943, ADR-5969). The control plane writes
+      // them on the assistant's own session (`assistant-session.ts` in
+      // @oxagen/agent), never a host. A model call and a tool call each take two
+      // frames: the write-ahead request, durable before the provider or the tool
+      // is reached, and the completion. The history summary is the context a
+      // turn carried in place of its older messages, and the goal verdict is one
+      // verifier round. Each body is opaque on the wire, like `proof.observed`:
+      // its members are the receipt the assistant recorded, and the readers in
+      // @oxagen/run-ledger read them by name.
+      "model.engine_call_started": external_exports.object({}).catchall(json),
+      "model.engine_call_completed": external_exports.object({}).catchall(json),
+      "tool.engine_call_started": external_exports.object({}).catchall(json),
+      "tool.engine_call_completed": external_exports.object({}).catchall(json),
+      "context.history_summarized": external_exports.object({}).catchall(json),
+      "verification.goal_verdict": external_exports.object({}).catchall(json)
     };
     TACHO_KINDS = Object.keys(KIND_BODIES);
     agentIdentitySchema = external_exports.object({
@@ -22940,6 +22955,15 @@ function setupTokenCommand(claude, platform) {
     return { file: "script", args: ["-q", "-e", "-c", inner, "/dev/null"] };
   return void 0;
 }
+function shellQuote(value) {
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+function setupTokenShellLine(claude, platform) {
+  const command2 = setupTokenCommand(claude, platform);
+  if (command2 === void 0) return void 0;
+  const script = [command2.file, ...command2.args].map(shellQuote).join(" ");
+  return `sleep 2147483647 | { ${script}; echo "${SETUP_TOKEN_EXIT_MARK}$?"; }`;
+}
 function runClaudeSetupToken(options) {
   const command2 = setupTokenCommand(
     options.claude,
@@ -22958,28 +22982,69 @@ function runClaudeSetupToken(options) {
       );
       return;
     }
-    const child = spawn(command2.file, command2.args, {
-      stdio: [options.interactive ? "inherit" : "pipe", "pipe", "inherit"],
-      env: options.env ?? process.env
+    const env = options.env ?? process.env;
+    if (options.interactive) {
+      const child2 = spawn(command2.file, command2.args, {
+        stdio: ["inherit", "pipe", "inherit"],
+        env
+      });
+      let output2 = "";
+      child2.stdout?.setEncoding("utf8");
+      child2.stdout?.on("data", (chunk2) => {
+        output2 += chunk2;
+        options.write(chunk2);
+      });
+      child2.on("error", reject);
+      child2.on(
+        "close",
+        (code) => resolve25({
+          token: extractSetupToken(output2),
+          code: code ?? 1,
+          captured: true
+        })
+      );
+      return;
+    }
+    const line = setupTokenShellLine(
+      options.claude,
+      options.platform ?? process.platform
+    );
+    const child = spawn("sh", ["-c", line], {
+      detached: true,
+      stdio: ["ignore", "pipe", "inherit"],
+      env
     });
     let output = "";
+    let exited;
+    const mark = new RegExp(`${SETUP_TOKEN_EXIT_MARK}(\\d+)`);
+    const stopGroup = () => {
+      try {
+        if (child.pid !== void 0) process.kill(-child.pid, "SIGTERM");
+      } catch {
+      }
+    };
     child.stdout?.setEncoding("utf8");
     child.stdout?.on("data", (chunk2) => {
       output += chunk2;
-      options.write(chunk2);
+      const found = mark.exec(output);
+      options.write(chunk2.replace(mark, "").replace(SETUP_TOKEN_EXIT_MARK, ""));
+      if (found !== null && exited === void 0) {
+        exited = Number(found[1]);
+        stopGroup();
+      }
     });
     child.on("error", reject);
-    child.on("close", (code) => {
-      child.stdin?.destroy();
-      resolve25({
-        token: extractSetupToken(output),
-        code: code ?? 1,
+    child.on(
+      "close",
+      (code) => resolve25({
+        token: extractSetupToken(output.replace(mark, "")),
+        code: exited ?? code ?? 1,
         captured: true
-      });
-    });
+      })
+    );
   });
 }
-var TOKEN, TOKEN_CHAR, ANSI;
+var TOKEN, TOKEN_CHAR, ANSI, SETUP_TOKEN_EXIT_MARK;
 var init_claude_setup_token = __esm({
   "../../packages/tacho/src/host/claude-setup-token.ts"() {
     "use strict";
@@ -22988,6 +23053,7 @@ var init_claude_setup_token = __esm({
     TOKEN_CHAR = /[A-Za-z0-9_-]/;
     ANSI = // biome-ignore lint/suspicious/noControlCharactersInRegex: terminal escapes
     /\u001b\][^\u0007\u001b]*(?:\u0007|\u001b\\)|\u001b\[[0-?]*[ -/]*[@-~]|\u001b[@-Z\\-_]/g;
+    SETUP_TOKEN_EXIT_MARK = "__oxagen_setup_token_exit__=";
   }
 });
 
@@ -25711,7 +25777,7 @@ import { readFileSync as readFileSync10 } from "node:fs";
 import { dirname as dirname9, resolve as resolve3 } from "node:path";
 import { fileURLToPath } from "node:url";
 function readVersion() {
-  if (true) return "2.1.4-965";
+  if (true) return "2.1.4-976";
   try {
     const here = dirname9(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(
@@ -25796,7 +25862,7 @@ function transientBinDir(binDir, env = process.env) {
     return "an AppImage mount";
   return void 0;
 }
-function shellQuote(value, platform = process.platform) {
+function shellQuote2(value, platform = process.platform) {
   if (/^[A-Za-z0-9_@%+=:,./-]+$/.test(value)) return value;
   if (platform === "win32") return `"${value}"`;
   return `'${value.replace(/'/g, "'\\''")}'`;
@@ -25847,8 +25913,8 @@ function runtimeCommands(entry2 = process.argv[1], env = process.env, nodePath =
     const dir = P.dirname(tacho);
     const transient2 = transientBinDir(dir, env);
     return {
-      hookCommand: `${shellQuote(tacho, platform)} hook`,
-      credentialHelperCommand: helperCommandFor(shellQuote(tacho, platform)),
+      hookCommand: `${shellQuote2(tacho, platform)} hook`,
+      credentialHelperCommand: helperCommandFor(shellQuote2(tacho, platform)),
       daemonCommand: [tacho, "daemon"],
       mcpStdioCommand: [tacho, "mcp-stdio"],
       binDir: dir,
@@ -25862,9 +25928,9 @@ function runtimeCommands(entry2 = process.argv[1], env = process.env, nodePath =
   const flagged = transient !== void 0 ? { transient } : {};
   const node2 = stableExecutablePath(nodePath, platform, exists);
   return {
-    hookCommand: `${shellQuote(node2, platform)} ${shellQuote(P.join(binDir, "tacho-hook.mjs"), platform)}`,
+    hookCommand: `${shellQuote2(node2, platform)} ${shellQuote2(P.join(binDir, "tacho-hook.mjs"), platform)}`,
     credentialHelperCommand: helperCommandFor(
-      `${shellQuote(node2, platform)} ${shellQuote(P.join(binDir, "tacho.mjs"), platform)}`
+      `${shellQuote2(node2, platform)} ${shellQuote2(P.join(binDir, "tacho.mjs"), platform)}`
     ),
     daemonCommand: [node2, P.join(binDir, "tachod.mjs")],
     mcpStdioCommand: [node2, P.join(binDir, "tacho.mjs"), "mcp-stdio"],
@@ -25892,7 +25958,7 @@ function oxagenRuntimeCommands(entry2 = process.argv[1], env = process.env, node
   } else {
     return runtimeCommands(void 0, env, nodePath, platform, false, exists);
   }
-  const line = prefix.map((word) => shellQuote(word, platform)).join(" ");
+  const line = prefix.map((word) => shellQuote2(word, platform)).join(" ");
   const binDir = P.dirname(prefix[prefix.length - 1]);
   const transient = transientBinDir(binDir, env);
   return {
@@ -29352,7 +29418,7 @@ function githubConfigure(options, rootDeps) {
   const helperBase = deps.runtime.credentialHelperCommand;
   if (!helperBase)
     throw new Error("This installation has no credential helper command");
-  const helper = `!${helperBase.replace(/credential issue --harness claude-code$/, "github credential")} --harness ${shellQuote(options.harness, deps.platform)} --cwd ${shellQuote(cwd, deps.platform)}`;
+  const helper = `!${helperBase.replace(/credential issue --harness claude-code$/, "github credential")} --harness ${shellQuote2(options.harness, deps.platform)} --cwd ${shellQuote2(cwd, deps.platform)}`;
   const previous = (host.github_repositories ?? []).find(
     (entry2) => sameReceipt(entry2, cwd, repository)
   );
@@ -31144,7 +31210,7 @@ function runtimeOf(host) {
   if (first === void 0 || !files2.every((file) => existsSync16(file)))
     return void 0;
   const binDir = dirname13(first);
-  const tacho = host.daemon_command[0] === first ? shellQuote(first) : `${host.daemon_command[0]} ${shellQuote(join22(binDir, "tacho.mjs"))}`;
+  const tacho = host.daemon_command[0] === first ? shellQuote2(first) : `${host.daemon_command[0]} ${shellQuote2(join22(binDir, "tacho.mjs"))}`;
   return {
     hookCommand: host.hook_command,
     credentialHelperCommand: helperCommandFor(tacho),
@@ -34979,7 +35045,7 @@ __export(cli_exports, {
   runtimeCommands: () => runtimeCommands,
   serviceInstalled: () => serviceInstalled,
   sessionRefusal: () => sessionRefusal,
-  shellQuote: () => shellQuote,
+  shellQuote: () => shellQuote2,
   shimError: () => shimError,
   shippingHealth: () => shippingHealth,
   signInIfNoCredential: () => signInIfNoCredential,
@@ -39028,9 +39094,9 @@ function hardenedGitArgs(cwd, args, globals = []) {
   ];
 }
 function hardenedGitShellPrefix() {
-  return ["git", ...HARDENED_GIT_CONFIG.map(shellQuote2)].join(" ");
+  return ["git", ...HARDENED_GIT_CONFIG.map(shellQuote3)].join(" ");
 }
-function shellQuote2(value) {
+function shellQuote3(value) {
   return /^[A-Za-z0-9_./=:-]+$/.test(value) ? value : `'${value.replace(/'/g, "'\\''")}'`;
 }
 function hardenedGitExecOptions(repository) {
@@ -39847,7 +39913,7 @@ var init_privilege = __esm({
 // ../../packages/tacho/src/contained/sandbox/launcher.ts
 import { randomBytes as randomBytes9 } from "node:crypto";
 import { join as join29 } from "node:path";
-function shellQuote3(value) {
+function shellQuote4(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
 function sandboxHarnessEnvironment(request3, gatewayPort) {
@@ -39873,7 +39939,7 @@ function ptyCommand(argv) {
       "-f",
       "-e",
       "-c",
-      `exec ${argv.map(shellQuote3).join(" ")}`,
+      `exec ${argv.map(shellQuote4).join(" ")}`,
       "/dev/null"
     ]
   };
@@ -41597,9 +41663,17 @@ function createWorkOrderAutostart(deps) {
       log(`work order ${id2}: the harness ${ended}`);
       return;
     }
-    const [status2, ahead] = await Promise.all([
+    const [status2, ahead, current] = await Promise.all([
       git6(worktree, ["status", "--porcelain"]),
-      base2 === void 0 ? Promise.resolve({ ok: false, out: "", error: "no base commit" }) : git6(worktree, ["rev-list", "--count", `${base2}..HEAD`])
+      base2 === void 0 ? Promise.resolve({ ok: false, out: "", error: "no base commit" }) : git6(worktree, [
+        "rev-list",
+        "--count",
+        "HEAD",
+        "--not",
+        base2,
+        "--remotes"
+      ]),
+      git6(worktree, ["branch", "--show-current"])
     ]);
     const clean = status2.ok && status2.out.length === 0 && ahead.ok && ahead.out === "0";
     if (!clean || root === void 0) {
@@ -41615,13 +41689,26 @@ function createWorkOrderAutostart(deps) {
     );
     if (!removed.ok) {
       log(
-        `work order ${id2}: the harness ${ended} and left no work, but Git could not remove ${worktree}: ${removed.error}`
+        `work order ${id2}: the harness ${ended} and left nothing that is not on a remote, but Git could not remove ${worktree}: ${removed.error}`
       );
       return;
     }
-    if (branch !== void 0) await git6(root, ["branch", "-D", branch]);
+    const used = /* @__PURE__ */ new Set();
+    if (branch !== void 0) used.add(branch);
+    if (current.ok && current.out.length > 0) used.add(current.out);
+    for (const name of used) {
+      const unpushed = await git6(root, [
+        "rev-list",
+        "--count",
+        name,
+        "--not",
+        "--remotes"
+      ]);
+      if (unpushed.ok && unpushed.out === "0")
+        await git6(root, ["branch", "-D", name]);
+    }
     log(
-      `work order ${id2}: the harness ${ended} and left no work, so its worktree is removed${mark.log !== void 0 ? `. Its output is in ${mark.log}` : ""}.`
+      `work order ${id2}: the harness ${ended} and left nothing that is not on a remote, so its worktree is removed${mark.log !== void 0 ? `. Its output is in ${mark.log}` : ""}.`
     );
   }
   function watch2(id2, workspace, exited) {
@@ -60199,7 +60286,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@oxagen/cli",
-      version: "2.1.4-965",
+      version: "2.1.4-976",
       description: "Oxagen governance CLI \u2014 spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
       type: "module",
       main: "./dist/index.js",
@@ -79283,10 +79370,10 @@ var init_run_list = __esm({
       /** `owner/name` as the frame recorded it; null when it recorded none. */
       repository: external_exports.string().max(512).nullable(),
       /**
-       * The state read from `tacho.run_pull_requests`, which forge webhooks and
-       * one read when the link landed keep current (ADR-192). Null when no row
-       * exists or no forge has reported the pull request, and a caller then
-       * renders "status unknown", never a guessed "open".
+       * The state `forge.pull_requests` holds for the pull request, which the
+       * forge sync keeps current from each delivery and each recorded link
+       * (ADR-288, #5949). Null when the store holds no row for it, and a caller
+       * then renders "status unknown", never a guessed "open".
        */
       state: external_exports.enum(["open", "draft", "merged", "closed"]).nullable(),
       /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxagen/cli",
-  "version": "2.1.4-965",
+  "version": "2.1.4-976",
   "description": "Oxagen governance CLI — spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
   "type": "module",
   "bin": {