@runtypelabs/cli 1.3.0 → 1.4.0

package/dist/index.js

@@ -126,7 +126,7 @@ var init_credential_store = __esm({
 
 // src/index.ts
 import { Command as Command20 } from "commander";
-import chalk21 from "chalk";
+import chalk22 from "chalk";
 import { config as loadEnv } from "dotenv";
 import { readFileSync as readFileSync6 } from "fs";
 import { dirname as dirname2, join as join2 } from "path";
@@ -154,8 +154,8 @@ var CallbackServer = class {
   expectedState;
   constructor() {
     this.app = express();
-    this.codePromise = new Promise((resolve, reject) => {
-      this.codeResolve = resolve;
+    this.codePromise = new Promise((resolve2, reject) => {
+      this.codeResolve = resolve2;
       this.codeReject = reject;
     });
     this.app.get("/callback", (req, res) => {
@@ -214,8 +214,14 @@ var CallbackServer = class {
   }
   stop() {
     if (this.server) {
-      this.server.close();
+      const s = this.server;
       this.server = null;
+      s.unref();
+      if (typeof s.closeAllConnections === "function") {
+        ;
+        s.closeAllConnections();
+      }
+      s.close();
     }
   }
   successHTML() {
@@ -1324,7 +1330,7 @@ authCommand.command("whoami").description("Display current user information").op
 
 // src/commands/flows.ts
 import { Command as Command2 } from "commander";
-import chalk4 from "chalk";
+import chalk5 from "chalk";
 import React2 from "react";
 import { render as render2 } from "ink";
 import { useState as useState3, useEffect as useEffect4 } from "react";
@@ -1333,80 +1339,179 @@ import { processStream } from "@runtypelabs/sdk";
 
 // src/lib/ensure-auth.ts
 init_credential_store();
-import readline from "readline";
+import readline2 from "readline";
+import chalk3 from "chalk";
+
+// src/lib/select-prompt.ts
 import chalk2 from "chalk";
+import readline from "readline";
+function canUseArrowKeySelect() {
+  return process.stdin.isTTY === true && process.stdout.isTTY === true && typeof process.stdin.setRawMode === "function";
+}
+function clearRenderedLines(output, lineCount) {
+  for (let index = 0; index < lineCount; index += 1) {
+    readline.clearLine(output, 0);
+    readline.cursorTo(output, 0);
+    if (index < lineCount - 1) {
+      readline.moveCursor(output, 0, -1);
+    }
+  }
+}
+function formatChoice(choice, index, selectedIndex) {
+  const prefix = index === selectedIndex ? chalk2.cyan("\u203A") : " ";
+  const shortcut = index === selectedIndex ? chalk2.cyan(`${index + 1})`) : chalk2.gray(`${index + 1})`);
+  const label = index === selectedIndex ? chalk2.bold(choice.label) : choice.label;
+  const description = choice.description ? chalk2.gray(` - ${choice.description}`) : "";
+  return ` ${prefix} ${shortcut} ${label}${description}`;
+}
+async function promptNumericSelect(choices, promptLabel) {
+  choices.forEach((choice, index) => {
+    const description = choice.description ? chalk2.gray(` - ${choice.description}`) : "";
+    console.log(`  ${chalk2.green(`${index + 1})`)} ${choice.label}${description}`);
+  });
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    terminal: true
+  });
+  return new Promise((resolve2) => {
+    const ask = () => {
+      rl.question(chalk2.cyan(`
+${promptLabel} (1-${choices.length}): `), (answer) => {
+        const value = parseInt(answer.trim(), 10);
+        if (value >= 1 && value <= choices.length) {
+          rl.close();
+          resolve2(choices[value - 1].value);
+          return;
+        }
+        console.log(chalk2.red(`Please enter a number between 1 and ${choices.length}.`));
+        ask();
+      });
+    };
+    ask();
+  });
+}
+async function promptSelect(message, choices, options) {
+  if (message) {
+    console.log(chalk2.cyan(`
+${message}`));
+  }
+  if (!canUseArrowKeySelect()) {
+    return promptNumericSelect(choices, options?.promptLabel ?? "Select");
+  }
+  const input = process.stdin;
+  const output = process.stdout;
+  const promptLabel = options?.promptLabel ?? "Select";
+  const shortcutRange = choices.length === 1 ? "1" : `1-${choices.length}`;
+  const instructions = chalk2.gray(
+    `Use ${chalk2.cyan("\u2191/\u2193")} to move, ${chalk2.cyan("Enter")} to select, or press ${shortcutRange}.`
+  );
+  const previousRawMode = input.isRaw === true;
+  let selectedIndex = 0;
+  let renderedLineCount = 0;
+  return new Promise((resolve2) => {
+    const renderMenu = () => {
+      if (renderedLineCount > 0) {
+        clearRenderedLines(output, renderedLineCount);
+      }
+      const lines = [
+        ...choices.map((choice, index) => formatChoice(choice, index, selectedIndex)),
+        "",
+        `${promptLabel}: ${instructions}`
+      ];
+      output.write(`${lines.join("\n")}`);
+      renderedLineCount = lines.length;
+    };
+    const cleanup = () => {
+      input.off("keypress", onKeypress);
+      if (typeof input.setRawMode === "function") {
+        input.setRawMode(previousRawMode);
+      }
+      output.write("\n");
+    };
+    const finish = (value) => {
+      cleanup();
+      resolve2(value);
+    };
+    const onKeypress = (_, key) => {
+      if (key.ctrl && key.name === "c") {
+        cleanup();
+        process.kill(process.pid, "SIGINT");
+        return;
+      }
+      if (key.name === "up" || key.name === "k") {
+        selectedIndex = (selectedIndex - 1 + choices.length) % choices.length;
+        renderMenu();
+        return;
+      }
+      if (key.name === "down" || key.name === "j") {
+        selectedIndex = (selectedIndex + 1) % choices.length;
+        renderMenu();
+        return;
+      }
+      if (key.name === "return" || key.name === "enter") {
+        finish(choices[selectedIndex].value);
+        return;
+      }
+      if (/^[1-9]$/.test(key.sequence ?? "")) {
+        const numericIndex = Number(key.sequence) - 1;
+        if (numericIndex >= 0 && numericIndex < choices.length) {
+          finish(choices[numericIndex].value);
+        }
+      }
+    };
+    readline.emitKeypressEvents(input);
+    input.on("keypress", onKeypress);
+    input.resume();
+    input.setRawMode?.(true);
+    renderMenu();
+  });
+}
+
+// src/lib/ensure-auth.ts
 async function promptConfirm(message, options) {
   const defaultYes = options?.default !== false;
   const hint = defaultYes ? "Y/n" : "y/N";
-  const rl = readline.createInterface({
+  const rl = readline2.createInterface({
     input: process.stdin,
     output: process.stdout,
     terminal: true
   });
-  return new Promise((resolve) => {
-    rl.question(chalk2.cyan(`${message} (${hint}): `), (answer) => {
+  return new Promise((resolve2) => {
+    rl.question(chalk3.cyan(`${message} (${hint}): `), (answer) => {
       rl.close();
       const trimmed = answer.trim().toLowerCase();
       if (trimmed === "") {
-        resolve(defaultYes);
+        resolve2(defaultYes);
       } else {
-        resolve(trimmed === "y" || trimmed === "yes");
+        resolve2(trimmed === "y" || trimmed === "yes");
       }
     });
   });
 }
 async function promptText(message) {
-  const rl = readline.createInterface({
+  const rl = readline2.createInterface({
     input: process.stdin,
     output: process.stdout,
     terminal: true
   });
-  return new Promise((resolve) => {
-    rl.question(chalk2.cyan(`${message}: `), (answer) => {
+  return new Promise((resolve2) => {
+    rl.question(chalk3.cyan(`${message}: `), (answer) => {
       rl.close();
-      resolve(answer.trim());
+      resolve2(answer.trim());
     });
   });
 }
-async function promptSelect(message, choices) {
-  console.log(chalk2.cyan(`
-${message}`));
-  choices.forEach((choice, index) => {
-    const desc = choice.description ? chalk2.gray(` - ${choice.description}`) : "";
-    console.log(`  ${chalk2.green(`${index + 1})`)} ${choice.label}${desc}`);
-  });
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-    terminal: true
-  });
-  return new Promise((resolve) => {
-    const ask = () => {
-      rl.question(chalk2.cyan(`
-Select (1-${choices.length}): `), (answer) => {
-        const num = parseInt(answer.trim(), 10);
-        if (num >= 1 && num <= choices.length) {
-          rl.close();
-          resolve(choices[num - 1].value);
-        } else {
-          console.log(chalk2.red(`Please enter a number between 1 and ${choices.length}`));
-          ask();
-        }
-      });
-    };
-    ask();
-  });
-}
 async function ensureAuth(options) {
   const store = new CredentialStore();
   const apiKey = await store.getApiKey();
   if (apiKey) {
     return apiKey;
   }
-  console.log(chalk2.yellow("\nAuthentication required."));
+  console.log(chalk3.yellow("\nAuthentication required."));
   const shouldLogin = await promptConfirm("Would you like to log in now?", { default: true });
   if (!shouldLogin) {
-    console.log(chalk2.gray(`Run "runtype auth login" when you're ready.`));
+    console.log(chalk3.gray(`Run "runtype auth login" when you're ready.`));
     if (options?.exitOnFailure !== false) {
       process.exit(1);
     }
@@ -1424,15 +1529,15 @@ async function ensureAuth(options) {
 async function handleApiKeyLogin(store, apiUrl) {
   const key = await promptText("Enter your API key");
   if (!key) {
-    console.log(chalk2.red("No API key provided."));
+    console.log(chalk3.red("No API key provided."));
     return null;
   }
-  console.log(chalk2.gray("Validating API key..."));
+  console.log(chalk3.gray("Validating API key..."));
   try {
     const apiKeyManager = new ApiKeyManager();
     const isValid = await apiKeyManager.validateApiKey(key, apiUrl);
     if (!isValid) {
-      console.log(chalk2.red("Invalid API key"));
+      console.log(chalk3.red("Invalid API key"));
       return null;
     }
     const userData = await apiKeyManager.getCurrentUser(key, apiUrl);
@@ -1444,43 +1549,43 @@ async function handleApiKeyLogin(store, apiUrl) {
       orgId: userData.org_id ?? void 0,
       apiUrl: apiUrl || getApiUrl()
     });
-    console.log(chalk2.green("Logged in successfully!"));
+    console.log(chalk3.green("Logged in successfully!"));
     return key;
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown error";
-    console.log(chalk2.red("Login failed"));
-    console.error(chalk2.red(message));
+    console.log(chalk3.red("Login failed"));
+    console.error(chalk3.red(message));
     return null;
   }
 }
 async function handleBrowserLogin(store, apiUrl) {
-  console.log(chalk2.gray("Initializing authentication..."));
+  console.log(chalk3.gray("Initializing authentication..."));
   try {
     const oauth = new OAuthManager({
       clerkPublishableKey: getClerkPublishableKey(),
       dashboardUrl: getDashboardUrl()
     });
-    console.log(chalk2.gray("Waiting for browser authentication..."));
+    console.log(chalk3.gray("Waiting for browser authentication..."));
     const sessionToken = await oauth.authenticate("sign-in");
-    console.log(chalk2.gray("Getting API key..."));
+    console.log(chalk3.gray("Getting API key..."));
     const apiKeyManager = new ApiKeyManager();
     const { key, userId, orgId } = await apiKeyManager.exchangeSessionForApiKey(
       sessionToken,
       apiUrl || getApiUrl()
     );
-    console.log(chalk2.gray("Storing credentials..."));
+    console.log(chalk3.gray("Storing credentials..."));
     await store.saveCredentials({
       apiKey: key,
       userId,
       orgId,
       apiUrl: apiUrl || getApiUrl()
     });
-    console.log(chalk2.green("Logged in successfully!"));
+    console.log(chalk3.green("Logged in successfully!"));
     return key;
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown error";
-    console.log(chalk2.red("Login failed"));
-    console.error(chalk2.red(message));
+    console.log(chalk3.red("Login failed"));
+    console.error(chalk3.red(message));
     return null;
   }
 }
@@ -1604,14 +1709,14 @@ var ApiClient = class {
 };
 
 // src/lib/output.ts
-import chalk3 from "chalk";
+import chalk4 from "chalk";
 function printJson(data) {
   console.log(JSON.stringify(data, null, 2));
 }
 function printList(items, options) {
-  console.log(chalk3.cyan(`${options.title}:`));
+  console.log(chalk4.cyan(`${options.title}:`));
   if (items.length === 0) {
-    console.log(chalk3.gray(`  ${options.emptyMessage || "None found"}`));
+    console.log(chalk4.gray(`  ${options.emptyMessage || "None found"}`));
     return;
   }
   for (const item of items) {
@@ -1620,7 +1725,7 @@ function printList(items, options) {
       const value = item[col.key];
       if (value === void 0 || value === null) continue;
       const str = String(value);
-      const colorFn = col.color ? chalk3[col.color] : (s) => s;
+      const colorFn = col.color ? chalk4[col.color] : (s) => s;
       if (col.label) {
         parts.push(`${col.label}: ${colorFn(str)}`);
       } else {
@@ -1630,16 +1735,16 @@ function printList(items, options) {
     console.log(`  ${parts.join(" - ")}`);
   }
   if (options.total !== void 0) {
-    console.log(chalk3.dim(`
+    console.log(chalk4.dim(`
   Total: ${options.total}`));
   }
 }
 function printDetail(title, fields) {
-  console.log(chalk3.cyan(`${title}:`));
+  console.log(chalk4.cyan(`${title}:`));
   for (const field of fields) {
     if (field.value === void 0 || field.value === null) continue;
     const str = typeof field.value === "object" ? JSON.stringify(field.value) : String(field.value);
-    console.log(`  ${chalk3.gray(field.label + ":")} ${str}`);
+    console.log(`  ${chalk4.gray(field.label + ":")} ${str}`);
   }
 }
 function getTotalCount(pagination) {
@@ -1671,7 +1776,7 @@ flowsCommand.command("list").description("List all flows").option("--json", "Out
       });
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk4.red(`Failed to fetch flows: ${message}`));
+      console.error(chalk5.red(`Failed to fetch flows: ${message}`));
       process.exit(1);
     }
     return;
@@ -1727,7 +1832,7 @@ flowsCommand.command("get <id>").description("Get flow details").option("--json"
       ]);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk4.red(`Failed to fetch flow: ${message}`));
+      console.error(chalk5.red(`Failed to fetch flow: ${message}`));
       process.exit(1);
     }
     return;
@@ -1774,7 +1879,7 @@ flowsCommand.command("run <id>").description("Execute a flow via dispatch").opti
       payload.messages = [{ role: "user", content: options.message }];
     }
     if (options.stream) {
-      console.log(chalk4.gray("Starting flow..."));
+      console.log(chalk5.gray("Starting flow..."));
       try {
         const response = await client.stream("/dispatch", payload);
         const callbacks = {
@@ -1788,7 +1893,7 @@ flowsCommand.command("run <id>").description("Execute a flow via dispatch").opti
             }
           },
           onError: (err) => {
-            console.error(chalk4.red(`
+            console.error(chalk5.red(`
 Error: ${err.message}`));
           }
         };
@@ -1796,19 +1901,19 @@ Error: ${err.message}`));
         console.log();
       } catch (error) {
         const message = error instanceof Error ? error.message : "Unknown error";
-        console.error(chalk4.red(`Flow execution failed: ${message}`));
+        console.error(chalk5.red(`Flow execution failed: ${message}`));
         process.exit(1);
       }
     } else {
-      console.log(chalk4.gray("Executing flow..."));
+      console.log(chalk5.gray("Executing flow..."));
       try {
         payload.streamResponse = false;
         const result = await client.post("/dispatch", payload);
-        console.log(chalk4.green("Flow execution complete"));
+        console.log(chalk5.green("Flow execution complete"));
         printJson(result);
       } catch (error) {
         const message = error instanceof Error ? error.message : "Unknown error";
-        console.error(chalk4.red(`Flow execution failed: ${message}`));
+        console.error(chalk5.red(`Flow execution failed: ${message}`));
         process.exit(1);
       }
     }
@@ -1833,7 +1938,7 @@ flowsCommand.command("create").description("Create a new flow").requiredOption("
         }
       } catch (error) {
         const msg = error instanceof Error ? error.message : "Unknown error";
-        console.error(chalk4.red(`Failed to read flow file: ${msg}`));
+        console.error(chalk5.red(`Failed to read flow file: ${msg}`));
         process.exit(1);
       }
     }
@@ -1844,11 +1949,11 @@ flowsCommand.command("create").description("Create a new flow").requiredOption("
           printJson(data);
           return;
         }
-        console.log(`  ID: ${chalk4.green(data.id)}`);
+        console.log(`  ID: ${chalk5.green(data.id)}`);
         console.log(`  Name: ${data.name}`);
       } catch (error) {
         const message = error instanceof Error ? error.message : "Unknown error";
-        console.error(chalk4.red(`Failed to create flow: ${message}`));
+        console.error(chalk5.red(`Failed to create flow: ${message}`));
         process.exit(1);
       }
       return;
@@ -1897,7 +2002,7 @@ flowsCommand.command("delete <id>").description("Delete a flow").option("--tty",
       console.log(JSON.stringify({ status: "deleted", id }, null, 2));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk4.red(`Failed to delete flow: ${message}`));
+      console.error(chalk5.red(`Failed to delete flow: ${message}`));
       process.exit(1);
     }
     return;
@@ -1948,7 +2053,7 @@ flowsCommand.command("delete <id>").description("Delete a flow").option("--tty",
 
 // src/commands/records.ts
 import { Command as Command3 } from "commander";
-import chalk5 from "chalk";
+import chalk6 from "chalk";
 import React3 from "react";
 import { render as render3 } from "ink";
 import { useState as useState4, useEffect as useEffect5 } from "react";
@@ -1986,7 +2091,7 @@ recordsCommand.command("list").description("List all records").option("--type <t
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk5.red(`Failed to fetch records: ${message}`));
+      console.error(chalk6.red(`Failed to fetch records: ${message}`));
       process.exit(1);
     }
     return;
@@ -2047,7 +2152,7 @@ recordsCommand.command("get <id>").description("Get record details").option("--j
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk5.red(`Failed to fetch record: ${message}`));
+      console.error(chalk6.red(`Failed to fetch record: ${message}`));
       process.exit(1);
     }
     return;
@@ -2091,7 +2196,7 @@ recordsCommand.command("create").description("Create a new record").requiredOpti
     try {
       metadata = JSON.parse(options.metadata);
     } catch {
-      console.error(chalk5.red("Invalid JSON in metadata"));
+      console.error(chalk6.red("Invalid JSON in metadata"));
       process.exit(1);
     }
   }
@@ -2111,7 +2216,7 @@ recordsCommand.command("create").description("Create a new record").requiredOpti
       console.log(`  Type: ${data.type}`);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk5.red(`Failed to create record: ${message}`));
+      console.error(chalk6.red(`Failed to create record: ${message}`));
       process.exit(1);
     }
     return;
@@ -2164,7 +2269,7 @@ recordsCommand.command("delete <id>").description("Delete a record").option("--t
       console.log(JSON.stringify({ status: "deleted", id }, null, 2));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk5.red(`Failed to delete record: ${message}`));
+      console.error(chalk6.red(`Failed to delete record: ${message}`));
       process.exit(1);
     }
     return;
@@ -2216,7 +2321,7 @@ recordsCommand.command("export").description("Export records to a file").option(
   async (options) => {
     const apiKey = await ensureAuth();
     if (!apiKey) return;
-    console.log(chalk5.gray("Exporting records..."));
+    console.log(chalk6.gray("Exporting records..."));
     try {
       const client = new ApiClient(apiKey);
       const params = { limit: options.limit };
@@ -2224,7 +2329,7 @@ recordsCommand.command("export").description("Export records to a file").option(
       const data = await client.get("/records", params);
       const records = data.data ?? [];
       if (records.length === 0) {
-        console.log(chalk5.yellow("No records to export"));
+        console.log(chalk6.yellow("No records to export"));
         return;
       }
       let content;
@@ -2242,10 +2347,10 @@ recordsCommand.command("export").description("Export records to a file").option(
       }
       const filename = options.output || `records-export-${Date.now()}.${options.format === "csv" ? "csv" : "json"}`;
       writeFileSync(filename, content);
-      console.log(chalk5.green(`Exported ${records.length} records to ${filename}`));
+      console.log(chalk6.green(`Exported ${records.length} records to ${filename}`));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk5.red(`Failed to export records: ${message}`));
+      console.error(chalk6.red(`Failed to export records: ${message}`));
       process.exit(1);
     }
   }
@@ -2259,7 +2364,7 @@ function csvEscape(value) {
 
 // src/commands/prompts.ts
 import { Command as Command4 } from "commander";
-import chalk6 from "chalk";
+import chalk7 from "chalk";
 import React4 from "react";
 import { render as render4 } from "ink";
 import { useState as useState5, useEffect as useEffect6 } from "react";
@@ -2297,7 +2402,7 @@ promptsCommand.command("list").description("List all prompts").option("--json",
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk6.red(`Failed to fetch prompts: ${message}`));
+      console.error(chalk7.red(`Failed to fetch prompts: ${message}`));
       process.exit(1);
     }
     return;
@@ -2354,7 +2459,7 @@ promptsCommand.command("get <id>").description("Get prompt details").option("--j
       ]);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk6.red(`Failed to fetch prompt: ${message}`));
+      console.error(chalk7.red(`Failed to fetch prompt: ${message}`));
       process.exit(1);
     }
     return;
@@ -2409,7 +2514,7 @@ promptsCommand.command("test <id>").description("Test a prompt with input").opti
       payload.messages = [{ role: "user", content: options.input }];
     }
     if (options.stream) {
-      console.log(chalk6.gray("Testing prompt..."));
+      console.log(chalk7.gray("Testing prompt..."));
       try {
         const response = await client.stream("/dispatch", payload);
         const callbacks = {
@@ -2417,7 +2522,7 @@ promptsCommand.command("test <id>").description("Test a prompt with input").opti
             process.stdout.write(chunk);
           },
           onError: (err) => {
-            console.error(chalk6.red(`
+            console.error(chalk7.red(`
 Error: ${err.message}`));
           }
         };
@@ -2425,15 +2530,15 @@ Error: ${err.message}`));
         console.log();
       } catch (error) {
         const message = error instanceof Error ? error.message : "Unknown error";
-        console.error(chalk6.red(`Prompt test failed: ${message}`));
+        console.error(chalk7.red(`Prompt test failed: ${message}`));
         process.exit(1);
       }
     } else {
-      console.log(chalk6.gray("Testing prompt..."));
+      console.log(chalk7.gray("Testing prompt..."));
       try {
         payload.streamResponse = false;
         const result = await client.post("/dispatch", payload);
-        console.log(chalk6.green("Prompt test complete"));
+        console.log(chalk7.green("Prompt test complete"));
         if (options.json) {
           printJson(result);
         } else {
@@ -2441,7 +2546,7 @@ Error: ${err.message}`));
         }
       } catch (error) {
         const message = error instanceof Error ? error.message : "Unknown error";
-        console.error(chalk6.red(`Prompt test failed: ${message}`));
+        console.error(chalk7.red(`Prompt test failed: ${message}`));
         process.exit(1);
       }
     }
@@ -2450,7 +2555,7 @@ Error: ${err.message}`));
 
 // src/commands/batch.ts
 import { Command as Command5 } from "commander";
-import chalk7 from "chalk";
+import chalk8 from "chalk";
 import React5 from "react";
 import { render as render5 } from "ink";
 import { useState as useState6, useEffect as useEffect7 } from "react";
@@ -2466,7 +2571,7 @@ batchCommand.command("submit").description("Submit a batch job").requiredOption(
     recordIds = Array.isArray(parsed) ? parsed : parsed.recordIds || parsed.records || [];
   } catch (error) {
     const msg = error instanceof Error ? error.message : "Unknown error";
-    console.error(chalk7.red(`Failed to read records file: ${msg}`));
+    console.error(chalk8.red(`Failed to read records file: ${msg}`));
     process.exit(1);
   }
   const client = new ApiClient(apiKey);
@@ -2479,14 +2584,14 @@ batchCommand.command("submit").description("Submit a batch job").requiredOption(
       if (options.json) {
         printJson(data);
       } else {
-        console.log(chalk7.green("Batch submitted"));
-        console.log(`  Batch ID: ${chalk7.green(data.id)}`);
+        console.log(chalk8.green("Batch submitted"));
+        console.log(`  Batch ID: ${chalk8.green(data.id)}`);
         console.log(`  Status: ${data.status}`);
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk7.red("Failed to submit batch"));
-      console.error(chalk7.red(message));
+      console.error(chalk8.red("Failed to submit batch"));
+      console.error(chalk8.red(message));
       process.exit(1);
     }
     return;
@@ -2541,20 +2646,20 @@ batchCommand.command("status <id>").description("Check batch job status").option
       if (options.json) {
         printJson(data);
       } else {
-        console.log(chalk7.cyan(`Batch Job: ${batchId}`));
-        console.log(`  Status: ${chalk7.green(data.status)}`);
+        console.log(chalk8.cyan(`Batch Job: ${batchId}`));
+        console.log(`  Status: ${chalk8.green(data.status)}`);
         console.log(`  Progress: ${data.processedRecords}/${data.totalRecords}`);
         if (data.failedRecords > 0) {
-          console.log(`  Failed: ${chalk7.red(data.failedRecords)}`);
+          console.log(`  Failed: ${chalk8.red(data.failedRecords)}`);
         }
         if (options.watch && data.status === "processing") {
-          console.log(chalk7.gray("\nWatching for updates... (Ctrl+C to stop)"));
+          console.log(chalk8.gray("\nWatching for updates... (Ctrl+C to stop)"));
         }
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk7.red("Failed to fetch batch status"));
-      console.error(chalk7.red(message));
+      console.error(chalk8.red("Failed to fetch batch status"));
+      console.error(chalk8.red(message));
       process.exit(1);
     }
     return;
@@ -2606,11 +2711,11 @@ batchCommand.command("cancel <id>").description("Cancel a batch job").option("--
   if (!isTTY(options)) {
     try {
       await client.post(`/batch/cancel/${batchId}`);
-      console.log(chalk7.green("Batch job cancelled"));
+      console.log(chalk8.green("Batch job cancelled"));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk7.red("Failed to cancel batch job"));
-      console.error(chalk7.red(message));
+      console.error(chalk8.red("Failed to cancel batch job"));
+      console.error(chalk8.red(message));
       process.exit(1);
     }
     return;
@@ -2649,7 +2754,7 @@ batchCommand.command("cancel <id>").description("Cancel a batch job").option("--
 import { Command as Command6 } from "commander";
 import React8 from "react";
 import { render as render6 } from "ink";
-import chalk8 from "chalk";
+import chalk9 from "chalk";
 import { processStream as processStream3 } from "@runtypelabs/sdk";
 
 // src/chat/session-manager.ts
@@ -2898,14 +3003,14 @@ function formatRelativeTime(timestamp) {
   return `${Math.floor(diff / 86400)}d ago`;
 }
 function useRelativeTime(timestamp) {
-  const [relative, setRelative] = useState8(() => formatRelativeTime(timestamp));
+  const [relative2, setRelative] = useState8(() => formatRelativeTime(timestamp));
   useEffect8(() => {
     const interval = setInterval(() => {
       setRelative(formatRelativeTime(timestamp));
     }, 3e4);
     return () => clearInterval(interval);
   }, [timestamp]);
-  return relative;
+  return relative2;
 }
 
 // src/ink/talk/MessageBubble.tsx
@@ -3480,10 +3585,10 @@ var talkCommand = new Command6("talk").description("Start an interactive chat se
   if (options.continue) {
     try {
       await session.loadFromFile(options.continue);
-      console.log(chalk8.green(`Loaded session from: ${options.continue}`));
+      console.log(chalk9.green(`Loaded session from: ${options.continue}`));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk8.red(`Failed to load session: ${message}`));
+      console.error(chalk9.red(`Failed to load session: ${message}`));
       process.exit(1);
     }
   }
@@ -3540,14 +3645,14 @@ var talkCommand = new Command6("talk").description("Start an interactive chat se
   } catch (error) {
     exitAltScreen();
     const message = error instanceof Error ? error.message : "Unknown error";
-    console.error(chalk8.red(`Talk failed: ${message}`));
+    console.error(chalk9.red(`Talk failed: ${message}`));
     process.exit(1);
   }
 });
 
 // src/commands/config.ts
 import { Command as Command7 } from "commander";
-import chalk9 from "chalk";
+import chalk10 from "chalk";
 import Conf2 from "conf";
 import path4 from "path";
 import os3 from "os";
@@ -3571,31 +3676,31 @@ var config = new Conf2({
 configCommand.command("get [key]").description("Get configuration value").action((key) => {
   if (key) {
     if (!isCliConfigKey(key)) {
-      console.log(chalk9.yellow(`Configuration key '${key}' not found`));
+      console.log(chalk10.yellow(`Configuration key '${key}' not found`));
       return;
     }
     const value = config.get(key);
     if (value !== void 0) {
       console.log(value);
     } else {
-      console.log(chalk9.yellow(`Configuration key '${key}' not found`));
+      console.log(chalk10.yellow(`Configuration key '${key}' not found`));
     }
   } else {
     const allConfig = config.store;
     if (Object.keys(allConfig).length > 0) {
-      console.log(chalk9.cyan("Current Configuration:"));
+      console.log(chalk10.cyan("Current Configuration:"));
       for (const [k, v] of Object.entries(allConfig)) {
-        console.log(`  ${chalk9.green(k)}: ${v}`);
+        console.log(`  ${chalk10.green(k)}: ${v}`);
       }
     } else {
-      console.log(chalk9.gray("No configuration set"));
+      console.log(chalk10.gray("No configuration set"));
     }
   }
 });
 configCommand.command("set <key> <value>").description("Set configuration value").action((key, value) => {
   if (!isCliConfigKey(key)) {
-    console.log(chalk9.red(`Invalid configuration key: ${key}`));
-    console.log(chalk9.gray(`Valid keys: ${CLI_CONFIG_KEYS.join(", ")}`));
+    console.log(chalk10.red(`Invalid configuration key: ${key}`));
+    console.log(chalk10.gray(`Valid keys: ${CLI_CONFIG_KEYS.join(", ")}`));
     process.exit(1);
   }
   let parsedValue;
@@ -3604,7 +3709,7 @@ configCommand.command("set <key> <value>").description("Set configuration value"
       {
         const temperature = parseFloat(value);
         if (isNaN(temperature) || temperature < 0 || temperature > 1) {
-          console.log(chalk9.red("Temperature must be a number between 0 and 1"));
+          console.log(chalk10.red("Temperature must be a number between 0 and 1"));
           process.exit(1);
         }
         parsedValue = temperature;
@@ -3615,7 +3720,7 @@ configCommand.command("set <key> <value>").description("Set configuration value"
       break;
     case "outputFormat":
       if (!["table", "json", "plain"].includes(value)) {
-        console.log(chalk9.red("Output format must be: table, json, or plain"));
+        console.log(chalk10.red("Output format must be: table, json, or plain"));
         process.exit(1);
       }
       parsedValue = value;
@@ -3625,11 +3730,11 @@ configCommand.command("set <key> <value>").description("Set configuration value"
       break;
   }
   config.set(key, parsedValue);
-  console.log(chalk9.green(`Configuration updated: ${key} = ${parsedValue}`));
+  console.log(chalk10.green(`Configuration updated: ${key} = ${parsedValue}`));
 });
 configCommand.command("reset").description("Reset all configuration to defaults").action(() => {
   config.clear();
-  console.log(chalk9.green("Configuration reset to defaults"));
+  console.log(chalk10.green("Configuration reset to defaults"));
 });
 configCommand.command("path").description("Show configuration file path").action(() => {
   console.log(config.path);
@@ -3637,13 +3742,13 @@ configCommand.command("path").description("Show configuration file path").action
 
 // src/commands/products.ts
 import { Command as Command8 } from "commander";
-import chalk10 from "chalk";
+import chalk11 from "chalk";
 import React9 from "react";
 import { render as render7 } from "ink";
 import { useState as useState11, useEffect as useEffect10 } from "react";
 import open2 from "open";
 function displayAgentCard(agentCard) {
-  console.log(chalk10.cyan("\nAgent Details:"));
+  console.log(chalk11.cyan("\nAgent Details:"));
   console.log(`  Name:        ${agentCard.name}`);
   if (agentCard.description) {
     console.log(`  Description: ${agentCard.description}`);
@@ -3653,7 +3758,7 @@ function displayAgentCard(agentCard) {
     console.log("  Skills:");
     agentCard.skills.forEach((skill) => {
       const desc = skill.description ? ` - ${skill.description}` : "";
-      console.log(`    ${chalk10.cyan("\u2022")} ${skill.name}${desc}`);
+      console.log(`    ${chalk11.cyan("\u2022")} ${skill.name}${desc}`);
     });
   }
 }
@@ -3703,7 +3808,7 @@ function displayCreationSuccess(result, agentCard, dashboardBaseUrl, jsonOutput)
 Product ID:  ${result.product.id}`);
   console.log(`Name:        ${result.product.name}`);
   console.log(`Dashboard:   ${productUrl}`);
-  console.log(chalk10.cyan("\nNext steps:"));
+  console.log(chalk11.cyan("\nNext steps:"));
   console.log("  1. Visit the dashboard to configure surfaces");
   console.log("  2. Or run: runtype products init --from <another-url>");
 }
@@ -3740,7 +3845,7 @@ productsCommand.command("init").description("Initialize a product from an extern
         );
         process.exit(1);
       }
-      console.error(chalk10.red("--from URL required in non-TTY mode"));
+      console.error(chalk11.red("--from URL required in non-TTY mode"));
       process.exit(1);
     }
     try {
@@ -3755,7 +3860,7 @@ productsCommand.command("init").description("Initialize a product from an extern
             )
           );
         } else {
-          console.error(chalk10.red(result.error));
+          console.error(chalk11.red(result.error));
         }
         process.exit(1);
       }
@@ -3778,7 +3883,7 @@ productsCommand.command("init").description("Initialize a product from an extern
             )
           );
         } else {
-          console.log(chalk10.cyan("\nOpening browser to complete setup..."));
+          console.log(chalk11.cyan("\nOpening browser to complete setup..."));
         }
         await open2(targetUrl);
         return;
@@ -3801,14 +3906,14 @@ productsCommand.command("init").description("Initialize a product from an extern
             )
           );
         } else {
-          console.error(chalk10.red(createResult.error));
+          console.error(chalk11.red(createResult.error));
         }
         process.exit(1);
       }
       displayCreationSuccess(createResult, result.agentCard, getDashboardUrl(), isJsonMode);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk10.red(`Failed: ${message}`));
+      console.error(chalk11.red(`Failed: ${message}`));
       process.exit(1);
     }
     return;
@@ -4771,7 +4876,7 @@ var initCommand = new Command9("init").description("Set up Runtype CLI with guid
 
 // src/commands/dispatch.ts
 import { Command as Command10 } from "commander";
-import chalk11 from "chalk";
+import chalk12 from "chalk";
 import React11 from "react";
 import { render as render9 } from "ink";
 import { useState as useState13, useEffect as useEffect12 } from "react";
@@ -4779,7 +4884,7 @@ import { readFileSync as readFileSync3 } from "fs";
 import { processStream as processStream4 } from "@runtypelabs/sdk";
 var dispatchCommand = new Command10("dispatch").description("Execute a flow or agent via the dispatch API").option("-f, --flow <id>", "Flow ID to execute").option("-a, --agent <id>", "Agent ID to execute").option("-r, --record <id>", "Existing record ID").option("--record-json <file>", "JSON file with record data").option("-m, --message <text>", "Message to send").option("-v, --variable <key=value>", "Set a variable (repeatable)", collectVariables, []).option("--stream", "Stream the response (default)", true).option("--no-stream", "Wait for complete response").option("--json", "Output as JSON").option("--debug", "Show step-level details").option("--tty", "Force TTY mode").option("--no-tty", "Force non-TTY mode").action(async (options) => {
   if (!options.flow && !options.agent) {
-    console.error(chalk11.red("Error: Either --flow or --agent is required"));
+    console.error(chalk12.red("Error: Either --flow or --agent is required"));
     process.exit(1);
   }
   const apiKey = await ensureAuth();
@@ -4800,7 +4905,7 @@ var dispatchCommand = new Command10("dispatch").description("Execute a flow or a
       payload.record = { metadata: data };
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk11.red(`Failed to read record JSON: ${message}`));
+      console.error(chalk12.red(`Failed to read record JSON: ${message}`));
       process.exit(1);
     }
   }
@@ -4825,18 +4930,18 @@ function collectVariables(value, previous) {
   return previous.concat([value]);
 }
 async function handleStreaming(client, payload, options) {
-  console.log(chalk11.gray("Starting execution..."));
+  console.log(chalk12.gray("Starting execution..."));
   try {
     const response = await client.stream("/dispatch", payload);
     const callbacks = {
       onFlowStart: (event) => {
         if (options.debug) {
-          console.log(chalk11.cyan(`Flow: ${event.flowName} (${event.totalSteps} steps)`));
+          console.log(chalk12.cyan(`Flow: ${event.flowName} (${event.totalSteps} steps)`));
         }
       },
       onStepStart: (event) => {
         if (options.debug) {
-          console.log(chalk11.gray(`
+          console.log(chalk12.gray(`
 [${event.name}] Running...`));
         }
       },
@@ -4845,7 +4950,7 @@ async function handleStreaming(client, payload, options) {
       },
       onStepComplete: (_result, event) => {
         if (options.debug) {
-          console.log(chalk11.gray(`
+          console.log(chalk12.gray(`
 [${event.name}] Complete`));
         }
       },
@@ -4856,7 +4961,7 @@ async function handleStreaming(client, payload, options) {
         }
       },
       onError: (err) => {
-        console.error(chalk11.red(`
+        console.error(chalk12.red(`
 Error: ${err.message}`));
       }
     };
@@ -4864,8 +4969,8 @@ Error: ${err.message}`));
     console.log();
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown error";
-    console.error(chalk11.red("Execution failed"));
-    console.error(chalk11.red(message));
+    console.error(chalk12.red("Execution failed"));
+    console.error(chalk12.red(message));
     process.exit(1);
   }
 }
@@ -4880,7 +4985,7 @@ async function handleNonStreaming(client, payload, options) {
         const steps = result.steps;
         if (steps) {
           for (const step of steps) {
-            console.log(chalk11.cyan(`
+            console.log(chalk12.cyan(`
 [${step.name}]`));
             if (typeof step.result === "string") {
               console.log(step.result);
@@ -4894,8 +4999,8 @@ async function handleNonStreaming(client, payload, options) {
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk11.red("Execution failed"));
-      console.error(chalk11.red(message));
+      console.error(chalk12.red("Execution failed"));
+      console.error(chalk12.red(message));
       process.exit(1);
     }
     return;
@@ -4917,7 +5022,7 @@ async function handleNonStreaming(client, payload, options) {
             const steps = result.steps;
             if (steps) {
               for (const step of steps) {
-                console.log(chalk11.cyan(`
+                console.log(chalk12.cyan(`
 [${step.name}]`));
                 if (typeof step.result === "string") {
                   console.log(step.result);
@@ -4951,7 +5056,7 @@ async function handleNonStreaming(client, payload, options) {
 
 // src/commands/agents.ts
 import { Command as Command12 } from "commander";
-import chalk13 from "chalk";
+import chalk14 from "chalk";
 import React13 from "react";
 import { render as render11 } from "ink";
 import { useState as useState19, useEffect as useEffect17 } from "react";
@@ -4959,22 +5064,41 @@ import { processStream as processStream5 } from "@runtypelabs/sdk";
 
 // src/commands/agents-task.ts
 import { Command as Command11 } from "commander";
-import chalk12 from "chalk";
+import chalk13 from "chalk";
 import { render as render10 } from "ink";
 import React12 from "react";
 
 // src/ink/marathon/MarathonApp.tsx
-import { useState as useState18, useEffect as useEffect16, useRef as useRef7, useCallback as useCallback5 } from "react";
+import { useState as useState18, useEffect as useEffect16, useRef as useRef7, useCallback as useCallback5, useMemo as useMemo5 } from "react";
 import { execSync } from "child_process";
 import open3 from "open";
-import { Box as Box20, useApp as useApp5, useInput as useInput9, useStdout as useStdout2 } from "ink";
-import { StreamOutput as StreamOutput3, StatusBar as StatusBar2, ErrorDisplay as ErrorDisplay4, theme as theme21 } from "@runtypelabs/ink-components";
+import { Box as Box23, useApp as useApp5, useInput as useInput9, useStdout as useStdout2 } from "ink";
+import { StreamOutput as StreamOutput3, StatusBar as StatusBar2, ErrorDisplay as ErrorDisplay4, theme as theme23 } from "@runtypelabs/ink-components";
+import { LoadingAnimation } from "@runtypelabs/terminal-animations";
 
 // src/ink/marathon/useMarathonStream.ts
 import { useState as useState14, useRef as useRef5, useMemo as useMemo2, useCallback as useCallback4 } from "react";
+
+// src/ink/marathon/transcript-utils.ts
+function appendTranscriptText(content, delta, previousKind) {
+  if (!content) return delta;
+  const needsSeparator = previousKind === "tool" && !content.endsWith("\n") && !delta.startsWith("\n");
+  return needsSeparator ? `${content}
+${delta}` : `${content}${delta}`;
+}
+function getVisibleReasoningLines(reasoning, maxLines) {
+  if (maxLines <= 0) return [];
+  const trimmed = reasoning.trimEnd();
+  if (!trimmed) return [];
+  return trimmed.split("\n").slice(-maxLines);
+}
+
+// src/ink/marathon/useMarathonStream.ts
 var INITIAL_STATE2 = {
   phase: "idle",
   content: "",
+  reasoning: "",
+  lastTranscriptKind: null,
   thinkingStartedAt: null,
   tools: [],
   sessionCount: 0,
@@ -4984,6 +5108,11 @@ var INITIAL_STATE2 = {
   rawEvents: []
 };
 var MAX_RAW_EVENTS = 500;
+function appendContentLine(content, line) {
+  if (!content) return line;
+  const separator = content.endsWith("\n") ? "" : "\n";
+  return `${content}${separator}${line}`;
+}
 function pushRawEvent(prev, type, data) {
   const event = { timestamp: Date.now(), type, data };
   const events = [...prev.rawEvents, event];
@@ -5012,15 +5141,24 @@ function useMarathonStream() {
         }));
       },
       onTurnDelta(event) {
-        if (event.contentType === "text") {
-          setState((prev) => ({
-            ...prev,
+        setState((prev) => ({
+          ...prev,
+          ...event.contentType === "text" ? {
             phase: "streaming",
-            content: prev.content + event.delta,
-            thinkingStartedAt: null,
-            rawEvents: pushRawEvent(prev, "agent_turn_delta", { contentType: event.contentType, deltaLength: event.delta.length })
-          }));
-        }
+            content: appendTranscriptText(prev.content, event.delta, prev.lastTranscriptKind),
+            lastTranscriptKind: "text",
+            thinkingStartedAt: null
+          } : {
+            phase: "thinking",
+            reasoning: prev.reasoning + event.delta,
+            thinkingStartedAt: prev.thinkingStartedAt ?? Date.now()
+          },
+          rawEvents: pushRawEvent(prev, "agent_turn_delta", {
+            contentType: event.contentType,
+            delta: event.delta,
+            deltaLength: event.delta.length
+          })
+        }));
       },
       onTurnComplete(event) {
         setState((prev) => ({
@@ -5031,22 +5169,30 @@ function useMarathonStream() {
       },
       onToolStart(event) {
         const uniqueId = `tool-${++toolCounter}`;
-        const newTool = {
-          id: uniqueId,
-          sourceToolCallId: event.toolCallId,
-          name: event.toolName,
-          toolType: event.toolType,
-          status: "running",
-          parameters: event.parameters,
-          startedAt: Date.now()
-        };
-        setState((prev) => ({
-          ...prev,
-          phase: "tool",
-          thinkingStartedAt: null,
-          tools: [...prev.tools, newTool],
-          rawEvents: pushRawEvent(prev, "agent_tool_start", { ...event })
-        }));
+        setState((prev) => {
+          const sequence = prev.tools.length + 1;
+          return {
+            ...prev,
+            phase: "tool",
+            thinkingStartedAt: null,
+            content: appendContentLine(prev.content, `[${sequence}] ${event.toolName}`),
+            lastTranscriptKind: "tool",
+            tools: [
+              ...prev.tools,
+              {
+                id: uniqueId,
+                sequence,
+                sourceToolCallId: event.toolCallId,
+                name: event.toolName,
+                toolType: event.toolType,
+                status: "running",
+                parameters: event.parameters,
+                startedAt: Date.now()
+              }
+            ],
+            rawEvents: pushRawEvent(prev, "agent_tool_start", { ...event })
+          };
+        });
       },
       onToolComplete(event) {
         setState((prev) => {
@@ -5121,13 +5267,23 @@ function useMarathonStream() {
       ...prev,
       phase: "idle",
       content: "",
+      reasoning: "",
+      lastTranscriptKind: null,
       thinkingStartedAt: null,
       tools: [],
       currentIteration: 0,
       error: null
     }));
   }, []);
-  return { state, callbacks, reset, setSteering, resetForNewSession };
+  const showError = useCallback4((error) => {
+    setState((prev) => ({
+      ...prev,
+      phase: "error",
+      error,
+      rawEvents: pushRawEvent(prev, "agent_error", { message: error.message })
+    }));
+  }, []);
+  return { state, callbacks, reset, setSteering, resetForNewSession, showError };
 }
 
 // src/ink/marathon/SessionHeader.tsx
@@ -5162,10 +5318,38 @@ function SessionHeader({
   ] });
 }
 
+// src/ink/marathon/SessionTabs.tsx
+import { Box as Box15, Text as Text15 } from "ink";
+import { theme as theme15 } from "@runtypelabs/ink-components";
+import { jsx as jsx16, jsxs as jsxs15 } from "react/jsx-runtime";
+function getTabColor(tab) {
+  if (tab.isSelected) return theme15.primary;
+  if (tab.isUnread) return theme15.success;
+  if (tab.isLive) return theme15.warning;
+  return theme15.label;
+}
+function SessionTabs({ tabs, hiddenLeft, hiddenRight }) {
+  if (tabs.length === 0) return null;
+  return /* @__PURE__ */ jsxs15(Box15, { children: [
+    hiddenLeft > 0 && /* @__PURE__ */ jsx16(Text15, { color: theme15.muted, children: `\u2039${hiddenLeft}` }),
+    hiddenLeft > 0 && /* @__PURE__ */ jsx16(Text15, { children: " " }),
+    tabs.map((tab, index) => {
+      const unreadPrefix = tab.isUnread ? "\u2022 " : "";
+      const shortcutPrefix = tab.shortcut != null ? `${tab.shortcut} ` : "";
+      return /* @__PURE__ */ jsxs15(Box15, { children: [
+        index > 0 && /* @__PURE__ */ jsx16(Text15, { children: " " }),
+        /* @__PURE__ */ jsx16(Text15, { bold: tab.isSelected, inverse: tab.isSelected, color: getTabColor(tab), children: `${shortcutPrefix}${unreadPrefix}${tab.title}` })
+      ] }, tab.key);
+    }),
+    hiddenRight > 0 && /* @__PURE__ */ jsx16(Text15, { children: " " }),
+    hiddenRight > 0 && /* @__PURE__ */ jsx16(Text15, { color: theme15.muted, children: `${hiddenRight}\u203A` })
+  ] });
+}
+
 // src/ink/marathon/ThinkingIndicator.tsx
 import { useState as useState15, useEffect as useEffect13 } from "react";
-import { Spinner as Spinner5, theme as theme15 } from "@runtypelabs/ink-components";
-import { jsx as jsx16 } from "react/jsx-runtime";
+import { Spinner as Spinner5, theme as theme16 } from "@runtypelabs/ink-components";
+import { jsx as jsx17 } from "react/jsx-runtime";
 function ThinkingIndicator({ startedAt }) {
   const [elapsed, setElapsed] = useState15(
     () => startedAt ? Math.floor((Date.now() - startedAt) / 1e3) : 0
@@ -5178,62 +5362,108 @@ function ThinkingIndicator({ startedAt }) {
     }, 1e3);
     return () => clearInterval(interval);
   }, [startedAt]);
-  return /* @__PURE__ */ jsx16(Spinner5, { label: `Thinking... ${elapsed}s`, color: theme15.muted });
+  return /* @__PURE__ */ jsx17(Spinner5, { label: `Thinking... ${elapsed}s`, color: theme16.muted });
 }
 
 // src/ink/marathon/ToolPanel.tsx
 import { useState as useState16, useEffect as useEffect14, useMemo as useMemo3 } from "react";
+import { Box as Box18, Text as Text18 } from "ink";
+import { theme as theme18 } from "@runtypelabs/ink-components";
+
+// src/ink/marathon/ReasoningBlock.tsx
 import { Box as Box16, Text as Text16 } from "ink";
-import { theme as theme17 } from "@runtypelabs/ink-components";
+import { jsx as jsx18, jsxs as jsxs16 } from "react/jsx-runtime";
+var REASONING_LABEL_COLOR = "cyan";
+var REASONING_TEXT_COLOR = "blueBright";
+var REASONING_HINT_COLOR = "gray";
+function renderReasoningLine(line) {
+  return line ? `| ${line}` : "|";
+}
+function ReasoningBlock({
+  lines,
+  live = false,
+  collapsed = false,
+  compact = false,
+  showToggleHint = false
+}) {
+  const label = collapsed ? "Reasoning hidden" : "Reasoning";
+  const hint = showToggleHint ? collapsed ? "r to show" : "r to hide" : null;
+  return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs16(Box16, { children: [
+      /* @__PURE__ */ jsx18(Text16, { color: REASONING_LABEL_COLOR, children: label }),
+      hint && /* @__PURE__ */ jsxs16(Text16, { color: REASONING_HINT_COLOR, children: [
+        " (",
+        hint,
+        ")"
+      ] })
+    ] }),
+    !collapsed && lines.map((line, index) => /* @__PURE__ */ jsx18(
+      Text16,
+      {
+        color: REASONING_TEXT_COLOR,
+        wrap: compact ? "truncate" : void 0,
+        children: renderReasoningLine(line)
+      },
+      `${index}:${line}`
+    )),
+    !collapsed && live && /* @__PURE__ */ jsx18(Text16, { color: REASONING_TEXT_COLOR, wrap: compact ? "truncate" : void 0, children: "| ..." })
+  ] });
+}
 
 // src/ink/marathon/ToolEntry.tsx
-import { Box as Box15, Text as Text15 } from "ink";
-import { Spinner as Spinner6, theme as theme16 } from "@runtypelabs/ink-components";
-import { Fragment, jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
+import { Box as Box17, Text as Text17 } from "ink";
+import { Spinner as Spinner6, theme as theme17 } from "@runtypelabs/ink-components";
+import { Fragment, jsx as jsx19, jsxs as jsxs17 } from "react/jsx-runtime";
 function ToolEntry({ tool, now }) {
   const elapsedLive = ((now - tool.startedAt) / 1e3).toFixed(1);
   const elapsedFinal = tool.executionTime != null ? (tool.executionTime / 1e3).toFixed(1) : ((now - tool.startedAt) / 1e3).toFixed(1);
   const paramsPreview = tool.parameters ? JSON.stringify(tool.parameters).slice(0, 60) : null;
   const resultPreview = tool.result != null ? String(typeof tool.result === "object" ? JSON.stringify(tool.result) : tool.result).slice(0, 80) : null;
-  return /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", marginBottom: 1, children: [
-    /* @__PURE__ */ jsxs15(Box15, { children: [
-      tool.status === "running" && /* @__PURE__ */ jsxs15(Fragment, { children: [
-        /* @__PURE__ */ jsx17(Spinner6, { label: "", color: theme16.spinner }),
-        /* @__PURE__ */ jsxs15(Text15, { bold: true, children: [
-          " ",
+  return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", marginBottom: 1, children: [
+    /* @__PURE__ */ jsxs17(Box17, { children: [
+      tool.status === "running" && /* @__PURE__ */ jsxs17(Fragment, { children: [
+        /* @__PURE__ */ jsx19(Spinner6, { label: "", color: theme17.spinner }),
+        /* @__PURE__ */ jsxs17(Text17, { bold: true, children: [
+          " [",
+          tool.sequence,
+          "] ",
           tool.name
         ] }),
-        /* @__PURE__ */ jsxs15(Text15, { color: theme16.muted, children: [
+        /* @__PURE__ */ jsxs17(Text17, { color: theme17.muted, children: [
           " ",
           elapsedLive,
           "s"
         ] })
       ] }),
-      tool.status === "complete" && /* @__PURE__ */ jsxs15(Fragment, { children: [
-        /* @__PURE__ */ jsx17(Text15, { color: theme16.success, children: "\u2713" }),
-        /* @__PURE__ */ jsxs15(Text15, { bold: true, children: [
-          " ",
+      tool.status === "complete" && /* @__PURE__ */ jsxs17(Fragment, { children: [
+        /* @__PURE__ */ jsx19(Text17, { color: theme17.success, children: "\u2713" }),
+        /* @__PURE__ */ jsxs17(Text17, { bold: true, children: [
+          " [",
+          tool.sequence,
+          "] ",
           tool.name
         ] }),
-        /* @__PURE__ */ jsxs15(Text15, { color: theme16.muted, children: [
+        /* @__PURE__ */ jsxs17(Text17, { color: theme17.muted, children: [
           " ",
           elapsedFinal,
           "s"
         ] })
       ] }),
-      tool.status === "error" && /* @__PURE__ */ jsxs15(Fragment, { children: [
-        /* @__PURE__ */ jsx17(Text15, { color: theme16.error, children: "\u2717" }),
-        /* @__PURE__ */ jsxs15(Text15, { bold: true, children: [
-          " ",
+      tool.status === "error" && /* @__PURE__ */ jsxs17(Fragment, { children: [
+        /* @__PURE__ */ jsx19(Text17, { color: theme17.error, children: "\u2717" }),
+        /* @__PURE__ */ jsxs17(Text17, { bold: true, children: [
+          " [",
+          tool.sequence,
+          "] ",
           tool.name
         ] })
       ] })
     ] }),
-    paramsPreview && /* @__PURE__ */ jsxs15(Text15, { color: theme16.dimLabel, wrap: "truncate", children: [
+    paramsPreview && /* @__PURE__ */ jsxs17(Text17, { color: theme17.dimLabel, wrap: "truncate", children: [
       "  ",
       paramsPreview
     ] }),
-    tool.status === "complete" && resultPreview && /* @__PURE__ */ jsxs15(Text15, { color: theme16.dimLabel, wrap: "truncate", children: [
+    tool.status === "complete" && resultPreview && /* @__PURE__ */ jsxs17(Text17, { color: theme17.dimLabel, wrap: "truncate", children: [
       "  ",
       resultPreview
     ] })
@@ -5241,11 +5471,16 @@ function ToolEntry({ tool, now }) {
 }
 
 // src/ink/marathon/ToolPanel.tsx
-import { jsx as jsx18, jsxs as jsxs16 } from "react/jsx-runtime";
+import { jsx as jsx20, jsxs as jsxs18 } from "react/jsx-runtime";
 var ROWS_PER_TOOL = 3;
-function ToolPanel({ tools, maxHeight }) {
+var REASONING_PREVIEW_LINES = 4;
+function ToolPanel({ tools, reasoning, maxHeight }) {
   const [now, setNow] = useState16(Date.now());
   const hasRunning = tools.some((t) => t.status === "running");
+  const reasoningLines = useMemo3(
+    () => getVisibleReasoningLines(reasoning || "", REASONING_PREVIEW_LINES),
+    [reasoning]
+  );
   useEffect14(() => {
     if (!hasRunning) return;
     const interval = setInterval(() => {
@@ -5255,39 +5490,41 @@ function ToolPanel({ tools, maxHeight }) {
   }, [hasRunning]);
   const visibleTools = useMemo3(() => {
     if (!maxHeight) return tools;
-    const availableRows = maxHeight - 1;
+    const reasoningRows = reasoningLines.length > 0 ? 1 + reasoningLines.length + 1 : 0;
+    const availableRows = maxHeight - 1 - reasoningRows;
     const maxTools = Math.max(1, Math.floor(availableRows / ROWS_PER_TOOL));
     if (tools.length <= maxTools) return tools;
     return tools.slice(-maxTools);
-  }, [tools, maxHeight]);
+  }, [tools, maxHeight, reasoningLines]);
   const hiddenCount = tools.length - visibleTools.length;
-  return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx18(Text16, { bold: true, color: theme17.info, children: "Tools" }),
-    hiddenCount > 0 && /* @__PURE__ */ jsxs16(Text16, { color: theme17.muted, dimColor: true, children: [
+  return /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", children: [
+    reasoningLines.length > 0 && /* @__PURE__ */ jsx20(Box18, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ jsx20(ReasoningBlock, { lines: reasoningLines, compact: true }) }),
+    /* @__PURE__ */ jsx20(Text18, { bold: true, color: theme18.info, children: "Tools" }),
+    hiddenCount > 0 && /* @__PURE__ */ jsxs18(Text18, { color: theme18.muted, dimColor: true, children: [
       "  ",
       hiddenCount,
       " earlier tools hidden"
     ] }),
-    visibleTools.map((tool) => /* @__PURE__ */ jsx18(ToolEntry, { tool, now }, tool.id))
+    visibleTools.map((tool) => /* @__PURE__ */ jsx20(ToolEntry, { tool, now }, tool.id))
   ] });
 }
 
 // src/ink/marathon/EventStreamPanel.tsx
 import { useMemo as useMemo4 } from "react";
-import { Box as Box17, Text as Text17 } from "ink";
-import { theme as theme18 } from "@runtypelabs/ink-components";
-import { jsx as jsx19, jsxs as jsxs17 } from "react/jsx-runtime";
+import { Box as Box19, Text as Text19 } from "ink";
+import { theme as theme19 } from "@runtypelabs/ink-components";
+import { jsx as jsx21, jsxs as jsxs19 } from "react/jsx-runtime";
 var EVENT_COLORS = {
-  agent_start: theme18.success,
-  agent_complete: theme18.success,
-  agent_error: theme18.error,
-  agent_await: theme18.warning,
-  agent_iteration_start: theme18.info,
-  agent_iteration_complete: theme18.info,
-  agent_turn_delta: theme18.muted,
-  agent_turn_complete: theme18.primary,
-  agent_tool_start: theme18.warning,
-  agent_tool_complete: theme18.warning
+  agent_start: theme19.success,
+  agent_complete: theme19.success,
+  agent_error: theme19.error,
+  agent_await: theme19.warning,
+  agent_iteration_start: theme19.info,
+  agent_iteration_complete: theme19.info,
+  agent_turn_delta: theme19.muted,
+  agent_turn_complete: theme19.primary,
+  agent_tool_start: theme19.warning,
+  agent_tool_complete: theme19.warning
 };
 function formatTimestamp(ts, start) {
   if (!start) return "0.000s";
@@ -5317,21 +5554,21 @@ function EventDetailView({
     return { lines: allLines.slice(start, end), totalLines: total };
   }, [event, maxVisibleLines, scrollOffset]);
   const color = EVENT_COLORS[event.type] || "white";
-  return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsxs17(Box17, { marginBottom: 1, children: [
-      /* @__PURE__ */ jsxs17(Text17, { color: theme18.muted, children: [
+  return /* @__PURE__ */ jsxs19(Box19, { flexDirection: "column", paddingX: 1, children: [
+    /* @__PURE__ */ jsxs19(Box19, { marginBottom: 1, children: [
+      /* @__PURE__ */ jsxs19(Text19, { color: theme19.muted, children: [
         formatTimestamp(event.timestamp, startTime),
         " "
       ] }),
-      /* @__PURE__ */ jsx19(Text17, { bold: true, color, children: event.type }),
-      /* @__PURE__ */ jsx19(Text17, { color: theme18.muted, children: " \u2014 Esc to close" }),
-      totalLines > maxVisibleLines && /* @__PURE__ */ jsxs17(Text17, { color: theme18.muted, children: [
+      /* @__PURE__ */ jsx21(Text19, { bold: true, color, children: event.type }),
+      /* @__PURE__ */ jsx21(Text19, { color: theme19.muted, children: " \u2014 Esc to close" }),
+      totalLines > maxVisibleLines && /* @__PURE__ */ jsxs19(Text19, { color: theme19.muted, children: [
         " (",
         totalLines,
         " lines)"
       ] })
     ] }),
-    lines.map((line, i) => /* @__PURE__ */ jsx19(Text17, { color: theme18.label, children: line }, i))
+    lines.map((line, i) => /* @__PURE__ */ jsx21(Text19, { color: theme19.label, children: line }, i))
   ] });
 }
 function EventStreamPanel({
@@ -5343,7 +5580,7 @@ function EventStreamPanel({
   detailScrollOffset = 0
 }) {
   if (detailEvent) {
-    return /* @__PURE__ */ jsx19(
+    return /* @__PURE__ */ jsx21(
       EventDetailView,
       {
         event: detailEvent,
@@ -5382,22 +5619,22 @@ function EventStreamPanel({
     };
   }, [events, startTime, maxVisibleLines, selectedIndex]);
   if (events.length === 0) {
-    return /* @__PURE__ */ jsx19(Box17, { flexDirection: "column", paddingX: 1, children: /* @__PURE__ */ jsx19(Text17, { color: theme18.muted, children: "Waiting for events..." }) });
+    return /* @__PURE__ */ jsx21(Box19, { flexDirection: "column", paddingX: 1, children: /* @__PURE__ */ jsx21(Text19, { color: theme19.muted, children: "Waiting for events..." }) });
   }
-  return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsxs17(Box17, { marginBottom: 0, children: [
-      /* @__PURE__ */ jsx19(Text17, { bold: true, color: theme18.info, children: "Event Stream" }),
-      /* @__PURE__ */ jsxs17(Text17, { color: theme18.muted, children: [
+  return /* @__PURE__ */ jsxs19(Box19, { flexDirection: "column", paddingX: 1, children: [
+    /* @__PURE__ */ jsxs19(Box19, { marginBottom: 0, children: [
+      /* @__PURE__ */ jsx21(Text19, { bold: true, color: theme19.info, children: "Event Stream" }),
+      /* @__PURE__ */ jsxs19(Text19, { color: theme19.muted, children: [
         " (",
         events.length,
         " events)"
       ] }),
-      hiddenAbove > 0 && /* @__PURE__ */ jsxs17(Text17, { color: theme18.muted, children: [
+      hiddenAbove > 0 && /* @__PURE__ */ jsxs19(Text19, { color: theme19.muted, children: [
         " [",
         hiddenAbove,
         " above]"
       ] }),
-      hiddenBelow > 0 && /* @__PURE__ */ jsxs17(Text17, { color: theme18.muted, children: [
+      hiddenBelow > 0 && /* @__PURE__ */ jsxs19(Text19, { color: theme19.muted, children: [
         " [",
         hiddenBelow,
         " below]"
@@ -5405,11 +5642,11 @@ function EventStreamPanel({
     ] }),
     rows.map((row) => {
       const isSelected = row.globalIndex === selectedIndex;
-      return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "row", flexWrap: "nowrap", children: [
-        /* @__PURE__ */ jsx19(Box17, { width: 2, flexShrink: 0, children: /* @__PURE__ */ jsx19(Text17, { color: theme18.info, children: isSelected ? ">" : " " }) }),
-        /* @__PURE__ */ jsx19(Box17, { width: 9, flexShrink: 0, children: /* @__PURE__ */ jsx19(Text17, { color: theme18.muted, inverse: isSelected, children: row.time }) }),
-        /* @__PURE__ */ jsx19(Box17, { width: 28, flexShrink: 0, children: /* @__PURE__ */ jsx19(Text17, { color: row.color, bold: true, inverse: isSelected, children: row.type }) }),
-        /* @__PURE__ */ jsx19(Box17, { flexShrink: 1, children: /* @__PURE__ */ jsx19(Text17, { color: theme18.muted, wrap: "truncate", inverse: isSelected, children: row.data }) })
+      return /* @__PURE__ */ jsxs19(Box19, { flexDirection: "row", flexWrap: "nowrap", children: [
+        /* @__PURE__ */ jsx21(Box19, { width: 2, flexShrink: 0, children: /* @__PURE__ */ jsx21(Text19, { color: theme19.info, children: isSelected ? ">" : " " }) }),
+        /* @__PURE__ */ jsx21(Box19, { width: 9, flexShrink: 0, children: /* @__PURE__ */ jsx21(Text19, { color: theme19.muted, inverse: isSelected, children: row.time }) }),
+        /* @__PURE__ */ jsx21(Box19, { width: 28, flexShrink: 0, children: /* @__PURE__ */ jsx21(Text19, { color: row.color, bold: true, inverse: isSelected, children: row.type }) }),
+        /* @__PURE__ */ jsx21(Box19, { flexShrink: 1, children: /* @__PURE__ */ jsx21(Text19, { color: theme19.muted, wrap: "truncate", inverse: isSelected, children: row.data }) })
       ] }, row.key);
     })
   ] });
@@ -5417,14 +5654,14 @@ function EventStreamPanel({
 
 // src/ink/marathon/SteeringPrompt.tsx
 import { useState as useState17, useEffect as useEffect15, useRef as useRef6 } from "react";
-import { Box as Box19, Text as Text19 } from "ink";
+import { Box as Box21, Text as Text21 } from "ink";
 import TextInput3 from "ink-text-input";
-import { theme as theme20 } from "@runtypelabs/ink-components";
+import { theme as theme21 } from "@runtypelabs/ink-components";
 
 // src/ink/marathon/SteeringRecap.tsx
-import { Box as Box18, Text as Text18 } from "ink";
-import { theme as theme19 } from "@runtypelabs/ink-components";
-import { jsx as jsx20, jsxs as jsxs18 } from "react/jsx-runtime";
+import { Box as Box20, Text as Text20 } from "ink";
+import { theme as theme20 } from "@runtypelabs/ink-components";
+import { jsx as jsx22, jsxs as jsxs20 } from "react/jsx-runtime";
 function SteeringRecap({
   sessionNumber,
   toolCallsMade,
@@ -5434,9 +5671,9 @@ function SteeringRecap({
   isTerminal
 }) {
   const label = isTerminal ? `\u2713 Session ${sessionNumber} complete` : `Session ${sessionNumber} complete`;
-  return /* @__PURE__ */ jsxs18(Box18, { borderStyle: "single", borderColor: theme19.muted, flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsx20(Text18, { color: theme19.label, children: label }),
-    /* @__PURE__ */ jsxs18(Text18, { color: theme19.muted, children: [
+  return /* @__PURE__ */ jsxs20(Box20, { borderStyle: "single", borderColor: theme20.muted, flexDirection: "column", paddingX: 1, children: [
+    /* @__PURE__ */ jsx22(Text20, { color: theme20.label, children: label }),
+    /* @__PURE__ */ jsxs20(Text20, { color: theme20.muted, children: [
       "Tools: ",
       toolCallsMade,
       " | Tokens: ",
@@ -5463,7 +5700,7 @@ var MARATHON_STEER_COMMANDS = [
 ];
 
 // src/ink/marathon/SteeringPrompt.tsx
-import { Fragment as Fragment2, jsx as jsx21, jsxs as jsxs19 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx23, jsxs as jsxs21 } from "react/jsx-runtime";
 function SteeringPrompt({
   onSubmit,
   timeout,
@@ -5558,19 +5795,19 @@ function SteeringPrompt({
     if (isTyping) return "(paused)";
     return `(${remaining}s)`;
   })();
-  return /* @__PURE__ */ jsxs19(Box19, { flexDirection: "column", flexShrink: 0, children: [
-    /* @__PURE__ */ jsx21(SteeringRecap, { ...recap, isTerminal }),
-    showModelPicker ? /* @__PURE__ */ jsx21(
+  return /* @__PURE__ */ jsxs21(Box21, { flexDirection: "column", flexShrink: 0, children: [
+    /* @__PURE__ */ jsx23(SteeringRecap, { ...recap, isTerminal }),
+    showModelPicker ? /* @__PURE__ */ jsx23(
       ModelPicker,
       {
         currentModel,
         onSelect: handleModelSelect,
         onCancel: handleModelCancel
       }
-    ) : /* @__PURE__ */ jsxs19(Fragment2, { children: [
-      /* @__PURE__ */ jsxs19(Box19, { children: [
-        /* @__PURE__ */ jsx21(Text19, { color: theme20.muted, children: "> " }),
-        /* @__PURE__ */ jsx21(Box19, { flexGrow: 1, children: /* @__PURE__ */ jsx21(
+    ) : /* @__PURE__ */ jsxs21(Fragment2, { children: [
+      /* @__PURE__ */ jsxs21(Box21, { children: [
+        /* @__PURE__ */ jsx23(Text21, { color: theme21.muted, children: "> " }),
+        /* @__PURE__ */ jsx23(Box21, { flexGrow: 1, children: /* @__PURE__ */ jsx23(
           TextInput3,
           {
             value,
@@ -5579,16 +5816,16 @@ function SteeringPrompt({
             placeholder: isTerminal ? "Send new instructions to continue marathon, or press enter to exit..." : "Steer next iteration..."
           }
         ) }),
-        countdownText && /* @__PURE__ */ jsxs19(Text19, { dimColor: true, children: [
+        countdownText && /* @__PURE__ */ jsxs21(Text21, { dimColor: true, children: [
           " ",
           countdownText
         ] })
       ] }),
-      /* @__PURE__ */ jsxs19(Text19, { dimColor: true, children: [
+      /* @__PURE__ */ jsxs21(Text21, { dimColor: true, children: [
         isTerminal ? isTyping ? "Enter: send" : "Enter: exit" : "Enter: continue",
         " | /model /tools /sandbox /stop /help"
       ] }),
-      showHelp && /* @__PURE__ */ jsx21(Box19, { flexDirection: "column", marginTop: 1, children: MARATHON_STEER_COMMANDS.map((cmd) => /* @__PURE__ */ jsxs19(Text19, { dimColor: true, children: [
+      showHelp && /* @__PURE__ */ jsx23(Box21, { flexDirection: "column", marginTop: 1, children: MARATHON_STEER_COMMANDS.map((cmd) => /* @__PURE__ */ jsxs21(Text21, { dimColor: true, children: [
         cmd.name.padEnd(12),
         " ",
         cmd.description
@@ -5597,16 +5834,249 @@ function SteeringPrompt({
   ] });
 }
 
+// src/ink/marathon/UpgradeModal.tsx
+import { Box as Box22, Text as Text22 } from "ink";
+import { theme as theme22 } from "@runtypelabs/ink-components";
+import { jsx as jsx24, jsxs as jsxs22 } from "react/jsx-runtime";
+function UpgradeModal({ prompt, width }) {
+  return /* @__PURE__ */ jsxs22(
+    Box22,
+    {
+      width,
+      flexDirection: "column",
+      borderStyle: "round",
+      borderColor: theme22.warning,
+      paddingX: 2,
+      paddingY: 1,
+      children: [
+        /* @__PURE__ */ jsx24(Text22, { color: theme22.warning, bold: true, children: "Upgrade available" }),
+        /* @__PURE__ */ jsx24(Box22, { marginTop: 1, children: /* @__PURE__ */ jsx24(Text22, { color: theme22.label, children: prompt.message }) }),
+        (prompt.code || prompt.limitType || prompt.retryAfter) && /* @__PURE__ */ jsxs22(Box22, { flexDirection: "column", marginTop: 1, children: [
+          prompt.code && /* @__PURE__ */ jsxs22(Text22, { color: theme22.muted, children: [
+            "Code: ",
+            /* @__PURE__ */ jsx24(Text22, { color: theme22.label, children: prompt.code })
+          ] }),
+          prompt.limitType && /* @__PURE__ */ jsxs22(Text22, { color: theme22.muted, children: [
+            "Limit: ",
+            /* @__PURE__ */ jsx24(Text22, { color: theme22.label, children: prompt.limitType })
+          ] }),
+          prompt.retryAfter && /* @__PURE__ */ jsxs22(Text22, { color: theme22.muted, children: [
+            "Retry after: ",
+            /* @__PURE__ */ jsx24(Text22, { color: theme22.label, children: prompt.retryAfter })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxs22(Box22, { marginTop: 1, children: [
+          /* @__PURE__ */ jsx24(Text22, { color: theme22.info, children: "Enter" }),
+          /* @__PURE__ */ jsx24(Text22, { color: theme22.muted, children: " open billing " }),
+          /* @__PURE__ */ jsx24(Text22, { color: theme22.info, children: "Esc" }),
+          /* @__PURE__ */ jsx24(Text22, { color: theme22.muted, children: " close" })
+        ] }),
+        /* @__PURE__ */ jsx24(Box22, { marginTop: 1, children: /* @__PURE__ */ jsx24(Text22, { color: theme22.dimLabel, children: "Opens your dashboard billing page" }) })
+      ]
+    }
+  );
+}
+
+// src/ink/marathon/upgrade-modal-utils.ts
+var UPGRADE_LIMIT_TYPES = /* @__PURE__ */ new Set([
+  "slow_mode_hourly",
+  "daily_limit",
+  "monthly_limit",
+  "spend_limit"
+]);
+var UPGRADE_CODES = /* @__PURE__ */ new Set([
+  "SLOW_MODE_HOURLY_LIMIT_EXCEEDED",
+  "DAILY_EXECUTION_LIMIT_EXCEEDED",
+  "MONTHLY_EXECUTION_LIMIT_EXCEEDED",
+  "SPEND_LIMIT_EXCEEDED"
+]);
+function trimPrefixedLine(line, prefix) {
+  return line.startsWith(prefix) ? line.slice(prefix.length).trim() : void 0;
+}
+function parseMarathonUpgradePrompt(error) {
+  const rawMessage = typeof error === "string" ? error : error instanceof Error ? error.message : "";
+  if (!rawMessage.trim()) return void 0;
+  const lines = rawMessage.split("\n").map((line) => line.trim()).filter(Boolean);
+  const messageLine = lines.find((line) => line.startsWith("Task failed: "));
+  const statusLine = lines.find((line) => line.includes("429"));
+  const code = lines.map((line) => trimPrefixedLine(line, "Code: ")).find((value) => Boolean(value));
+  const limitType = lines.map((line) => trimPrefixedLine(line, "Limit type: ")).find((value) => Boolean(value));
+  const retryAfter = lines.map((line) => trimPrefixedLine(line, "Retry after: ")).find((value) => Boolean(value));
+  const message = messageLine?.replace(/^Task failed:\s*/, "").trim() ?? rawMessage.trim();
+  const isUpgradeEligible = message.toLowerCase().includes("upgrade") || (code ? UPGRADE_CODES.has(code) : false) || (limitType ? UPGRADE_LIMIT_TYPES.has(limitType) : false);
+  if (!statusLine || !isUpgradeEligible) {
+    return void 0;
+  }
+  return {
+    message,
+    ...code ? { code } : {},
+    ...limitType ? { limitType } : {},
+    ...retryAfter ? { retryAfter } : {}
+  };
+}
+
+// src/ink/marathon/session-tabs-utils.ts
+var MAX_VISIBLE_TAB_SHORTCUTS = 9;
+var TAB_PADDING = 4;
+var TAB_SEPARATOR_WIDTH = 1;
+var TAB_OVERFLOW_WIDTH = 2;
+function createSessionTabKey(sessionIndex, status = "snapshot") {
+  return `${status}:${sessionIndex}`;
+}
+function getLatestSessionTabKey(sessionSnapshots, liveSnapshot) {
+  if (liveSnapshot) return createSessionTabKey(liveSnapshot.sessionIndex, "live");
+  const latestSnapshot = sessionSnapshots[sessionSnapshots.length - 1];
+  return latestSnapshot ? createSessionTabKey(latestSnapshot.sessionIndex) : void 0;
+}
+function getSessionTabBaseTitle(snapshot) {
+  return `Run ${snapshot.sessionIndex}${snapshot.status === "live" ? "*" : ""}`;
+}
+function estimateRenderedTabWidth(tab) {
+  const shortcutPrefix = tab.shortcut != null ? `${tab.shortcut} ` : "";
+  const unreadPrefix = tab.isUnread ? "\u2022 " : "";
+  return shortcutPrefix.length + unreadPrefix.length + tab.title.length + TAB_PADDING;
+}
+function estimateWindowWidth(tabs, hiddenLeft, hiddenRight) {
+  if (tabs.length === 0) return 0;
+  const overflowWidth = (hiddenLeft > 0 ? TAB_OVERFLOW_WIDTH : 0) + (hiddenRight > 0 ? TAB_OVERFLOW_WIDTH : 0);
+  return tabs.reduce((total, tab) => total + estimateRenderedTabWidth(tab), 0) + Math.max(0, tabs.length - 1) * TAB_SEPARATOR_WIDTH + overflowWidth;
+}
+function buildSessionTabs(sessionSnapshots, selectedKey, latestUnreadKey, liveSnapshot) {
+  const orderedSnapshots = [...sessionSnapshots].sort((left, right) => left.sessionIndex - right.sessionIndex);
+  const tabs = orderedSnapshots.map((snapshot) => {
+    const key = createSessionTabKey(snapshot.sessionIndex);
+    return {
+      key,
+      sessionIndex: snapshot.sessionIndex,
+      title: getSessionTabBaseTitle(snapshot),
+      isLive: false,
+      isUnread: key === latestUnreadKey,
+      isSelected: key === selectedKey,
+      shortcut: null
+    };
+  });
+  if (liveSnapshot) {
+    const liveKey = createSessionTabKey(liveSnapshot.sessionIndex, "live");
+    tabs.push({
+      key: liveKey,
+      sessionIndex: liveSnapshot.sessionIndex,
+      title: getSessionTabBaseTitle(liveSnapshot),
+      isLive: true,
+      isUnread: liveKey === latestUnreadKey,
+      isSelected: liveKey === selectedKey,
+      shortcut: null
+    });
+  }
+  return tabs;
+}
+function getVisibleSessionTabs(tabs, selectedKey, maxWidth) {
+  if (tabs.length === 0) {
+    return { tabs: [], hiddenLeft: 0, hiddenRight: 0 };
+  }
+  const maxTabCount = Math.min(MAX_VISIBLE_TAB_SHORTCUTS, tabs.length);
+  const selectedIndex = tabs.findIndex((tab) => tab.key === selectedKey);
+  let start = Math.max(0, tabs.length - maxTabCount);
+  let end = tabs.length;
+  if (selectedIndex >= 0 && selectedIndex < start) {
+    start = selectedIndex;
+    end = Math.min(tabs.length, start + maxTabCount);
+  } else if (selectedIndex >= end) {
+    end = Math.min(tabs.length, selectedIndex + 1);
+    start = Math.max(0, end - maxTabCount);
+  }
+  const shrinkWindowToFit = () => {
+    while (end - start > 1) {
+      const slice = tabs.slice(start, end);
+      const hiddenLeft2 = start;
+      const hiddenRight2 = tabs.length - end;
+      if (estimateWindowWidth(slice, hiddenLeft2, hiddenRight2) <= maxWidth) break;
+      const dropLeftDistance = selectedIndex - start;
+      const dropRightDistance = end - 1 - selectedIndex;
+      if (dropLeftDistance >= dropRightDistance && start < selectedIndex) {
+        start += 1;
+      } else if (end - 1 > selectedIndex) {
+        end -= 1;
+      } else {
+        start += 1;
+      }
+    }
+  };
+  shrinkWindowToFit();
+  const hiddenLeft = start;
+  const hiddenRight = tabs.length - end;
+  const visibleTabs = tabs.slice(start, end).map((tab, index) => ({
+    ...tab,
+    shortcut: index < MAX_VISIBLE_TAB_SHORTCUTS ? index + 1 : null
+  }));
+  return { tabs: visibleTabs, hiddenLeft, hiddenRight };
+}
+function getAdjacentSessionTabKey(tabs, selectedKey, direction) {
+  if (tabs.length === 0) return void 0;
+  const currentIndex = tabs.findIndex((tab) => tab.key === selectedKey);
+  const fallbackIndex = direction > 0 ? tabs.length - 1 : 0;
+  const nextIndex = currentIndex < 0 ? fallbackIndex : Math.max(0, Math.min(tabs.length - 1, currentIndex + direction));
+  return tabs[nextIndex]?.key;
+}
+function getSessionTabKeyForShortcut(visibleTabs, input) {
+  if (!/^[1-9]$/.test(input)) return void 0;
+  const slot = Number(input);
+  return visibleTabs.find((tab) => tab.shortcut === slot)?.key;
+}
+
 // src/ink/marathon/MarathonApp.tsx
-import { jsx as jsx22, jsxs as jsxs20 } from "react/jsx-runtime";
-var TOOL_PANEL_WIDE = 40;
-var TOOL_PANEL_NARROW = 30;
+import { Fragment as Fragment3, jsx as jsx25, jsxs as jsxs23 } from "react/jsx-runtime";
+var TOOL_PANEL_WIDE = 48;
+var TOOL_PANEL_NARROW = 36;
 var NARROW_THRESHOLD = 100;
 var STACKED_THRESHOLD = 80;
 var CHROME_ROWS_BASE = 6;
 var GOAL_ROW = 1;
 var SCROLL_STEP2 = 3;
 var STEERING_PROMPT_ROWS = 7;
+var SESSION_TABS_ROWS = 1;
+function cloneSessionSnapshot(snapshot) {
+  return {
+    ...snapshot,
+    tools: snapshot.tools.map((tool) => ({
+      ...tool,
+      ...tool.parameters ? { parameters: structuredClone(tool.parameters) } : {},
+      ...tool.result !== void 0 ? { result: structuredClone(tool.result) } : {}
+    })),
+    rawEvents: snapshot.rawEvents.map((event) => ({
+      ...event,
+      data: structuredClone(event.data)
+    }))
+  };
+}
+function upsertSessionSnapshots(snapshots, nextSnapshot) {
+  const bySessionIndex = /* @__PURE__ */ new Map();
+  for (const snapshot of snapshots) {
+    bySessionIndex.set(snapshot.sessionIndex, cloneSessionSnapshot(snapshot));
+  }
+  bySessionIndex.set(nextSnapshot.sessionIndex, cloneSessionSnapshot(nextSnapshot));
+  return Array.from(bySessionIndex.values()).sort((left, right) => left.sessionIndex - right.sessionIndex);
+}
+function buildLiveSessionSnapshot(liveState, sessionIndex, model) {
+  const hasLiveState = Boolean(liveState.content) || Boolean(liveState.reasoning) || liveState.tools.length > 0 || liveState.rawEvents.length > 0;
+  if (!hasLiveState) return void 0;
+  return {
+    sessionIndex,
+    status: "live",
+    model,
+    cost: liveState.totalCost,
+    content: liveState.content,
+    reasoning: liveState.reasoning,
+    tools: liveState.tools.map((tool) => ({
+      ...tool,
+      ...tool.parameters ? { parameters: structuredClone(tool.parameters) } : {},
+      ...tool.result !== void 0 ? { result: structuredClone(tool.result) } : {}
+    })),
+    rawEvents: liveState.rawEvents.map((event) => ({
+      ...event,
+      data: structuredClone(event.data)
+    }))
+  };
+}
 function copyToClipboard(text) {
   try {
     if (process.platform === "darwin") {
@@ -5633,16 +6103,18 @@ function MarathonApp({
   goal,
   initialSessionCount,
   initialCost,
+  initialSessionSnapshots,
   debug: _debug,
   plainText,
   noSteer: _noSteer,
   steeringTimeout,
   dashboardUrl,
+  billingUrl,
   onSaveState,
   onComplete: _onComplete,
   streamRef
 }) {
-  const { state, callbacks, reset: _reset, setSteering, resetForNewSession } = useMarathonStream();
+  const { state, callbacks, reset: _reset, setSteering, resetForNewSession, showError } = useMarathonStream();
   const { exit } = useApp5();
   const { stdout } = useStdout2();
   const steeringResolveRef = useRef7(null);
@@ -5650,6 +6122,12 @@ function MarathonApp({
   const [currentModel, setCurrentModel] = useState18(model || "default");
   const [currentSandbox, setCurrentSandbox] = useState18(sandbox);
   const [isTerminalSteering, setIsTerminalSteering] = useState18(false);
+  const [sessionSnapshots, setSessionSnapshots] = useState18(
+    () => (initialSessionSnapshots || []).map((snapshot) => cloneSessionSnapshot(snapshot))
+  );
+  const [selectedSessionKey, setSelectedSessionKey] = useState18(void 0);
+  const [followLatest, setFollowLatest] = useState18(true);
+  const [latestUnreadKey, setLatestUnreadKey] = useState18(void 0);
   const isTerminalSteeringRef = useRef7(false);
   const handleSteeringSubmit = useCallback5(
     (result) => {
@@ -5680,6 +6158,19 @@ function MarathonApp({
     streamRef.current = {
       getCallbacks: () => callbacks,
       getState: () => state,
+      appendSessionSnapshot: (snapshot) => {
+        setSessionSnapshots((prev) => upsertSessionSnapshots(prev, snapshot));
+        const snapshotKey = createSessionTabKey(snapshot.sessionIndex);
+        if (followLatest) {
+          setSelectedSessionKey(snapshotKey);
+          setLatestUnreadKey(void 0);
+        } else {
+          setLatestUnreadKey(snapshotKey);
+        }
+      },
+      hydrateSessionSnapshots: (snapshots) => {
+        setSessionSnapshots(snapshots.map((snapshot) => cloneSessionSnapshot(snapshot)));
+      },
       requestSteering: async (recap, isTerminal) => {
         setSteering();
         setSteeringRecap(recap);
@@ -5687,14 +6178,24 @@ function MarathonApp({
           setIsTerminalSteering(true);
           isTerminalSteeringRef.current = true;
         }
-        return new Promise((resolve) => {
-          steeringResolveRef.current = resolve;
+        return new Promise((resolve2) => {
+          steeringResolveRef.current = resolve2;
         });
       },
       resetForNewSession,
+      showError,
       exit: () => exit()
     };
-  });
+  }, [
+    callbacks,
+    exit,
+    followLatest,
+    setSteering,
+    showError,
+    state,
+    streamRef,
+    resetForNewSession
+  ]);
   const terminalWidth = stdout?.columns ?? 120;
   const terminalRows = stdout?.rows ?? 40;
   const chromeRows = CHROME_ROWS_BASE + (goal ? GOAL_ROW : 0);
@@ -5705,33 +6206,135 @@ function MarathonApp({
   const ctrlCTimeout = useRef7(null);
   const [showEventStream, setShowEventStream] = useState18(false);
   const [scrollOffset, setScrollOffset] = useState18(0);
+  const [reasoningCollapsed, setReasoningCollapsed] = useState18(false);
   const [eventCursor, setEventCursor] = useState18(-1);
   const [detailEvent, setDetailEvent] = useState18(null);
   const [detailScrollOffset, setDetailScrollOffset] = useState18(0);
   const [goalExpanded, setGoalExpanded] = useState18(false);
+  const [upgradeModalDismissed, setUpgradeModalDismissed] = useState18(false);
   const [clipboardFlash, setClipboardFlash] = useState18(null);
   const flashTimeout = useRef7(null);
+  const billingPageUrl = billingUrl || `${(dashboardUrl || "https://use.runtype.com").replace(/\/$/, "")}/settings/billing`;
   function showFlash(msg) {
     setClipboardFlash(msg);
     if (flashTimeout.current) clearTimeout(flashTimeout.current);
     flashTimeout.current = setTimeout(() => setClipboardFlash(null), 2e3);
   }
-  function navigateToEvent(index) {
-    const clamped = Math.max(0, Math.min(state.rawEvents.length - 1, index));
-    const evt = state.rawEvents[clamped];
-    if (evt) {
-      setEventCursor(clamped);
-      setDetailEvent(evt);
+  const latestCompletedSessionIndex = sessionSnapshots[sessionSnapshots.length - 1]?.sessionIndex ?? initialSessionCount;
+  const shouldShowLiveTab = state.phase !== "idle" && state.phase !== "steering" && state.phase !== "complete" && (Boolean(state.content) || Boolean(state.reasoning) || state.tools.length > 0 || state.rawEvents.length > 0 || state.phase === "thinking" || state.phase === "error");
+  const liveSessionSnapshot = useMemo5(
+    () => shouldShowLiveTab ? buildLiveSessionSnapshot(state, latestCompletedSessionIndex + 1, currentModel) : void 0,
+    [currentModel, latestCompletedSessionIndex, shouldShowLiveTab, state]
+  );
+  const liveSessionKey = liveSessionSnapshot ? createSessionTabKey(liveSessionSnapshot.sessionIndex, "live") : void 0;
+  const latestSessionKey = getLatestSessionTabKey(sessionSnapshots, liveSessionSnapshot);
+  const allTabs = useMemo5(
+    () => buildSessionTabs(sessionSnapshots, selectedSessionKey, latestUnreadKey, liveSessionSnapshot),
+    [latestUnreadKey, liveSessionSnapshot, selectedSessionKey, sessionSnapshots]
+  );
+  const visibleTabs = useMemo5(
+    () => getVisibleSessionTabs(allTabs, selectedSessionKey, terminalWidth),
+    [allTabs, selectedSessionKey, terminalWidth]
+  );
+  const displayedSessionSnapshot = useMemo5(() => {
+    if (!selectedSessionKey) return liveSessionSnapshot ?? sessionSnapshots[sessionSnapshots.length - 1];
+    if (selectedSessionKey === liveSessionKey) return liveSessionSnapshot;
+    return sessionSnapshots.find(
+      (snapshot) => createSessionTabKey(snapshot.sessionIndex) === selectedSessionKey
+    );
+  }, [liveSessionKey, liveSessionSnapshot, selectedSessionKey, sessionSnapshots]);
+  const selectedIsLive = displayedSessionSnapshot?.status === "live";
+  const displayedContent = displayedSessionSnapshot?.content ?? state.content;
+  const displayedReasoning = displayedSessionSnapshot?.reasoning ?? state.reasoning;
+  const displayedTools = displayedSessionSnapshot?.tools ?? state.tools;
+  const displayedEvents = displayedSessionSnapshot?.rawEvents ?? state.rawEvents;
+  const latestLiveActivityRef = useRef7(void 0);
+  const upgradePrompt = useMemo5(() => parseMarathonUpgradePrompt(state.error), [state.error]);
+  const upgradePromptKey = useMemo5(
+    () => upgradePrompt ? `${upgradePrompt.message}|${upgradePrompt.code ?? ""}|${upgradePrompt.limitType ?? ""}|${upgradePrompt.retryAfter ?? ""}` : void 0,
+    [upgradePrompt]
+  );
+  const showUpgradeModal = Boolean(upgradePrompt && !upgradeModalDismissed);
+  const canBrowseAfterUpgradeError = Boolean(upgradePrompt && !showUpgradeModal);
+  const selectSessionTab = useCallback5(
+    (nextKey, manual = true) => {
+      if (!nextKey) return;
+      setSelectedSessionKey(nextKey);
+      setDetailEvent(null);
       setDetailScrollOffset(0);
+      setScrollOffset(0);
+      setEventCursor(-1);
+      if (nextKey === latestSessionKey) {
+        setFollowLatest(true);
+        setLatestUnreadKey(void 0);
+      } else if (manual) {
+        setFollowLatest(false);
+      }
+    },
+    [latestSessionKey]
+  );
+  useEffect16(() => {
+    if (!selectedSessionKey && latestSessionKey) {
+      setSelectedSessionKey(latestSessionKey);
     }
-  }
+  }, [latestSessionKey, selectedSessionKey]);
+  useEffect16(() => {
+    if (followLatest && latestSessionKey && selectedSessionKey !== latestSessionKey) {
+      setSelectedSessionKey(latestSessionKey);
+    }
+  }, [followLatest, latestSessionKey, selectedSessionKey]);
+  useEffect16(() => {
+    if (selectedSessionKey && selectedSessionKey === latestSessionKey && latestUnreadKey) {
+      setLatestUnreadKey(void 0);
+    }
+  }, [latestSessionKey, latestUnreadKey, selectedSessionKey]);
+  useEffect16(() => {
+    setUpgradeModalDismissed(false);
+  }, [upgradePromptKey]);
   useEffect16(() => {
-    if (showEventStream && eventCursor === -1 && state.rawEvents.length > 0) {
-      setEventCursor(state.rawEvents.length - 1);
+    const liveActivityKey = liveSessionSnapshot ? `${liveSessionSnapshot.sessionIndex}:${state.phase}:${state.content.length}:${state.reasoning.length}:${state.tools.length}:${state.rawEvents.length}` : void 0;
+    if (!liveActivityKey) {
+      latestLiveActivityRef.current = void 0;
+      return;
     }
-  }, [showEventStream, eventCursor, state.rawEvents.length]);
+    if (latestLiveActivityRef.current && latestLiveActivityRef.current !== liveActivityKey && !followLatest && latestSessionKey) {
+      setLatestUnreadKey(latestSessionKey);
+    }
+    latestLiveActivityRef.current = liveActivityKey;
+  }, [
+    followLatest,
+    latestSessionKey,
+    liveSessionSnapshot,
+    state.content.length,
+    state.phase,
+    state.rawEvents.length,
+    state.reasoning.length,
+    state.tools.length
+  ]);
+  useEffect16(() => {
+    if (showEventStream && displayedEvents.length > 0 && eventCursor === -1) {
+      setEventCursor(displayedEvents.length - 1);
+    }
+  }, [displayedEvents.length, eventCursor, showEventStream]);
+  const navigateToEvent = useCallback5(
+    (index) => {
+      const clamped = Math.max(0, Math.min(displayedEvents.length - 1, index));
+      const evt = displayedEvents[clamped];
+      if (evt) {
+        setEventCursor(clamped);
+        setDetailEvent(evt);
+        setDetailScrollOffset(0);
+      }
+    },
+    [displayedEvents]
+  );
   const agentPageUrl = agentId && dashboardUrl ? `${dashboardUrl.replace(/\/$/, "")}/agents/${agentId}` : null;
   useInput9((_input, key) => {
+    if (_input === "u" && upgradePrompt) {
+      void open3(billingPageUrl);
+      setUpgradeModalDismissed(true);
+      return;
+    }
     if (_input === "o" && agentPageUrl && !(state.phase === "steering" && steeringRecap)) {
       void open3(agentPageUrl);
       return;
@@ -5741,7 +6344,13 @@ function MarathonApp({
         if (ctrlCTimeout.current) {
           clearTimeout(ctrlCTimeout.current);
         }
-        onSaveState(state.content, state.tools);
+        onSaveState({
+          content: state.content,
+          reasoning: state.reasoning,
+          tools: state.tools,
+          rawEvents: state.rawEvents,
+          sessionSnapshots
+        });
         exit();
       } else {
         setCtrlCPressed(true);
@@ -5751,9 +6360,26 @@ function MarathonApp({
       }
       return;
     }
-    if (state.phase === "steering" && steeringRecap) {
-      if (key.upArrow) {
-        setScrollOffset((prev) => prev + SCROLL_STEP2);
+    if (showUpgradeModal) {
+      if (key.escape) {
+        setUpgradeModalDismissed(true);
+        return;
+      }
+      if (key.return) {
+        void open3(billingPageUrl);
+        setUpgradeModalDismissed(true);
+        return;
+      }
+    }
+    if (state.phase === "error" && !canBrowseAfterUpgradeError) {
+      if (key.return || key.escape) {
+        exit();
+      }
+      return;
+    }
+    if (state.phase === "steering" && steeringRecap) {
+      if (key.upArrow) {
+        setScrollOffset((prev) => prev + SCROLL_STEP2);
         return;
       }
       if (key.downArrow) {
@@ -5762,6 +6388,23 @@ function MarathonApp({
       }
       return;
     }
+    if (key.shift && key.leftArrow) {
+      selectSessionTab(getAdjacentSessionTabKey(allTabs, selectedSessionKey, -1));
+      return;
+    }
+    if (key.shift && key.rightArrow) {
+      selectSessionTab(getAdjacentSessionTabKey(allTabs, selectedSessionKey, 1));
+      return;
+    }
+    if (_input === "0") {
+      selectSessionTab(latestSessionKey);
+      return;
+    }
+    const shortcutTabKey = getSessionTabKeyForShortcut(visibleTabs.tabs, _input);
+    if (shortcutTabKey) {
+      selectSessionTab(shortcutTabKey);
+      return;
+    }
     if (key.tab) {
       setShowEventStream((prev) => !prev);
       setScrollOffset(0);
@@ -5782,8 +6425,12 @@ function MarathonApp({
       setGoalExpanded((prev) => !prev);
       return;
     }
+    if (_input === "r" && !showEventStream && !detailEvent && displayedReasoning.trim()) {
+      setReasoningCollapsed((prev) => !prev);
+      return;
+    }
     if (_input === "c" && showEventStream) {
-      const evt = detailEvent ?? state.rawEvents[eventCursor];
+      const evt = detailEvent ?? displayedEvents[eventCursor];
       if (evt) {
         const json = JSON.stringify(evt.data, null, 2);
         const ok = copyToClipboard(json);
@@ -5792,7 +6439,7 @@ function MarathonApp({
       return;
     }
     if (key.return && showEventStream && !detailEvent) {
-      const evt = state.rawEvents[eventCursor];
+      const evt = displayedEvents[eventCursor];
       if (evt) {
         setDetailEvent(evt);
         setDetailScrollOffset(0);
@@ -5818,7 +6465,7 @@ function MarathonApp({
       if (showEventStream && detailEvent) {
         setDetailScrollOffset((prev) => Math.max(0, prev - SCROLL_STEP2));
       } else if (showEventStream) {
-        setEventCursor((prev) => Math.min(state.rawEvents.length - 1, prev + 1));
+        setEventCursor((prev) => Math.min(displayedEvents.length - 1, prev + 1));
       } else {
         setScrollOffset((prev) => Math.max(0, prev - SCROLL_STEP2));
       }
@@ -5839,28 +6486,58 @@ function MarathonApp({
       if (flashTimeout.current) clearTimeout(flashTimeout.current);
     };
   }, []);
-  const sessionCount = initialSessionCount + state.sessionCount;
+  const sessionCount = liveSessionSnapshot?.sessionIndex ?? latestCompletedSessionIndex;
   const totalCost = initialCost + state.totalCost;
-  const hasTools = state.tools.length > 0;
+  const hasTabs = allTabs.length > 0;
+  const hasTools = displayedTools.length > 0;
+  const hasReasoning = Boolean(displayedReasoning.trim());
+  const showThinkingIndicator = selectedIsLive && state.phase === "thinking" && !hasReasoning;
+  const showLoadingAnimation = !displayedContent.trim() && !displayedReasoning.trim() && displayedTools.length === 0 && (state.phase === "idle" || state.phase === "thinking");
   const statusRight = (() => {
     if (ctrlCPressed) return "Press Ctrl+C again to exit";
     if (clipboardFlash) return clipboardFlash;
+    if (showUpgradeModal) return "u: upgrade | Enter: upgrade | Esc: close | Ctrl+C";
+    if (state.phase === "error" && !canBrowseAfterUpgradeError) return "Enter: exit | Ctrl+C";
     if (state.phase === "steering" && steeringRecap) {
       const scrollHint2 = scrollOffset > 0 ? ` | +${scrollOffset}` : "";
       return `\u2191\u2193: scroll | Ctrl+C${scrollHint2}`;
     }
-    if (showEventStream && detailEvent) return "c: copy | \u2190\u2192: prev/next | Esc: back | Tab: chat";
-    if (showEventStream) return "Enter: detail | c: copy | Tab: chat | Ctrl+C";
+    if (showEventStream && detailEvent) {
+      return `Shift+\u2190/\u2192: tabs | c: copy | \u2190\u2192: prev/next | Esc: back |${upgradePrompt ? " u: upgrade |" : ""} Ctrl+C`;
+    }
+    if (showEventStream) {
+      return `Shift+\u2190/\u2192: tabs | 1-9: jump | 0: latest | Enter: detail |${upgradePrompt ? " u: upgrade |" : ""} Ctrl+C`;
+    }
     const scrollHint = scrollOffset > 0 ? ` | +${scrollOffset}` : "";
     const dashboardHint = agentPageUrl ? "o: dashboard | " : "";
-    return `${dashboardHint}Tab: events | Ctrl+C${scrollHint}`;
+    const upgradeHint = upgradePrompt ? " | u: upgrade" : "";
+    return `${dashboardHint}Shift+\u2190/\u2192: tabs | 1-9: jump | 0: latest | Tab: events | Ctrl+C${scrollHint}${upgradeHint}`;
   })();
-  const detailCenter = detailEvent ? `EVENT DETAIL (${eventCursor + 1}/${state.rawEvents.length})` : "EVENT STREAM";
+  const detailCenter = detailEvent ? `EVENT DETAIL (${eventCursor + 1}/${displayedEvents.length})` : "EVENT STREAM";
   const goalText = goal || "";
   const goalExpandedRows = goalExpanded && goalText.length > terminalWidth - 4 ? Math.ceil(goalText.length / (terminalWidth - 4)) - 1 : 0;
-  const adjustedContentHeight = contentHeight - goalExpandedRows;
-  return /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", height: terminalRows, children: [
-    /* @__PURE__ */ jsx22(
+  const adjustedContentHeight = contentHeight - goalExpandedRows - (hasTabs ? SESSION_TABS_ROWS : 0);
+  const reasoningHintRows = hasReasoning ? 1 : 0;
+  const thinkingRows = showThinkingIndicator ? 2 : 0;
+  const reasoningLiveRows = hasReasoning && !reasoningCollapsed && selectedIsLive && state.phase === "thinking" ? 1 : 0;
+  const maxReasoningRows = Math.max(
+    0,
+    adjustedContentHeight - reasoningHintRows - reasoningLiveRows - thinkingRows - 3
+  );
+  const targetReasoningRows = hasReasoning && !reasoningCollapsed ? Math.min(maxReasoningRows, Math.max(3, Math.min(8, Math.floor(adjustedContentHeight * 0.3)))) : 0;
+  const visibleReasoningLines = useMemo5(
+    () => getVisibleReasoningLines(displayedReasoning, targetReasoningRows),
+    [displayedReasoning, targetReasoningRows]
+  );
+  const reasoningBodyRows = reasoningCollapsed ? 0 : visibleReasoningLines.length;
+  const transcriptRows = Math.max(
+    3,
+    adjustedContentHeight - reasoningHintRows - reasoningBodyRows - reasoningLiveRows - thinkingRows
+  );
+  const upgradeModalWidth = Math.max(24, Math.min(terminalWidth - 6, 88));
+  const showUpgradeBrowseHint = canBrowseAfterUpgradeError && selectedIsLive && !displayedContent.trim() && !displayedReasoning.trim() && displayedTools.length === 0 && displayedEvents.length === 0;
+  return /* @__PURE__ */ jsxs23(Box23, { flexDirection: "column", height: terminalRows, children: [
+    /* @__PURE__ */ jsx25(
       SessionHeader,
       {
         sessionName: taskName,
@@ -5871,18 +6548,26 @@ function MarathonApp({
         goalExpanded
       }
     ),
-    state.phase === "steering" && steeringRecap ? /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", height: adjustedContentHeight, children: [
-      /* @__PURE__ */ jsx22(Box20, { flexDirection: "column", flexGrow: 1, overflow: "hidden", children: /* @__PURE__ */ jsx22(
+    hasTabs && /* @__PURE__ */ jsx25(
+      SessionTabs,
+      {
+        tabs: visibleTabs.tabs,
+        hiddenLeft: visibleTabs.hiddenLeft,
+        hiddenRight: visibleTabs.hiddenRight
+      }
+    ),
+    state.phase === "steering" && steeringRecap ? /* @__PURE__ */ jsxs23(Box23, { flexDirection: "column", height: adjustedContentHeight, children: [
+      /* @__PURE__ */ jsx25(Box23, { flexDirection: "column", flexGrow: 1, overflow: "hidden", children: /* @__PURE__ */ jsx25(
         StreamOutput3,
         {
-          content: state.content,
+          content: displayedContent,
           isStreaming: false,
           enableMarkdown: !plainText,
           maxVisibleLines: adjustedContentHeight - STEERING_PROMPT_ROWS,
           scrollOffset
         }
       ) }),
-      /* @__PURE__ */ jsx22(
+      /* @__PURE__ */ jsx25(
         SteeringPrompt,
         {
           onSubmit: handleSteeringSubmit,
@@ -5893,45 +6578,92 @@ function MarathonApp({
           recap: steeringRecap
         }
       )
-    ] }) : showEventStream ? /* @__PURE__ */ jsx22(Box20, { flexDirection: "column", height: adjustedContentHeight, overflow: "hidden", children: /* @__PURE__ */ jsx22(
+    ] }) : showEventStream ? /* @__PURE__ */ jsx25(Box23, { flexDirection: "column", height: adjustedContentHeight, overflow: "hidden", children: /* @__PURE__ */ jsx25(
       EventStreamPanel,
       {
-        events: state.rawEvents,
-        startTime: state.rawEvents[0]?.timestamp ?? null,
+        events: displayedEvents,
+        startTime: displayedEvents[0]?.timestamp ?? null,
         maxVisibleLines: adjustedContentHeight - 1,
         selectedIndex: eventCursor,
         detailEvent,
         detailScrollOffset
       }
-    ) }) : /* @__PURE__ */ jsxs20(Box20, { flexDirection: isStacked ? "column" : "row", height: adjustedContentHeight, overflow: "hidden", children: [
-      /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", flexGrow: 1, flexShrink: 1, children: [
-        state.phase === "thinking" && /* @__PURE__ */ jsx22(ThinkingIndicator, { startedAt: state.thinkingStartedAt }),
-        /* @__PURE__ */ jsx22(
+    ) }) : /* @__PURE__ */ jsxs23(Box23, { flexDirection: isStacked ? "column" : "row", height: adjustedContentHeight, overflow: "hidden", children: [
+      /* @__PURE__ */ jsx25(Box23, { flexDirection: "column", flexGrow: 1, flexShrink: 1, children: showLoadingAnimation ? /* @__PURE__ */ jsx25(
+        Box23,
+        {
+          flexGrow: 1,
+          justifyContent: "center",
+          alignItems: "center",
+          minHeight: adjustedContentHeight,
+          children: /* @__PURE__ */ jsx25(LoadingAnimation, {})
+        }
+      ) : /* @__PURE__ */ jsxs23(Fragment3, { children: [
+        hasReasoning && /* @__PURE__ */ jsx25(Box23, { flexDirection: "column", marginBottom: reasoningCollapsed ? 0 : 1, children: /* @__PURE__ */ jsx25(
+          ReasoningBlock,
+          {
+            lines: visibleReasoningLines,
+            live: selectedIsLive && state.phase === "thinking" && !reasoningCollapsed,
+            collapsed: reasoningCollapsed,
+            showToggleHint: true
+          }
+        ) }),
+        showThinkingIndicator && /* @__PURE__ */ jsx25(ThinkingIndicator, { startedAt: state.thinkingStartedAt }),
+        showUpgradeBrowseHint && /* @__PURE__ */ jsx25(Box23, { marginBottom: 1, children: /* @__PURE__ */ jsx25(
+          ReasoningBlock,
+          {
+            lines: [
+              "Upgrade modal dismissed.",
+              "Use Shift+Left/Right or 1-9 to review previous marathon runs."
+            ],
+            compact: true
+          }
+        ) }),
+        /* @__PURE__ */ jsx25(
           StreamOutput3,
           {
-            content: state.content,
-            isStreaming: state.phase === "streaming",
+            content: displayedContent,
+            isStreaming: selectedIsLive && state.phase === "streaming",
             enableMarkdown: !plainText,
-            maxVisibleLines: adjustedContentHeight - (state.phase === "thinking" ? 2 : 1),
+            maxVisibleLines: transcriptRows,
             scrollOffset
           }
         ),
-        state.error && /* @__PURE__ */ jsx22(ErrorDisplay4, { error: state.error })
-      ] }),
-      hasTools && /* @__PURE__ */ jsx22(
-        Box20,
+        selectedIsLive && state.error && !upgradePrompt && /* @__PURE__ */ jsx25(ErrorDisplay4, { error: state.error })
+      ] }) }),
+      (hasTools || hasReasoning) && /* @__PURE__ */ jsx25(
+        Box23,
         {
           flexDirection: "column",
           width: isStacked ? void 0 : toolPanelWidth,
           flexShrink: 0,
           borderStyle: "single",
-          borderColor: theme21.muted,
+          borderColor: theme23.muted,
           paddingX: 1,
-          children: /* @__PURE__ */ jsx22(ToolPanel, { tools: state.tools, maxHeight: adjustedContentHeight - 2 })
+          children: /* @__PURE__ */ jsx25(
+            ToolPanel,
+            {
+              tools: displayedTools,
+              reasoning: displayedReasoning,
+              maxHeight: adjustedContentHeight - 2
+            }
+          )
         }
       )
     ] }),
-    /* @__PURE__ */ jsx22(
+    showUpgradeModal && upgradePrompt && /* @__PURE__ */ jsx25(
+      Box23,
+      {
+        marginTop: -adjustedContentHeight,
+        marginBottom: -adjustedContentHeight,
+        height: adjustedContentHeight,
+        justifyContent: "center",
+        alignItems: "center",
+        flexShrink: 0,
+        children: /* @__PURE__ */ jsx25(UpgradeModal, { prompt: upgradePrompt, width: upgradeModalWidth })
+      }
+    ),
+    /* @__PURE__ */ jsx25(
       StatusBar2,
       {
         left: `Model: ${currentModel}`,
@@ -5943,24 +6675,285 @@ function MarathonApp({
 }
 
 // src/commands/agents-task.ts
+import { spawnSync } from "child_process";
 import * as fs4 from "fs";
 import * as path5 from "path";
 import {
   RuntypeClient,
+  RuntypeApiError,
   evaluateGeneratedRuntimeToolProposal
 } from "@runtypelabs/sdk";
 function defaultStateDir() {
   return path5.join(process.cwd(), ".runtype", "marathons");
 }
+function stateSafeName(name) {
+  return name.replace(/[^a-zA-Z0-9_-]/g, "_");
+}
 function stateFilePath(name, stateDir) {
   const dir = stateDir || defaultStateDir();
-  const safeName = name.replace(/[^a-zA-Z0-9_-]/g, "_");
-  return path5.join(dir, `${safeName}.json`);
+  return path5.join(dir, `${stateSafeName(name)}.json`);
+}
+function marathonArtifactsDir(taskName, stateDir) {
+  return path5.join(stateDir || defaultStateDir(), stateSafeName(taskName));
+}
+function resolveMarathonCheckpointPath(taskName, targetPath, stateDir) {
+  const normalizedTargetPath = path5.normalize(targetPath);
+  const relativeTargetPath = path5.isAbsolute(normalizedTargetPath) ? path5.relative(process.cwd(), normalizedTargetPath) : normalizedTargetPath;
+  return path5.join(
+    marathonArtifactsDir(taskName, stateDir),
+    "checkpoints",
+    "original",
+    relativeTargetPath
+  );
+}
+function ensureMarathonFileCheckpoint(taskName, targetPath, stateDir) {
+  const normalizedTargetPath = path5.resolve(targetPath);
+  const relativeTargetPath = path5.relative(process.cwd(), normalizedTargetPath);
+  if (!relativeTargetPath || relativeTargetPath.startsWith("..")) return void 0;
+  if (!fs4.existsSync(normalizedTargetPath)) return void 0;
+  if (!fs4.statSync(normalizedTargetPath).isFile()) return void 0;
+  const normalizedRelativeTargetPath = relativeTargetPath.replace(/\\/g, "/");
+  if (normalizedRelativeTargetPath.startsWith(".runtype/")) return void 0;
+  const checkpointPath = resolveMarathonCheckpointPath(taskName, normalizedTargetPath, stateDir);
+  if (fs4.existsSync(checkpointPath)) return checkpointPath;
+  fs4.mkdirSync(path5.dirname(checkpointPath), { recursive: true });
+  fs4.copyFileSync(normalizedTargetPath, checkpointPath);
+  return checkpointPath;
+}
+function restoreMarathonFileCheckpoint(taskName, targetPath, stateDir) {
+  const normalizedTargetPath = path5.resolve(targetPath);
+  const relativeTargetPath = path5.relative(process.cwd(), normalizedTargetPath);
+  if (!relativeTargetPath || relativeTargetPath.startsWith("..")) {
+    return {
+      restored: false,
+      error: `Cannot restore checkpoint outside the current repository: ${normalizedTargetPath}`
+    };
+  }
+  const checkpointPath = resolveMarathonCheckpointPath(taskName, normalizedTargetPath, stateDir);
+  if (!fs4.existsSync(checkpointPath)) {
+    return {
+      restored: false,
+      checkpointPath,
+      error: `No checkpoint found for ${normalizedTargetPath}`
+    };
+  }
+  fs4.mkdirSync(path5.dirname(normalizedTargetPath), { recursive: true });
+  fs4.copyFileSync(checkpointPath, normalizedTargetPath);
+  return { restored: true, checkpointPath };
+}
+var BLOCKED_VERIFICATION_PATTERNS = [
+  /&&/,
+  /\|\|/,
+  /\|/,
+  /;/,
+  />/,
+  /</,
+  /`/,
+  /\$\(/,
+  /\r|\n/,
+  /\brm\b/i,
+  /\bmv\b/i,
+  /\bcp\b/i,
+  /\bsudo\b/i,
+  /\bchmod\b/i,
+  /\bchown\b/i,
+  /\bcurl\b/i,
+  /\bwget\b/i,
+  /\bssh\b/i,
+  /\bscp\b/i,
+  /\brsync\b/i,
+  /\bgit\s+(?:reset|checkout|restore|clean|revert|commit|push)\b/i,
+  /\b(?:npm|pnpm|yarn|bun)\s+(?:add|install|remove|unlink|publish)\b/i
+];
+var ALLOWED_VERIFICATION_COMMANDS = [
+  /^(?:pnpm|npm|yarn|bun)\s+(?:test|lint|build|check|typecheck)\b/i,
+  /^(?:pnpm|npm|yarn|bun)\s+exec\s+(?:tsc|vitest|eslint|prettier|jest)\b/i,
+  /^(?:pnpm|npm|yarn|bun)\s+run\s+(?:test|lint|build|check|typecheck)\b/i,
+  /^(?:vitest|jest|pytest|eslint|ruff|mypy|tsc)\b/i,
+  /^(?:playwright\s+test|prettier\s+--check|cargo\s+(?:test|check)|go\s+test|deno\s+(?:test|check)|git\s+diff\s+--check)\b/i,
+  /^(?:make|just)\s+(?:test|lint|build|check|typecheck)\b/i
+];
+function isSafeVerificationCommand(command) {
+  const trimmed = command.trim();
+  if (!trimmed) return false;
+  if (BLOCKED_VERIFICATION_PATTERNS.some((pattern) => pattern.test(trimmed))) return false;
+  return ALLOWED_VERIFICATION_COMMANDS.some((pattern) => pattern.test(trimmed));
+}
+function normalizeMarathonStatePath(candidatePath) {
+  if (!candidatePath) return void 0;
+  const normalized = candidatePath.trim().replace(/\\/g, "/").replace(/^\.?\//, "").replace(/\/+/g, "/");
+  return normalized || void 0;
+}
+function marathonStatePathExists(candidatePath) {
+  if (!candidatePath) return false;
+  return fs4.existsSync(path5.resolve(candidatePath));
+}
+function isMarathonArtifactStatePath(candidatePath) {
+  if (!candidatePath) return false;
+  const normalized = normalizeMarathonStatePath(candidatePath)?.toLowerCase();
+  return normalized === ".runtype" || normalized?.startsWith(".runtype/") === true;
+}
+function scoreMarathonCandidatePath(candidatePath) {
+  const normalized = candidatePath.toLowerCase();
+  let score = 0;
+  if (normalized.endsWith("/theme.html") || normalized.endsWith("theme.html")) score += 80;
+  if (normalized.includes("agent")) score += 30;
+  if (normalized.includes("editor")) score += 30;
+  if (normalized.includes("theme")) score += 25;
+  if (normalized.endsWith(".html")) score += 20;
+  if (normalized.includes("/src/")) score += 10;
+  if (normalized.includes("/app/")) score += 10;
+  if (normalized.includes("index.html")) score -= 10;
+  return score;
+}
+function dedupeNormalizedPaths(paths, options) {
+  return Array.from(
+    new Set(
+      (paths || []).map((candidatePath) => normalizeMarathonStatePath(candidatePath)).filter((candidatePath) => {
+        if (!candidatePath) return false;
+        if (options?.allowArtifacts) return true;
+        return !isMarathonArtifactStatePath(candidatePath);
+      })
+    )
+  );
+}
+function normalizePersistedWorkflowPhase(state) {
+  if (state.status === "complete") return "complete";
+  if (state.planWritten) return "execution";
+  return state.workflowPhase;
+}
+function mapRunTaskStatusToSnapshotStatus(status, fallback) {
+  if (status === "complete") return "complete";
+  if (status === "error") return "error";
+  if (status === "budget_exceeded") return "budget_exceeded";
+  return fallback;
+}
+function isMarathonResumableStatus(status) {
+  return status === "paused" || status === "max_sessions" || status === "error";
+}
+function isRawStreamEvent(value) {
+  return typeof value === "object" && value !== null && typeof value.timestamp === "number" && typeof value.type === "string" && typeof value.data === "object" && value.data !== null && !Array.isArray(value.data);
+}
+function isMarathonToolEntry(value) {
+  return typeof value === "object" && value !== null && typeof value.id === "string" && typeof value.sequence === "number" && typeof value.sourceToolCallId === "string" && typeof value.name === "string" && typeof value.toolType === "string" && typeof value.status === "string" && typeof value.startedAt === "number";
+}
+function isMarathonSessionSnapshotStatus(value) {
+  return value === "complete" || value === "error" || value === "budget_exceeded" || value === "stopped" || value === "live";
+}
+function cloneSessionSnapshot2(snapshot) {
+  return {
+    ...snapshot,
+    tools: snapshot.tools.map((tool) => ({
+      ...tool,
+      ...tool.parameters ? { parameters: structuredClone(tool.parameters) } : {},
+      ...tool.result !== void 0 ? { result: structuredClone(tool.result) } : {}
+    })),
+    rawEvents: snapshot.rawEvents.map((event) => ({
+      ...event,
+      data: structuredClone(event.data)
+    }))
+  };
+}
+function sanitizeMarathonSessionSnapshots(snapshots) {
+  if (!Array.isArray(snapshots)) return [];
+  const bySessionIndex = /* @__PURE__ */ new Map();
+  for (const snapshot of snapshots) {
+    if (typeof snapshot !== "object" || snapshot === null || typeof snapshot.sessionIndex !== "number" || !isMarathonSessionSnapshotStatus(snapshot.status) || typeof snapshot.cost !== "number" || typeof snapshot.content !== "string" || typeof snapshot.reasoning !== "string" || !Array.isArray(snapshot.tools) || !Array.isArray(snapshot.rawEvents)) {
+      continue;
+    }
+    const tools = snapshot.tools;
+    const rawEvents = snapshot.rawEvents;
+    if (!tools.every(isMarathonToolEntry) || !rawEvents.every(isRawStreamEvent)) continue;
+    const sanitizedSnapshot = {
+      sessionIndex: snapshot.sessionIndex,
+      status: snapshot.status,
+      cost: snapshot.cost,
+      content: snapshot.content,
+      reasoning: snapshot.reasoning,
+      tools: tools.map((tool) => ({
+        ...tool,
+        ...tool.parameters ? { parameters: structuredClone(tool.parameters) } : {},
+        ...tool.result !== void 0 ? { result: structuredClone(tool.result) } : {}
+      })),
+      rawEvents: rawEvents.map((event) => ({
+        ...event,
+        data: structuredClone(event.data)
+      })),
+      ...typeof snapshot.stopReason === "string" ? { stopReason: snapshot.stopReason } : {},
+      ...typeof snapshot.completedAt === "string" ? { completedAt: snapshot.completedAt } : {},
+      ...typeof snapshot.model === "string" ? { model: snapshot.model } : {}
+    };
+    bySessionIndex.set(sanitizedSnapshot.sessionIndex, sanitizedSnapshot);
+  }
+  return Array.from(bySessionIndex.values()).sort((left, right) => left.sessionIndex - right.sessionIndex);
+}
+function upsertMarathonSessionSnapshot(snapshots, nextSnapshot) {
+  const bySessionIndex = /* @__PURE__ */ new Map();
+  for (const snapshot of snapshots) {
+    bySessionIndex.set(snapshot.sessionIndex, cloneSessionSnapshot2(snapshot));
+  }
+  bySessionIndex.set(nextSnapshot.sessionIndex, cloneSessionSnapshot2(nextSnapshot));
+  return Array.from(bySessionIndex.values()).sort((left, right) => left.sessionIndex - right.sessionIndex);
+}
+function mergeMarathonSessionSummaries(existingSessions, nextSessions, offset) {
+  const byIndex = /* @__PURE__ */ new Map();
+  for (const session of existingSessions) {
+    byIndex.set(session.index, { ...session });
+  }
+  for (const session of nextSessions) {
+    const absoluteIndex = offset + session.index;
+    byIndex.set(absoluteIndex, { ...session, index: absoluteIndex });
+  }
+  return Array.from(byIndex.values()).sort((left, right) => left.index - right.index);
+}
+function buildMarathonSessionSnapshot(liveState, sessionSummary, model, status = "complete") {
+  return {
+    sessionIndex: sessionSummary.index,
+    status,
+    stopReason: sessionSummary.stopReason,
+    cost: sessionSummary.cost,
+    completedAt: sessionSummary.completedAt,
+    model,
+    content: liveState.content,
+    reasoning: liveState.reasoning,
+    tools: liveState.tools.map((tool) => ({
+      ...tool,
+      ...tool.parameters ? { parameters: structuredClone(tool.parameters) } : {},
+      ...tool.result !== void 0 ? { result: structuredClone(tool.result) } : {}
+    })),
+    rawEvents: liveState.rawEvents.map((event) => ({
+      ...event,
+      data: structuredClone(event.data)
+    }))
+  };
+}
+function sanitizeLoadedMarathonState(state) {
+  const planPath = normalizeMarathonStatePath(state.planPath) || state.planPath;
+  const candidatePaths = dedupeNormalizedPaths(state.candidatePaths).filter(
+    (candidatePath) => marathonStatePathExists(candidatePath)
+  );
+  const recentReadPaths = dedupeNormalizedPaths(state.recentReadPaths).filter(
+    (candidatePath) => marathonStatePathExists(candidatePath)
+  );
+  const normalizedBestCandidate = normalizeMarathonStatePath(state.bestCandidatePath);
+  const bestCandidatePath = normalizedBestCandidate && !isMarathonArtifactStatePath(normalizedBestCandidate) && marathonStatePathExists(normalizedBestCandidate) ? normalizedBestCandidate : [...candidatePaths, ...recentReadPaths].sort((left, right) => scoreMarathonCandidatePath(right) - scoreMarathonCandidatePath(left))[0];
+  return {
+    ...state,
+    workflowPhase: normalizePersistedWorkflowPhase(state),
+    planPath,
+    bestCandidatePath,
+    bestCandidateReason: bestCandidatePath ? state.bestCandidateReason : void 0,
+    candidatePaths,
+    recentReadPaths,
+    sessionSnapshots: sanitizeMarathonSessionSnapshots(
+      state.sessionSnapshots
+    )
+  };
 }
 function loadState(filePath) {
   try {
     const raw = fs4.readFileSync(filePath, "utf-8");
-    return JSON.parse(raw);
+    return sanitizeLoadedMarathonState(JSON.parse(raw));
   } catch {
     return null;
   }
@@ -5970,6 +6963,26 @@ function saveState(filePath, state) {
   fs4.mkdirSync(dir, { recursive: true });
   fs4.writeFileSync(filePath, JSON.stringify(state, null, 2));
 }
+function extractRunTaskResumeState(state) {
+  if (!state) return void 0;
+  const sanitized = sanitizeLoadedMarathonState(state);
+  return {
+    ...sanitized.originalMessage ? { originalMessage: sanitized.originalMessage } : {},
+    ...sanitized.bootstrapContext ? { bootstrapContext: sanitized.bootstrapContext } : {},
+    ...sanitized.workflowPhase ? { workflowPhase: sanitized.workflowPhase } : {},
+    ...sanitized.planPath ? { planPath: sanitized.planPath } : {},
+    ...sanitized.planWritten ? { planWritten: sanitized.planWritten } : {},
+    ...sanitized.bestCandidatePath ? { bestCandidatePath: sanitized.bestCandidatePath } : {},
+    ...sanitized.bestCandidateReason ? { bestCandidateReason: sanitized.bestCandidateReason } : {},
+    ...sanitized.candidatePaths ? { candidatePaths: sanitized.candidatePaths } : {},
+    ...sanitized.recentReadPaths ? { recentReadPaths: sanitized.recentReadPaths } : {},
+    ...sanitized.recentActionKeys ? { recentActionKeys: sanitized.recentActionKeys } : {},
+    ...sanitized.bestCandidateNeedsVerification ? { bestCandidateNeedsVerification: sanitized.bestCandidateNeedsVerification } : {},
+    ...sanitized.bestCandidateVerified ? { bestCandidateVerified: sanitized.bestCandidateVerified } : {},
+    ...sanitized.verificationRequired !== void 0 ? { verificationRequired: sanitized.verificationRequired } : {},
+    ...sanitized.lastVerificationPassed ? { lastVerificationPassed: sanitized.lastVerificationPassed } : {}
+  };
+}
 function findStateFile(name, stateDir) {
   const newPath = stateFilePath(name, stateDir || path5.join(process.cwd(), ".runtype", "marathons"));
   if (fs4.existsSync(newPath)) return newPath;
@@ -5996,6 +7009,175 @@ function findLatestStateFile(stateDir) {
   }
   return latest ? { name: latest.name, filePath: latest.filePath } : null;
 }
+function readRateLimitHeader(headers, names) {
+  for (const name of names) {
+    const value = headers?.get(name);
+    if (value) return value;
+  }
+  return void 0;
+}
+function extractInlineRateLimitPayload(error) {
+  const match = error.message.match(/^API request failed:\s*429\s+[^-]+-\s*([\s\S]+)$/);
+  if (!match?.[1]) return void 0;
+  try {
+    const parsed = JSON.parse(match[1]);
+    return {
+      message: typeof parsed.message === "string" ? parsed.message : typeof parsed.error === "string" ? parsed.error : error.message,
+      ...typeof parsed.code === "string" ? { code: parsed.code } : {},
+      ...typeof parsed.limitType === "string" ? { limitType: parsed.limitType } : {}
+    };
+  } catch {
+    return { message: match[1].trim() || error.message };
+  }
+}
+function describeMarathonApiError(error) {
+  if (error instanceof RuntypeApiError && error.statusCode === 429) {
+    const apiError = error;
+    const errorData = apiError.data ?? {};
+    const message = typeof errorData.message === "string" ? errorData.message : typeof errorData.error === "string" ? errorData.error : apiError.message;
+    const retryAfter = readRateLimitHeader(apiError.headers, ["Retry-After", "retry-after"]) ?? (typeof errorData.retryAfter === "number" ? String(errorData.retryAfter) : void 0);
+    const limit = readRateLimitHeader(apiError.headers, ["RateLimit-Limit", "X-RateLimit-Limit"]);
+    const remaining = readRateLimitHeader(apiError.headers, ["RateLimit-Remaining", "X-RateLimit-Remaining"]);
+    const reset = readRateLimitHeader(apiError.headers, ["RateLimit-Reset", "X-RateLimit-Reset"]);
+    return [
+      `Task failed: ${message}`,
+      "API returned 429 Too Many Requests.",
+      ...errorData.code ? [`Code: ${errorData.code}`] : [],
+      ...errorData.limitType ? [`Limit type: ${errorData.limitType}`] : [],
+      ...retryAfter ? [`Retry after: ${retryAfter}s`] : [],
+      ...limit ? [`RateLimit-Limit: ${limit}`] : [],
+      ...remaining ? [`RateLimit-Remaining: ${remaining}`] : [],
+      ...reset ? [`RateLimit-Reset: ${reset}`] : []
+    ];
+  }
+  if (error instanceof Error) {
+    const inlineRateLimitPayload = extractInlineRateLimitPayload(error);
+    if (inlineRateLimitPayload) {
+      return [
+        `Task failed: ${inlineRateLimitPayload.message}`,
+        "API returned 429 Too Many Requests.",
+        ...inlineRateLimitPayload.code ? [`Code: ${inlineRateLimitPayload.code}`] : [],
+        ...inlineRateLimitPayload.limitType ? [`Limit type: ${inlineRateLimitPayload.limitType}`] : []
+      ];
+    }
+  }
+  if (!(error instanceof Error)) {
+    return ["Task failed: Unknown error"];
+  }
+  if (!(error instanceof RuntypeApiError) || error.statusCode !== 429) {
+    const message = error instanceof Error ? error.message : "Unknown error";
+    return [`Task failed: ${message}`];
+  }
+  return [`Task failed: ${error.message}`];
+}
+function formatMarathonApiError(error) {
+  return describeMarathonApiError(error).map((line, index) => {
+    if (index === 0) return chalk13.red(line);
+    if (index === 1 && line.includes("429")) return chalk13.yellow(line);
+    return chalk13.gray(line);
+  });
+}
+function canPromptForStateChoice(options) {
+  return process.stdin.isTTY === true && process.stdout.isTTY === true && !options.json;
+}
+function buildStateSummary(taskName, filePath, state) {
+  const lines = [`Task: ${taskName}`, `State file: ${filePath}`];
+  if (!state) {
+    lines.push("Saved state exists but could not be parsed cleanly.");
+    return lines;
+  }
+  lines.push(`Status: ${state.status}`);
+  lines.push(`Sessions: ${state.sessionCount}`);
+  lines.push(`Cost: $${state.totalCost.toFixed(4)}`);
+  if (state.workflowPhase) {
+    lines.push(`Workflow phase: ${state.workflowPhase}`);
+  }
+  if (state.bestCandidatePath) {
+    lines.push(`Best candidate: ${state.bestCandidatePath}`);
+  }
+  return lines;
+}
+async function promptMarathonStateChoice(context) {
+  const title = context.reason === "latest-resume" ? "Found a saved marathon session to resume." : "Found saved local marathon state for this task.";
+  console.log(chalk13.cyan(`
+${title}`));
+  for (const line of buildStateSummary(context.taskName, context.filePath, context.existingState)) {
+    console.log(chalk13.gray(`  ${line}`));
+  }
+  console.log(
+    chalk13.gray(
+      context.reason === "latest-resume" ? "  `--resume` without --name or --session would use this latest state." : "  Starting without --resume would overwrite this saved local state."
+    )
+  );
+  const choices = [
+    {
+      label: "Resume",
+      value: "resume",
+      description: "Continue from the saved marathon state."
+    },
+    {
+      label: "Start fresh",
+      value: "fresh",
+      description: "Ignore the saved state and start a new marathon run."
+    },
+    {
+      label: "Cancel",
+      value: "cancel",
+      description: "Exit without changing anything."
+    }
+  ];
+  console.log();
+  return promptSelect("", choices);
+}
+async function resolveMarathonStateResolution(options, taskName, filePath, promptForChoice = promptMarathonStateChoice) {
+  if (options.resume && options.fresh) {
+    throw new Error("Cannot use --resume and --fresh together.");
+  }
+  const allowPrompt = canPromptForStateChoice(options);
+  if (options.resume) {
+    if (options.session || options.name) {
+      return { action: "resume" };
+    }
+    const latest = findLatestStateFile(options.stateDir);
+    if (!latest) {
+      throw new Error("No state files found to resume. Run without --resume to start a new task.");
+    }
+    if (!allowPrompt) {
+      throw new Error(
+        `--resume without --name or --session is ambiguous in non-interactive mode. Re-run with --session "${latest.name}", --name "${latest.name}", or --fresh.`
+      );
+    }
+    const choice2 = await promptForChoice({
+      reason: "latest-resume",
+      taskName: latest.name,
+      filePath: latest.filePath,
+      existingState: loadState(latest.filePath)
+    });
+    if (choice2 === "cancel") return { action: "cancel" };
+    if (choice2 === "fresh") return { action: "fresh" };
+    return { action: "resume", taskName: latest.name, filePath: latest.filePath };
+  }
+  if (options.fresh) {
+    return { action: "fresh" };
+  }
+  if (!fs4.existsSync(filePath)) {
+    return { action: "fresh" };
+  }
+  if (!allowPrompt) {
+    throw new Error(
+      `Local marathon state already exists at ${filePath}. Use --resume to continue it or --fresh to start over.`
+    );
+  }
+  const choice = await promptForChoice({
+    reason: "existing-state",
+    taskName,
+    filePath,
+    existingState: loadState(filePath)
+  });
+  if (choice === "cancel") return { action: "cancel" };
+  if (choice === "resume") return { action: "resume", taskName, filePath };
+  return { action: "fresh" };
+}
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -6047,6 +7229,185 @@ function parseDaytonaExecutionResult(value) {
     }
   }
 }
+var IGNORED_REPO_DIRS = /* @__PURE__ */ new Set([
+  ".git",
+  ".next",
+  ".runtype",
+  ".turbo",
+  "coverage",
+  "dist",
+  "node_modules"
+]);
+var DEFAULT_DISCOVERY_MAX_RESULTS = 50;
+var MAX_FILE_BYTES_TO_SCAN = 1024 * 1024;
+var LOW_SIGNAL_FILE_NAMES = /* @__PURE__ */ new Set([
+  ".gitignore",
+  "package-lock.json",
+  "pnpm-lock.yaml",
+  "yarn.lock"
+]);
+var LOW_SIGNAL_PATH_SEGMENTS = /* @__PURE__ */ new Set([".changeset", "coverage", "docs", "examples"]);
+var PREFERRED_CODE_PATH_SEGMENTS = [
+  "apps",
+  "packages",
+  "src",
+  "app",
+  "components",
+  "pages",
+  "routes"
+];
+var PREFERRED_EXTENSIONS = /* @__PURE__ */ new Set([".html", ".tsx", ".ts", ".jsx", ".js"]);
+var SEARCH_STOP_WORDS = /* @__PURE__ */ new Set([
+  "a",
+  "analyze",
+  "and",
+  "against",
+  "the",
+  "your",
+  "progress",
+  "through",
+  "go",
+  "with",
+  "when",
+  "make",
+  "sure",
+  "based",
+  "best",
+  "most",
+  "loved",
+  "products",
+  "problem",
+  "research",
+  "first",
+  "generate",
+  "plan",
+  "save",
+  "markdown",
+  "execute",
+  "editing",
+  "files",
+  "exactly",
+  "order",
+  "task",
+  "turn",
+  "update",
+  "goal",
+  "follow",
+  "following",
+  "codebase",
+  "web",
+  "results",
+  "it",
+  "its",
+  "to",
+  "do"
+]);
+function normalizeToolPath(toolPath) {
+  const resolved = path5.resolve(toolPath || ".");
+  return path5.relative(process.cwd(), resolved) || ".";
+}
+function tokenizeSearchQuery(query) {
+  return query.toLowerCase().split(/[^a-z0-9./_-]+/g).map((token) => token.trim()).filter((token) => token.length >= 2 && !SEARCH_STOP_WORDS.has(token));
+}
+function scoreSearchPath(relativePath) {
+  const normalized = relativePath.replace(/\\/g, "/");
+  const segments = normalized.split("/");
+  const fileName = segments[segments.length - 1] || normalized;
+  const extension = path5.extname(fileName).toLowerCase();
+  let score = 0;
+  if (LOW_SIGNAL_FILE_NAMES.has(fileName)) score -= 50;
+  if (segments.some((segment) => LOW_SIGNAL_PATH_SEGMENTS.has(segment))) score -= 15;
+  if (segments.some((segment) => PREFERRED_CODE_PATH_SEGMENTS.includes(segment))) score += 10;
+  if (PREFERRED_EXTENSIONS.has(extension)) score += 8;
+  if (normalized.startsWith("apps/")) score += 10;
+  if (normalized.startsWith("packages/")) score += 6;
+  if (normalized.includes("/src/")) score += 6;
+  if (normalized.includes("/app/")) score += 6;
+  return score;
+}
+function shouldIgnoreRepoEntry(entryPath) {
+  const normalized = normalizeToolPath(entryPath);
+  if (normalized === ".") return false;
+  return normalized.split(path5.sep).some((segment) => IGNORED_REPO_DIRS.has(segment));
+}
+function safeReadTextFile(filePath) {
+  try {
+    const stat = fs4.statSync(filePath);
+    if (!stat.isFile() || stat.size > MAX_FILE_BYTES_TO_SCAN) return null;
+    const buffer = fs4.readFileSync(filePath);
+    if (buffer.includes(0)) return null;
+    return buffer.toString("utf-8");
+  } catch {
+    return null;
+  }
+}
+function walkRepo(startPath, visitor) {
+  if (!fs4.existsSync(startPath) || !fs4.statSync(startPath).isDirectory()) return;
+  const stack = [startPath];
+  while (stack.length > 0) {
+    const currentDir = stack.pop();
+    if (!currentDir) continue;
+    let entries;
+    try {
+      entries = fs4.readdirSync(currentDir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      const entryPath = path5.join(currentDir, entry.name);
+      if (shouldIgnoreRepoEntry(entryPath)) continue;
+      const shouldStop = visitor(entryPath, entry);
+      if (shouldStop === true) return;
+      if (entry.isDirectory()) stack.push(entryPath);
+    }
+  }
+}
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function globPatternToRegExp(pattern) {
+  const normalized = pattern.replace(/\\/g, "/");
+  let regex = "^";
+  for (let i = 0; i < normalized.length; i += 1) {
+    const char = normalized[i];
+    const next = normalized[i + 1];
+    if (char === "*") {
+      if (next === "*") {
+        regex += ".*";
+        i += 1;
+      } else {
+        regex += "[^/]*";
+      }
+      continue;
+    }
+    if (char === "?") {
+      regex += "[^/]";
+      continue;
+    }
+    regex += escapeRegExp(char);
+  }
+  return new RegExp(`${regex}$`, "i");
+}
+function buildTree(dirPath, maxDepth, depth = 0) {
+  if (depth > maxDepth || shouldIgnoreRepoEntry(dirPath)) return [];
+  let entries;
+  try {
+    entries = fs4.readdirSync(dirPath, { withFileTypes: true });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return [`${"  ".repeat(depth)}[error reading ${normalizeToolPath(dirPath)}: ${message}]`];
+  }
+  const lines = [];
+  for (const entry of entries.sort((a, b) => a.name.localeCompare(b.name))) {
+    const entryPath = path5.join(dirPath, entry.name);
+    if (shouldIgnoreRepoEntry(entryPath)) continue;
+    lines.push(`${"  ".repeat(depth)}- ${entry.name}${entry.isDirectory() ? "/" : ""}`);
+    if (entry.isDirectory() && depth < maxDepth) {
+      lines.push(...buildTree(entryPath, maxDepth, depth + 1));
+    }
+  }
+  return lines;
+}
 function createSandboxInstructions(provider) {
   if (provider === "cloudflare-worker") {
     return [
@@ -6199,7 +7560,7 @@ function createSandboxLocalTool(client, provider, debugMode) {
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         if (debugMode) {
-          console.log(chalk12.gray(`  [sandbox:${provider}] execution error: ${message}`));
+          console.log(chalk13.gray(`  [sandbox:${provider}] execution error: ${message}`));
         }
         return {
           success: false,
@@ -6262,12 +7623,268 @@ var defaultLocalTools = {
       const dirPath = String(args.path || ".");
       return fs4.readdirSync(dirPath).join("\n");
     }
+  },
+  search_repo: {
+    description: "Search the repository recursively for matching file paths and file contents before deciding what to edit",
+    parametersSchema: {
+      type: "object",
+      properties: {
+        query: {
+          type: "string",
+          description: "Text to search for in file paths and file contents"
+        },
+        path: {
+          type: "string",
+          description: 'Directory to search from (defaults to ".")'
+        },
+        maxResults: {
+          type: "number",
+          description: "Maximum number of matches to return (default 20, max 100)"
+        }
+      },
+      required: ["query"]
+    },
+    execute: async (args) => {
+      const query = String(args.query || "").trim();
+      if (!query) return "Error: query is required";
+      const startPath = path5.resolve(String(args.path || "."));
+      if (!fs4.existsSync(startPath)) return `Error: path does not exist: ${startPath}`;
+      const maxResults = Math.max(
+        1,
+        Math.min(100, Number.isFinite(Number(args.maxResults)) ? Math.floor(Number(args.maxResults)) : 20)
+      );
+      const needle = query.toLowerCase();
+      const tokens = tokenizeSearchQuery(query);
+      const candidates = [];
+      walkRepo(startPath, (entryPath, dirent) => {
+        const relativePath = normalizeToolPath(entryPath);
+        const normalizedPath = relativePath.toLowerCase();
+        const pathScoreBase = scoreSearchPath(relativePath);
+        const pathTokenMatches = tokens.filter((token) => normalizedPath.includes(token)).length;
+        if (normalizedPath.includes(needle) || tokens.length > 0 && pathTokenMatches >= Math.min(tokens.length, tokens.length > 2 ? 2 : tokens.length)) {
+          const score = pathScoreBase + (normalizedPath.includes(needle) ? 80 : 0) + pathTokenMatches * 18;
+          candidates.push({ score, text: `[path] ${relativePath}` });
+        }
+        if (!dirent.isFile()) return;
+        const contents = safeReadTextFile(entryPath);
+        if (!contents) return;
+        const lines = contents.split("\n");
+        for (let i = 0; i < lines.length; i += 1) {
+          const line = lines[i];
+          const normalizedLine = line?.toLowerCase() || "";
+          const lineTokenMatches = tokens.filter((token) => normalizedLine.includes(token)).length;
+          const exactPhraseMatch = normalizedLine.includes(needle);
+          const hasUsefulMatch = exactPhraseMatch || tokens.length > 0 && lineTokenMatches >= Math.min(tokens.length, tokens.length > 2 ? 2 : tokens.length);
+          if (!hasUsefulMatch) continue;
+          const score = pathScoreBase + (exactPhraseMatch ? 70 : 0) + lineTokenMatches * 16 - i * 0.01;
+          candidates.push({
+            score,
+            text: `[content] ${relativePath}:${i + 1}: ${line}`
+          });
+        }
+      });
+      const matches = candidates.sort((a, b) => b.score - a.score || a.text.localeCompare(b.text)).map((candidate) => candidate.text).filter((text, index, array) => array.indexOf(text) === index).slice(0, maxResults);
+      return matches.length > 0 ? matches.join("\n") : `No matches found for "${query}" under ${normalizeToolPath(startPath)}`;
+    }
+  },
+  glob_files: {
+    description: 'Find repository files by path or filename pattern, e.g. "**/theme.html" or "**/*agent*"',
+    parametersSchema: {
+      type: "object",
+      properties: {
+        pattern: {
+          type: "string",
+          description: "Glob-like pattern using * and ** wildcards"
+        },
+        path: {
+          type: "string",
+          description: 'Directory to search from (defaults to ".")'
+        },
+        maxResults: {
+          type: "number",
+          description: "Maximum number of matching paths to return (default 50, max 200)"
+        }
+      },
+      required: ["pattern"]
+    },
+    execute: async (args) => {
+      const pattern = String(args.pattern || "").trim();
+      if (!pattern) return "Error: pattern is required";
+      const startPath = path5.resolve(String(args.path || "."));
+      if (!fs4.existsSync(startPath)) return `Error: path does not exist: ${startPath}`;
+      const maxResults = Math.max(
+        1,
+        Math.min(
+          200,
+          Number.isFinite(Number(args.maxResults)) ? Math.floor(Number(args.maxResults)) : DEFAULT_DISCOVERY_MAX_RESULTS
+        )
+      );
+      const matcher = globPatternToRegExp(pattern);
+      const matches = [];
+      walkRepo(startPath, (entryPath) => {
+        const relativePath = normalizeToolPath(entryPath).replace(/\\/g, "/");
+        if (matcher.test(relativePath)) {
+          matches.push({
+            score: scoreSearchPath(relativePath),
+            path: relativePath
+          });
+        }
+      });
+      const rankedMatches = matches.sort((a, b) => b.score - a.score || a.path.localeCompare(b.path)).map((match) => match.path).slice(0, maxResults);
+      return rankedMatches.length > 0 ? rankedMatches.join("\n") : `No files matched "${pattern}" under ${normalizeToolPath(startPath)}`;
+    }
+  },
+  tree_directory: {
+    description: "Show a recursive tree of files and folders so you can understand repository structure before editing",
+    parametersSchema: {
+      type: "object",
+      properties: {
+        path: {
+          type: "string",
+          description: 'Directory path (defaults to ".")'
+        },
+        maxDepth: {
+          type: "number",
+          description: "Maximum recursion depth (default 2, max 6)"
+        }
+      }
+    },
+    execute: async (args) => {
+      const dirPath = path5.resolve(String(args.path || "."));
+      if (!fs4.existsSync(dirPath)) return `Error: path does not exist: ${dirPath}`;
+      if (!fs4.statSync(dirPath).isDirectory()) return `Error: path is not a directory: ${dirPath}`;
+      const maxDepth = Math.max(
+        0,
+        Math.min(6, Number.isFinite(Number(args.maxDepth)) ? Math.floor(Number(args.maxDepth)) : 2)
+      );
+      const lines = [`${normalizeToolPath(dirPath)}/`, ...buildTree(dirPath, maxDepth)];
+      return lines.join("\n");
+    }
   }
 };
-function buildLocalTools(client, sandboxProvider, options) {
+function createCheckpointedWriteFileTool(taskName, stateDir) {
+  return {
+    description: "Write content to a file, creating directories as needed and checkpointing original repo files",
+    parametersSchema: {
+      type: "object",
+      properties: {
+        path: { type: "string", description: "File path to write" },
+        content: { type: "string", description: "Content to write" }
+      },
+      required: ["path", "content"]
+    },
+    execute: async (args) => {
+      const toolFilePath = String(args.path || "");
+      if (!toolFilePath) return "Error: path is required";
+      const content = String(args.content || "");
+      ensureMarathonFileCheckpoint(taskName, toolFilePath, stateDir);
+      const dir = path5.dirname(toolFilePath);
+      fs4.mkdirSync(dir, { recursive: true });
+      fs4.writeFileSync(toolFilePath, content);
+      return "ok";
+    }
+  };
+}
+function createRestoreFileCheckpointTool(taskName, stateDir) {
+  return {
+    description: "Restore the original checkpointed contents for a previously edited repo file if a change regresses behavior",
+    parametersSchema: {
+      type: "object",
+      properties: {
+        path: { type: "string", description: "File path to restore from its original checkpoint" }
+      },
+      required: ["path"]
+    },
+    execute: async (args) => {
+      const toolFilePath = String(args.path || "");
+      if (!toolFilePath) return "Error: path is required";
+      const result = restoreMarathonFileCheckpoint(taskName, toolFilePath, stateDir);
+      if (!result.restored) {
+        return result.error || `No checkpoint found for ${toolFilePath}`;
+      }
+      return "ok";
+    }
+  };
+}
+function createRunCheckTool() {
+  return {
+    description: "Run a safe verification command such as lint, test, or typecheck to validate recent edits before completion",
+    parametersSchema: {
+      type: "object",
+      properties: {
+        command: {
+          type: "string",
+          description: 'Verification command to run, for example "pnpm lint" or "pnpm exec tsc --noEmit"'
+        },
+        timeoutMs: {
+          type: "number",
+          description: "Optional timeout in milliseconds (default 120000, max 600000)"
+        }
+      },
+      required: ["command"]
+    },
+    execute: async (args) => {
+      const command = String(args.command || "").trim();
+      if (!command) {
+        return JSON.stringify({
+          success: false,
+          command,
+          error: "command is required"
+        });
+      }
+      if (!isSafeVerificationCommand(command)) {
+        return JSON.stringify({
+          success: false,
+          command,
+          error: "Blocked unsafe verification command. Use a single non-destructive lint/test/typecheck/build command."
+        });
+      }
+      const timeoutMs = Math.max(
+        1e3,
+        Math.min(
+          6e5,
+          Number.isFinite(Number(args.timeoutMs)) ? Math.floor(Number(args.timeoutMs)) : 12e4
+        )
+      );
+      try {
+        const result = spawnSync(command, {
+          cwd: process.cwd(),
+          encoding: "utf-8",
+          shell: true,
+          timeout: timeoutMs,
+          maxBuffer: 1024 * 1024 * 4
+        });
+        const output = `${result.stdout || ""}${result.stderr || ""}`.trim().slice(0, 12e3);
+        return JSON.stringify({
+          success: result.status === 0 && !result.error,
+          command,
+          exitCode: result.status,
+          timedOut: result.signal === "SIGTERM",
+          output,
+          ...result.error ? { error: result.error.message } : {}
+        });
+      } catch (error) {
+        return JSON.stringify({
+          success: false,
+          command,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+    }
+  };
+}
+function buildLocalTools(client, sandboxProvider, options, context) {
   const enabledTools = {};
   if (!options.noLocalTools) {
     Object.assign(enabledTools, defaultLocalTools);
+    if (context) {
+      enabledTools.write_file = createCheckpointedWriteFileTool(context.taskName, context.stateDir);
+      enabledTools.restore_file_checkpoint = createRestoreFileCheckpointTool(
+        context.taskName,
+        context.stateDir
+      );
+      enabledTools.run_check = createRunCheckTool();
+    }
   }
   if (sandboxProvider) {
     enabledTools.run_sandbox_code = createSandboxLocalTool(client, sandboxProvider, options.debug);
@@ -6276,8 +7893,8 @@ function buildLocalTools(client, sandboxProvider, options) {
 }
 async function taskAction(agent, options) {
   if (!options.resume && !options.goal) {
-    console.error(chalk12.red("Error: -g, --goal <text> is required for new tasks"));
-    console.log(chalk12.gray("  Use --resume to continue an existing task without a new goal"));
+    console.error(chalk13.red("Error: -g, --goal <text> is required for new tasks"));
+    console.log(chalk13.gray("  Use --resume to continue an existing task without a new goal"));
     process.exit(1);
   }
   const apiKey = await ensureAuth();
@@ -6288,12 +7905,12 @@ async function taskAction(agent, options) {
   });
   let parsedSandbox = parseSandboxProvider(options.sandbox);
   if (options.sandbox && !parsedSandbox) {
-    console.error(chalk12.red(`Invalid --sandbox value "${options.sandbox}". Use: cloudflare-worker, quickjs, or daytona`));
+    console.error(chalk13.red(`Invalid --sandbox value "${options.sandbox}". Use: cloudflare-worker, quickjs, or daytona`));
     process.exit(1);
   }
   let agentId = agent;
   if (!agent.startsWith("agent_")) {
-    console.log(chalk12.gray("Looking up agent by name..."));
+    console.log(chalk13.gray("Looking up agent by name..."));
     try {
       const list = await client.agents.list();
       const found = list.data.find(
@@ -6301,24 +7918,24 @@ async function taskAction(agent, options) {
       );
       if (found) {
         agentId = found.id;
-        console.log(chalk12.green(`Found agent: ${agentId}`));
+        console.log(chalk13.green(`Found agent: ${agentId}`));
       } else {
-        console.log(chalk12.gray(`Creating agent "${agent}"...`));
+        console.log(chalk13.gray(`Creating agent "${agent}"...`));
         try {
           const created = await client.agents.create({ name: agent });
           agentId = created.id;
-          console.log(chalk12.green(`Created agent: ${agentId}`));
+          console.log(chalk13.green(`Created agent: ${agentId}`));
         } catch (createErr) {
-          console.error(chalk12.red(`Failed to create agent "${agent}"`));
+          console.error(chalk13.red(`Failed to create agent "${agent}"`));
           const errMsg = createErr instanceof Error ? createErr.message : String(createErr);
-          console.error(chalk12.red(errMsg));
+          console.error(chalk13.red(errMsg));
           process.exit(1);
         }
       }
     } catch (error) {
-      console.error(chalk12.red("Failed to list agents"));
+      console.error(chalk13.red("Failed to list agents"));
       const errMsg = error instanceof Error ? error.message : String(error);
-      console.error(chalk12.red(errMsg));
+      console.error(chalk13.red(errMsg));
       process.exit(1);
     }
   }
@@ -6326,6 +7943,30 @@ async function taskAction(agent, options) {
   let filePath = stateFilePath(taskName, options.stateDir);
   const maxSessions = parseInt(options.maxSessions, 10);
   const maxCost = options.maxCost ? parseFloat(options.maxCost) : void 0;
+  let resumeRequested = Boolean(options.resume);
+  let forcedResumeTaskName;
+  let forcedResumeFilePath;
+  try {
+    const stateResolution = await resolveMarathonStateResolution(options, taskName, filePath);
+    if (stateResolution.action === "cancel") {
+      console.log(chalk13.gray("Marathon start cancelled."));
+      return;
+    }
+    if (stateResolution.action === "resume") {
+      resumeRequested = true;
+      forcedResumeTaskName = stateResolution.taskName;
+      forcedResumeFilePath = stateResolution.filePath;
+    } else {
+      resumeRequested = false;
+      if (options.fresh && fs4.existsSync(filePath)) {
+        console.log(chalk13.gray(`Starting fresh and ignoring saved local state at ${filePath}`));
+      }
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error(chalk13.red(message));
+    process.exit(1);
+  }
   let priorSessionCount = 0;
   let priorCost = 0;
   let previousMessages = [];
@@ -6335,10 +7976,16 @@ async function taskAction(agent, options) {
   let priorContinuations = [];
   let priorCostByModel = {};
   let priorOriginalMessage;
-  if (options.resume) {
+  let persistedSessionSummaries = [];
+  let persistedSessionSnapshots = [];
+  let resumeState;
+  if (resumeRequested) {
     let resolvedFilePath;
     let resolvedTaskName;
-    if (options.session) {
+    if (forcedResumeFilePath && forcedResumeTaskName) {
+      resolvedTaskName = forcedResumeTaskName;
+      resolvedFilePath = forcedResumeFilePath;
+    } else if (options.session) {
       resolvedTaskName = options.session;
       resolvedFilePath = findStateFile(options.session, options.stateDir);
     } else if (options.name) {
@@ -6347,24 +7994,26 @@ async function taskAction(agent, options) {
     } else {
       const latest = findLatestStateFile(options.stateDir);
       if (!latest) {
-        console.error(chalk12.red("No state files found to resume"));
-        console.log(chalk12.gray("  Run without --resume to start a new task."));
+        console.error(chalk13.red("No state files found to resume"));
+        console.log(chalk13.gray("  Run without --resume to start a new task."));
         process.exit(1);
       }
       resolvedTaskName = latest.name;
       resolvedFilePath = latest.filePath;
-      console.log(chalk12.gray(`  Auto-selected session: ${resolvedTaskName}`));
+      console.log(chalk13.gray(`  Auto-selected session: ${resolvedTaskName}`));
     }
     const existing = loadState(resolvedFilePath);
     if (!existing) {
-      console.error(chalk12.red(`No state file found at ${resolvedFilePath}`));
-      console.log(chalk12.gray("  Run without --resume to start a new task."));
+      console.error(chalk13.red(`No state file found at ${resolvedFilePath}`));
+      console.log(chalk13.gray("  Run without --resume to start a new task."));
       process.exit(1);
     }
     priorSessionCount = existing.sessionCount;
     priorCost = existing.totalCost;
     priorCostByModel = existing.costByModel ?? {};
     priorOriginalMessage = existing.originalMessage;
+    persistedSessionSummaries = existing.sessions ?? [];
+    persistedSessionSnapshots = existing.sessionSnapshots ?? [];
     const resumeMessage = typeof options.resume === "string" ? options.resume : options.goal;
     const continuation = {
       continuedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -6385,27 +8034,33 @@ async function taskAction(agent, options) {
     continuationMessage = resumeMessage;
     useCompact = options.compact ?? false;
     continuationIndex = continuations.length - 1;
+    resumeState = extractRunTaskResumeState(existing);
     filePath = resolvedFilePath;
     taskName = resolvedTaskName;
     console.log(
-      chalk12.cyan(
+      chalk13.cyan(
         `Resuming "${resolvedTaskName}" from session ${priorSessionCount} (${existing.status}) \u2014 $${priorCost.toFixed(4)} spent`
       )
     );
   }
   const remainingSessions = maxSessions - priorSessionCount;
   const remainingCost = maxCost ? maxCost - priorCost : void 0;
-  const baseMessage = options.goal || (options.resume ? "Continue the task." : "");
+  const baseMessage = options.goal || (resumeRequested ? "Continue the task." : "");
   const sandboxPrompt = parsedSandbox ? createSandboxInstructions(parsedSandbox) : "";
-  let localTools = buildLocalTools(client, parsedSandbox, options);
+  let localTools = buildLocalTools(client, parsedSandbox, options, {
+    taskName,
+    stateDir: options.stateDir
+  });
   let toolsEnabled = true;
   let taskMessage = sandboxPrompt ? `${baseMessage}
 
 ${sandboxPrompt}` : baseMessage;
   const streamRef = { current: null };
+  let waitForUiExit;
   let lastKnownState = null;
   const exitAltScreen = enterAltScreen();
   try {
+    const marathonDashboardBaseUrl = getDashboardUrl().replace(/\/$/, "");
     const { waitUntilExit } = render10(
       React12.createElement(MarathonApp, {
         taskName,
@@ -6415,24 +8070,28 @@ ${sandboxPrompt}` : baseMessage;
         goal: baseMessage,
         initialSessionCount: priorSessionCount,
         initialCost: priorCost,
+        initialSessionSnapshots: persistedSessionSnapshots,
         debug: options.debug,
         plainText: options.plainText ?? false,
         noSteer: options.noSteer ?? false,
         steeringTimeout: parseInt(options.steerTimeout || "10", 10),
-        dashboardUrl: getDashboardUrl(),
-        onSaveState: (content, _tools) => {
+        dashboardUrl: marathonDashboardBaseUrl,
+        billingUrl: `${marathonDashboardBaseUrl}/settings/billing`,
+        onSaveState: (payload) => {
           const partialState = {
+            ...lastKnownState ?? {},
             agentId,
             agentName: agentId,
             taskName,
             status: "paused",
-            sessionCount: priorSessionCount,
-            totalCost: priorCost,
-            lastOutput: content || "",
-            lastStopReason: "paused",
-            sessions: [],
-            startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+            sessionCount: lastKnownState?.sessionCount ?? priorSessionCount,
+            totalCost: lastKnownState?.totalCost ?? priorCost,
+            lastOutput: payload.content || "",
+            lastStopReason: "end_turn",
+            sessions: persistedSessionSummaries,
+            startedAt: lastKnownState?.startedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
             updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+            ...persistedSessionSnapshots.length > 0 || payload.sessionSnapshots.length > 0 ? { sessionSnapshots: payload.sessionSnapshots.length > 0 ? payload.sessionSnapshots : persistedSessionSnapshots } : {},
             ...priorContinuations.length > 0 ? { continuations: priorContinuations } : {},
             ...Object.keys(priorCostByModel).length > 0 ? { costByModel: priorCostByModel } : {},
             ...priorOriginalMessage ? { originalMessage: priorOriginalMessage } : {}
@@ -6447,13 +8106,17 @@ Saving state... done. Session saved to ${filePath}`);
       }),
       { exitOnCtrlC: false }
     );
-    await new Promise((resolve) => setTimeout(resolve, 0));
+    waitForUiExit = waitUntilExit;
+    await new Promise((resolve2) => setTimeout(resolve2, 0));
     const streamActions = streamRef.current;
     if (!streamActions) {
       exitAltScreen();
-      console.error(chalk12.red("Failed to initialize marathon UI"));
+      console.error(chalk13.red("Failed to initialize marathon UI"));
       process.exit(1);
     }
+    if (persistedSessionSnapshots.length > 0) {
+      streamActions.hydrateSessionSnapshots(persistedSessionSnapshots);
+    }
     let shouldContinue = true;
     let accumulatedSessions = 0;
     let accumulatedCost = 0;
@@ -6462,8 +8125,9 @@ Saving state... done. Session saved to ${filePath}`);
     while (shouldContinue) {
       shouldContinue = false;
       const currentStreamCallbacks = streamActions.getCallbacks();
+      const currentSessionOffset = priorSessionCount + accumulatedSessions;
       const currentRemainingCost = remainingCost ? remainingCost - accumulatedCost : void 0;
-      const result2 = await client.agents.runTask(agentId, {
+      const runTaskOptions = {
         message: taskMessage,
         maxSessions: remainingSessions - accumulatedSessions,
         maxCost: currentRemainingCost,
@@ -6479,18 +8143,47 @@ Saving state... done. Session saved to ${filePath}`);
           continuationMessage,
           compact: useCompact
         } : {},
+        ...resumeState ? { resumeState } : {},
         onSession: async (state) => {
+          const currentActions = streamRef.current;
+          persistedSessionSummaries = mergeMarathonSessionSummaries(
+            persistedSessionSummaries,
+            state.sessions,
+            currentSessionOffset
+          );
+          const latestSessionSummary2 = persistedSessionSummaries[persistedSessionSummaries.length - 1];
+          if (currentActions && latestSessionSummary2) {
+            const liveState = currentActions.getState();
+            const sessionSnapshot = buildMarathonSessionSnapshot(
+              {
+                content: liveState.content,
+                reasoning: liveState.reasoning,
+                tools: liveState.tools,
+                rawEvents: liveState.rawEvents,
+                sessionSnapshots: []
+              },
+              latestSessionSummary2,
+              options.model
+            );
+            persistedSessionSnapshots = upsertMarathonSessionSnapshot(
+              persistedSessionSnapshots,
+              sessionSnapshot
+            );
+            currentActions.appendSessionSnapshot(sessionSnapshot);
+          }
           const adjustedState = {
             ...state,
-            sessionCount: priorSessionCount + accumulatedSessions + state.sessionCount,
-            totalCost: priorCost + accumulatedCost + state.totalCost
+            sessionCount: currentSessionOffset + state.sessionCount,
+            totalCost: priorCost + accumulatedCost + state.totalCost,
+            sessions: persistedSessionSummaries,
+            ...persistedSessionSnapshots.length > 0 ? { sessionSnapshots: persistedSessionSnapshots } : {}
           };
           lastKnownState = adjustedState;
+          resumeState = extractRunTaskResumeState(adjustedState);
           lastSessionMessages = state.messages ?? [];
           saveState(filePath, adjustedState);
           if (options.noSteer) return;
           if (state.status !== "running") return;
-          const currentActions = streamRef.current;
           if (!currentActions) return;
           const recap = {
             sessionNumber: adjustedState.sessionCount,
@@ -6498,7 +8191,7 @@ Saving state... done. Session saved to ${filePath}`);
             tokensInput: 0,
             tokensOutput: 0,
             cost: state.totalCost,
-            outputPreview: currentActions.getState().content.slice(0, 100)
+            outputPreview: adjustedState.lastOutput.slice(0, 100)
           };
           const steeringResult = await currentActions.requestSteering(recap);
           switch (steeringResult.action) {
@@ -6522,18 +8215,27 @@ Saving state... done. Session saved to ${filePath}`);
               if (!toolsEnabled) {
                 localTools = void 0;
               } else {
-                localTools = buildLocalTools(client, parsedSandbox, options);
+                localTools = buildLocalTools(client, parsedSandbox, options, {
+                  taskName,
+                  stateDir: options.stateDir
+                });
               }
               break;
             case "sandbox":
               if (steeringResult.sandbox === false) {
                 parsedSandbox = void 0;
-                localTools = buildLocalTools(client, void 0, options);
+                localTools = buildLocalTools(client, void 0, options, {
+                  taskName,
+                  stateDir: options.stateDir
+                });
               } else if (steeringResult.sandbox) {
                 const newSandbox = parseSandboxProvider(steeringResult.sandbox);
                 if (newSandbox) {
                   parsedSandbox = newSandbox;
-                  localTools = buildLocalTools(client, parsedSandbox, options);
+                  localTools = buildLocalTools(client, parsedSandbox, options, {
+                    taskName,
+                    stateDir: options.stateDir
+                  });
                 }
               }
               break;
@@ -6542,7 +8244,29 @@ Saving state... done. Session saved to ${filePath}`);
               break;
           }
         }
-      });
+      };
+      const result2 = await client.agents.runTask(agentId, runTaskOptions);
+      persistedSessionSummaries = mergeMarathonSessionSummaries(
+        persistedSessionSummaries,
+        result2.sessions,
+        currentSessionOffset
+      );
+      const latestSessionSummary = persistedSessionSummaries[persistedSessionSummaries.length - 1];
+      if (latestSessionSummary) {
+        const existingSnapshot = persistedSessionSnapshots.find(
+          (snapshot) => snapshot.sessionIndex === latestSessionSummary.index
+        );
+        if (existingSnapshot) {
+          persistedSessionSnapshots = upsertMarathonSessionSnapshot(persistedSessionSnapshots, {
+            ...existingSnapshot,
+            status: mapRunTaskStatusToSnapshotStatus(result2.status, existingSnapshot.status),
+            stopReason: latestSessionSummary.stopReason,
+            cost: latestSessionSummary.cost,
+            completedAt: latestSessionSummary.completedAt,
+            model: options.model
+          });
+        }
+      }
       accumulatedSessions += result2.sessionCount;
       accumulatedCost += result2.totalCost;
       lastResult = result2;
@@ -6550,6 +8274,7 @@ Saving state... done. Session saved to ${filePath}`);
         previousMessages = lastSessionMessages;
         continuationMessage = taskMessage;
         useCompact = false;
+        resumeState = extractRunTaskResumeState(lastKnownState);
       }
       if (result2.status === "complete" || result2.status === "budget_exceeded") {
         if (options.noSteer) break;
@@ -6557,13 +8282,15 @@ Saving state... done. Session saved to ${filePath}`);
         if (!currentActions) break;
         let exitTerminal = false;
         while (!exitTerminal) {
+          const knownState2 = lastKnownState;
+          const terminalPreview = knownState2?.lastOutput ?? currentActions.getState().content;
           const recap = {
             sessionNumber: priorSessionCount + accumulatedSessions,
             toolCallsMade: currentActions.getState().tools.length,
             tokensInput: 0,
             tokensOutput: 0,
             cost: accumulatedCost,
-            outputPreview: currentActions.getState().content.slice(0, 100)
+            outputPreview: terminalPreview.slice(0, 100)
           };
           const steeringResult = await currentActions.requestSteering(recap, true);
           switch (steeringResult.action) {
@@ -6573,17 +8300,26 @@ Saving state... done. Session saved to ${filePath}`);
             // re-show steering prompt
             case "tools":
               toolsEnabled = !toolsEnabled;
-              localTools = toolsEnabled ? buildLocalTools(client, parsedSandbox, options) : void 0;
+              localTools = toolsEnabled ? buildLocalTools(client, parsedSandbox, options, {
+                taskName,
+                stateDir: options.stateDir
+              }) : void 0;
               break;
             case "sandbox":
               if (steeringResult.sandbox === false) {
                 parsedSandbox = void 0;
-                localTools = buildLocalTools(client, void 0, options);
+                localTools = buildLocalTools(client, void 0, options, {
+                  taskName,
+                  stateDir: options.stateDir
+                });
               } else if (steeringResult.sandbox) {
                 const newSandbox = parseSandboxProvider(steeringResult.sandbox);
                 if (newSandbox) {
                   parsedSandbox = newSandbox;
-                  localTools = buildLocalTools(client, parsedSandbox, options);
+                  localTools = buildLocalTools(client, parsedSandbox, options, {
+                    taskName,
+                    stateDir: options.stateDir
+                  });
                 }
               }
               break;
@@ -6594,6 +8330,7 @@ Saving state... done. Session saved to ${filePath}`);
                 previousMessages = lastSessionMessages;
                 continuationMessage = taskMessage;
                 useCompact = false;
+                resumeState = extractRunTaskResumeState(lastKnownState);
                 shouldContinue = true;
               }
               exitTerminal = true;
@@ -6611,7 +8348,9 @@ Saving state... done. Session saved to ${filePath}`);
       }
     }
     const result = lastResult;
+    const knownState = lastKnownState;
     const finalState = {
+      ...knownState ?? {},
       agentId,
       agentName: result.sessions[0]?.stopReason ? agentId : agentId,
       taskName,
@@ -6620,9 +8359,10 @@ Saving state... done. Session saved to ${filePath}`);
       totalCost: priorCost + accumulatedCost,
       lastOutput: result.lastOutput,
       lastStopReason: result.sessions[result.sessions.length - 1]?.stopReason || "complete",
-      sessions: result.sessions,
-      startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      sessions: persistedSessionSummaries,
+      startedAt: typeof knownState?.startedAt === "string" ? knownState.startedAt : (/* @__PURE__ */ new Date()).toISOString(),
       updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      ...persistedSessionSnapshots.length > 0 ? { sessionSnapshots: persistedSessionSnapshots } : {},
       // Carry forward continuation-related fields
       ...priorContinuations.length > 0 ? { continuations: priorContinuations } : {},
       ...Object.keys(priorCostByModel).length > 0 ? { costByModel: priorCostByModel } : {},
@@ -6635,36 +8375,39 @@ Saving state... done. Session saved to ${filePath}`);
     await waitUntilExit();
     exitAltScreen();
     console.log();
-    const statusColor = result.status === "complete" ? chalk12.green : result.status === "budget_exceeded" ? chalk12.red : chalk12.yellow;
+    const statusColor = result.status === "complete" ? chalk13.green : result.status === "budget_exceeded" || result.status === "error" ? chalk13.red : chalk13.yellow;
     console.log(`Status:     ${statusColor(result.status)}`);
     console.log(`Sessions:   ${finalState.sessionCount}`);
-    console.log(`Total cost: ${chalk12.yellow(`$${finalState.totalCost.toFixed(4)}`)}`);
-    console.log(`State:      ${chalk12.gray(filePath)}`);
+    console.log(`Total cost: ${chalk13.yellow(`$${finalState.totalCost.toFixed(4)}`)}`);
+    console.log(`State:      ${chalk13.gray(filePath)}`);
+    if (typeof finalState.lastError === "string" && finalState.lastError.trim()) {
+      console.log(`Last error: ${chalk13.red(finalState.lastError)}`);
+    }
     const dashboardBaseUrl = getDashboardUrl();
-    console.log(`Dashboard:  ${chalk12.cyan(`${dashboardBaseUrl}/agents/${agentId}`)}`);
+    console.log(`Dashboard:  ${chalk13.cyan(`${dashboardBaseUrl}/agents/${agentId}`)}`);
     if (result.recordId) {
-      console.log(`Record:     ${chalk12.gray(result.recordId)}`);
+      console.log(`Record:     ${chalk13.gray(result.recordId)}`);
     }
     if (finalState.continuations && finalState.continuations.length > 0) {
-      console.log(chalk12.dim("\nContinuation history:"));
+      console.log(chalk13.dim("\nContinuation history:"));
       for (let i = 0; i < finalState.continuations.length; i++) {
         const c = finalState.continuations[i];
         const msg = c.userMessage ? ` "${c.userMessage.slice(0, 50)}"` : " (no message)";
         const modelName = c.model ? ` [${c.model}]` : "";
         console.log(
-          chalk12.gray(`  #${i + 1}: ${c.continuedAt}${modelName}${msg} \u2014 $${c.segmentCost.toFixed(4)}`)
+          chalk13.gray(`  #${i + 1}: ${c.continuedAt}${modelName}${msg} \u2014 $${c.segmentCost.toFixed(4)}`)
         );
       }
     }
     if (finalState.costByModel && Object.keys(finalState.costByModel).length > 1) {
-      console.log(chalk12.dim("\nCost by model:"));
+      console.log(chalk13.dim("\nCost by model:"));
       for (const [modelName, cost] of Object.entries(finalState.costByModel)) {
-        console.log(chalk12.gray(`  ${modelName}: $${cost.toFixed(4)}`));
+        console.log(chalk13.gray(`  ${modelName}: $${cost.toFixed(4)}`));
       }
     }
-    if (result.status === "paused" || result.status === "max_sessions") {
+    if (isMarathonResumableStatus(result.status)) {
       console.log(
-        chalk12.gray(
+        chalk13.gray(
           `
 Resume: ${buildResumeCommand(agent, options, parsedSandbox)}`
         )
@@ -6675,21 +8418,27 @@ Resume: ${buildResumeCommand(agent, options, parsedSandbox)}`
       printJson(finalState);
     }
   } catch (error) {
-    exitAltScreen();
     const stateAtError = lastKnownState;
     if (stateAtError) {
       stateAtError.status = "paused";
       saveState(filePath, stateAtError);
     }
-    const errMsg = error instanceof Error ? error.message : "Unknown error";
-    console.error(chalk12.red(`
-Task failed: ${errMsg}`));
-    console.log(chalk12.gray(`State saved to ${filePath} \u2014 resume with --resume`));
+    const streamActions = streamRef.current;
+    if (streamActions && waitForUiExit) {
+      const uiError = new Error(describeMarathonApiError(error).join("\n"));
+      streamActions.showError(uiError);
+      await waitForUiExit();
+    }
+    exitAltScreen();
+    for (const line of formatMarathonApiError(error)) {
+      console.error(line);
+    }
+    console.log(chalk13.gray(`State saved to ${filePath} \u2014 resume with --resume`));
     process.exit(1);
   }
 }
 function applyTaskOptions(cmd) {
-  return cmd.argument("<agent>", "Agent ID or name").option("-g, --goal <text>", "Goal message for the agent").option("--max-sessions <n>", "Maximum sessions", "50").option("--max-cost <n>", "Budget in USD").option("--model <modelId>", "Model ID to use (overrides agent config)").option("--name <name>", "Task name (used for state file, defaults to agent name)").option("--session <name>", "Resume a specific session by name").option("--state-dir <path>", "Directory for state files (default: .runtype/marathons/)").option("--resume [message]", "Resume from existing local state, optionally with a new message").option("--compact", "Use compact summary instead of full history on resume").option("--track", "Sync progress to a Runtype record (visible in dashboard)").option("--debug", "Show debug output from each session").option("--json", "Output final result as JSON").option("--sandbox <provider>", "Enable sandbox code execution tool (cloudflare-worker, quickjs, or daytona)").option("--no-local-tools", "Disable built-in local tool execution (read_file, write_file, list_directory)").option("--plain-text", "Disable markdown rendering in output").option("--no-steer", "Run all iterations without steering pauses (fully autonomous)").option("--steer-timeout <seconds>", "Auto-continue timeout in seconds (default: 10)", "10").action(taskAction);
+  return cmd.argument("<agent>", "Agent ID or name").option("-g, --goal <text>", "Goal message for the agent").option("--max-sessions <n>", "Maximum sessions", "50").option("--max-cost <n>", "Budget in USD").option("--model <modelId>", "Model ID to use (overrides agent config)").option("--name <name>", "Task name (used for state file, defaults to agent name)").option("--session <name>", "Resume a specific session by name").option("--state-dir <path>", "Directory for state files (default: .runtype/marathons/)").option("--resume [message]", "Resume from existing local state, optionally with a new message").option("--fresh", "Start a new run and ignore any existing local state for this task").option("--compact", "Use compact summary instead of full history on resume").option("--track", "Sync progress to a Runtype record (visible in dashboard)").option("--debug", "Show debug output from each session").option("--json", "Output final result as JSON").option("--sandbox <provider>", "Enable sandbox code execution tool (cloudflare-worker, quickjs, or daytona)").option("--no-local-tools", "Disable built-in local tool execution (read_file, write_file, list_directory)").option("--plain-text", "Disable markdown rendering in output").option("--no-steer", "Run all iterations without steering pauses (fully autonomous)").option("--steer-timeout <seconds>", "Auto-continue timeout in seconds (default: 10)", "10").action(taskAction);
 }
 var taskCommand = applyTaskOptions(
   new Command11("task").description("Run a multi-session agent task")
@@ -6733,7 +8482,7 @@ agentsCommand.command("list").description("List all agents").option("--json", "O
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk13.red(`Failed to fetch agents: ${message}`));
+      console.error(chalk14.red(`Failed to fetch agents: ${message}`));
       process.exit(1);
     }
     return;
@@ -6794,7 +8543,7 @@ agentsCommand.command("get <id>").description("Get agent details").option("--jso
       ]);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk13.red(`Failed to fetch agent: ${message}`));
+      console.error(chalk14.red(`Failed to fetch agent: ${message}`));
       process.exit(1);
     }
     return;
@@ -6846,7 +8595,7 @@ agentsCommand.command("create").description("Create a new agent").requiredOption
       console.log(`  Name: ${data.name}`);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk13.red(`Failed to create agent: ${message}`));
+      console.error(chalk14.red(`Failed to create agent: ${message}`));
       process.exit(1);
     }
     return;
@@ -6897,7 +8646,7 @@ agentsCommand.command("delete <id>").description("Delete an agent").option("--tt
       console.log(JSON.stringify({ status: "deleted", id }, null, 2));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk13.red(`Failed to delete agent: ${message}`));
+      console.error(chalk14.red(`Failed to delete agent: ${message}`));
       process.exit(1);
     }
     return;
@@ -6953,7 +8702,7 @@ agentsCommand.command("execute <id>").description("Execute an agent").requiredOp
     messages: [{ role: "user", content: options.message }]
   };
   if (options.stream) {
-    console.log(chalk13.gray("Starting agent..."));
+    console.log(chalk14.gray("Starting agent..."));
     try {
       const response = await client.stream(`/agents/${id}/execute`, payload);
       const callbacks = {
@@ -6961,7 +8710,7 @@ agentsCommand.command("execute <id>").description("Execute an agent").requiredOp
           process.stdout.write(chunk);
         },
         onError: (err) => {
-          console.error(chalk13.red(`
+          console.error(chalk14.red(`
 Error: ${err.message}`));
         }
       };
@@ -6969,11 +8718,11 @@ Error: ${err.message}`));
       console.log();
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk13.red(`Execution failed: ${message}`));
+      console.error(chalk14.red(`Execution failed: ${message}`));
       process.exit(1);
     }
   } else {
-    console.log(chalk13.gray("Executing agent..."));
+    console.log(chalk14.gray("Executing agent..."));
     try {
       const result = await client.post(`/agents/${id}/execute`, {
         ...payload,
@@ -6986,7 +8735,7 @@ Error: ${err.message}`));
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk13.red(`Execution failed: ${message}`));
+      console.error(chalk14.red(`Execution failed: ${message}`));
       process.exit(1);
     }
   }
@@ -6994,7 +8743,7 @@ Error: ${err.message}`));
 
 // src/commands/models.ts
 import { Command as Command13 } from "commander";
-import chalk14 from "chalk";
+import chalk15 from "chalk";
 import React14 from "react";
 import { render as render12 } from "ink";
 import { useState as useState20, useEffect as useEffect18 } from "react";
@@ -7028,7 +8777,7 @@ modelsCommand.command("list").description("List your enabled model configuration
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk14.red(`Failed to fetch models: ${message}`));
+      console.error(chalk15.red(`Failed to fetch models: ${message}`));
       process.exit(1);
     }
     return;
@@ -7093,7 +8842,7 @@ modelsCommand.command("available").description("List all available models groupe
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk14.red(`Failed to fetch available models: ${message}`));
+      console.error(chalk15.red(`Failed to fetch available models: ${message}`));
       process.exit(1);
     }
     return;
@@ -7141,7 +8890,7 @@ modelsCommand.command("enable <modelId>").description("Enable a model by creatin
       console.log(`  Model: ${data.modelId}`);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk14.red(`Failed to enable model: ${message}`));
+      console.error(chalk15.red(`Failed to enable model: ${message}`));
       process.exit(1);
     }
     return;
@@ -7189,7 +8938,7 @@ modelsCommand.command("disable <id>").description("Disable a model configuration
       console.log(JSON.stringify({ status: "disabled", id }, null, 2));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk14.red(`Failed to disable model: ${message}`));
+      console.error(chalk15.red(`Failed to disable model: ${message}`));
       process.exit(1);
     }
     return;
@@ -7229,7 +8978,7 @@ modelsCommand.command("default <id>").description("Set a model configuration as
       console.log(JSON.stringify({ status: "updated", id }, null, 2));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk14.red(`Failed to set default model: ${message}`));
+      console.error(chalk15.red(`Failed to set default model: ${message}`));
       process.exit(1);
     }
     return;
@@ -7262,21 +9011,21 @@ modelsCommand.command("default <id>").description("Set a model configuration as
 modelsCommand.command("usage").description("Show model usage statistics").option("--json", "Output as JSON").action(async () => {
   const apiKey = await ensureAuth();
   if (!apiKey) return;
-  console.log(chalk14.gray("Fetching model usage..."));
+  console.log(chalk15.gray("Fetching model usage..."));
   try {
     const client = new ApiClient(apiKey);
     const data = await client.get("/model-configs/usage");
     printJson(data);
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown error";
-    console.error(chalk14.red(`Failed to fetch model usage: ${message}`));
+    console.error(chalk15.red(`Failed to fetch model usage: ${message}`));
     process.exit(1);
   }
 });
 
 // src/commands/schedules.ts
 import { Command as Command14 } from "commander";
-import chalk15 from "chalk";
+import chalk16 from "chalk";
 import React15 from "react";
 import { render as render13 } from "ink";
 import { useState as useState21, useEffect as useEffect19 } from "react";
@@ -7317,7 +9066,7 @@ schedulesCommand.command("list").description("List all schedules").option("--jso
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk15.red(`Failed to fetch schedules: ${message}`));
+      console.error(chalk16.red(`Failed to fetch schedules: ${message}`));
       process.exit(1);
     }
     return;
@@ -7383,7 +9132,7 @@ schedulesCommand.command("get <id>").description("Get schedule details").option(
       ]);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk15.red(`Failed to fetch schedule: ${message}`));
+      console.error(chalk16.red(`Failed to fetch schedule: ${message}`));
       process.exit(1);
     }
     return;
@@ -7439,7 +9188,7 @@ schedulesCommand.command("create").description("Create a new schedule").required
       if (data.nextRunAt) console.log(`  Next run: ${data.nextRunAt}`);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk15.red(`Failed to create schedule: ${message}`));
+      console.error(chalk16.red(`Failed to create schedule: ${message}`));
       process.exit(1);
     }
     return;
@@ -7494,7 +9243,7 @@ function simpleMutationCommand(name, description, mutationFn, successMsg, loadin
         console.log(JSON.stringify({ status: name, id }, null, 2));
       } catch (error) {
         const message = error instanceof Error ? error.message : "Unknown error";
-        console.error(chalk15.red(`Failed to ${name} schedule: ${message}`));
+        console.error(chalk16.red(`Failed to ${name} schedule: ${message}`));
         process.exit(1);
       }
       return;
@@ -7556,7 +9305,7 @@ schedulesCommand.command("delete <id>").description("Delete a schedule").option(
       console.log(JSON.stringify({ status: "deleted", id }, null, 2));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk15.red(`Failed to delete schedule: ${message}`));
+      console.error(chalk16.red(`Failed to delete schedule: ${message}`));
       process.exit(1);
     }
     return;
@@ -7607,11 +9356,11 @@ schedulesCommand.command("delete <id>").description("Delete a schedule").option(
 
 // src/commands/eval.ts
 import { Command as Command15 } from "commander";
-import chalk16 from "chalk";
+import chalk17 from "chalk";
 import React16 from "react";
 import { render as render14 } from "ink";
 import { useState as useState22, useEffect as useEffect20 } from "react";
-import { Text as Text20 } from "ink";
+import { Text as Text23 } from "ink";
 import { readFileSync as readFileSync5 } from "fs";
 var evalCommand = new Command15("eval").description("Manage evaluations");
 evalCommand.command("submit").description("Submit an eval batch").requiredOption("-f, --flow <id>", "Flow ID to evaluate").requiredOption("-r, --records <file>", "JSON file with record IDs").option("-n, --name <name>", "Eval batch name").option("--json", "Output as JSON").option("--tty", "Force TTY mode").option("--no-tty", "Force non-TTY mode").action(async (options) => {
@@ -7624,7 +9373,7 @@ evalCommand.command("submit").description("Submit an eval batch").requiredOption
     recordIds = Array.isArray(parsed) ? parsed : parsed.recordIds || parsed.records || [];
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown error";
-    console.error(chalk16.red(`Failed to read records file: ${message}`));
+    console.error(chalk17.red(`Failed to read records file: ${message}`));
     process.exit(1);
     return;
   }
@@ -7639,8 +9388,8 @@ evalCommand.command("submit").description("Submit an eval batch").requiredOption
       if (options.json) {
         printJson(data);
       } else {
-        console.log(chalk16.green("Eval submitted"));
-        console.log(`  Batch ID: ${chalk16.green(data.id)}`);
+        console.log(chalk17.green("Eval submitted"));
+        console.log(`  Batch ID: ${chalk17.green(data.id)}`);
         if (data.name) console.log(`  Name: ${data.name}`);
         console.log(`  Status: ${data.status}`);
         console.log(`  Records: ${data.totalRecords}`);
@@ -7648,8 +9397,8 @@ evalCommand.command("submit").description("Submit an eval batch").requiredOption
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk16.red("Failed to submit eval"));
-      console.error(chalk16.red(message));
+      console.error(chalk17.red("Failed to submit eval"));
+      console.error(chalk17.red(message));
       process.exit(1);
     }
     return;
@@ -7711,28 +9460,28 @@ evalCommand.command("list").description("List eval batches").option("--flow <id>
       } else {
         const batches = data.data ?? [];
         if (batches.length === 0) {
-          console.log(chalk16.gray("No eval batches found"));
+          console.log(chalk17.gray("No eval batches found"));
           return;
         }
-        console.log(chalk16.cyan("Eval Batches:"));
+        console.log(chalk17.cyan("Eval Batches:"));
         for (const batch of batches) {
           const name = batch.name || batch.id;
           const progress = batch.totalRecords ? `${batch.completedRecords ?? 0}/${batch.totalRecords}` : "";
           const statusColor = batch.status === "completed" ? "green" : "yellow";
           console.log(
-            `  ${chalk16.green(batch.id)} ${name} ${chalk16[statusColor](`[${batch.status}]`)} ${chalk16.gray(progress)}`
+            `  ${chalk17.green(batch.id)} ${name} ${chalk17[statusColor](`[${batch.status}]`)} ${chalk17.gray(progress)}`
           );
         }
         const total = getTotalCount(data.pagination);
         if (total !== void 0) {
-          console.log(chalk16.dim(`
+          console.log(chalk17.dim(`
   Total: ${total} batches`));
         }
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk16.red("Failed to fetch eval batches"));
-      console.error(chalk16.red(message));
+      console.error(chalk17.red("Failed to fetch eval batches"));
+      console.error(chalk17.red(message));
       process.exit(1);
     }
     return;
@@ -7769,7 +9518,7 @@ evalCommand.command("list").description("List eval batches").option("--flow <id>
         const progress = b.totalRecords ? `${b.completedRecords ?? 0}/${b.totalRecords}` : "";
         const statusColor = b.status === "completed" ? "green" : "yellow";
         return React16.createElement(
-          Text20,
+          Text23,
           { color: statusColor },
           `  ${b.id} ${name} [${b.status}] ${progress}`
         );
@@ -7790,29 +9539,29 @@ evalCommand.command("results <id>").description("Get eval batch results").option
         printJson(data);
       } else {
         if (data.batch) {
-          console.log(chalk16.cyan(`Eval: ${data.batch.name || data.batch.id}`));
+          console.log(chalk17.cyan(`Eval: ${data.batch.name || data.batch.id}`));
           console.log(`  Status: ${data.batch.status}`);
           console.log(`  Progress: ${data.batch.completedRecords ?? 0}/${data.batch.totalRecords ?? 0}`);
           console.log();
         }
         const results = data.data ?? [];
         if (results.length === 0) {
-          console.log(chalk16.gray("No results yet"));
+          console.log(chalk17.gray("No results yet"));
           return;
         }
-        console.log(chalk16.cyan("Results:"));
+        console.log(chalk17.cyan("Results:"));
         for (const result of results) {
-          const scoreStr = result.score !== void 0 ? chalk16.blue(` score=${result.score}`) : "";
+          const scoreStr = result.score !== void 0 ? chalk17.blue(` score=${result.score}`) : "";
           const statusColor = result.status === "completed" ? "green" : "red";
           console.log(
-            `  ${chalk16.gray(result.recordId)} ${chalk16[statusColor](`[${result.status}]`)}${scoreStr}`
+            `  ${chalk17.gray(result.recordId)} ${chalk17[statusColor](`[${result.status}]`)}${scoreStr}`
           );
         }
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk16.red("Failed to fetch eval results"));
-      console.error(chalk16.red(message));
+      console.error(chalk17.red("Failed to fetch eval results"));
+      console.error(chalk17.red(message));
       process.exit(1);
     }
     return;
@@ -7875,8 +9624,8 @@ evalCommand.command("compare <groupId>").description("Compare evals in a group")
       printJson(data);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk16.red("Failed to compare evals"));
-      console.error(chalk16.red(message));
+      console.error(chalk17.red("Failed to compare evals"));
+      console.error(chalk17.red(message));
       process.exit(1);
     }
     return;
@@ -7914,11 +9663,11 @@ evalCommand.command("compare <groupId>").description("Compare evals in a group")
 
 // src/commands/api-keys.ts
 import { Command as Command16 } from "commander";
-import chalk17 from "chalk";
+import chalk18 from "chalk";
 import React17 from "react";
 import { render as render15 } from "ink";
 import { useState as useState23, useEffect as useEffect21 } from "react";
-import { Text as Text21 } from "ink";
+import { Text as Text24 } from "ink";
 var apiKeysCommand = new Command16("api-keys").description("Manage API keys");
 apiKeysCommand.command("list").description("List your API keys").option("--json", "Output as JSON").option("--tty", "Force TTY mode").option("--no-tty", "Force non-TTY mode").action(async (options) => {
   const apiKey = await ensureAuth();
@@ -7932,25 +9681,25 @@ apiKeysCommand.command("list").description("List your API keys").option("--json"
       } else {
         const keys = data.data ?? [];
         if (keys.length === 0) {
-          console.log(chalk17.gray("No API keys found"));
+          console.log(chalk18.gray("No API keys found"));
           return;
         }
-        console.log(chalk17.cyan("Your API Keys:"));
+        console.log(chalk18.cyan("Your API Keys:"));
         for (const key of keys) {
-          const prefix = key.prefix ? chalk17.gray(` (${key.prefix}...)`) : "";
-          const lastUsed = key.lastUsedAt ? chalk17.gray(` last used: ${key.lastUsedAt}`) : "";
-          console.log(`  ${chalk17.green(key.id)} ${key.name}${prefix}${lastUsed}`);
+          const prefix = key.prefix ? chalk18.gray(` (${key.prefix}...)`) : "";
+          const lastUsed = key.lastUsedAt ? chalk18.gray(` last used: ${key.lastUsedAt}`) : "";
+          console.log(`  ${chalk18.green(key.id)} ${key.name}${prefix}${lastUsed}`);
         }
         const total = getTotalCount(data.pagination);
         if (total !== void 0) {
-          console.log(chalk17.dim(`
+          console.log(chalk18.dim(`
   Total: ${total} keys`));
         }
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk17.red("Failed to fetch API keys"));
-      console.error(chalk17.red(message));
+      console.error(chalk18.red("Failed to fetch API keys"));
+      console.error(chalk18.red(message));
       process.exit(1);
     }
     return;
@@ -7985,7 +9734,7 @@ apiKeysCommand.command("list").description("List your API keys").option("--json"
         const k = item;
         const prefix = k.prefix ? ` (${k.prefix}...)` : "";
         const lastUsed = k.lastUsedAt ? ` last used: ${k.lastUsedAt}` : "";
-        return React17.createElement(Text21, null, `  ${k.id} ${k.name}${prefix}${lastUsed}`);
+        return React17.createElement(Text24, null, `  ${k.id} ${k.name}${prefix}${lastUsed}`);
       }
     });
   };
@@ -8013,8 +9762,8 @@ apiKeysCommand.command("get <id>").description("Get API key details").option("--
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk17.red("Failed to fetch API key"));
-      console.error(chalk17.red(message));
+      console.error(chalk18.red("Failed to fetch API key"));
+      console.error(chalk18.red(message));
       process.exit(1);
     }
     return;
@@ -8072,18 +9821,18 @@ apiKeysCommand.command("create").description("Create a new API key").requiredOpt
       if (options.json) {
         printJson(data);
       } else {
-        console.log(chalk17.green("API key created"));
-        console.log(`  ID: ${chalk17.green(data.id)}`);
+        console.log(chalk18.green("API key created"));
+        console.log(`  ID: ${chalk18.green(data.id)}`);
         console.log(`  Name: ${data.name}`);
         if (data.key) {
-          console.log(`  Key: ${chalk17.yellow(data.key)}`);
-          console.log(chalk17.gray("  Save this key - it will not be shown again"));
+          console.log(`  Key: ${chalk18.yellow(data.key)}`);
+          console.log(chalk18.gray("  Save this key - it will not be shown again"));
         }
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk17.red("Failed to create API key"));
-      console.error(chalk17.red(message));
+      console.error(chalk18.red("Failed to create API key"));
+      console.error(chalk18.red(message));
       process.exit(1);
     }
     return;
@@ -8137,11 +9886,11 @@ apiKeysCommand.command("delete <id>").description("Delete an API key").option("-
   if (!isTTY(options)) {
     try {
       await client.delete(`/api-keys/${id}`);
-      console.log(chalk17.green("API key deleted"));
+      console.log(chalk18.green("API key deleted"));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk17.red("Failed to delete API key"));
-      console.error(chalk17.red(message));
+      console.error(chalk18.red("Failed to delete API key"));
+      console.error(chalk18.red(message));
       process.exit(1);
     }
     return;
@@ -8177,13 +9926,13 @@ apiKeysCommand.command("delete <id>").description("Delete an API key").option("-
     await waitUntilExit2();
     return;
   }
-  const confirmed = await new Promise((resolve) => {
+  const confirmed = await new Promise((resolve2) => {
     const { unmount } = render15(
       React17.createElement(ConfirmPrompt, {
         message: `Delete API key ${id}?`,
         defaultValue: false,
         onConfirm: (result) => {
-          resolve(result);
+          resolve2(result);
           unmount();
         }
       })
@@ -8229,16 +9978,16 @@ apiKeysCommand.command("regenerate <id>").description("Regenerate an API key").o
       if (options.json) {
         printJson(data);
       } else {
-        console.log(chalk17.green("API key regenerated"));
+        console.log(chalk18.green("API key regenerated"));
         if (data.key) {
-          console.log(`  New Key: ${chalk17.yellow(data.key)}`);
-          console.log(chalk17.gray("  Save this key - it will not be shown again"));
+          console.log(`  New Key: ${chalk18.yellow(data.key)}`);
+          console.log(chalk18.gray("  Save this key - it will not be shown again"));
         }
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk17.red("Failed to regenerate API key"));
-      console.error(chalk17.red(message));
+      console.error(chalk18.red("Failed to regenerate API key"));
+      console.error(chalk18.red(message));
       process.exit(1);
     }
     return;
@@ -8293,8 +10042,8 @@ apiKeysCommand.command("analytics").description("Show API key usage analytics").
       printJson(data);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk17.red("Failed to fetch analytics"));
-      console.error(chalk17.red(message));
+      console.error(chalk18.red("Failed to fetch analytics"));
+      console.error(chalk18.red(message));
       process.exit(1);
     }
     return;
@@ -8333,11 +10082,11 @@ apiKeysCommand.command("analytics").description("Show API key usage analytics").
 
 // src/commands/analytics.ts
 import { Command as Command17 } from "commander";
-import chalk18 from "chalk";
+import chalk19 from "chalk";
 import React18 from "react";
 import { render as render16 } from "ink";
 import { useState as useState24, useEffect as useEffect22 } from "react";
-import { Text as Text22 } from "ink";
+import { Text as Text25 } from "ink";
 var analyticsCommand = new Command17("analytics").description("View analytics and execution results");
 analyticsCommand.command("stats").description("Show account statistics").option("--json", "Output as JSON").option("--tty", "Force TTY mode").option("--no-tty", "Force non-TTY mode").action(async (options) => {
   const apiKey = await ensureAuth();
@@ -8358,8 +10107,8 @@ analyticsCommand.command("stats").description("Show account statistics").option(
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk18.red("Failed to fetch stats"));
-      console.error(chalk18.red(message));
+      console.error(chalk19.red("Failed to fetch stats"));
+      console.error(chalk19.red(message));
       process.exit(1);
     }
     return;
@@ -8423,27 +10172,27 @@ analyticsCommand.command("results").description("List execution results").option
         } else {
           const results = data.data ?? [];
           if (results.length === 0) {
-            console.log(chalk18.gray("No results found"));
+            console.log(chalk19.gray("No results found"));
             return;
           }
-          console.log(chalk18.cyan("Execution Results:"));
+          console.log(chalk19.cyan("Execution Results:"));
           for (const result of results) {
             const statusColor = result.status === "completed" ? "green" : "red";
-            const date = result.createdAt ? chalk18.gray(` ${result.createdAt}`) : "";
+            const date = result.createdAt ? chalk19.gray(` ${result.createdAt}`) : "";
             console.log(
-              `  ${chalk18.green(result.id)} ${chalk18[statusColor](`[${result.status}]`)} flow=${chalk18.gray(result.flowId)} record=${chalk18.gray(result.recordId)}${date}`
+              `  ${chalk19.green(result.id)} ${chalk19[statusColor](`[${result.status}]`)} flow=${chalk19.gray(result.flowId)} record=${chalk19.gray(result.recordId)}${date}`
             );
           }
           const total = getTotalCount(data.pagination);
           if (total !== void 0) {
-            console.log(chalk18.dim(`
+            console.log(chalk19.dim(`
   Total: ${total} results`));
           }
         }
       } catch (error) {
         const message = error instanceof Error ? error.message : "Unknown error";
-        console.error(chalk18.red("Failed to fetch results"));
-        console.error(chalk18.red(message));
+        console.error(chalk19.red("Failed to fetch results"));
+        console.error(chalk19.red(message));
         process.exit(1);
       }
       return;
@@ -8481,7 +10230,7 @@ analyticsCommand.command("results").description("List execution results").option
           const r = item;
           const statusColor = r.status === "completed" ? "green" : "red";
           return React18.createElement(
-            Text22,
+            Text25,
             { color: statusColor },
             `  ${r.id} [${r.status}] flow=${r.flowId} record=${r.recordId}${r.createdAt ? ` ${r.createdAt}` : ""}`
           );
@@ -8495,7 +10244,7 @@ analyticsCommand.command("results").description("List execution results").option
 
 // src/commands/billing.ts
 import { Command as Command18 } from "commander";
-import chalk19 from "chalk";
+import chalk20 from "chalk";
 import React19 from "react";
 import { render as render17 } from "ink";
 import { useState as useState25, useEffect as useEffect23 } from "react";
@@ -8537,8 +10286,8 @@ billingCommand.command("status").description("Show current plan and usage").opti
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk19.red("Failed to fetch billing status"));
-      console.error(chalk19.red(message));
+      console.error(chalk20.red("Failed to fetch billing status"));
+      console.error(chalk20.red(message));
       process.exit(1);
     }
     return;
@@ -8608,8 +10357,8 @@ billingCommand.command("portal").description("Open the billing portal in your br
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk19.red("Failed to open billing portal"));
-      console.error(chalk19.red(message));
+      console.error(chalk20.red("Failed to open billing portal"));
+      console.error(chalk20.red(message));
       process.exit(1);
     }
     return;
@@ -8658,11 +10407,11 @@ billingCommand.command("refresh").description("Refresh plan data from billing pr
   if (!isTTY(options)) {
     try {
       await client.post("/billing/refresh");
-      console.log(chalk19.green("Plan data refreshed"));
+      console.log(chalk20.green("Plan data refreshed"));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk19.red("Failed to refresh plan data"));
-      console.error(chalk19.red(message));
+      console.error(chalk20.red("Failed to refresh plan data"));
+      console.error(chalk20.red(message));
       process.exit(1);
     }
     return;
@@ -8699,11 +10448,11 @@ billingCommand.command("refresh").description("Refresh plan data from billing pr
 
 // src/commands/flow-versions.ts
 import { Command as Command19 } from "commander";
-import chalk20 from "chalk";
+import chalk21 from "chalk";
 import React20 from "react";
 import { render as render18 } from "ink";
 import { useState as useState26, useEffect as useEffect24 } from "react";
-import { Text as Text23 } from "ink";
+import { Text as Text26 } from "ink";
 var flowVersionsCommand = new Command19("flow-versions").description(
   "Manage flow versions"
 );
@@ -8719,21 +10468,21 @@ flowVersionsCommand.command("list <flowId>").description("List all versions for
       } else {
         const versions = data.data ?? [];
         if (versions.length === 0) {
-          console.log(chalk20.gray("No versions found"));
+          console.log(chalk21.gray("No versions found"));
           return;
         }
-        console.log(chalk20.cyan(`Versions for flow ${flowId}:`));
+        console.log(chalk21.cyan(`Versions for flow ${flowId}:`));
         for (const v of versions) {
-          const publishedTag = v.published ? chalk20.green(" [published]") : "";
+          const publishedTag = v.published ? chalk21.green(" [published]") : "";
           const versionNum = v.version !== void 0 ? `v${v.version}` : v.id;
-          const date = v.createdAt ? chalk20.gray(` ${v.createdAt}`) : "";
-          console.log(`  ${chalk20.green(v.id)} ${versionNum}${publishedTag}${date}`);
+          const date = v.createdAt ? chalk21.gray(` ${v.createdAt}`) : "";
+          console.log(`  ${chalk21.green(v.id)} ${versionNum}${publishedTag}${date}`);
         }
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk20.red("Failed to fetch versions"));
-      console.error(chalk20.red(message));
+      console.error(chalk21.red("Failed to fetch versions"));
+      console.error(chalk21.red(message));
       process.exit(1);
     }
     return;
@@ -8765,7 +10514,7 @@ flowVersionsCommand.command("list <flowId>").description("List all versions for
         const v = item;
         const publishedTag = v.published ? " [published]" : "";
         const versionNum = v.version !== void 0 ? `v${v.version}` : v.id;
-        return React20.createElement(Text23, null, `  ${v.id} ${versionNum}${publishedTag}${v.createdAt ? ` ${v.createdAt}` : ""}`);
+        return React20.createElement(Text26, null, `  ${v.id} ${versionNum}${publishedTag}${v.createdAt ? ` ${v.createdAt}` : ""}`);
       }
     });
   };
@@ -8793,8 +10542,8 @@ flowVersionsCommand.command("get <flowId> <versionId>").description("Get a speci
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk20.red("Failed to fetch version"));
-      console.error(chalk20.red(message));
+      console.error(chalk21.red("Failed to fetch version"));
+      console.error(chalk21.red(message));
       process.exit(1);
     }
     return;
@@ -8859,8 +10608,8 @@ flowVersionsCommand.command("published <flowId>").description("Get the published
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk20.red("Failed to fetch published version"));
-      console.error(chalk20.red(message));
+      console.error(chalk21.red("Failed to fetch published version"));
+      console.error(chalk21.red(message));
       process.exit(1);
     }
     return;
@@ -8913,11 +10662,11 @@ flowVersionsCommand.command("publish <flowId>").description("Publish a version")
       await client.post(`/flow-versions/${flowId}/publish`, {
         versionId: options.version
       });
-      console.log(chalk20.green("Version published"));
+      console.log(chalk21.green("Version published"));
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown error";
-      console.error(chalk20.red("Failed to publish version"));
-      console.error(chalk20.red(message));
+      console.error(chalk21.red("Failed to publish version"));
+      console.error(chalk21.red(message));
       process.exit(1);
     }
     return;
@@ -8999,15 +10748,15 @@ try {
 } catch (error) {
   const commanderError = error;
   if (commanderError.code === "commander.missingArgument") {
-    console.error(chalk21.red(`Error: ${commanderError.message}`));
+    console.error(chalk22.red(`Error: ${commanderError.message}`));
     process.exit(1);
   } else if (commanderError.code === "commander.unknownOption") {
-    console.error(chalk21.red(`Error: ${commanderError.message}`));
+    console.error(chalk22.red(`Error: ${commanderError.message}`));
     process.exit(1);
   } else if (commanderError.code === "commander.help" || commanderError.code === "commander.version") {
     process.exit(0);
   } else {
-    console.error(chalk21.red("An unexpected error occurred:"));
+    console.error(chalk22.red("An unexpected error occurred:"));
     console.error(error);
     process.exit(1);
   }
@@ -9016,12 +10765,12 @@ async function handleNoCommand() {
   const store = new CredentialStore();
   const hasCredentials = await store.hasCredentials();
   if (!hasCredentials) {
-    console.log(chalk21.cyan("\nWelcome to Runtype CLI!\n"));
+    console.log(chalk22.cyan("\nWelcome to Runtype CLI!\n"));
     console.log("It looks like this is your first time. Run the setup wizard:");
-    console.log(`  ${chalk21.green("runtype init")}
+    console.log(`  ${chalk22.green("runtype init")}
 `);
     console.log("Or see all available commands:");
-    console.log(`  ${chalk21.green("runtype --help")}
+    console.log(`  ${chalk22.green("runtype --help")}
 `);
   } else {
     try {