@sandblocks/cli 0.6.8 → 0.6.10

package/dist/cli.js

@@ -12578,6 +12578,23 @@ class SandblocksClient {
   listSandboxes(projectId) {
     return this.request(`/v1/projects/${encodeURIComponent(projectId)}/sandboxes`);
   }
+  cleanupSandboxes(input) {
+    return this.request(`/v1/projects/${encodeURIComponent(input.projectId)}/sandboxes/cleanup`, {
+      method: "POST",
+      body: JSON.stringify({
+        ids: input.ids,
+        stack: input.stack,
+        deploymentType: input.deploymentType,
+        statuses: input.statuses,
+        olderThanHours: input.olderThanHours,
+        dryRun: input.dryRun,
+        purge: input.purge
+      })
+    });
+  }
+  removeSandbox(projectId, sandboxId, purge = true) {
+    return this.cleanupSandboxes({ projectId, ids: [sandboxId], purge });
+  }
   listAgentSessions(projectId, sandboxId) {
     return this.request(`/v1/projects/${encodeURIComponent(projectId)}/sandboxes/${encodeURIComponent(sandboxId)}/agent-sessions`);
   }
@@ -13286,10 +13303,11 @@ async function create(args, dependencies) {
       projectId,
       sandboxId,
       workspaceId,
-      pool: dependencies.option(options, "pool") ?? process.env.SANDBLOCKS_WORKER_POOL ?? "build-fleet",
+      pool: dependencies.option(options, "pool") ?? process.env.SANDBLOCKS_WORKER_POOL ?? (preview.mode === "development" ? undefined : "build-fleet"),
       apiUrl,
       apiKey,
       idempotencyKey: `${sandboxId}:workspace-import`,
+      requiredWorkerRole: preview.mode === "development" ? "development" : "build",
       source: dependencies.source,
       ..."image" in loaded.manifest.workspace && loaded.manifest.workspace.image ? { workspaceImage: loaded.manifest.workspace.image } : {}
     });
@@ -13456,7 +13474,7 @@ async function deployUnlocked(args, dependencies) {
               workspaceId: buildWorkspaceId,
               sandboxId: context.state.sandboxId,
               revisionId: deploymentId,
-              runtimeType: preview.deploymentType,
+              runtimeType: managedEnvironmentId(context),
               serviceUrls,
               steps: serviceSteps,
               ..."image" in loaded.manifest.workspace && loaded.manifest.workspace.image ? { workspaceImage: loaded.manifest.workspace.image } : {},
@@ -13574,7 +13592,7 @@ async function deployUnlocked(args, dependencies) {
           workspaceId: context.state.workspaceId,
           deploymentId,
           sandboxId: context.state.sandboxId,
-          runtimeType: preview.deploymentType,
+          runtimeType: managedEnvironmentId(context),
           stack,
           workspace: preview.workspace,
           artifactImage,
@@ -13630,7 +13648,7 @@ async function deployUnlocked(args, dependencies) {
             workspaceId: buildWorkspaceId ?? context.state.workspaceId,
             deploymentId,
             sandboxId: context.state.sandboxId,
-            runtimeType: preview.deploymentType,
+            runtimeType: managedEnvironmentId(context),
             checks: preview.steps,
             serviceUrls: serviceUrls2,
             placement: {
@@ -13694,7 +13712,7 @@ async function deployDevelopmentUnlocked(context, loaded, preview) {
             workspaceId: context.state.workspaceId,
             sandboxId: context.state.sandboxId,
             revisionId: context.state.sourceRevision ?? deploymentId,
-            runtimeType: preview.deploymentType,
+            runtimeType: managedEnvironmentId(context),
             serviceUrls,
             steps,
             ..."image" in loaded.manifest.workspace && loaded.manifest.workspace.image ? { workspaceImage: loaded.manifest.workspace.image } : {},
@@ -13721,7 +13739,7 @@ async function deployDevelopmentUnlocked(context, loaded, preview) {
           workspaceId: context.state.workspaceId,
           deploymentId,
           sandboxId: context.state.sandboxId,
-          runtimeType: preview.deploymentType,
+          runtimeType: managedEnvironmentId(context),
           stack,
           workspace: preview.workspace,
           mutableDevelopment: true,
@@ -14148,16 +14166,19 @@ async function importSource(input) {
       "x-sandblocks-api-key": input.apiKey,
       "x-sandblocks-workspace-id": input.workspaceId,
       ...input.sandboxId ? { "x-sandblocks-sandbox-id": input.sandboxId } : {},
-      "x-sandblocks-worker-pool": input.pool,
+      ...input.pool ? { "x-sandblocks-worker-pool": input.pool } : {},
       ...input.memoryReservationBytes ? { "x-sandblocks-memory-reservation-bytes": String(input.memoryReservationBytes) } : {},
+      ...input.requiredWorkerRole ? { "x-sandblocks-worker-role": input.requiredWorkerRole } : {},
       ...input.workspaceImage ? { "x-sandblocks-workspace-image": input.workspaceImage } : {},
       "idempotency-key": input.idempotencyKey
     },
     body: new Blob([Uint8Array.from(source.bundle)])
   });
   const submitted = await response.json().catch(() => ({}));
-  if (!response.ok)
-    throw new Error(String(submitted?.error ?? `sandbox import failed (${response.status})`));
+  if (!response.ok) {
+    const placement = submitted?.placement ? `: ${JSON.stringify(submitted.placement)}` : "";
+    throw new Error(`${String(submitted?.error ?? `sandbox import failed (${response.status})`)}${placement}`);
+  }
   return {
     files: source.files,
     bytes: source.bundle.byteLength,
@@ -15675,6 +15696,9 @@ var HELP = `Sandblocks CLI
   sandblocks sandbox redeploy [directory] [--environment <id>] [--build-pool <pool>]
   sandblocks sandbox status [directory] [--environment <id>] [--json]
   sandblocks sandbox promote --project <id> --sandbox <id> [--json]
+  sandblocks sandbox cleanup --project <id> [--sandbox <id>] [--stack <id>]
+                    [--deployment-type <id>] [--status <status>] [--older-than-hours <n>]
+                    [--dry-run] [--keep-records] [--json]
   sandblocks sandbox agent <run|list|get|cancel|redeploy> --project <id> --sandbox <id>
                     [--repository <id>] [--provider <codex|claude-code|pi>] [--model <id>]
                     [--prompt <text> | --prompt-file <path>] [--session <id>] [--wait] [--json]
@@ -16143,6 +16167,9 @@ function printResources(kind, action, body) {
 function objectRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
+function multiValue(value) {
+  return Array.isArray(value) ? value : typeof value === "string" ? [value] : [];
+}
 async function sandbox(args) {
   const [subcommand, ...rest] = args;
   if (isStatefulSandboxCommand(subcommand) && !(subcommand === "deploy" && rest.includes("--workspace"))) {
@@ -16157,6 +16184,8 @@ async function sandbox(args) {
     return sandboxDeploy(rest);
   if (subcommand === "promote")
     return sandboxPromote(rest);
+  if (subcommand === "cleanup" || subcommand === "remove")
+    return sandboxCleanup(rest);
   if (subcommand === "agent")
     return sandboxAgent(rest);
   if (subcommand !== "import")
@@ -16270,6 +16299,45 @@ async function waitForAgentSession(apiUrl, apiKey, projectId, sandboxId, session
     await Bun.sleep(1000);
   }
 }
+async function sandboxCleanup(args) {
+  const options = parse2(args);
+  const projectId = option2(options, "project");
+  const apiUrl = (option2(options, "api-url") ?? process.env.SANDBLOCKS_API_URL ?? "").replace(/\/$/, "");
+  const apiKey = option2(options, "api-key") ?? process.env.SANDBLOCKS_API_KEY;
+  if (!projectId)
+    throw new Error("sandbox cleanup requires --project");
+  if (!apiUrl || !apiKey)
+    throw new Error("sandbox cleanup requires API URL and API key");
+  const ids = multiValue(options.sandbox);
+  const statuses = multiValue(options.status);
+  const stack = option2(options, "stack");
+  const deploymentType = option2(options, "deployment-type");
+  const olderThanHours = option2(options, "older-than-hours");
+  if (!ids.length && !statuses.length && !stack && !deploymentType && !olderThanHours)
+    throw new Error("sandbox cleanup requires --sandbox, --stack, --deployment-type, --status, or --older-than-hours");
+  const result = await sandblocksRequest(apiUrl, apiKey, `/v1/projects/${encodeURIComponent(projectId)}/sandboxes/cleanup`, {
+    method: "POST",
+    body: JSON.stringify({
+      ...ids.length ? { ids } : {},
+      ...statuses.length ? { statuses } : {},
+      ...stack ? { stack } : {},
+      ...deploymentType ? { deploymentType } : {},
+      ...olderThanHours ? { olderThanHours: Number(olderThanHours) } : {},
+      dryRun: options["dry-run"] === true,
+      purge: options["keep-records"] !== true
+    })
+  });
+  if (options.json)
+    console.log(JSON.stringify(result, null, 2));
+  else {
+    const selected = result.removed ?? result.matched ?? [];
+    console.log(`${result.dryRun ? "matched" : "removed"} ${selected.length} deployment(s)`);
+    for (const id2 of selected)
+      console.log(`  ${id2}`);
+    for (const skipped of result.skipped ?? [])
+      console.log(`skipped ${skipped.id}: ${skipped.reason}`);
+  }
+}
 async function sandboxPromote(args) {
   const options = parse2(args);
   const projectId = option2(options, "project");
@@ -16591,7 +16659,9 @@ function parse2(args) {
       "rootless",
       "allow-unpinned-images",
       "read-only-root",
-      "resume"
+      "resume",
+      "dry-run",
+      "keep-records"
     ].includes(rawKey)) {
       output[rawKey] = inline === undefined ? true : inline !== "false";
       continue;
@@ -16658,4 +16728,4 @@ export {
   parse2 as parse
 };
 
-//# debugId=818C8E6D2946F5CD64756E2164756E21
+//# debugId=D7067CF7EF69C62A64756E2164756E21