@madarco/agentbox 0.14.0 → 0.16.0

package/dist/{chunk-BYCLD6D6.js → chunk-SB4QTF2T.js}

@@ -3,7 +3,7 @@ import {
   DEFAULT_RELAY_PORT,
   loadEffectiveConfig,
   readBoxStatus
-} from "./chunk-TCS5HXJX.js";
+} from "./chunk-GXJNJUEV.js";
 
 // src/commands/_cloud-attach.ts
 import { spawn as spawn4 } from "child_process";
@@ -20,26 +20,26 @@ function isKnownProvider(name) {
 async function getProvider(name) {
   switch (name) {
     case "docker": {
-      const mod = await import("./dist-4DPOL5A7.js");
+      const mod = await import("./dist-7YB7BMNG.js");
       return mod.dockerProvider;
     }
     case "daytona": {
-      const mod = await import("./dist-3IMQNTTV.js");
+      const mod = await import("./dist-SL2QSMBE.js");
       await mod.ensureDaytonaCredentials();
       return mod.daytonaProvider;
     }
     case "hetzner": {
-      const mod = await import("./dist-J2IHD5T7.js");
+      const mod = await import("./dist-VHI5QOSQ.js");
       await mod.ensureHetznerCredentials();
       return mod.hetznerProvider;
     }
     case "vercel": {
-      const mod = await import("./dist-57M6ZA7H.js");
+      const mod = await import("./dist-XC47DSCR.js");
       await mod.ensureVercelCredentials();
       return mod.vercelProvider;
     }
     case "e2b": {
-      const mod = await import("./dist-34RKQ74M.js");
+      const mod = await import("./dist-4IQFJJQI.js");
       await mod.ensureE2bCredentials();
       return mod.e2bProvider;
     }
@@ -64,6 +64,24 @@ async function providerForCreate(choice) {
 // src/wrapped-pty/run.ts
 import { spawn as spawn3, spawnSync as spawnSync2 } from "child_process";
 
+// src/wrapped-pty/service-status.ts
+function serviceStatusLabel(status) {
+  if (!status) return null;
+  const services = status.services ?? [];
+  const tasks = status.tasks ?? [];
+  if (services.length === 0 && tasks.length === 0) return null;
+  const errored = services.some((s) => s.state === "crashed" || s.state === "unhealthy" || s.state === "backoff") || tasks.some((t) => t.state === "failed");
+  if (errored) return "service error";
+  const isUp = (s) => s.state === "ready" || s.state === "running" && !s.probed;
+  const counted = services.filter((s) => s.state !== "stopped");
+  const total = counted.length;
+  const up = counted.filter(isUp).length;
+  const settling = services.some((s) => s.state === "pending" || s.state === "waiting" || s.state === "starting") || services.some((s) => s.state === "running" && Boolean(s.probed)) || tasks.some((t) => t.state === "pending" || t.state === "waiting" || t.state === "running");
+  if (total === 0) return settling ? "starting\u2026" : null;
+  if (settling || up < total) return `starting ${String(up)}/${String(total)}\u2026`;
+  return "ready";
+}
+
 // src/pty/pty-backend.ts
 async function loadPtyBackend() {
   try {
@@ -115,16 +133,17 @@ async function spawnInNewTerminal(args) {
 }
 async function spawnInTmux(args) {
   const cmdStr = shellJoin(args.argv);
+  const target = args.tmuxTarget ? ["-t", args.tmuxTarget] : [];
   let tmuxArgv;
   let noteKind;
   if (args.mode === "split") {
-    tmuxArgv = ["split-window", "-h", "-c", args.cwd, "--", cmdStr];
+    tmuxArgv = ["split-window", "-h", ...target, "-c", args.cwd, "--", cmdStr];
     noteKind = "tmux split";
   } else {
-    tmuxArgv = ["new-window", "-n", args.title, "-c", args.cwd, "--", cmdStr];
+    tmuxArgv = ["new-window", ...target, "-n", args.title, "-c", args.cwd, "--", cmdStr];
     noteKind = "tmux window";
   }
-  const r = await runQuiet("tmux", tmuxArgv);
+  const r = await runQuiet("tmux", tmuxArgv, args.env);
   if (r.code !== 0) {
     return {
       launched: false,
@@ -138,9 +157,54 @@ async function spawnInTmux(args) {
   };
 }
 async function spawnInCmux(args) {
-  const bin = cmuxBinary();
-  if (args.mode === "window") {
-    const r = await runQuiet(bin, [
+  const bin = cmuxBinary(args.env);
+  if (args.mode === "window") return newCmuxWorkspace(bin, args);
+  const base = args.mode === "split" ? ["new-split", "right"] : ["new-surface"];
+  const noteKind = args.mode === "split" ? "cmux split" : "cmux tab";
+  const attempts = [];
+  if (args.mode === "split" && args.cmuxTargetSurface) {
+    attempts.push([...base, "--surface", args.cmuxTargetSurface, "--focus", "true"]);
+  }
+  if (args.cmuxTargetWorkspace) {
+    attempts.push([...base, "--workspace", args.cmuxTargetWorkspace, "--focus", "true"]);
+  }
+  if (!args.cmuxWorkspaceFallback) {
+    attempts.push([...base, "--focus", "true"]);
+  }
+  const cmdLine = `cd ${shellQuote(args.cwd)} && exec ${shellJoin(args.argv)}`;
+  let lastError = "";
+  for (const createArgv of attempts) {
+    const created = await runQuiet(bin, createArgv, args.env);
+    if (created.code !== 0) {
+      lastError = `cmux ${createArgv.join(" ")} exited ${String(created.code)}: ${created.stderr.trim()}`;
+      continue;
+    }
+    const surfaceRef = parseCmuxRef(created.stdout);
+    if (!surfaceRef) {
+      return {
+        launched: false,
+        note: "",
+        error: `cmux ${createArgv[0]} gave no surface ref: ${created.stdout.trim()}`
+      };
+    }
+    const sent = await runQuiet(bin, ["send", "--surface", surfaceRef, `${cmdLine}
+`], args.env);
+    if (sent.code !== 0) {
+      return {
+        launched: false,
+        note: "",
+        error: `cmux send exited ${String(sent.code)}: ${sent.stderr.trim()}`
+      };
+    }
+    return { launched: true, note: `Attached in new ${noteKind}.` };
+  }
+  if (args.cmuxWorkspaceFallback) return newCmuxWorkspace(bin, args);
+  return { launched: false, note: "", error: lastError };
+}
+async function newCmuxWorkspace(bin, args) {
+  const r = await runQuiet(
+    bin,
+    [
       "new-workspace",
       "--name",
       args.title,
@@ -150,45 +214,17 @@ async function spawnInCmux(args) {
       shellJoin(args.argv),
       "--focus",
       "true"
-    ]);
-    if (r.code !== 0) {
-      return {
-        launched: false,
-        note: "",
-        error: `cmux new-workspace exited ${String(r.code)}: ${r.stderr.trim()}`
-      };
-    }
-    return { launched: true, note: "Attached in new cmux workspace." };
-  }
-  const createArgv = args.mode === "split" ? ["new-split", "right", "--focus", "true"] : ["new-surface", "--focus", "true"];
-  const noteKind = args.mode === "split" ? "cmux split" : "cmux tab";
-  const created = await runQuiet(bin, createArgv);
-  if (created.code !== 0) {
-    return {
-      launched: false,
-      note: "",
-      error: `cmux ${createArgv[0]} exited ${String(created.code)}: ${created.stderr.trim()}`
-    };
-  }
-  const surfaceRef = parseCmuxRef(created.stdout);
-  if (!surfaceRef) {
-    return {
-      launched: false,
-      note: "",
-      error: `cmux ${createArgv[0]} gave no surface ref: ${created.stdout.trim()}`
-    };
-  }
-  const cmdLine = `cd ${shellQuote(args.cwd)} && exec ${shellJoin(args.argv)}`;
-  const sent = await runQuiet(bin, ["send", "--surface", surfaceRef, `${cmdLine}
-`]);
-  if (sent.code !== 0) {
+    ],
+    args.env
+  );
+  if (r.code !== 0) {
     return {
       launched: false,
       note: "",
-      error: `cmux send exited ${String(sent.code)}: ${sent.stderr.trim()}`
+      error: `cmux new-workspace exited ${String(r.code)}: ${r.stderr.trim()}`
     };
   }
-  return { launched: true, note: `Attached in new ${noteKind}.` };
+  return { launched: true, note: "Attached in new cmux workspace." };
 }
 function parseCmuxRef(stdout) {
   const m = stdout.match(/\b(?:surface|pane):\d+\b/);
@@ -242,9 +278,9 @@ async function spawnInITerm2(args) {
     note: `Attached in new ${noteKind}.`
   };
 }
-function runQuiet(cmd, argv) {
+function runQuiet(cmd, argv, env) {
   return new Promise((resolve) => {
-    const child = spawn(cmd, argv, { stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn(cmd, argv, { stdio: ["ignore", "pipe", "pipe"], env });
     let stdout = "";
     let stderr = "";
     child.stdout?.on("data", (chunk) => {
@@ -961,7 +997,8 @@ function renderFooter(state, cols) {
     };
     const isClaude = state.mode === "claude";
     const detachable = state.detachable ?? isClaude;
-    const stateLabel = isClaude ? void 0 : state.mode === "shell" ? "shell" : state.mode;
+    const modeLabel = isClaude ? void 0 : state.mode === "shell" ? "shell" : state.mode;
+    const stateLabel = state.boxServiceStatus ?? modeLabel;
     if (state.leaderActive) {
       const leaderHints = detachable ? DETACHABLE_LEADER_HINTS : PLAIN_LEADER_HINTS;
       return statusLine(sidebarBox, cols, stateLabel, leaderHints);
@@ -1323,11 +1360,12 @@ async function runWrappedAttach(opts) {
   setTerminalTitle(lastEmittedTitle);
   const detachable = opts.detachable ?? opts.mode === "claude";
   let leaderActive = false;
-  const buildIdle = (sessionTitle, claudeActivity) => ({
+  const buildIdle = (sessionTitle, claudeActivity, boxServiceStatus) => ({
     kind: "idle",
     boxName: opts.boxName,
     sessionTitle,
     claudeActivity,
+    boxServiceStatus,
     mode: opts.mode,
     detachable,
     leaderActive
@@ -1335,6 +1373,7 @@ async function runWrappedAttach(opts) {
   let footerState = buildIdle();
   let lastSessionTitle;
   let lastActivity;
+  let lastServiceStatus;
   let capturingPrompt = null;
   let activeNotice = null;
   let reconnectBanner = null;
@@ -1382,7 +1421,7 @@ async function runWrappedAttach(opts) {
     } else if (flashMessage) {
       footerState = { kind: "flash", message: flashMessage };
     } else {
-      footerState = buildIdle(lastSessionTitle, lastActivity);
+      footerState = buildIdle(lastSessionTitle, lastActivity, lastServiceStatus);
     }
   };
   const recomputeBand = () => {
@@ -1650,6 +1689,7 @@ async function runWrappedAttach(opts) {
       const body = opts.mode === "codex" ? status?.codex : opts.mode === "opencode" ? status?.opencode : opts.mode === "shell" ? void 0 : status?.claude;
       const nextTitle = body?.sessionTitle?.trim() || void 0;
       const nextActivity = body?.state || void 0;
+      const nextServiceStatus = serviceStatusLabel(status) ?? void 0;
       if (cmuxOn && nextActivity !== lastActivity) {
         applyCmuxAgentState(opts.mode, nextActivity);
         if (isAttentionState(nextActivity) && !isAttentionState(lastActivity)) {
@@ -1667,9 +1707,11 @@ async function runWrappedAttach(opts) {
         questionPayload = nextQuestion;
         applyBandChange();
       }
-      if (nextTitle === lastSessionTitle && nextActivity === lastActivity) return;
+      if (nextTitle === lastSessionTitle && nextActivity === lastActivity && nextServiceStatus === lastServiceStatus)
+        return;
       lastSessionTitle = nextTitle;
       lastActivity = nextActivity;
+      lastServiceStatus = nextServiceStatus;
       if (footerState.kind === "idle") {
         recomputeFooter();
         redrawChrome();
@@ -2103,8 +2145,10 @@ export {
   getProvider,
   providerForBox,
   providerForCreate,
-  loadPtyBackend,
   detectHostTerminal,
+  cmuxBinary,
+  spawnInNewTerminal,
+  loadPtyBackend,
   setTerminalTitle,
   pushTerminalTitle,
   popTerminalTitle,
@@ -2129,4 +2173,4 @@ export {
   cloudAgentAttach,
   cloudAgentStartDetached
 };
-//# sourceMappingURL=chunk-BYCLD6D6.js.map
+//# sourceMappingURL=chunk-SB4QTF2T.js.map