@gaberrb/polypus 0.4.7 → 0.4.9

package/dist/index.js

@@ -2,7 +2,7 @@
 
 // src/cli/index.ts
 import { Command } from "commander";
-import pc13 from "picocolors";
+import pc15 from "picocolors";
 
 // src/cli/commands/add-agent.ts
 import pc from "picocolors";
@@ -111,6 +111,11 @@ var en = {
   "cli.opt.maxSteps": "maximum agent steps",
   "cli.opt.json": "headless mode: emit a single JSON object (steps, tool calls, files changed, usage) instead of the TUI \u2014 use with --mode bypass",
   "cli.opt.verify": "after the agent finishes, run project checks (typecheck/build/test) and iterate until they pass",
+  "cli.opt.budget": "stop the run when the estimated session cost reaches this USD amount (OpenRouter pricing)",
+  "cli.cmd.usage": "Show token/cost analytics aggregated per day",
+  "cli.cmd.sessions": "List saved sessions that can be resumed",
+  "cli.opt.continue": "resume the most recent saved session",
+  "cli.opt.resume": "resume a specific saved session by id",
   "cli.arg.swarmTask": "high-level task to split across agents",
   "cli.opt.agents": "comma-separated agent names (default: all configured)",
   "cli.opt.maxSubtasks": "maximum number of parallel subtasks",
@@ -147,6 +152,20 @@ var en = {
   "verify.passed": "verification passed",
   "verify.failed": "{n} check(s) failed \u2014 handing the output back to the agent (attempt {attempt})",
   "verify.giveUp": "{n} check(s) still failing after the retry budget \u2014 stopping",
+  "budget.session": "session spend: {spent} / budget {budget}",
+  "budget.hit": "\u25A0 stopped: estimated cost reached the budget of {budget}",
+  // usage analytics
+  "usage.header": "Usage (tokens / estimated cost) per day:",
+  "usage.empty": "No usage recorded yet. Run a task to start tracking.",
+  "usage.total": "total",
+  "usage.runs": "runs",
+  // sessions
+  "sessions.header": "Saved sessions (most recent first):",
+  "sessions.empty": "No saved sessions yet.",
+  "sessions.hint": "Resume with `polypus run --continue` or `polypus run --resume <id>`.",
+  "sessions.notFound": 'No saved session with id "{id}".',
+  "sessions.noneToContinue": "No previous session to continue \u2014 starting fresh.",
+  "sessions.resumed": "\u21BA resumed session {id} ({n} messages)",
   // repl
   "repl.welcome": "Polypus interactive session.",
   "repl.welcomeHint": " Type /help for commands, /exit to quit.",
@@ -173,6 +192,8 @@ var en = {
     "  /allow <glob>    add a path glob to the allow-list",
     "  /allow           show the current allow-list and mode",
     "  /reset           clear the conversation history",
+    "  /sessions        list saved sessions you can resume",
+    "  /resume <id>     resume a saved session",
     "  /help            show this help",
     "  /exit            quit",
     "Anything else is sent to the agent as a task."
@@ -351,6 +372,11 @@ var ptBR = {
   "cli.opt.maxSteps": "n\xFAmero m\xE1ximo de passos do agente",
   "cli.opt.json": "modo headless: emite um \xFAnico objeto JSON (passos, tool calls, arquivos alterados, uso) em vez da TUI \u2014 use com --mode bypass",
   "cli.opt.verify": "ap\xF3s o agente terminar, roda as checagens do projeto (typecheck/build/test) e itera at\xE9 passar",
+  "cli.opt.budget": "interrompe a execu\xE7\xE3o quando o custo estimado da sess\xE3o atingir este valor em USD (pre\xE7os do OpenRouter)",
+  "cli.cmd.usage": "Mostra analytics de tokens/custo agregados por dia",
+  "cli.cmd.sessions": "Lista as sess\xF5es salvas que podem ser retomadas",
+  "cli.opt.continue": "retoma a sess\xE3o salva mais recente",
+  "cli.opt.resume": "retoma uma sess\xE3o salva espec\xEDfica pelo id",
   "cli.arg.swarmTask": "tarefa de alto n\xEDvel para dividir entre os agentes",
   "cli.opt.agents": "nomes de agentes separados por v\xEDrgula (padr\xE3o: todos)",
   "cli.opt.maxSubtasks": "n\xFAmero m\xE1ximo de subtarefas paralelas",
@@ -385,6 +411,20 @@ var ptBR = {
   "verify.passed": "verifica\xE7\xE3o passou",
   "verify.failed": "{n} checagem(ns) falharam \u2014 devolvendo a sa\xEDda ao agente (tentativa {attempt})",
   "verify.giveUp": "{n} checagem(ns) ainda falhando ap\xF3s o limite de tentativas \u2014 parando",
+  "budget.session": "gasto da sess\xE3o: {spent} / or\xE7amento {budget}",
+  "budget.hit": "\u25A0 interrompido: o custo estimado atingiu o or\xE7amento de {budget}",
+  // usage analytics
+  "usage.header": "Uso (tokens / custo estimado) por dia:",
+  "usage.empty": "Nenhum uso registrado ainda. Rode uma tarefa para come\xE7ar a medir.",
+  "usage.total": "total",
+  "usage.runs": "execu\xE7\xF5es",
+  // sessions
+  "sessions.header": "Sess\xF5es salvas (mais recentes primeiro):",
+  "sessions.empty": "Nenhuma sess\xE3o salva ainda.",
+  "sessions.hint": "Retome com `polypus run --continue` ou `polypus run --resume <id>`.",
+  "sessions.notFound": 'Nenhuma sess\xE3o salva com id "{id}".',
+  "sessions.noneToContinue": "Nenhuma sess\xE3o anterior para continuar \u2014 come\xE7ando do zero.",
+  "sessions.resumed": "\u21BA sess\xE3o {id} retomada ({n} mensagens)",
   "repl.welcome": "Sess\xE3o interativa do Polypus.",
   "repl.welcomeHint": " Digite /help para comandos, /exit para sair.",
   "repl.modeChanged": "modo \u2192 {mode}",
@@ -410,6 +450,8 @@ var ptBR = {
     "  /allow <glob>    adiciona um glob de caminho \xE0 allow-list",
     "  /allow           mostra a allow-list e o modo atuais",
     "  /reset           limpa o hist\xF3rico da conversa",
+    "  /sessions        lista as sess\xF5es salvas que voc\xEA pode retomar",
+    "  /resume <id>     retoma uma sess\xE3o salva",
     "  /help            mostra esta ajuda",
     "  /exit            sair",
     "Qualquer outra coisa \xE9 enviada ao agente como tarefa."
@@ -1068,6 +1110,13 @@ var SECRET_PATTERNS = [
   { re: /\bsk-[A-Za-z0-9]{32,}\b/, kind: "OpenAI-style secret key" },
   { re: /\bAIza[0-9A-Za-z_-]{35}\b/, kind: "Google API key" }
 ];
+function redactSecrets(text2) {
+  let out = text2;
+  for (const { re } of SECRET_PATTERNS) {
+    out = out.replace(new RegExp(re.source, re.flags.includes("g") ? re.flags : re.flags + "g"), "[redacted]");
+  }
+  return out;
+}
 function scanSecrets(text2) {
   const findings = [];
   const lines = text2.split("\n");
@@ -2096,9 +2145,9 @@ async function runAgent(opts) {
   let failStreak = 0;
   const maxToolRetries = opts.maxToolRetries ?? 3;
   const autoCorrect = opts.autoCorrect ?? true;
-  const usage = { promptTokens: 0, completionTokens: 0 };
+  const usage2 = { promptTokens: 0, completionTokens: 0 };
   for (let step = 1; step <= maxSteps; step++) {
-    if (opts.signal?.aborted) return { finished: false, reason: "cancelled", steps: step - 1, messages, usage };
+    if (opts.signal?.aborted) return { finished: false, reason: "cancelled", steps: step - 1, messages, usage: usage2 };
     events?.onStep?.(step);
     let response;
     try {
@@ -2109,12 +2158,12 @@ async function runAgent(opts) {
         signal: opts.signal
       });
     } catch (err) {
-      if (opts.signal?.aborted) return { finished: false, reason: "cancelled", steps: step, messages, usage };
+      if (opts.signal?.aborted) return { finished: false, reason: "cancelled", steps: step, messages, usage: usage2 };
       throw err;
     }
-    usage.promptTokens += response.usage?.promptTokens ?? 0;
-    usage.completionTokens += response.usage?.completionTokens ?? 0;
-    events?.onUsage?.(usage);
+    usage2.promptTokens += response.usage?.promptTokens ?? 0;
+    usage2.completionTokens += response.usage?.completionTokens ?? 0;
+    events?.onUsage?.(usage2);
     const { toolCalls, text: text2 } = driver.parse(response);
     messages.push(driver.assistantMessage(response, toolCalls));
     if (text2) events?.onAssistantText?.(text2);
@@ -2128,7 +2177,7 @@ async function runAgent(opts) {
           messages.push({ role: "user", content: guidance });
           continue;
         }
-        return { finished: false, reason: "stalled", steps: step, messages, usage };
+        return { finished: false, reason: "stalled", steps: step, messages, usage: usage2 };
       }
       const stalled = text2.trim().length === 0 || looksLikeStall(text2);
       if (stalled) {
@@ -2138,17 +2187,17 @@ async function runAgent(opts) {
           messages.push(driver.repromptMessage());
           continue;
         }
-        return { finished: false, reason: "stalled", steps: step, messages, usage };
+        return { finished: false, reason: "stalled", steps: step, messages, usage: usage2 };
       }
-      return { finished: false, reason: "reply", steps: step, messages, usage };
+      return { finished: false, reason: "reply", steps: step, messages, usage: usage2 };
     }
     consecutiveNoTool = 0;
     for (const call of toolCalls) {
-      if (opts.signal?.aborted) return { finished: false, reason: "cancelled", steps: step, messages, usage };
+      if (opts.signal?.aborted) return { finished: false, reason: "cancelled", steps: step, messages, usage: usage2 };
       events?.onToolCall?.(call);
       if (call.name === "finish") {
         const summary = String(call.arguments.summary ?? "").trim();
-        return { finished: true, reason: "finished", summary, steps: step, messages, usage };
+        return { finished: true, reason: "finished", summary, steps: step, messages, usage: usage2 };
       }
       const tool = getTool(call.name);
       const result = tool ? await tool.run(call.arguments, ctx) : { ok: false, output: `Unknown tool "${call.name}". Available: ${toolSpecs().map((t2) => t2.name).join(", ")}` };
@@ -2186,12 +2235,12 @@ ${guidance}`;
         failStreak = sig === lastFailSig ? failStreak + 1 : 1;
         lastFailSig = sig;
         if (failStreak >= maxToolRetries) {
-          return { finished: false, reason: "stalled", steps: step, messages, usage };
+          return { finished: false, reason: "stalled", steps: step, messages, usage: usage2 };
         }
       }
     }
   }
-  return { finished: false, reason: "maxsteps", steps: maxSteps, messages, usage };
+  return { finished: false, reason: "maxsteps", steps: maxSteps, messages, usage: usage2 };
 }
 
 // src/core/context/mentions.ts
@@ -2296,6 +2345,216 @@ function clamp2(s) {
   return s.length > MAX_OUTPUT3 ? s.slice(-MAX_OUTPUT3) : s;
 }
 
+// src/core/agent/usage.ts
+import { appendFile, mkdir as mkdir3, readFile as readFile10 } from "fs/promises";
+import { join as join4 } from "path";
+
+// src/core/providers/openrouter.ts
+var MODELS_URL = "https://openrouter.ai/api/v1/models";
+async function listOpenRouterModels(apiKey, timeoutMs = 8e3) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const res = await fetch(MODELS_URL, {
+      signal: controller.signal,
+      headers: apiKey ? { authorization: `Bearer ${apiKey}` } : {}
+    });
+    if (!res.ok) throw new Error(`OpenRouter ${res.status}: ${await res.text().catch(() => "")}`);
+    const data = await res.json();
+    return (data.data ?? []).map(normalize).filter((m) => m.id.length > 0);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function normalize(m) {
+  const promptPrice = toPerMillion(m.pricing?.prompt);
+  const completionPrice = toPerMillion(m.pricing?.completion);
+  return {
+    id: m.id ?? "",
+    name: m.name ?? m.id ?? "",
+    promptPrice,
+    completionPrice,
+    contextLength: m.context_length ?? 0,
+    supportsTools: (m.supported_parameters ?? []).includes("tools"),
+    free: promptPrice === 0 && completionPrice === 0
+  };
+}
+function toPerMillion(price) {
+  const n = Number(price ?? "0");
+  return Number.isFinite(n) ? n * 1e6 : 0;
+}
+function filterModels(models2, f) {
+  const term = f.search?.trim().toLowerCase();
+  let out = models2.filter((m) => {
+    if (term && !m.id.toLowerCase().includes(term) && !m.name.toLowerCase().includes(term)) {
+      return false;
+    }
+    if (f.tools === "tools" && !m.supportsTools) return false;
+    if (f.tools === "no-tools" && m.supportsTools) return false;
+    if (f.freeOnly && !m.free) return false;
+    if (f.maxPrice !== void 0 && (m.promptPrice < 0 || m.promptPrice > f.maxPrice)) return false;
+    return true;
+  });
+  const key = (m) => m.promptPrice < 0 ? Number.POSITIVE_INFINITY : m.promptPrice;
+  const sort = f.sort ?? "price";
+  out = out.sort((a, b) => {
+    switch (sort) {
+      case "price-desc":
+        return key(b) - key(a);
+      case "context":
+        return b.contextLength - a.contextLength;
+      case "name":
+        return a.id.localeCompare(b.id);
+      default:
+        return key(a) - key(b);
+    }
+  });
+  return out;
+}
+function fmtPrice(perMillion) {
+  if (perMillion < 0) return "var";
+  if (perMillion === 0) return "free";
+  if (perMillion < 1) return `$${perMillion.toFixed(2)}`;
+  if (perMillion < 100) return `$${perMillion.toFixed(perMillion % 1 ? 1 : 0)}`;
+  return `$${Math.round(perMillion)}`;
+}
+function fmtContext(n) {
+  if (n >= 1e6) return `${Math.round(n / 1e5) / 10}M`;
+  if (n >= 1e3) return `${Math.round(n / 1e3)}k`;
+  return String(n);
+}
+
+// src/core/agent/usage.ts
+var catalogCache;
+async function resolveModelPricing(agent) {
+  if (agent.provider !== "openrouter") return void 0;
+  try {
+    catalogCache ??= listOpenRouterModels(resolveSecret(agent.apiKey));
+    const models2 = await catalogCache;
+    const m = models2.find((x) => x.id === agent.model);
+    if (!m || m.promptPrice < 0 || m.completionPrice < 0) return void 0;
+    return { promptPrice: m.promptPrice, completionPrice: m.completionPrice };
+  } catch {
+    return void 0;
+  }
+}
+function estimateCost(usage2, pricing) {
+  return usage2.promptTokens / 1e6 * pricing.promptPrice + usage2.completionTokens / 1e6 * pricing.completionPrice;
+}
+function fmtUsd(n) {
+  if (n <= 0) return "US$0.00";
+  if (n < 0.01) return `US$${n.toFixed(4)}`;
+  return `US$${n.toFixed(2)}`;
+}
+function usagePath() {
+  return join4(configDir(), "usage.jsonl");
+}
+async function recordUsage(entry) {
+  try {
+    await mkdir3(configDir(), { recursive: true });
+    await appendFile(usagePath(), JSON.stringify(entry) + "\n", "utf8");
+  } catch {
+  }
+}
+async function aggregateUsage() {
+  let text2 = "";
+  try {
+    text2 = await readFile10(usagePath(), "utf8");
+  } catch {
+    return { days: [], total: emptyBucket("total") };
+  }
+  const byDay = /* @__PURE__ */ new Map();
+  const total = emptyBucket("total");
+  for (const line of text2.split("\n")) {
+    if (!line.trim()) continue;
+    let e;
+    try {
+      e = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    const date = (e.ts ?? "").slice(0, 10) || "unknown";
+    const bucket = byDay.get(date) ?? emptyBucket(date);
+    accumulate(bucket, e);
+    byDay.set(date, bucket);
+    accumulate(total, e);
+  }
+  const days = [...byDay.values()].sort((a, b) => a.date.localeCompare(b.date));
+  return { days, total };
+}
+function emptyBucket(date) {
+  return { date, promptTokens: 0, completionTokens: 0, costUsd: 0, runs: 0 };
+}
+function accumulate(bucket, e) {
+  bucket.promptTokens += e.promptTokens ?? 0;
+  bucket.completionTokens += e.completionTokens ?? 0;
+  bucket.costUsd += e.costUsd ?? 0;
+  bucket.runs += 1;
+}
+
+// src/core/agent/session-store.ts
+import { mkdir as mkdir4, readFile as readFile11, readdir as readdir5, writeFile as writeFile4 } from "fs/promises";
+import { join as join5 } from "path";
+function sessionsDir() {
+  return join5(configDir(), "sessions");
+}
+function newSessionId() {
+  const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const rand = Math.random().toString(36).slice(2, 6);
+  return `${stamp}-${rand}`;
+}
+function sessionPath(id) {
+  return join5(sessionsDir(), `${id}.json`);
+}
+async function saveSession(record) {
+  await mkdir4(sessionsDir(), { recursive: true });
+  const safe = {
+    ...record,
+    messages: record.messages.map((m) => ({ ...m, content: redactSecrets(m.content) }))
+  };
+  await writeFile4(sessionPath(record.id), JSON.stringify(safe, null, 2) + "\n", "utf8");
+}
+async function loadSession(id) {
+  try {
+    return JSON.parse(await readFile11(sessionPath(id), "utf8"));
+  } catch {
+    return void 0;
+  }
+}
+async function listSessions() {
+  let files;
+  try {
+    files = (await readdir5(sessionsDir())).filter((f) => f.endsWith(".json"));
+  } catch {
+    return [];
+  }
+  const summaries = [];
+  for (const f of files) {
+    try {
+      const r = JSON.parse(await readFile11(join5(sessionsDir(), f), "utf8"));
+      summaries.push({
+        id: r.id,
+        updatedAt: r.updatedAt,
+        title: r.title,
+        agentName: r.agentName,
+        mode: r.mode,
+        messageCount: r.messages?.length ?? 0
+      });
+    } catch {
+    }
+  }
+  return summaries.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
+}
+async function latestSession() {
+  const [latest] = await listSessions();
+  return latest ? loadSession(latest.id) : void 0;
+}
+function deriveTitle(messages) {
+  const firstUser = messages.find((m) => m.role === "user");
+  const text2 = (firstUser?.content ?? "").replace(/\s+/g, " ").trim();
+  return text2.length > 60 ? text2.slice(0, 60) + "\u2026" : text2 || "(untitled)";
+}
+
 // src/cli/commands/json-output.ts
 var OUTPUT_PREVIEW = 500;
 function createJsonCollector() {
@@ -2381,81 +2640,6 @@ async function listOllamaModels(host = ollamaHost(), timeoutMs = 2e3) {
   }
 }
 
-// src/core/providers/openrouter.ts
-var MODELS_URL = "https://openrouter.ai/api/v1/models";
-async function listOpenRouterModels(apiKey, timeoutMs = 8e3) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const res = await fetch(MODELS_URL, {
-      signal: controller.signal,
-      headers: apiKey ? { authorization: `Bearer ${apiKey}` } : {}
-    });
-    if (!res.ok) throw new Error(`OpenRouter ${res.status}: ${await res.text().catch(() => "")}`);
-    const data = await res.json();
-    return (data.data ?? []).map(normalize).filter((m) => m.id.length > 0);
-  } finally {
-    clearTimeout(timer);
-  }
-}
-function normalize(m) {
-  const promptPrice = toPerMillion(m.pricing?.prompt);
-  const completionPrice = toPerMillion(m.pricing?.completion);
-  return {
-    id: m.id ?? "",
-    name: m.name ?? m.id ?? "",
-    promptPrice,
-    completionPrice,
-    contextLength: m.context_length ?? 0,
-    supportsTools: (m.supported_parameters ?? []).includes("tools"),
-    free: promptPrice === 0 && completionPrice === 0
-  };
-}
-function toPerMillion(price) {
-  const n = Number(price ?? "0");
-  return Number.isFinite(n) ? n * 1e6 : 0;
-}
-function filterModels(models2, f) {
-  const term = f.search?.trim().toLowerCase();
-  let out = models2.filter((m) => {
-    if (term && !m.id.toLowerCase().includes(term) && !m.name.toLowerCase().includes(term)) {
-      return false;
-    }
-    if (f.tools === "tools" && !m.supportsTools) return false;
-    if (f.tools === "no-tools" && m.supportsTools) return false;
-    if (f.freeOnly && !m.free) return false;
-    if (f.maxPrice !== void 0 && (m.promptPrice < 0 || m.promptPrice > f.maxPrice)) return false;
-    return true;
-  });
-  const key = (m) => m.promptPrice < 0 ? Number.POSITIVE_INFINITY : m.promptPrice;
-  const sort = f.sort ?? "price";
-  out = out.sort((a, b) => {
-    switch (sort) {
-      case "price-desc":
-        return key(b) - key(a);
-      case "context":
-        return b.contextLength - a.contextLength;
-      case "name":
-        return a.id.localeCompare(b.id);
-      default:
-        return key(a) - key(b);
-    }
-  });
-  return out;
-}
-function fmtPrice(perMillion) {
-  if (perMillion < 0) return "var";
-  if (perMillion === 0) return "free";
-  if (perMillion < 1) return `$${perMillion.toFixed(2)}`;
-  if (perMillion < 100) return `$${perMillion.toFixed(perMillion % 1 ? 1 : 0)}`;
-  return `$${Math.round(perMillion)}`;
-}
-function fmtContext(n) {
-  if (n >= 1e6) return `${Math.round(n / 1e5) / 10}M`;
-  if (n >= 1e3) return `${Math.round(n / 1e3)}k`;
-  return String(n);
-}
-
 // src/ui/wizard.ts
 function bail(value) {
   if (p.isCancel(value)) {
@@ -3055,6 +3239,36 @@ async function handleCommand(cmd, arg, ctx) {
       session.history = [];
       console.log(pc6.dim(t("repl.historyCleared")));
       return;
+    case "sessions": {
+      const all = await listSessions();
+      if (all.length === 0) {
+        console.log(pc6.yellow(t("sessions.empty")));
+        return;
+      }
+      console.log(pc6.bold(t("sessions.header")));
+      for (const s of all) {
+        console.log(`  ${pc6.cyan(s.id)} ${pc6.dim(`[${s.messageCount} msgs]`)} ${s.title}`);
+      }
+      return;
+    }
+    case "resume": {
+      if (!arg) {
+        console.log(pc6.yellow(t("repl.needName", { usage: "/resume <id>" })));
+        return;
+      }
+      const record = await loadSession(arg);
+      if (!record) {
+        console.log(pc6.red(t("sessions.notFound", { id: arg })));
+        return;
+      }
+      session.id = record.id;
+      session.title = record.title;
+      session.agentName = record.agentName;
+      session.mode = record.mode;
+      session.history = record.messages;
+      console.log(pc6.green(t("sessions.resumed", { id: record.id, n: record.messages.length })));
+      return;
+    }
     case "swarm": {
       if (!arg) {
         console.log(pc6.yellow(t("repl.needName", { usage: "/swarm <task>" })));
@@ -3136,7 +3350,7 @@ import pc7 from "picocolors";
 // src/core/git/worktree.ts
 import { mkdtemp } from "fs/promises";
 import { tmpdir } from "os";
-import { join as join4 } from "path";
+import { join as join6 } from "path";
 import { simpleGit } from "simple-git";
 async function ensureRepo(workspace) {
   const git = simpleGit(workspace);
@@ -3157,7 +3371,7 @@ async function identityArgs(git) {
 }
 async function createWorktree(git, label) {
   const branch = `polypus/${label}-${Date.now().toString(36)}`;
-  const path = await mkdtemp(join4(tmpdir(), "polypus-wt-"));
+  const path = await mkdtemp(join6(tmpdir(), "polypus-wt-"));
   await git.raw(["worktree", "add", "-b", branch, path, "HEAD"]);
   return { path, branch };
 }
@@ -3588,17 +3802,32 @@ var Spinner = class {
 var MAX_VERIFY_FIXES = 3;
 async function run(task, opts) {
   let config = await loadConfig();
-  const agentConfig = resolveAgent(config, opts.agent);
   const workspace = process.cwd();
+  let seeded;
+  if (opts.resume) {
+    seeded = await loadSession(opts.resume);
+    if (!seeded) throw new Error(t("sessions.notFound", { id: opts.resume }));
+  } else if (opts.continue) {
+    seeded = await latestSession();
+    if (!seeded && !opts.json) console.log(pc8.dim(t("sessions.noneToContinue")));
+  }
+  const agentConfig = resolveAgent(config, opts.agent ?? seeded?.agentName);
   const session = {
+    id: seeded?.id ?? newSessionId(),
+    title: seeded?.title ?? "",
     agentName: agentConfig.name,
-    mode: opts.mode ?? config.permissions.mode,
+    mode: opts.mode ?? seeded?.mode ?? config.permissions.mode,
     allow: config.permissions.allow,
     deny: config.permissions.deny,
     allowedCommands: config.permissions.allowedCommands,
     maxSteps: opts.maxSteps ? Number(opts.maxSteps) : void 0,
-    history: []
+    history: seeded?.messages ?? [],
+    budget: opts.budget ? Number(opts.budget) : void 0,
+    costUsd: 0
   };
+  if (seeded && !opts.json) {
+    console.log(pc8.dim(t("sessions.resumed", { id: seeded.id, n: seeded.messages.length })));
+  }
   const runTask = async (taskText) => {
     const active = resolveAgent(config, session.agentName);
     const resolved2 = createProvider(active);
@@ -3621,6 +3850,9 @@ async function run(task, opts) {
       );
     }
     await executeTask(task, resolved2, workspace, session, opts.json ?? false, opts.verify ?? false);
+    if (session.budget !== void 0 && !opts.json) {
+      console.log(pc8.dim(t("budget.session", { spent: fmtUsd(session.costUsd), budget: fmtUsd(session.budget) })));
+    }
     return;
   }
   const resolved = createProvider(agentConfig);
@@ -3657,6 +3889,21 @@ async function executeTask(task, resolved, workspace, session, json = false, ver
   const controller = new AbortController();
   const cancel2 = listenForCancel(controller);
   const collector = json ? createJsonCollector() : void 0;
+  const pricing = await resolveModelPricing(resolved.config);
+  let budgetHit = false;
+  const baseEvents = collector ? collector.events : renderEvents(spinner3);
+  const events = {
+    ...baseEvents,
+    onUsage(u) {
+      baseEvents.onUsage?.(u);
+      if (session.budget !== void 0 && pricing && !controller.signal.aborted) {
+        if (session.costUsd + estimateCost(u, pricing) >= session.budget) {
+          budgetHit = true;
+          controller.abort();
+        }
+      }
+    }
+  };
   const permissions = new PermissionEngine({
     mode: session.mode,
     policy: { workspace, allow: session.allow, deny: session.deny },
@@ -3679,7 +3926,7 @@ async function executeTask(task, resolved, workspace, session, json = false, ver
     history: session.history,
     maxSteps: session.maxSteps,
     signal: controller.signal,
-    events: collector ? collector.events : renderEvents(spinner3)
+    events
   });
   if (!json) spinner3.start(t("ui.thinking"));
   let result;
@@ -3693,10 +3940,34 @@ async function executeTask(task, resolved, workspace, session, json = false, ver
     spinner3.stop();
     cancel2.dispose();
   }
+  if (!session.title) session.title = deriveTitle(session.history);
+  await saveSession({
+    id: session.id,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    title: session.title,
+    agentName: session.agentName,
+    mode: session.mode,
+    messages: session.history
+  }).catch(() => {
+  });
+  const runCost = pricing ? estimateCost(result.usage, pricing) : 0;
+  session.costUsd += runCost;
+  await recordUsage({
+    ts: (/* @__PURE__ */ new Date()).toISOString(),
+    agent: resolved.config.name,
+    provider: resolved.config.provider,
+    model: resolved.config.model,
+    promptTokens: result.usage.promptTokens,
+    completionTokens: result.usage.completionTokens,
+    costUsd: runCost
+  });
   if (collector) {
     process.stdout.write(JSON.stringify(collector.build(result)) + "\n");
     return;
   }
+  if (budgetHit) {
+    console.log(pc8.yellow("\n" + t("budget.hit", { budget: fmtUsd(session.budget ?? 0) })));
+  }
   if (result.reason === "finished") {
     console.log(pc8.green("\n" + t("run.done", { steps: result.steps })) + (result.summary ? ` ${result.summary}` : ""));
   } else if (result.reason === "cancelled") {
@@ -3706,15 +3977,13 @@ async function executeTask(task, resolved, workspace, session, json = false, ver
   }
   if (result.usage.promptTokens || result.usage.completionTokens) {
     const total = result.usage.promptTokens + result.usage.completionTokens;
-    console.log(
-      pc8.dim(
-        "\u21B3 " + t("ui.tokens", {
-          total: fmtTokens(total),
-          in: fmtTokens(result.usage.promptTokens),
-          out: fmtTokens(result.usage.completionTokens)
-        })
-      )
-    );
+    const tokensLine = t("ui.tokens", {
+      total: fmtTokens(total),
+      in: fmtTokens(result.usage.promptTokens),
+      out: fmtTokens(result.usage.completionTokens)
+    });
+    const cost = pricing ? ` \xB7 ~${fmtUsd(runCost)}` : "";
+    console.log(pc8.dim("\u21B3 " + tokensLine + cost));
   }
 }
 function fmtTokens(n) {
@@ -3816,8 +4085,8 @@ function renderEvents(spinner3) {
     onStep() {
       spinner3.start(t("ui.thinking"));
     },
-    onUsage(usage) {
-      const total = usage.promptTokens + usage.completionTokens;
+    onUsage(usage2) {
+      const total = usage2.promptTokens + usage2.completionTokens;
       if (total > 0) spinner3.setSuffix(t("ui.tokensShort", { total: fmtTokens(total) }));
     },
     onAssistantText(text2) {
@@ -3855,8 +4124,8 @@ async function setup() {
 import pc9 from "picocolors";
 
 // src/core/scaffold/init.ts
-import { mkdir as mkdir3, writeFile as writeFile4, access } from "fs/promises";
-import { dirname as dirname3, join as join5 } from "path";
+import { mkdir as mkdir5, writeFile as writeFile5, access } from "fs/promises";
+import { dirname as dirname3, join as join7 } from "path";
 
 // src/core/scaffold/templates.ts
 function polyTemplates(locale) {
@@ -4099,13 +4368,13 @@ async function scaffoldPoly(workspace, opts) {
   const skipped = [];
   for (const [rel, content] of Object.entries(templates)) {
     const display = `.poly/${rel}`;
-    const abs = join5(workspace, ".poly", ...rel.split("/"));
+    const abs = join7(workspace, ".poly", ...rel.split("/"));
     if (!opts.force && await exists(abs)) {
       skipped.push(display);
       continue;
     }
-    await mkdir3(dirname3(abs), { recursive: true });
-    await writeFile4(abs, content, "utf8");
+    await mkdir5(dirname3(abs), { recursive: true });
+    await writeFile5(abs, content, "utf8");
     created.push(display);
   }
   return { created, skipped };
@@ -4198,11 +4467,51 @@ async function resolveOpenRouterKey() {
   }
 }
 
+// src/cli/commands/usage.ts
+import pc11 from "picocolors";
+async function usage() {
+  const { days, total } = await aggregateUsage();
+  if (days.length === 0) {
+    console.log(pc11.yellow(t("usage.empty")));
+    return;
+  }
+  console.log(pc11.bold(t("usage.header")));
+  for (const d of days) console.log("  " + formatRow(d));
+  console.log(pc11.dim("  " + "\u2500".repeat(40)));
+  console.log("  " + pc11.bold(formatRow({ ...total, date: t("usage.total") })));
+}
+function formatRow(b) {
+  const tokens2 = fmtTokens2(b.promptTokens + b.completionTokens);
+  return `${b.date.padEnd(12)} ${tokens2.padStart(7)} tok   ${fmtUsd(b.costUsd).padStart(10)}   (${b.runs} ${t("usage.runs")})`;
+}
+function fmtTokens2(n) {
+  return n >= 1e3 ? `${(n / 1e3).toFixed(1)}k` : String(n);
+}
+
+// src/cli/commands/sessions.ts
+import pc12 from "picocolors";
+async function sessions() {
+  const all = await listSessions();
+  if (all.length === 0) {
+    console.log(pc12.yellow(t("sessions.empty")));
+    return;
+  }
+  console.log(pc12.bold(t("sessions.header")));
+  for (const s of all) {
+    const when = s.updatedAt.replace("T", " ").slice(0, 16);
+    console.log(
+      `  ${pc12.cyan(s.id)}  ${pc12.dim(when)}  ${pc12.dim(`[${s.agentName} \xB7 ${s.mode} \xB7 ${s.messageCount} msgs]`)}`
+    );
+    console.log(`     ${s.title}`);
+  }
+  console.log(pc12.dim("\n" + t("sessions.hint")));
+}
+
 // src/cli/commands/prd.ts
-import { writeFile as writeFile5, readFile as readFile10 } from "fs/promises";
+import { writeFile as writeFile6, readFile as readFile12 } from "fs/promises";
 import { execFile } from "child_process";
 import { promisify as promisify3 } from "util";
-import pc11 from "picocolors";
+import pc13 from "picocolors";
 
 // src/core/agent/prd.ts
 var SYSTEM = [
@@ -4330,15 +4639,15 @@ async function prd(issueRef, opts) {
   const guide = readProjectGuide(["context.md"]);
   const markdown = await withRetry(() => generatePrd(issue, provider, guide));
   if (opts.out) {
-    await writeFile5(opts.out, markdown + "\n", "utf8");
-    console.error(pc11.green(t("prd.wrote", { path: opts.out })));
+    await writeFile6(opts.out, markdown + "\n", "utf8");
+    console.error(pc13.green(t("prd.wrote", { path: opts.out })));
   } else {
     process.stdout.write(markdown + "\n");
   }
 }
 async function loadIssue(issueRef, input) {
   if (input) {
-    const raw = input === "-" ? await readStdin() : await readFile10(input, "utf8");
+    const raw = input === "-" ? await readStdin() : await readFile12(input, "utf8");
     return normalize2(JSON.parse(stripBom(raw)));
   }
   const num = numericRef(issueRef);
@@ -4357,10 +4666,10 @@ function normalize2(raw) {
 }
 
 // src/cli/commands/review.ts
-import { writeFile as writeFile6, readFile as readFile11 } from "fs/promises";
+import { writeFile as writeFile7, readFile as readFile13 } from "fs/promises";
 import { execFile as execFile2 } from "child_process";
 import { promisify as promisify4 } from "util";
-import pc12 from "picocolors";
+import pc14 from "picocolors";
 
 // src/core/agent/review.ts
 var MAX_DIFF_CHARS = Number(process.env.POLYPUS_MAX_DIFF_CHARS) || 6e4;
@@ -4426,14 +4735,14 @@ async function review(prRef, opts) {
   const guide = readProjectGuide(["rules.md", "context.md"]);
   const markdown = await withRetry(() => reviewDiff(diff, meta, provider, guide));
   if (opts.out) {
-    await writeFile6(opts.out, markdown + "\n", "utf8");
-    console.error(pc12.green(t("review.wrote", { path: opts.out })));
+    await writeFile7(opts.out, markdown + "\n", "utf8");
+    console.error(pc14.green(t("review.wrote", { path: opts.out })));
   } else {
     process.stdout.write(markdown + "\n");
   }
 }
 async function loadDiff(num, input) {
-  if (input) return input === "-" ? readStdin() : readFile11(input, "utf8");
+  if (input) return input === "-" ? readStdin() : readFile13(input, "utf8");
   const { stdout: stdout2 } = await exec4("gh", ["pr", "diff", num]);
   return stdout2;
 }
@@ -4445,7 +4754,7 @@ async function loadMeta(num, input) {
 }
 
 // src/cli/index.ts
-import { join as join6 } from "path";
+import { join as join8 } from "path";
 
 // src/core/config/dotenv.ts
 import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
@@ -4478,7 +4787,7 @@ async function launchInteractive() {
   const config = await loadConfig();
   if (config.agents.length === 0) {
     console.log(banner());
-    console.log("  " + pc13.yellow(t("welcome.firstRun")) + "\n");
+    console.log("  " + pc15.yellow(t("welcome.firstRun")) + "\n");
     await setup();
   }
   await run(void 0, {});
@@ -4505,20 +4814,22 @@ function buildProgram() {
   program.command("add-agent").argument("<name>", t("cli.arg.addAgentName")).requiredOption("--provider <provider>", t("cli.opt.provider")).requiredOption("--model <model>", t("cli.opt.model")).option("--api-key <key>", t("cli.opt.apiKey")).option("--base-url <url>", t("cli.opt.baseUrl")).option("--tool-mode <mode>", t("cli.opt.toolMode"), "auto").option("--set-default", t("cli.opt.setDefault")).description(t("cli.cmd.addAgent")).action((name, opts) => addAgent(name, opts));
   program.command("remove-agent").argument("<name>", t("cli.arg.removeAgentName")).description(t("cli.cmd.removeAgent")).action((name) => removeAgent(name));
   program.command("list-agents").alias("agents").description(t("cli.cmd.listAgents")).action(() => listAgents());
-  program.command("run").argument("[task]", t("cli.arg.runTask")).option("--agent <name>", t("cli.opt.agent")).option("--mode <mode>", t("cli.opt.mode")).option("--max-steps <n>", t("cli.opt.maxSteps")).option("--json", t("cli.opt.json")).option("--verify", t("cli.opt.verify")).description(t("cli.cmd.run")).action((task, opts) => run(task, opts));
+  program.command("run").argument("[task]", t("cli.arg.runTask")).option("--agent <name>", t("cli.opt.agent")).option("--mode <mode>", t("cli.opt.mode")).option("--max-steps <n>", t("cli.opt.maxSteps")).option("--json", t("cli.opt.json")).option("--verify", t("cli.opt.verify")).option("--budget <usd>", t("cli.opt.budget")).option("--continue", t("cli.opt.continue")).option("--resume <id>", t("cli.opt.resume")).description(t("cli.cmd.run")).action((task, opts) => run(task, opts));
   program.command("swarm").argument("<task>", t("cli.arg.swarmTask")).option("--agents <names>", t("cli.opt.agents")).option("--max-subtasks <n>", t("cli.opt.maxSubtasks")).description(t("cli.cmd.swarm")).action((task, opts) => swarm(task, opts));
   program.command("models").option("--search <text>", t("cli.opt.search")).option("--tools", t("cli.opt.toolsOnly")).option("--free", t("cli.opt.free")).option("--max-price <usd>", t("cli.opt.maxPrice")).option("--sort <order>", t("cli.opt.sort")).option("--limit <n>", t("cli.opt.limit")).description(t("cli.cmd.models")).action((opts) => models(opts));
+  program.command("usage").description(t("cli.cmd.usage")).action(() => usage());
+  program.command("sessions").description(t("cli.cmd.sessions")).action(() => sessions());
   program.command("prd").argument("<issue>", t("cli.arg.prdIssue")).option("--out <file>", t("cli.opt.out")).option("--model <model>", t("cli.opt.model")).option("--input <file>", t("cli.opt.input")).description(t("cli.cmd.prd")).action((issue, opts) => prd(issue, opts));
   program.command("review").argument("<pr>", t("cli.arg.reviewPr")).option("--out <file>", t("cli.opt.out")).option("--model <model>", t("cli.opt.model")).option("--input <file>", t("cli.opt.input")).description(t("cli.cmd.review")).action((pr, opts) => review(pr, opts));
   return program;
 }
 async function main() {
   try {
-    loadDotenv([join6(configDir(), ".env"), join6(process.cwd(), ".env")]);
+    loadDotenv([join8(configDir(), ".env"), join8(process.cwd(), ".env")]);
     await resolveLocale();
     await buildProgram().parseAsync(process.argv);
   } catch (err) {
-    console.error(pc13.red(`\u2717 ${err.message}`));
+    console.error(pc15.red(`\u2717 ${err.message}`));
     process.exitCode = 1;
   }
 }