instabox 0.8.40 → 0.8.42

package/bin/instabox.mjs

@@ -20,6 +20,7 @@ import { fileURLToPath } from 'node:url';
 import { createClient } from '../lib/api.mjs';
 import { orderBoxes } from '../lib/boxes.mjs';
 import { guestUserNote, localGuestUser } from '../lib/guestuser.mjs';
+import { resolveImage } from '../lib/image.mjs';
 import {
   bundledCli,
   checkCli,
@@ -45,7 +46,8 @@ const API = (
   process.env.INSTABOX_API ||
   'https://api.instabox.sh'
 ).replace(/\/$/, '');
-// The template a new box starts from: the CLI's and dashboard's default (shown as standard).
+// The template a new box starts from: the CLI's and dashboard's default (shown as standard). An
+// official template wins over a snapshot of the same name; snapshot:<name> picks the snapshot.
 const IMAGE = process.env.INSTABOX_IMAGE || 'agent-browser';
 // SSH certificate lifetime for a box with no timeout of its own.
 const CERT_MIN = 120;
@@ -77,6 +79,9 @@ function usage() {
       --no-skills                   do not install the instabox agent skills
   npx instabox@latest <command>     run an instabox CLI command (instabox help lists them)
 
+  INSTABOX_IMAGE=<template> picks the template sh starts from (default agent-browser);
+  INSTABOX_IMAGE=snapshot:<name> starts from a snapshot of yours instead.
+
   Usage data (steps and outcomes, never names or arguments) goes to the instabox team;
   INSTABOX_NO_TELEMETRY=1 or DO_NOT_TRACK=1 turns it off.
 `);
@@ -190,19 +195,25 @@ async function quotaFull(err) {
 }
 
 async function newBox() {
-  const { images } = await client.call('GET', '/v1/images');
-  const named = images.filter((i) => i.name === IMAGE || i.id === IMAGE);
-  const img = named.find((i) => i.official) || named[0];
+  const src = await resolveImage(IMAGE, {
+    // Unreadable: null, and the name goes to the server as a template.
+    templates: () =>
+      client.call('GET', '/v1/templates').then(
+        (r) => r?.templates ?? null,
+        () => null,
+      ),
+    snapshots: () => client.call('GET', '/v1/images').then((r) => r?.images ?? []),
+  });
+  if (src.missing) throw new Error(`no snapshot named ${src.missing} (instabox snapshot ls lists yours)`);
   const body = {
     name: `box-${randomBytes(3).toString('hex')}`,
     desiredState: 'running',
+    ...src,
   };
-  if (img) body.imageId = img.id;
-  else body.templateId = IMAGE;
   // The box's Linux user is named after yours, so `ssh <box>` over your own network works. A
   // box from one of your own snapshots keeps the snapshot's user.
   const user = localGuestUser();
-  if (user.name && (!img || img.official)) body.guestUser = user.name;
+  if (user.name && src.templateId) body.guestUser = user.name;
   const op = await waitOp(await client.call('POST', '/v1/machines', body));
   return { id: op.machineId, name: body.name, user };
 }

package/cli/SHA256SUMS

@@ -1,6 +1,6 @@
-4ac8957ca170a605025f3506e6ddc2edce2df67230f9d7b9d06b315ab837dc22  instabox-darwin-amd64
-cdff54464dd57a5b21b64bef08a791fb16bcab8ac0076462aa87c9399bd540af  instabox-darwin-arm64
-da930996e671d53ac63dbf3f7f5c8303083deb2eea5c50f2a46a9a42b3ca3383  instabox-linux-amd64
-e10bb94c0a800824560856eebf0abed30885f00e9cfa6518804cba7c52ec2bc8  instabox-linux-arm64
-cf22c363a9cce8928d9bcc42de52472aa8dca237ad3b67cdefc58be894333d38  instabox-windows-amd64.exe
-79f74cd8f1947f17e3ef03a23c0ae66a2bffd6a38480805d936f26002922b10c  instabox-windows-arm64.exe
+d3e09346083f2cbde79a52d16e9dfa16fea085e5e268e4b3d3fa7cb902b7cd5a  instabox-darwin-amd64
+2132ff4338baeecc0748288393a5cc1b985f9823118b7df54f84c45855ab780d  instabox-darwin-arm64
+b2028004acee0159f35c2464e79bc3d230f266abde7ca446055107e5232c4141  instabox-linux-amd64
+d59a285821e6737d05f7358713392cfacaea0e304936405b6919ec2bad55ec3c  instabox-linux-arm64
+f3be1d0da240de3280fd2d918c4e1a8717fbe6b46301470c63f620dfae846368  instabox-windows-amd64.exe
+35d0320acaed1ae82a308ace922faa03eed0917dd3788aa2cb468253ae92d0d2  instabox-windows-arm64.exe

package/lib/image.mjs

@@ -0,0 +1,32 @@
+// What INSTABOX_IMAGE names: an official template (GET /v1/templates), as `id` or `id@version`.
+// A snapshot of yours is named with `snapshot:<name or id>`, so one that shares a template's name
+// never stands in for it. A bare name that is no template still finds a snapshot of that name.
+
+export const SNAPSHOT_PREFIX = 'snapshot:';
+
+// The snapshot named want: by id first, else by name.
+function findSnapshot(snapshots, want) {
+  const list = Array.isArray(snapshots) ? snapshots.filter((s) => s && typeof s.id === 'string') : [];
+  return list.find((s) => s.id === want) || list.find((s) => s.name === want) || null;
+}
+
+// isTemplate: whether image (id or id@version) is one of templates. templates null (the list
+// could not be read): treated as a template, so the server decides and a snapshot never wins.
+export function isTemplate(image, templates) {
+  if (!Array.isArray(templates)) return true;
+  const id = image.split('@')[0];
+  return templates.some((t) => t && t.id === id);
+}
+
+// resolveImage turns image into the create request's source: { templateId } or { imageId }, or
+// { missing } for a snapshot: name that matches none. snapshots is read only when needed.
+export async function resolveImage(image, { templates, snapshots }) {
+  if (image.startsWith(SNAPSHOT_PREFIX)) {
+    const want = image.slice(SNAPSHOT_PREFIX.length);
+    const s = findSnapshot(await snapshots(), want);
+    return s ? { imageId: s.id } : { missing: want };
+  }
+  if (isTemplate(image, await templates())) return { templateId: image };
+  const s = findSnapshot(await snapshots(), image);
+  return s ? { imageId: s.id } : { templateId: image };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instabox",
-  "version": "0.8.40",
+  "version": "0.8.42",
   "description": "A cloud box for your coding agent, the instabox CLI and its agent skills in one command: npx instabox@latest",
   "type": "module",
   "bin": {