@madarco/agentbox 0.10.1 → 0.11.1

package/dist/{chunk-CDKVD6UO.js → chunk-ZJXTIH6C.js}

@@ -9,6 +9,7 @@ import {
   detectGitRepos,
   ensureImage,
   findBox,
+  hostOpenCommand,
   imageExists,
   pickFreshBranch,
   preparedMatches,
@@ -18,10 +19,9 @@ import {
   readState,
   recordBox,
   removeBoxRecord
-} from "./chunk-PWUVHPN6.js";
+} from "./chunk-SNTHHWKY.js";
 
 // ../../packages/sandbox-docker/dist/index.js
-import { randomBytes as randomBytes3 } from "crypto";
 import { mkdir as mkdir7, stat as stat6 } from "fs/promises";
 import { homedir as homedir9 } from "os";
 import { basename as basename3, join as join10, resolve as resolve3 } from "path";
@@ -1669,13 +1669,71 @@ import { stat as stat32 } from "fs/promises";
 import { homedir as homedir4 } from "os";
 import { join as join5 } from "path";
 import { execa as execa6 } from "execa";
-import { randomBytes as randomBytes2 } from "crypto";
+import { randomBytes as randomBytes3 } from "crypto";
 import { execa as execa7 } from "execa";
 import { existsSync } from "fs";
 import { readFile as readFile42 } from "fs/promises";
 import { homedir as homedir5 } from "os";
 import { join as join6 } from "path";
 import { execa as execa8 } from "execa";
+
+// ../../packages/core/dist/index.js
+import { randomBytes } from "crypto";
+var claudeCodeLauncher = {
+  kind: "claude-code",
+  // claude treats its first positional argument as the seed user turn in
+  // interactive mode (`claude "<message>"`), so we slot the initial message
+  // ahead of any user-passed flags.
+  buildArgs(initialMessage, userArgs) {
+    if (!initialMessage) return [...userArgs];
+    return [initialMessage, ...userArgs];
+  }
+};
+var codexLauncher = {
+  kind: "codex",
+  buildArgs(initialMessage, userArgs) {
+    if (!initialMessage) return [...userArgs];
+    return [initialMessage, ...userArgs];
+  }
+};
+var opencodeLauncher = {
+  kind: "opencode",
+  buildArgs(initialMessage, userArgs) {
+    if (!initialMessage) return [...userArgs];
+    return [initialMessage, ...userArgs];
+  }
+};
+function resolveAgentLauncher(kind) {
+  if (kind === "claude-code") return claudeCodeLauncher;
+  if (kind === "codex") return codexLauncher;
+  if (kind === "opencode") return opencodeLauncher;
+  throw new Error(`unknown agent kind: ${String(kind)}`);
+}
+var BoxNotFoundError = class extends Error {
+  constructor(query) {
+    super(`no agentbox matches "${query}"`);
+    this.query = query;
+    this.name = "BoxNotFoundError";
+  }
+  query;
+};
+var AmbiguousBoxError = class extends Error {
+  constructor(query, matches) {
+    const ids = matches.map((m) => m.id).join(", ");
+    super(`"${query}" matches multiple boxes: ${ids}`);
+    this.query = query;
+    this.matches = matches;
+    this.name = "AmbiguousBoxError";
+  }
+  query;
+  matches;
+};
+var BOX_ID_PREFIX = "b";
+function generateBoxId() {
+  return `${BOX_ID_PREFIX}${randomBytes(4).toString("hex")}`;
+}
+
+// ../../packages/sandbox-docker/dist/index.js
 import { execa as execa9 } from "execa";
 import { mkdir as mkdir4, readdir as readdir22, rm as rm22, stat as stat4 } from "fs/promises";
 import { homedir as homedir6, platform } from "os";
@@ -1699,7 +1757,7 @@ import { setTimeout as delay2 } from "timers/promises";
 import { fileURLToPath } from "url";
 
 // ../../packages/relay/dist/index.js
-import { createHash as createHash2, randomBytes } from "crypto";
+import { createHash as createHash2, randomBytes as randomBytes2 } from "crypto";
 import { execa } from "execa";
 import { spawn as spawn4 } from "child_process";
 import {
@@ -1812,42 +1870,71 @@ async function loadQueue() {
   out.sort((a, b) => a.createdAt < b.createdAt ? -1 : a.createdAt > b.createdAt ? 1 : 0);
   return out;
 }
+function processAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function countInFlightCreateJobs(jobs, accountedBoxIds) {
+  let n = 0;
+  for (const j of jobs) {
+    if (j.status !== "running") continue;
+    if (j.boxId && accountedBoxIds.has(j.boxId)) continue;
+    if (typeof j.pid === "number" && !processAlive(j.pid)) continue;
+    n += 1;
+  }
+  return n;
+}
 var RUNNING_COUNT_CACHE_MS = 3e3;
-var runningCountCache = null;
+var boxStateCache = null;
 async function defaultCountRunningBoxes() {
+  const { boxCount, stateIds } = await cachedBoxState();
+  let jobs;
+  try {
+    jobs = await loadQueue();
+  } catch {
+    return boxCount;
+  }
+  return boxCount + countInFlightCreateJobs(jobs, stateIds);
+}
+async function cachedBoxState() {
   const now = Date.now();
-  if (runningCountCache && runningCountCache.expiresAt > now) {
-    return runningCountCache.value;
+  if (boxStateCache && boxStateCache.expiresAt > now) {
+    return { boxCount: boxStateCache.boxCount, stateIds: boxStateCache.stateIds };
   }
-  const value = await uncachedCountRunningBoxes();
-  runningCountCache = { value, expiresAt: now + RUNNING_COUNT_CACHE_MS };
-  return value;
+  const fresh = await uncachedBoxStateCount();
+  boxStateCache = { ...fresh, expiresAt: now + RUNNING_COUNT_CACHE_MS };
+  return fresh;
 }
-async function uncachedCountRunningBoxes() {
+async function uncachedBoxStateCount() {
   let boxes;
   try {
     boxes = (await readState(STATE_FILE)).boxes;
   } catch {
-    return 0;
+    return { boxCount: 0, stateIds: /* @__PURE__ */ new Set() };
   }
-  if (boxes.length === 0) return 0;
-  let count = 0;
+  const stateIds = new Set(boxes.map((b) => b.id));
+  if (boxes.length === 0) return { boxCount: 0, stateIds };
+  let boxCount = 0;
   const dockerBoxes = [];
   for (const b of boxes) {
     const provider = b.provider ?? "docker";
     if (provider === "docker") {
       dockerBoxes.push(b);
     } else {
-      count += 1;
+      boxCount += 1;
     }
   }
   if (dockerBoxes.length > 0) {
     const states = await Promise.all(dockerBoxes.map((b) => inspectDockerState(b.container)));
     for (const s of states) {
-      if (s === "running") count += 1;
+      if (s === "running") boxCount += 1;
     }
   }
-  return count;
+  return { boxCount, stateIds };
 }
 function inspectDockerState(containerName) {
   return new Promise((resolveP) => {
@@ -1887,59 +1974,6 @@ function queueLogPath(id) {
 import { execa as execa15 } from "execa";
 import { readdir as readdir5, rm as rm5, stat as stat7 } from "fs/promises";
 import { join as join12 } from "path";
-
-// ../../packages/core/dist/index.js
-var claudeCodeLauncher = {
-  kind: "claude-code",
-  // claude treats its first positional argument as the seed user turn in
-  // interactive mode (`claude "<message>"`), so we slot the initial message
-  // ahead of any user-passed flags.
-  buildArgs(initialMessage, userArgs) {
-    if (!initialMessage) return [...userArgs];
-    return [initialMessage, ...userArgs];
-  }
-};
-var codexLauncher = {
-  kind: "codex",
-  buildArgs(initialMessage, userArgs) {
-    if (!initialMessage) return [...userArgs];
-    return [initialMessage, ...userArgs];
-  }
-};
-var opencodeLauncher = {
-  kind: "opencode",
-  buildArgs(initialMessage, userArgs) {
-    if (!initialMessage) return [...userArgs];
-    return [initialMessage, ...userArgs];
-  }
-};
-function resolveAgentLauncher(kind) {
-  if (kind === "claude-code") return claudeCodeLauncher;
-  if (kind === "codex") return codexLauncher;
-  if (kind === "opencode") return opencodeLauncher;
-  throw new Error(`unknown agent kind: ${String(kind)}`);
-}
-var BoxNotFoundError = class extends Error {
-  constructor(query) {
-    super(`no agentbox matches "${query}"`);
-    this.query = query;
-    this.name = "BoxNotFoundError";
-  }
-  query;
-};
-var AmbiguousBoxError = class extends Error {
-  constructor(query, matches) {
-    const ids = matches.map((m) => m.id).join(", ");
-    super(`"${query}" matches multiple boxes: ${ids}`);
-    this.query = query;
-    this.matches = matches;
-    this.name = "AmbiguousBoxError";
-  }
-  query;
-  matches;
-};
-
-// ../../packages/sandbox-docker/dist/index.js
 import { execa as execa14 } from "execa";
 import { join as join11 } from "path";
 import { homedir as homedir10 } from "os";
@@ -2693,7 +2727,7 @@ async function openInFinder(record, opts) {
     usedFallback = refreshed.usedFallback;
   }
   if (!opts.noOpen) {
-    const opened = await execa22("open", [hostPath], { reject: false });
+    const opened = await execa22(hostOpenCommand(), [hostPath], { reject: false });
     if (opened.exitCode !== 0) {
       throw new ExportError(`open ${hostPath} failed`, opened.stdout, opened.stderr);
     }
@@ -4607,7 +4641,7 @@ async function launchVncDaemon(container, timeoutMs = 5e3) {
 }
 var VNC_PASSWORD_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 function generateVncPassword() {
-  const bytes = randomBytes2(8);
+  const bytes = randomBytes3(8);
   let out = "";
   for (let i = 0; i < 8; i++) {
     out += VNC_PASSWORD_ALPHABET[bytes[i] % VNC_PASSWORD_ALPHABET.length];
@@ -5459,7 +5493,7 @@ async function ensureRelay(opts = {}) {
     await reclaimRelay(health.pid, log);
   } else {
     const existingPid = await readPidFile();
-    if (existingPid !== null && await processAlive(existingPid)) {
+    if (existingPid !== null && await processAlive2(existingPid)) {
       for (let i = 0; i < 10; i++) {
         if (await pingHealthz(300)) return ENDPOINT;
         await delay2(200);
@@ -5488,7 +5522,7 @@ async function reclaimRelay(reportedPid, log) {
   for (const pid of [reportedPid, pidFromFile]) {
     if (typeof pid !== "number" || pid <= 0 || seen.has(pid)) continue;
     seen.add(pid);
-    if (!await processAlive(pid)) continue;
+    if (!await processAlive2(pid)) continue;
     log(`stopping crippled relay pid ${String(pid)}`);
     await killPid(pid);
   }
@@ -5507,7 +5541,7 @@ async function killPid(pid) {
     return;
   }
   for (let i = 0; i < 20; i++) {
-    if (!await processAlive(pid)) return;
+    if (!await processAlive2(pid)) return;
     await delay2(100);
   }
   try {
@@ -5658,7 +5692,7 @@ async function stopRelay() {
   if (pid === null) {
     return { stopped: false, pid: null };
   }
-  if (!await processAlive(pid)) {
+  if (!await processAlive2(pid)) {
     await unlink2(PID_FILE).catch(() => {
     });
     return { stopped: false, pid };
@@ -5668,10 +5702,10 @@ async function stopRelay() {
   } catch {
   }
   for (let i = 0; i < 20; i++) {
-    if (!await processAlive(pid)) break;
+    if (!await processAlive2(pid)) break;
     await delay2(100);
   }
-  if (await processAlive(pid)) {
+  if (await processAlive2(pid)) {
     try {
       process.kill(pid, "SIGKILL");
     } catch {
@@ -5683,7 +5717,7 @@ async function stopRelay() {
 }
 async function getRelayStatus() {
   const pid = await readPidFile();
-  const pidAlive2 = pid !== null && await processAlive(pid);
+  const pidAlive2 = pid !== null && await processAlive2(pid);
   const health = await fetchHealthz(300);
   return {
     running: health !== null,
@@ -5767,7 +5801,7 @@ async function readPidFile() {
     return null;
   }
 }
-async function processAlive(pid) {
+async function processAlive2(pid) {
   try {
     process.kill(pid, 0);
     return true;
@@ -6087,9 +6121,6 @@ function persistableLimits(lim) {
   if (lim.disk) out.disk = lim.disk;
   return Object.keys(out).length > 0 ? out : void 0;
 }
-function generateBoxId() {
-  return randomBytes3(4).toString("hex");
-}
 function sanitizeBasename(workspacePath) {
   const raw = basename3(resolve3(workspacePath));
   return raw.toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/-+/g, "-").replace(/^[-._]+|[-._]+$/g, "").slice(0, 30).replace(/[-._]+$/, "");
@@ -8228,6 +8259,10 @@ export {
   renderTaskTable,
   renderPortsTable,
   loadCarrySection,
+  resolveAgentLauncher,
+  BoxNotFoundError,
+  AmbiguousBoxError,
+  generateBoxId,
   DEFAULT_RELAY_PORT,
   RELAY_CONTAINER_NAME,
   RELAY_NETWORK_NAME,
@@ -8242,9 +8277,6 @@ export {
   loadQueue,
   defaultCountRunningBoxes,
   queueLogPath,
-  resolveAgentLauncher,
-  BoxNotFoundError,
-  AmbiguousBoxError,
   execInBox,
   removeImage,
   volumeExists,
@@ -8446,4 +8478,4 @@ export {
   browserSessionActive,
   ensureBoxBrowser
 };
-//# sourceMappingURL=chunk-CDKVD6UO.js.map
+//# sourceMappingURL=chunk-ZJXTIH6C.js.map