Revert "fix: skip expired snapshots and fallback to fresh sandbox on failure (#407)"

This reverts commit 85fa5b8.

Author: sweetmantech

lib/sandbox/createSandboxFromSnapshot.ts

@@ -9,8 +9,8 @@ export interface CreateSandboxFromSnapshotResult {
 }
 
 /**
- * Creates a new sandbox from the account's latest valid snapshot,
- * falling back to a fresh sandbox if the snapshot is expired or fails.
+ * Creates a new sandbox from the account's latest snapshot (or fresh if none)
+ * and records it in the database.
  *
  * @param accountId - The account ID to create a sandbox for
  * @returns The created Sandbox instance and whether it was created from a snapshot
@@ -19,34 +19,16 @@ export async function createSandboxFromSnapshot(
   accountId: string,
 ): Promise<CreateSandboxFromSnapshotResult> {
   const snapshots = await selectAccountSnapshots(accountId);
-  const snapshot = snapshots[0];
+  const snapshotId = snapshots[0]?.snapshot_id;
 
-  const isExpired = snapshot?.expires_at && new Date(snapshot.expires_at) < new Date();
-  const snapshotId = !isExpired ? snapshot?.snapshot_id : undefined;
-
-  let sandbox: Sandbox;
-  let fromSnapshot = false;
-
-  if (snapshotId) {
-    try {
-      const result = await createSandbox({
-        source: { type: "snapshot", snapshotId },
-      });
-      sandbox = result.sandbox;
-      fromSnapshot = true;
-    } catch {
-      const result = await createSandbox({});
-      sandbox = result.sandbox;
-    }
-  } else {
-    const result = await createSandbox({});
-    sandbox = result.sandbox;
-  }
+  const { sandbox, response } = await createSandbox(
+    snapshotId ? { source: { type: "snapshot", snapshotId } } : {},
+  );
 
   await insertAccountSandbox({
     account_id: accountId,
-    sandbox_id: sandbox.sandboxId,
+    sandbox_id: response.sandboxId,
   });
 
-  return { sandbox, fromSnapshot };
+  return { sandbox, fromSnapshot: !!snapshotId };
 }

lib/sandbox/processCreateSandbox.ts

@@ -9,24 +9,6 @@ type ProcessCreateSandboxInput = {
 };
 type ProcessCreateSandboxResult = SandboxCreatedResponse & { runId?: string };
 
-/**
- * Returns a valid (non-expired) snapshot ID for the account, or undefined.
- *
- * @param accountId - The account to look up
- * @returns The snapshot ID if it exists and has not expired
- */
-async function getValidSnapshotId(accountId: string): Promise<string | undefined> {
-  const accountSnapshots = await selectAccountSnapshots(accountId);
-  const snapshot = accountSnapshots[0];
-  if (!snapshot?.snapshot_id) return undefined;
-
-  if (snapshot.expires_at && new Date(snapshot.expires_at) < new Date()) {
-    return undefined;
-  }
-
-  return snapshot.snapshot_id;
-}
-
 /**
  * Shared domain logic for creating a sandbox and optionally running a prompt.
  * Used by both POST /api/sandboxes handler and the prompt_sandbox MCP tool.
@@ -39,24 +21,14 @@ export async function processCreateSandbox(
 ): Promise<ProcessCreateSandboxResult> {
   const { accountId, prompt } = input;
 
-  const snapshotId = await getValidSnapshotId(accountId);
-
-  let result;
+  // Get account's most recent snapshot if available
+  const accountSnapshots = await selectAccountSnapshots(accountId);
+  const snapshotId = accountSnapshots[0]?.snapshot_id;
 
-  if (snapshotId) {
-    try {
-      const createResult = await createSandbox({
-        source: { type: "snapshot", snapshotId },
-      });
-      result = createResult.response;
-    } catch {
-      const freshResult = await createSandbox({});
-      result = freshResult.response;
-    }
-  } else {
-    const freshResult = await createSandbox({});
-    result = freshResult.response;
-  }
+  // Create sandbox (from snapshot if valid, otherwise fresh)
+  const { response: result } = await createSandbox(
+    snapshotId ? { source: { type: "snapshot", snapshotId } } : {},
+  );
 
   await insertAccountSandbox({
     account_id: accountId,