sliccy 6.110.0 → 6.110.2

package/dist/node-server/_cloud_core/src/operations/start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/operations/start.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1D,MAAM,WAAW,aAAa;IAC5B;wEACoE;IACpE,WAAW,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,aAAa,EAAE,MAAM,CAAC;IACtB,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB;iEAC6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC;qEACiE;IACjE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,uDAAuD;IACvD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;2DACuD;IACvD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;0DACsD;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,iEAAiE;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,oDAAoD;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,oCAAoC;IACpC,GAAG,CAAC,EAAE;QACJ,gBAAgB,EAAE,MAAM,CAAC;QACzB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;IACF;;;2CAGuC;IACvC,eAAe,CAAC,EAAE,SAAS,EAAE,CAAC;CAC/B;AA6BD;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,aAAa,EACnB,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAwDpC;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAyJ9F"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/operations/start.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1D,MAAM,WAAW,aAAa;IAC5B;wEACoE;IACpE,WAAW,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,aAAa,EAAE,MAAM,CAAC;IACtB,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB;iEAC6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC;qEACiE;IACjE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,uDAAuD;IACvD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;2DACuD;IACvD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;0DACsD;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,iEAAiE;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,4CAA4C;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,oDAAoD;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,oCAAoC;IACpC,GAAG,CAAC,EAAE;QACJ,gBAAgB,EAAE,MAAM,CAAC;QACzB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;IACF;;;2CAGuC;IACvC,eAAe,CAAC,EAAE,SAAS,EAAE,CAAC;CAC/B;AA2DD;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,aAAa,EACnB,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAmCpC;AA6ID,wBAAsB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CA0D9F"}

package/dist/node-server/_cloud_core/src/operations/start.js

@@ -26,6 +26,34 @@ function parseCapLimit(name, raw) {
     }
     return n;
 }
+function errMessage(err) {
+    return err instanceof Error ? err.message : String(err);
+}
+/** Enforce running/paused caps when env caps are provided. */
+function enforceCaps(existing, env) {
+    const running = existing.filter((e) => e.state === 'running' || e.state === 'reserved').length;
+    const paused = existing.filter((e) => e.state === 'paused').length;
+    const runningCap = parseCapLimit('CONE_CAP_RUNNING', env.CONE_CAP_RUNNING);
+    const pausedCap = parseCapLimit('CONE_CAP_PAUSED', env.CONE_CAP_PAUSED);
+    if (running >= runningCap) {
+        throw new CloudError('CAP_EXCEEDED', `at running cap (${running}/${runningCap})`, {
+            running,
+            cap: runningCap,
+        });
+    }
+    if (paused >= pausedCap) {
+        throw new CloudError('CAP_EXCEEDED', `at paused cap (${paused}/${pausedCap})`, {
+            paused,
+            cap: pausedCap,
+        });
+    }
+}
+async function loadExistingCones(deps, opts) {
+    if (opts.reconciledCones)
+        return opts.reconciledCones;
+    const { listCones } = await import('./list.js');
+    return listCones(deps, opts.userId ? { metadata: { userId: opts.userId } } : {});
+}
 /**
  * Reserve a slot in the registry atomically under DO lock, BEFORE substrate.create.
  * Returns a synthetic reservationId (pending-<uuid>) that counts toward the cap.
@@ -40,32 +68,10 @@ export async function reserveSlot(deps, opts) {
     // Read existing entries to enforce caps + name conflicts.
     // If caller provided a pre-reconciled list (worker DO path), use it directly.
     // Otherwise (CLI path), do a full reconciliation via listCones.
-    let existing;
-    if (opts.reconciledCones) {
-        existing = opts.reconciledCones;
-    }
-    else {
-        const { listCones } = await import('./list.js');
-        existing = await listCones(deps, opts.userId ? { metadata: { userId: opts.userId } } : {});
-    }
+    const existing = await loadExistingCones(deps, opts);
     // Cap check: count both running and reserved entries (reservations count as running)
     if (opts.env) {
-        const running = existing.filter((e) => e.state === 'running' || e.state === 'reserved').length;
-        const paused = existing.filter((e) => e.state === 'paused').length;
-        const runningCap = parseCapLimit('CONE_CAP_RUNNING', opts.env.CONE_CAP_RUNNING);
-        const pausedCap = parseCapLimit('CONE_CAP_PAUSED', opts.env.CONE_CAP_PAUSED);
-        if (running >= runningCap) {
-            throw new CloudError('CAP_EXCEEDED', `at running cap (${running}/${runningCap})`, {
-                running,
-                cap: runningCap,
-            });
-        }
-        if (paused >= pausedCap) {
-            throw new CloudError('CAP_EXCEEDED', `at paused cap (${paused}/${pausedCap})`, {
-                paused,
-                cap: pausedCap,
-            });
-        }
+        enforceCaps(existing, opts.env);
     }
     // Name conflict check
     const requestedName = opts.name?.trim();
@@ -87,6 +93,121 @@ export async function reserveSlot(deps, opts) {
     await deps.registry.append(placeholder);
     return { reservationId };
 }
+function buildCreateEnvVars(opts, safeSecrets) {
+    return {
+        SLICC_TRAY_WORKER_BASE_URL: opts.workerBaseUrl,
+        SLICC_SECRETS_ENV_B64: encodeBundleEnv(safeSecrets),
+        ...(opts.coneConfigJson ? { SLICC_CONE_CONFIG_B64: encodeBundleEnv(opts.coneConfigJson) } : {}),
+        ...(opts.envs ?? {}),
+    };
+}
+function buildCreateMetadata(opts) {
+    return {
+        sliccVersion: opts.sliccVersion,
+        ...(opts.name ? { name: opts.name } : {}),
+        ...(opts.metadata ?? {}),
+    };
+}
+/**
+ * Swap a reservation for the real sandbox entry, or append a legacy placeholder.
+ * Returns the registry key that is now active (the real sandboxId).
+ *
+ * The placeholder ensures concurrent /list-cones calls see the cone in the registry
+ * (pass 1) instead of treating it as an orphan (pass 2). The empty joinUrl
+ * means the dashboard hides the Open button until pollCloudStatus completes
+ * and the entry is updated below. State is 'reserved' until poll completes.
+ */
+async function registerStartPlaceholder(registry, substrateId, handle, opts, createdAt) {
+    if (opts.reservationId) {
+        // Remove the reservation entry and append the real one
+        await registry.remove(opts.reservationId);
+        const placeholder = {
+            substrate: substrateId,
+            sandboxId: handle.sandboxId,
+            name: opts.name,
+            createdAt,
+            lastSeen: createdAt,
+            state: 'reserved',
+            joinUrl: '',
+            metadata: opts.metadata,
+        };
+        await registry.append(placeholder);
+    }
+    else {
+        // Legacy path: no reservation, append directly
+        const placeholder = {
+            substrate: substrateId,
+            sandboxId: handle.sandboxId,
+            name: opts.name,
+            createdAt,
+            lastSeen: createdAt,
+            state: 'reserved',
+            joinUrl: '',
+        };
+        await registry.append(placeholder);
+    }
+    return handle.sandboxId;
+}
+/**
+ * Two-layer secrets bootstrap (see Plan B):
+ *   1. start.sh writes /slicc/secrets.env from $ADOBE_IMS_TOKEN if the file
+ *      doesn't already exist (fallback for race-free worker path where env-vars
+ *      arrive before this writeFile lands).
+ *   2. THIS writeFile uploads the full filtered secrets.env. Worker overwrites
+ *      with Adobe-only content (effectively a no-op since start.sh already wrote
+ *      the same token). CLI overwrites with non-Adobe secrets (GitHub PATs, S3
+ *      keys, etc.), load-bearing for CLI-launched cones. The CLI race is benign
+ *      because the page-side bootstrap polls /api/hosted-bootstrap after a 5s
+ *      delay, by which time this writeFile has landed.
+ */
+async function writeBootstrapFiles(handle, safeSecrets, coneConfigJson) {
+    await handle.writeFile('/slicc/secrets.env', safeSecrets);
+    if (coneConfigJson) {
+        await handle.writeFile('/slicc/cone-config.json', coneConfigJson);
+    }
+}
+async function pollStatusOrThrow(handle, opts, minUpdatedAt) {
+    try {
+        return await pollCloudStatus(handle, {
+            timeoutMs: opts.pollTimeoutMs ?? 60_000,
+            intervalMs: opts.pollIntervalMs ?? 500,
+            minUpdatedAt,
+        });
+    }
+    catch (pollErr) {
+        // Surface boot diagnostics before tearing down. Spec failure mode #7.
+        const stderr = await tailStderr(handle, 50);
+        throw new CloudError('SANDBOX_NOT_READY', `${errMessage(pollErr)}\n` + `--- last 50 lines of /tmp/slicc-stderr.log ---\n${stderr}`, { sandboxId: handle.sandboxId });
+    }
+}
+async function bestEffortCleanup(registry, activeRegistryId, handle) {
+    // Best-effort cleanup: remove whichever registry entry is currently active.
+    if (activeRegistryId) {
+        try {
+            await registry.remove(activeRegistryId);
+        }
+        catch (cleanupErr) {
+            console.warn('[cloud-core] start cleanup', {
+                phase: 'registry-remove',
+                sandboxId: activeRegistryId,
+                err: errMessage(cleanupErr),
+            });
+        }
+    }
+    // Always kill the real sandbox if it was created (handle exists at this point)
+    if (handle) {
+        try {
+            await handle.kill();
+        }
+        catch (cleanupErr) {
+            console.warn('[cloud-core] start cleanup', {
+                phase: 'handle-kill',
+                sandboxId: handle.sandboxId,
+                err: errMessage(cleanupErr),
+            });
+        }
+    }
+}
 export async function startCone(deps, opts) {
     const safeSecrets = filterSecretsEnv(opts.envContents);
     // Track whichever registry entry is currently live, for cleanup on failure.
@@ -97,19 +218,8 @@ export async function startCone(deps, opts) {
         handle = await deps.substrate.create({
             template: opts.template ?? 'slicc',
             autoPauseOnCap: opts.autoPauseOnCap ?? true,
-            envVars: {
-                SLICC_TRAY_WORKER_BASE_URL: opts.workerBaseUrl,
-                SLICC_SECRETS_ENV_B64: encodeBundleEnv(safeSecrets),
-                ...(opts.coneConfigJson
-                    ? { SLICC_CONE_CONFIG_B64: encodeBundleEnv(opts.coneConfigJson) }
-                    : {}),
-                ...(opts.envs ?? {}),
-            },
-            metadata: {
-                sliccVersion: opts.sliccVersion,
-                ...(opts.name ? { name: opts.name } : {}),
-                ...(opts.metadata ?? {}),
-            },
+            envVars: buildCreateEnvVars(opts, safeSecrets),
+            metadata: buildCreateMetadata(opts),
             name: opts.name,
         });
         // Capture freshness baseline AFTER sandbox creation: any /tmp/slicc-join.json
@@ -121,73 +231,10 @@ export async function startCone(deps, opts) {
         const minUpdatedAt = new Date(Date.now() - 5_000).toISOString();
         const createdAt = new Date().toISOString();
         // Update or append placeholder depending on whether we have a reservation.
-        // If reservationId is provided, update it to the real sandboxId and remove the old entry.
-        // Otherwise, append a new placeholder as before.
-        //
-        // The placeholder ensures concurrent /list-cones calls see the cone in the registry
-        // (pass 1) instead of treating it as an orphan (pass 2). The empty joinUrl
-        // means the dashboard hides the Open button until pollCloudStatus completes
-        // and the entry is updated below. State is 'reserved' until poll completes.
-        if (opts.reservationId) {
-            // Remove the reservation entry and append the real one
-            await deps.registry.remove(opts.reservationId);
-            const placeholder = {
-                substrate: deps.substrate.id,
-                sandboxId: handle.sandboxId,
-                name: opts.name,
-                createdAt,
-                lastSeen: createdAt,
-                state: 'reserved',
-                joinUrl: '',
-                metadata: opts.metadata,
-            };
-            await deps.registry.append(placeholder);
-            // After swapping, the real sandboxId is the active registry key.
-            activeRegistryId = handle.sandboxId;
-        }
-        else {
-            // Legacy path: no reservation, append directly
-            const placeholder = {
-                substrate: deps.substrate.id,
-                sandboxId: handle.sandboxId,
-                name: opts.name,
-                createdAt,
-                lastSeen: createdAt,
-                state: 'reserved',
-                joinUrl: '',
-            };
-            await deps.registry.append(placeholder);
-            // The newly-appended sandboxId is the active registry key.
-            activeRegistryId = handle.sandboxId;
-        }
-        // Two-layer secrets bootstrap (see Plan B):
-        //   1. start.sh writes /slicc/secrets.env from $ADOBE_IMS_TOKEN if the file
-        //      doesn't already exist (fallback for race-free worker path where env-vars
-        //      arrive before this writeFile lands).
-        //   2. THIS writeFile uploads the full filtered secrets.env. Worker overwrites
-        //      with Adobe-only content (effectively a no-op since start.sh already wrote
-        //      the same token). CLI overwrites with non-Adobe secrets (GitHub PATs, S3
-        //      keys, etc.), load-bearing for CLI-launched cones. The CLI race is benign
-        //      because the page-side bootstrap polls /api/hosted-bootstrap after a 5s
-        //      delay, by which time this writeFile has landed.
-        await handle.writeFile('/slicc/secrets.env', safeSecrets);
-        if (opts.coneConfigJson) {
-            await handle.writeFile('/slicc/cone-config.json', opts.coneConfigJson);
-        }
-        let status;
-        try {
-            status = await pollCloudStatus(handle, {
-                timeoutMs: opts.pollTimeoutMs ?? 60_000,
-                intervalMs: opts.pollIntervalMs ?? 500,
-                minUpdatedAt,
-            });
-        }
-        catch (pollErr) {
-            // Surface boot diagnostics before tearing down. Spec failure mode #7.
-            const stderr = await tailStderr(handle, 50);
-            throw new CloudError('SANDBOX_NOT_READY', `${pollErr instanceof Error ? pollErr.message : String(pollErr)}\n` +
-                `--- last 50 lines of /tmp/slicc-stderr.log ---\n${stderr}`, { sandboxId: handle.sandboxId });
-        }
+        // After swapping/appending, the real sandboxId is the active registry key.
+        activeRegistryId = await registerStartPlaceholder(deps.registry, deps.substrate.id, handle, opts, createdAt);
+        await writeBootstrapFiles(handle, safeSecrets, opts.coneConfigJson);
+        const status = await pollStatusOrThrow(handle, opts, minUpdatedAt);
         // Promote the placeholder to a fully-populated running entry.
         await deps.registry.update(handle.sandboxId, {
             state: 'running',
@@ -203,34 +250,7 @@ export async function startCone(deps, opts) {
         };
     }
     catch (err) {
-        // Best-effort cleanup: remove whichever registry entry is currently active.
-        if (activeRegistryId) {
-            try {
-                await deps.registry.remove(activeRegistryId);
-            }
-            catch (cleanupErr) {
-                const msg = cleanupErr instanceof Error ? cleanupErr.message : String(cleanupErr);
-                console.warn('[cloud-core] start cleanup', {
-                    phase: 'registry-remove',
-                    sandboxId: activeRegistryId,
-                    err: msg,
-                });
-            }
-        }
-        // Always kill the real sandbox if it was created (handle exists at this point)
-        if (handle) {
-            try {
-                await handle.kill();
-            }
-            catch (cleanupErr) {
-                const msg = cleanupErr instanceof Error ? cleanupErr.message : String(cleanupErr);
-                console.warn('[cloud-core] start cleanup', {
-                    phase: 'handle-kill',
-                    sandboxId: handle.sandboxId,
-                    err: msg,
-                });
-            }
-        }
+        await bestEffortCleanup(deps.registry, activeRegistryId, handle);
         throw err;
     }
 }