@madarco/agentbox 0.9.0 → 0.10.0

package/dist/{chunk-BXQMIEHC.js → chunk-2GPORKYF.js}

@@ -27,7 +27,7 @@ import {
   stageOpencodeCredentialsForUpload,
   stageOpencodeStateForUpload,
   stageOpencodeStaticForUpload
-} from "./chunk-NCJP5MTN.js";
+} from "./chunk-7UIAO7PC.js";
 import {
   allocateProjectIndex,
   detectGitRepos,
@@ -334,6 +334,27 @@ async function removeCloudCheckpointDir(projectRoot, backend, name) {
   await rm(dir, { recursive: true, force: true });
   return true;
 }
+async function probeCloudCheckpoint(backend, projectRoot, ref) {
+  const found = await resolveCloudCheckpoint(projectRoot, backend.name, ref);
+  if (!found) return { live: false, pruned: false };
+  if (!backend.snapshotExists) return { live: true, pruned: false };
+  const live = await backend.snapshotExists(found.manifest.snapshotName);
+  if (live) return { live: true, pruned: false };
+  await removeCloudCheckpointDir(projectRoot, backend.name, ref);
+  return { live: false, pruned: true };
+}
+function isSnapshotGoneError(err) {
+  if (err === null || typeof err !== "object") return false;
+  const e = err;
+  const status = e.response?.status ?? e.status;
+  if (status === 410) return true;
+  const parts = [
+    typeof e.json?.error?.message === "string" ? e.json.error.message : "",
+    typeof e.message === "string" ? e.message : ""
+  ];
+  const msg = parts.join(" ").toLowerCase();
+  return /snapshot[^.]*\b(expired|deleted|gone|not[ -]?found)\b/.test(msg) || msg.includes("expired or deleted");
+}
 var WORKSPACE_DIR_DEFAULT = "/workspace";
 var REMOTE_TAR_PATH = "/tmp/agentbox-envfiles.tar";
 async function uploadEnvFiles(args) {
@@ -642,6 +663,8 @@ async function launchCloudCtlDaemon(args) {
   if (args.relayUrl) env.push(`AGENTBOX_RELAY_URL=${quoteShellArgv([args.relayUrl])}`);
   if (args.relayToken) env.push(`AGENTBOX_RELAY_TOKEN=${quoteShellArgv([args.relayToken])}`);
   if (args.bridgeToken) env.push(`AGENTBOX_BRIDGE_TOKEN=${quoteShellArgv([args.bridgeToken])}`);
+  if (args.webProxyPort !== void 0)
+    env.push(`AGENTBOX_WEB_PROXY_PORT=${quoteShellArgv([String(args.webProxyPort)])}`);
   const script = [
     `set -e`,
     `if command -v sudo >/dev/null 2>&1; then SUDO='sudo -n'; else SUDO=''; fi`,
@@ -1048,6 +1071,141 @@ function createCloudProvider(backend, opts = {}) {
       return "missing";
     }
   }
+  async function persistLastState(box, lastState) {
+    if (!box.cloud) return;
+    try {
+      await recordBox({ ...box, cloud: { ...box.cloud, lastState } });
+    } catch {
+    }
+  }
+  async function reEnsureCloudBox(box, h) {
+    const webPort = box.cloud?.webPort ?? backend.webProxyPort ?? CLOUD_WEB_PROXY_PORT;
+    let webPreview;
+    try {
+      webPreview = await backend.previewUrl(h, webPort);
+    } catch {
+      const cached = box.cloud?.previewUrls?.[webPort];
+      webPreview = cached ? { url: cached } : void 0;
+    }
+    const servicePreviews = {};
+    try {
+      const ports = await readExposedServicePorts(box.workspacePath);
+      for (const port of ports) {
+        if (port === webPort) continue;
+        try {
+          const p = await backend.previewUrl(h, port);
+          servicePreviews[port] = p.url;
+        } catch {
+        }
+      }
+    } catch {
+    }
+    let relayPreview;
+    try {
+      relayPreview = await backend.previewUrl(h, 8788);
+    } catch {
+      relayPreview = box.cloud?.relayPreviewUrl ? { url: box.cloud.relayPreviewUrl, token: box.cloud.relayPreviewToken } : void 0;
+    }
+    const mergedPreviews = {
+      ...box.cloud?.previewUrls ?? {},
+      ...servicePreviews
+    };
+    if (webPreview !== void 0) mergedPreviews[webPort] = webPreview.url;
+    let portlessAliasName = box.portlessAlias;
+    let portlessUrlResolved = box.portlessUrl;
+    if (box.portlessAlias && webPreview) {
+      const r = await bootstrapPortlessForCloudBox(backend, h, {
+        boxName: box.name,
+        webPreviewUrl: webPreview.url,
+        webPort,
+        onLog: () => {
+        }
+      });
+      if (r) {
+        portlessAliasName = r.alias;
+        portlessUrlResolved = r.url;
+      }
+    }
+    let portlessVncAliasName = box.portlessVncAlias;
+    let portlessVncUrlResolved = box.portlessVncUrl;
+    if (box.portlessVncAlias && box.vncEnabled) {
+      try {
+        const vncPreview = await backend.previewUrl(h, CLOUD_VNC_PORT);
+        const url = await registerHostPortlessAlias({
+          alias: box.portlessVncAlias,
+          previewUrl: vncPreview.url,
+          label: "vnc",
+          onLog: () => {
+          }
+        });
+        if (url) {
+          portlessVncAliasName = box.portlessVncAlias;
+          portlessVncUrlResolved = url;
+        }
+      } catch {
+      }
+    }
+    const next = {
+      ...box,
+      portlessAlias: portlessAliasName,
+      portlessUrl: portlessUrlResolved,
+      portlessVncAlias: portlessVncAliasName,
+      portlessVncUrl: portlessVncUrlResolved,
+      cloud: {
+        ...box.cloud ?? { backend: providerName, sandboxId: h.sandboxId },
+        webPort,
+        previewUrls: Object.keys(mergedPreviews).length > 0 ? mergedPreviews : void 0,
+        relayPreviewUrl: relayPreview?.url ?? box.cloud?.relayPreviewUrl,
+        relayPreviewToken: relayPreview?.token ?? box.cloud?.relayPreviewToken,
+        // reEnsureCloudBox only runs on a freshly-woken box (start/resume), so
+        // the box is now running — persist it for the fast `agentbox list` path.
+        lastState: "running"
+      }
+    };
+    await recordBox(next);
+    await launchCloudCtlDaemon({
+      backend,
+      handle: h,
+      boxId: box.id,
+      boxName: box.name,
+      relayUrl: `http://127.0.0.1:${String(8788)}`,
+      relayToken: box.relayToken ?? "",
+      bridgeToken: box.cloud?.bridgeToken,
+      webProxyPort: backend.webProxyPort
+    });
+    if (opts.launchDockerd !== false) {
+      try {
+        const dockerd = await launchCloudDockerdDaemon({ backend, handle: h, timeoutMs: 6e4 });
+        if (!dockerd.up) {
+        }
+      } catch {
+      }
+    }
+    if (box.vncEnabled && box.vncPassword) {
+      try {
+        await launchCloudVncDaemon({ backend, handle: h, vncPassword: box.vncPassword });
+      } catch {
+      }
+    }
+    if (relayPreview && box.relayToken && box.cloud?.bridgeToken) {
+      try {
+        await registerBoxWithRelay({
+          boxId: box.id,
+          token: box.relayToken,
+          name: box.name,
+          kind: "cloud",
+          backend: backend.name,
+          previewUrl: relayPreview.url,
+          previewToken: relayPreview.token,
+          bridgeToken: box.cloud.bridgeToken,
+          createdAt: box.createdAt,
+          projectIndex: box.projectIndex
+        });
+      } catch {
+      }
+    }
+    return next;
+  }
   return {
     name: providerName,
     async create(req) {
@@ -1085,32 +1243,56 @@ function createCloudProvider(backend, opts = {}) {
       }
       const agentVolumes = await ensureAgentVolumesForCloud(backend, { onLog: log });
       const exposeServicePorts = await readExposedServicePorts(req.workspacePath);
-      log(
-        snapshotName ? `provisioning ${providerName} sandbox from snapshot` : `provisioning ${providerName} sandbox`
-      );
-      const handle = await backend.provision({
-        name,
-        image,
-        snapshot: snapshotName,
-        resources,
-        timeoutMs,
-        exposePorts: exposeServicePorts,
-        networkPolicy,
-        env: {
-          AGENTBOX_BOX_ID: id,
-          AGENTBOX_BOX_NAME: name,
-          AGENTBOX_BOX_KIND: "cloud",
-          // In-sandbox relay is on the box's loopback at the in-box port.
-          // 8788 is distinct from the host relay's 8787 so a nested agentbox
-          // run inside the box can claim :8787 without colliding.
-          AGENTBOX_RELAY_URL: `http://127.0.0.1:${String(8788)}`,
-          AGENTBOX_RELAY_TOKEN: relayToken,
-          AGENTBOX_BRIDGE_TOKEN: bridgeToken,
-          ...agentVolumes.env
-        },
-        volumes: agentVolumes.mounts,
-        onLog: log
-      });
+      const provisionEnv = {
+        AGENTBOX_BOX_ID: id,
+        AGENTBOX_BOX_NAME: name,
+        AGENTBOX_BOX_KIND: "cloud",
+        // In-sandbox relay is on the box's loopback at the in-box port.
+        // 8788 is distinct from the host relay's 8787 so a nested agentbox
+        // run inside the box can claim :8787 without colliding.
+        AGENTBOX_RELAY_URL: `http://127.0.0.1:${String(8788)}`,
+        AGENTBOX_RELAY_TOKEN: relayToken,
+        AGENTBOX_BRIDGE_TOKEN: bridgeToken,
+        ...agentVolumes.env
+      };
+      const provisionFrom = async (snapshot) => {
+        log(
+          snapshot ? `provisioning ${providerName} sandbox from snapshot` : `provisioning ${providerName} sandbox`
+        );
+        return backend.provision({
+          name,
+          image,
+          snapshot,
+          resources,
+          timeoutMs,
+          exposePorts: exposeServicePorts,
+          networkPolicy,
+          env: provisionEnv,
+          volumes: agentVolumes.mounts,
+          onLog: log
+        });
+      };
+      let handle;
+      try {
+        handle = await provisionFrom(snapshotName);
+      } catch (err) {
+        if (snapshotName && isSnapshotGoneError(err)) {
+          log(
+            `checkpoint snapshot '${resolvedCheckpointRef ?? snapshotName}' has expired or been deleted; starting a fresh box from the base image instead`
+          );
+          if (req.projectRoot && resolvedCheckpointRef) {
+            try {
+              await removeCloudCheckpointDir(req.projectRoot, backend.name, resolvedCheckpointRef);
+            } catch {
+            }
+          }
+          snapshotName = void 0;
+          resolvedCheckpointRef = void 0;
+          handle = await provisionFrom(void 0);
+        } else {
+          throw err;
+        }
+      }
       try {
         if (snapshotName) {
           log("skipping workspace seed \u2014 snapshot already contains /workspace");
@@ -1169,7 +1351,8 @@ function createCloudProvider(backend, opts = {}) {
           boxName: name,
           relayUrl: `http://127.0.0.1:${String(8788)}`,
           relayToken,
-          bridgeToken
+          bridgeToken,
+          webProxyPort: backend.webProxyPort
         });
         if (opts.launchDockerd !== false) {
           log("launching in-box dockerd");
@@ -1192,9 +1375,10 @@ function createCloudProvider(backend, opts = {}) {
             );
           }
         }
+        const wp = backend.webProxyPort ?? CLOUD_WEB_PROXY_PORT;
         let webPreview;
         try {
-          webPreview = await backend.previewUrl(handle, CLOUD_WEB_PROXY_PORT);
+          webPreview = await backend.previewUrl(handle, wp);
         } catch {
           webPreview = void 0;
         }
@@ -1205,7 +1389,7 @@ function createCloudProvider(backend, opts = {}) {
           const r = await bootstrapPortlessForCloudBox(backend, handle, {
             boxName: name,
             webPreviewUrl: webPreview.url,
-            webPort: CLOUD_WEB_PROXY_PORT,
+            webPort: wp,
             onLog: log
           });
           if (r) {
@@ -1239,7 +1423,7 @@ function createCloudProvider(backend, opts = {}) {
         const servicePorts = exposeServicePorts;
         const servicePreviews = {};
         for (const port of servicePorts) {
-          if (port === CLOUD_WEB_PROXY_PORT) continue;
+          if (port === wp) continue;
           try {
             const p = await backend.previewUrl(handle, port);
             servicePreviews[port] = p.url;
@@ -1310,16 +1494,17 @@ function createCloudProvider(backend, opts = {}) {
             backend: backend.name,
             sandboxId: handle.sandboxId,
             image,
-            webPort: CLOUD_WEB_PROXY_PORT,
+            webPort: wp,
             previewUrls: (() => {
               const m = { ...servicePreviews };
-              if (webPreview) m[CLOUD_WEB_PROXY_PORT] = webPreview.url;
+              if (webPreview) m[wp] = webPreview.url;
               return Object.keys(m).length > 0 ? m : void 0;
             })(),
             relayPreviewUrl: relayPreview?.url,
             relayPreviewToken: relayPreview?.token,
             bridgeToken,
-            snapshotRef: resolvedCheckpointRef
+            snapshotRef: resolvedCheckpointRef,
+            lastState: "running"
           },
           createdAt: (/* @__PURE__ */ new Date()).toISOString()
         };
@@ -1336,137 +1521,20 @@ function createCloudProvider(backend, opts = {}) {
     async start(box) {
       const h = handleFor(box);
       await backend.start(h);
-      const webPort = box.cloud?.webPort ?? CLOUD_WEB_PROXY_PORT;
-      let webPreview;
-      try {
-        webPreview = await backend.previewUrl(h, webPort);
-      } catch {
-        const cached = box.cloud?.previewUrls?.[webPort];
-        webPreview = cached ? { url: cached } : void 0;
-      }
-      const servicePreviews = {};
-      try {
-        const ports = await readExposedServicePorts(box.workspacePath);
-        for (const port of ports) {
-          if (port === webPort) continue;
-          try {
-            const p = await backend.previewUrl(h, port);
-            servicePreviews[port] = p.url;
-          } catch {
-          }
-        }
-      } catch {
-      }
-      let relayPreview;
-      try {
-        relayPreview = await backend.previewUrl(h, 8788);
-      } catch {
-        relayPreview = box.cloud?.relayPreviewUrl ? { url: box.cloud.relayPreviewUrl, token: box.cloud.relayPreviewToken } : void 0;
-      }
-      const mergedPreviews = {
-        ...box.cloud?.previewUrls ?? {},
-        ...servicePreviews
-      };
-      if (webPreview !== void 0) mergedPreviews[webPort] = webPreview.url;
-      let portlessAliasName = box.portlessAlias;
-      let portlessUrlResolved = box.portlessUrl;
-      if (box.portlessAlias && webPreview) {
-        const r = await bootstrapPortlessForCloudBox(backend, h, {
-          boxName: box.name,
-          webPreviewUrl: webPreview.url,
-          webPort,
-          onLog: () => {
-          }
-        });
-        if (r) {
-          portlessAliasName = r.alias;
-          portlessUrlResolved = r.url;
-        }
-      }
-      let portlessVncAliasName = box.portlessVncAlias;
-      let portlessVncUrlResolved = box.portlessVncUrl;
-      if (box.portlessVncAlias && box.vncEnabled) {
-        try {
-          const vncPreview = await backend.previewUrl(h, CLOUD_VNC_PORT);
-          const url = await registerHostPortlessAlias({
-            alias: box.portlessVncAlias,
-            previewUrl: vncPreview.url,
-            label: "vnc",
-            onLog: () => {
-            }
-          });
-          if (url) {
-            portlessVncAliasName = box.portlessVncAlias;
-            portlessVncUrlResolved = url;
-          }
-        } catch {
-        }
-      }
-      const next = {
-        ...box,
-        portlessAlias: portlessAliasName,
-        portlessUrl: portlessUrlResolved,
-        portlessVncAlias: portlessVncAliasName,
-        portlessVncUrl: portlessVncUrlResolved,
-        cloud: {
-          ...box.cloud ?? { backend: providerName, sandboxId: h.sandboxId },
-          webPort,
-          previewUrls: Object.keys(mergedPreviews).length > 0 ? mergedPreviews : void 0,
-          relayPreviewUrl: relayPreview?.url ?? box.cloud?.relayPreviewUrl,
-          relayPreviewToken: relayPreview?.token ?? box.cloud?.relayPreviewToken
-        }
-      };
-      await recordBox(next);
-      await launchCloudCtlDaemon({
-        backend,
-        handle: h,
-        boxId: box.id,
-        boxName: box.name,
-        relayUrl: `http://127.0.0.1:${String(8788)}`,
-        relayToken: box.relayToken ?? "",
-        bridgeToken: box.cloud?.bridgeToken
-      });
-      if (opts.launchDockerd !== false) {
-        try {
-          const dockerd = await launchCloudDockerdDaemon({ backend, handle: h, timeoutMs: 6e4 });
-          if (!dockerd.up) {
-          }
-        } catch {
-        }
-      }
-      if (box.vncEnabled && box.vncPassword) {
-        try {
-          await launchCloudVncDaemon({ backend, handle: h, vncPassword: box.vncPassword });
-        } catch {
-        }
-      }
-      if (relayPreview && box.relayToken && box.cloud?.bridgeToken) {
-        try {
-          await registerBoxWithRelay({
-            boxId: box.id,
-            token: box.relayToken,
-            name: box.name,
-            kind: "cloud",
-            backend: backend.name,
-            previewUrl: relayPreview.url,
-            previewToken: relayPreview.token,
-            bridgeToken: box.cloud.bridgeToken,
-            createdAt: box.createdAt,
-            projectIndex: box.projectIndex
-          });
-        } catch {
-        }
-      }
-      return next;
+      return reEnsureCloudBox(box, h);
     },
     async pause(box) {
       await backend.pause(handleFor(box));
+      await persistLastState(box, "paused");
     },
     async resume(box) {
-      await backend.resume(handleFor(box));
+      const h = handleFor(box);
+      await backend.resume(h);
+      await reEnsureCloudBox(box, h);
     },
     async stop(box) {
       await backend.stop(handleFor(box));
+      await persistLastState(box, "paused");
     },
     async destroy(box) {
       try {
@@ -1498,7 +1566,7 @@ function createCloudProvider(backend, opts = {}) {
     },
     async inspect(box) {
       const state = await probe(box);
-      const webPort = box.cloud?.webPort ?? CLOUD_WEB_PROXY_PORT;
+      const webPort = box.cloud?.webPort ?? backend.webProxyPort ?? CLOUD_WEB_PROXY_PORT;
       const portlessWebUrl = box.portlessAlias !== void 0 ? box.portlessUrl ?? `https://${box.portlessAlias}.localhost` : void 0;
       const cachedWebUrl = box.cloud?.previewUrls?.[webPort];
       const webUrl = portlessWebUrl ?? cachedWebUrl;
@@ -1578,11 +1646,22 @@ function createCloudProvider(backend, opts = {}) {
           return box.portlessVncUrl ?? `https://${box.portlessVncAlias}.localhost`;
         }
       }
-      const port = kind === "vnc" ? CLOUD_VNC_PORT : box.cloud?.webPort ?? CLOUD_WEB_PROXY_PORT;
+      const port = kind === "vnc" ? CLOUD_VNC_PORT : box.cloud?.webPort ?? backend.webProxyPort ?? CLOUD_WEB_PROXY_PORT;
       if (backend.signedPreviewUrl) {
         const ttl = opts2?.ttl ?? DEFAULT_SIGNED_URL_TTL_SECONDS;
-        const signed = await backend.signedPreviewUrl(h, port, ttl);
-        return signed.url;
+        try {
+          const signed = await backend.signedPreviewUrl(h, port, ttl);
+          return signed.url;
+        } catch (err) {
+          if (kind === "web") {
+            const fallbackPort = await firstExposedServicePort(box);
+            if (fallbackPort !== void 0 && fallbackPort !== port) {
+              const signed = await backend.signedPreviewUrl(h, fallbackPort, ttl);
+              return signed.url;
+            }
+          }
+          throw err;
+        }
       }
       const p = await backend.previewUrl(h, port);
       throw new Error(
@@ -1607,6 +1686,18 @@ function createCloudProvider(backend, opts = {}) {
     // omit it. Backends that have one can decorate the returned provider.
   };
 }
+var RESERVED_CLOUD_PORTS = /* @__PURE__ */ new Set([CLOUD_WEB_PROXY_PORT, CLOUD_VNC_PORT, 8788]);
+async function firstExposedServicePort(box) {
+  const reserved = (p) => RESERVED_CLOUD_PORTS.has(p) || p === box.cloud?.webPort;
+  const fromRecord = Object.keys(box.cloud?.previewUrls ?? {}).map(Number).filter((p) => Number.isInteger(p) && !reserved(p));
+  if (fromRecord.length > 0) return Math.min(...fromRecord);
+  try {
+    const fromYaml = (await readExposedServicePorts(box.workspacePath)).filter((p) => !reserved(p));
+    if (fromYaml.length > 0) return Math.min(...fromYaml);
+  } catch {
+  }
+  return void 0;
+}
 function makeCloudCheckpoint(backend) {
   return {
     async create(box, name) {
@@ -1709,7 +1800,8 @@ export {
   resolveCloudCheckpoint,
   writeCloudCheckpointManifest,
   removeCloudCheckpointDir,
+  probeCloudCheckpoint,
   createCloudProvider,
   renderInnerCommand
 };
-//# sourceMappingURL=chunk-BXQMIEHC.js.map
+//# sourceMappingURL=chunk-2GPORKYF.js.map