claude-maestro 0.1.20 → 0.1.22

package/out/main/index.js

@@ -463,6 +463,12 @@ async function gitChangedFiles(folder) {
   }
 }
 const MAX_DIFF_CHARS = 5e5;
+function toFileDiff(text) {
+  const binary = /^Binary files .* differ$/m.test(text);
+  if (text.length <= MAX_DIFF_CHARS) return { diff: text, binary, truncated: false };
+  const cut = text.lastIndexOf("\n", MAX_DIFF_CHARS);
+  return { diff: text.slice(0, cut > 0 ? cut : MAX_DIFF_CHARS), binary, truncated: true };
+}
 async function gitFileDiff(folder, path2) {
   const empty = { diff: "", binary: false, truncated: false };
   try {
@@ -476,11 +482,47 @@ async function gitFileDiff(folder, path2) {
     } else {
       res = await git(root2, ["diff", "--no-index", "--", "/dev/null", path2]);
     }
+    return toFileDiff(res.stdout);
+  } catch {
+    return empty;
+  }
+}
+function parseNameStatus(out) {
+  const files = [];
+  for (const line of out.split(/\r?\n/)) {
+    if (!line.trim()) continue;
+    const parts = line.split("	");
+    const letter = parts[0]?.[0] ?? "M";
+    if ((letter === "R" || letter === "C") && parts.length >= 3) {
+      files.push({ path: parts[2], status: letter, origPath: parts[1] });
+    } else if (parts[1]) {
+      files.push({ path: parts[1], status: letter });
+    }
+  }
+  files.sort((a, b) => a.path.localeCompare(b.path));
+  return files;
+}
+async function branchDiff(folder, branch, baseBranch) {
+  const empty = { diff: "", truncated: false, files: [], branch, baseBranch };
+  try {
+    const mb = await git(folder, ["merge-base", baseBranch, branch]);
+    const base = mb.code === 0 ? mb.stdout.trim() : "";
+    if (!base) return empty;
+    const ns = await git(folder, ["diff", "--name-status", base, branch]);
+    const files = ns.code === 0 ? parseNameStatus(ns.stdout) : [];
+    const res = await git(folder, ["diff", base, branch]);
     const text = res.stdout;
-    const binary = /^Binary files .* differ$/m.test(text);
-    if (text.length <= MAX_DIFF_CHARS) return { diff: text, binary, truncated: false };
+    if (text.length <= MAX_DIFF_CHARS) {
+      return { diff: text, truncated: false, files, branch, baseBranch };
+    }
     const cut = text.lastIndexOf("\n", MAX_DIFF_CHARS);
-    return { diff: text.slice(0, cut > 0 ? cut : MAX_DIFF_CHARS), binary, truncated: true };
+    return {
+      diff: text.slice(0, cut > 0 ? cut : MAX_DIFF_CHARS),
+      truncated: true,
+      files,
+      branch,
+      baseBranch
+    };
   } catch {
     return empty;
   }
@@ -579,7 +621,7 @@ async function startMergeLeaveConflicts(baseFolder, branch, baseBranch) {
   const merging = await git(baseFolder, ["rev-parse", "--verify", "--quiet", "MERGE_HEAD"]);
   return { ok: false, conflict: merging.code === 0, output: res.output };
 }
-async function pushBranch(folder, branch) {
+async function pushBranch(folder, branch, env) {
   const up = await git(folder, [
     "rev-parse",
     "--abbrev-ref",
@@ -589,15 +631,20 @@ async function pushBranch(folder, branch) {
   if (up.code !== 0) return null;
   const remote = up.stdout.trim().split("/")[0];
   if (!remote) return null;
-  const res = await git(folder, ["push", remote, branch]);
+  const res = await git(folder, ["push", remote, branch], env);
   return { ok: res.code === 0, output: res.output };
 }
-function gh(cwd, args) {
+function gh$1(cwd, args, env) {
   return new Promise((resolve2, reject) => {
     child_process.execFile(
       "gh",
       args,
-      { cwd, windowsHide: true, maxBuffer: 8 * 1024 * 1024 },
+      {
+        cwd,
+        windowsHide: true,
+        maxBuffer: 8 * 1024 * 1024,
+        ...env ? { env: { ...process.env, ...env } } : {}
+      },
       (err, stdout, stderr) => {
         if (err && err.code === "ENOENT") {
           reject(
@@ -621,7 +668,7 @@ function extractPrUrl(text) {
   const m = text.match(/https:\/\/github\.com\/\S+\/pull\/\d+/);
   return m ? m[0] : "";
 }
-async function createPullRequest(folder, branch, baseBranch, title, body) {
+async function createPullRequest(folder, branch, baseBranch, title, body, env) {
   const remote = await defaultRemote(folder);
   if (!remote) {
     return {
@@ -629,28 +676,21 @@ async function createPullRequest(folder, branch, baseBranch, title, body) {
       output: "This repository has no git remote, so there is nowhere to open a pull request. Add a GitHub remote (e.g. `git remote add origin <url>`) first."
     };
   }
-  const push = await git(folder, ["push", "-u", remote, branch]);
+  const push = await git(folder, ["push", "-u", remote, branch], env);
   if (push.code !== 0) {
     return { ok: false, output: `Pushing "${branch}" to ${remote} failed:
 ${push.output}` };
   }
-  const res = await gh(folder, [
-    "pr",
-    "create",
-    "--base",
-    baseBranch,
-    "--head",
-    branch,
-    "--title",
-    title,
-    "--body",
-    body
-  ]);
+  const res = await gh$1(
+    folder,
+    ["pr", "create", "--base", baseBranch, "--head", branch, "--title", title, "--body", body],
+    env
+  );
   if (res.code === 0) {
     return { ok: true, url: extractPrUrl(res.stdout) || lastLine(res.stdout), output: res.output };
   }
   if (/already exists/i.test(res.output)) {
-    const view = await gh(folder, ["pr", "view", branch, "--json", "url", "--jq", ".url"]);
+    const view = await gh$1(folder, ["pr", "view", branch, "--json", "url", "--jq", ".url"], env);
     const url = view.code === 0 ? extractPrUrl(view.stdout) || lastLine(view.stdout) : "";
     return {
       ok: true,
@@ -670,10 +710,18 @@ async function defaultRemote(folder) {
   if (remotes.length === 0) return null;
   return remotes.includes("origin") ? "origin" : remotes[0];
 }
-async function publishBranch(folder, branch) {
+async function remoteUrl(folder) {
+  const remote = await defaultRemote(folder);
+  if (!remote) return null;
+  const res = await git(folder, ["remote", "get-url", remote]);
+  if (res.code !== 0) return null;
+  const url = res.stdout.trim();
+  return url || null;
+}
+async function publishBranch(folder, branch, env) {
   const remote = await defaultRemote(folder);
   if (!remote) return null;
-  const res = await git(folder, ["push", "-u", remote, branch]);
+  const res = await git(folder, ["push", "-u", remote, branch], env);
   return { ok: res.code === 0, output: res.output };
 }
 async function dirtyCount(folder) {
@@ -709,6 +757,39 @@ async function branchExists(repoRoot, branch) {
   const res = await git(repoRoot, ["rev-parse", "--verify", "--quiet", `refs/heads/${branch}`]);
   return res.code === 0;
 }
+async function isValidBranchName(name) {
+  const n = name.trim();
+  if (!n) return false;
+  const res = await git(process.cwd(), ["check-ref-format", "--branch", n]);
+  return res.code === 0;
+}
+async function checkoutBranch(folder, branch) {
+  return git(folder, ["checkout", branch]);
+}
+async function createBranch(folder, branch, from) {
+  const args = ["checkout", "-b", branch, ...[]];
+  return git(folder, args);
+}
+async function worktreeBranches(repoRoot) {
+  const res = await git(repoRoot, ["worktree", "list", "--porcelain"]);
+  if (res.code !== 0) return [];
+  const out = [];
+  let cur = null;
+  for (const line of res.stdout.split(/\r?\n/)) {
+    if (line.startsWith("worktree ")) {
+      if (cur) out.push(cur);
+      cur = { path: line.slice("worktree ".length).trim().replace(/\\/g, "/"), branch: null };
+    } else if (line.startsWith("branch ") && cur) {
+      cur.branch = line.slice("branch ".length).trim().replace(/^refs\/heads\//, "");
+    }
+  }
+  if (cur) out.push(cur);
+  return out;
+}
+async function branchCheckedOutAt(repoRoot, branch) {
+  const wts = await worktreeBranches(repoRoot);
+  return wts.find((w) => w.branch === branch)?.path ?? null;
+}
 async function listWorktreePaths(repoRoot) {
   const res = await git(repoRoot, ["worktree", "list", "--porcelain"]);
   if (res.code !== 0) return [];
@@ -859,6 +940,33 @@ async function listCheckpoints(folder) {
   }
   return out;
 }
+async function checkpointDiff(folder, id) {
+  const empty = { diff: "", binary: false, truncated: false };
+  if (!isValidCheckpointId(id)) return empty;
+  const root2 = await repoRootOf(folder);
+  const ref = CHECKPOINT_REF_PREFIX + id;
+  const resolved = await git(root2, ["rev-parse", "--verify", "--quiet", `${ref}^{commit}`]);
+  if (resolved.code !== 0 || !resolved.stdout.trim()) return empty;
+  const hash = resolved.stdout.trim();
+  const indexFile = path.join(os.tmpdir(), `maestro-ckpt-diff-${id}-${checkpointSeq++}.index`);
+  try {
+    const indexEnv = { GIT_INDEX_FILE: indexFile };
+    const add2 = await git(root2, ["add", "-A"], indexEnv);
+    if (add2.code !== 0) return empty;
+    const writeTree = await git(root2, ["write-tree"], indexEnv);
+    if (writeTree.code !== 0) return empty;
+    const curTree = writeTree.stdout.trim();
+    const res = await git(root2, ["diff", hash, curTree]);
+    return toFileDiff(res.stdout);
+  } catch {
+    return empty;
+  } finally {
+    try {
+      fs.rmSync(indexFile, { force: true });
+    } catch {
+    }
+  }
+}
 async function restoreCheckpoint(folder, id) {
   if (!isValidCheckpointId(id)) {
     return { ok: false, output: `Invalid checkpoint id: ${id}`, safety: null };
@@ -906,6 +1014,68 @@ function excludeFilePathSync(folder) {
     return null;
   }
 }
+function gh(args) {
+  return new Promise((resolve) => {
+    child_process.execFile("gh", args, { windowsHide: true, maxBuffer: 4 * 1024 * 1024 }, (err, stdout, stderr) => {
+      const code = err ? err.code ?? 1 : 0;
+      resolve({ code, stdout, stderr });
+    });
+  });
+}
+function stripAnsi$1(text) {
+  const esc = String.fromCharCode(27);
+  return text.replace(new RegExp(esc + "\\[[0-9;]*m", "g"), "");
+}
+async function listAccounts() {
+  const res = await gh(["auth", "status"]);
+  const text = stripAnsi$1(`${res.stdout}
+${res.stderr}`);
+  const accounts = [];
+  let last = null;
+  for (const line of text.split(/\r?\n/)) {
+    const logged = line.match(/Logged in to (\S+) account (\S+)/);
+    if (logged) {
+      last = { host: logged[1], login: logged[2] };
+      accounts.push(last);
+      continue;
+    }
+    const activeMatch = line.match(/Active account:\s*(true|false)/i);
+    if (activeMatch && last) {
+      last.active = activeMatch[1].toLowerCase() === "true";
+    }
+  }
+  return accounts;
+}
+async function tokenFor(host, login) {
+  const res = await gh(["auth", "token", "--hostname", host, "--user", login]);
+  if (res.code !== 0) return null;
+  const token = res.stdout.trim();
+  return token || null;
+}
+async function repoSlug(folder) {
+  const url = await remoteUrl(folder);
+  if (!url) return null;
+  let rest = url.trim();
+  const scp = rest.match(/^[^@]+@([^:]+):(.+)$/);
+  if (scp) {
+    rest = `${scp[1]}/${scp[2]}`;
+  } else {
+    rest = rest.replace(/^[a-z]+:\/\//i, "").replace(/^[^@/]+@/, "");
+  }
+  rest = rest.replace(/\.git$/i, "").replace(/\/+$/, "");
+  if (!rest.includes("/")) return null;
+  return rest.toLowerCase();
+}
+async function accountEnvForRepo(folder, mapping) {
+  if (!mapping) return void 0;
+  const slug = await repoSlug(folder);
+  if (!slug) return void 0;
+  const entry = mapping[slug];
+  if (!entry) return void 0;
+  const token = await tokenFor(entry.host, entry.login);
+  if (!token) return void 0;
+  return { GH_TOKEN: token };
+}
 const BEL = "\x07";
 const CSI_RE = new RegExp(
   "[\\x1b\\x9b][\\[\\]()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]",
@@ -939,6 +1109,10 @@ class StatusDetector {
   get lastOutput() {
     return this.lastOutputAt;
   }
+  /** ANSI-stripped tail of recent output, for prompt-content checks. */
+  get recentText() {
+    return stripAnsi(this.tail);
+  }
   /** ms epoch when the current status was continuously entered (watchdog clock). */
   get since() {
     return this.statusSince;
@@ -1377,7 +1551,11 @@ class AutoExpandService {
     if (!info.isRepo || !info.repoRoot) return;
     await ensureBranch(info.repoRoot, cfg.branch);
     try {
-      await publishBranch(info.repoRoot, cfg.branch);
+      const env = await accountEnvForRepo(
+        info.repoRoot,
+        this.persistence.state.settings.githubRepoAccounts
+      );
+      await publishBranch(info.repoRoot, cfg.branch, env);
     } catch {
     }
   }
@@ -1457,7 +1635,11 @@ class AutoExpandService {
       }
       await ensureBranch(info.repoRoot, cfg.branch);
       try {
-        await publishBranch(info.repoRoot, cfg.branch);
+        const env = await accountEnvForRepo(
+          info.repoRoot,
+          this.persistence.state.settings.githubRepoAccounts
+        );
+        await publishBranch(info.repoRoot, cfg.branch, env);
       } catch {
       }
       const existingTitles = this.features.list(session.id).map((f) => f.title);
@@ -2497,7 +2679,7 @@ const MIN_CONFIDENCE = 0.6;
 const MAX_SUGGESTIONS_PER_DETECT = 2;
 const JUDGE_DAILY_CAP = 12;
 const MAX_SUGGESTIONS = 60;
-function localDay$1() {
+function localDay$2() {
   const d = /* @__PURE__ */ new Date();
   return `${d.getFullYear()}-${d.getMonth() + 1}-${d.getDate()}`;
 }
@@ -2679,7 +2861,7 @@ class FactoryService {
       return;
     }
     const turnsAtStart = g.turnsSinceDetect;
-    const day = localDay$1();
+    const day = localDay$2();
     const callsToday = g.judgeDay === day ? g.judgeCallsToday : 0;
     if (callsToday >= JUDGE_DAILY_CAP) return;
     const recent = messages.filter((m) => !m.pending && m.text?.trim()).slice(-6);
@@ -2705,7 +2887,7 @@ class FactoryService {
       this.inFlight = null;
       this.setBusy(false);
       const g2 = this.store.loadGrowth();
-      const day2 = localDay$1();
+      const day2 = localDay$2();
       this.store.setGrowth({
         ...g2,
         lastDetectAt: Date.now(),
@@ -3858,7 +4040,10 @@ class FsService {
     }
   }
 }
+const TOKENS_PER_XP = 1e3;
 const XP_TABLE = {
+  "tokens.burn": 0,
+  // computed from meta.tokens in xpForEvent
   "session.turn": 5,
   "conductor.turn": 5,
   "action.run": 8,
@@ -3875,6 +4060,9 @@ const XP_TABLE = {
   "feature.merge": 80
 };
 function xpForEvent(e) {
+  if (e.type === "tokens.burn") {
+    return Math.max(0, Math.floor((e.meta?.tokens ?? 0) / TOKENS_PER_XP));
+  }
   let xp = XP_TABLE[e.type] ?? 0;
   if (e.type === "worktree.merge") xp += Math.min(e.meta?.commits ?? 0, 10) * 3;
   return xp;
@@ -3903,6 +4091,8 @@ const DEFAULT_GAME_STATE = {
   counters: {},
   nightTurns: 0,
   earlyTurns: 0,
+  tokensBurned: 0,
+  usageTokensSeen: -1,
   createdAt: 0
 };
 const c = (ctx, t) => ctx.counters[t] ?? 0;
@@ -3930,6 +4120,23 @@ const ACHIEVEMENTS = [
   { id: "first-agent", title: "Agent Architect", desc: "Create your first agent.", icon: "🤖", category: "factory", predicate: (x) => c(x, "factory.agent") >= 1 },
   { id: "toolsmith", title: "Toolsmith", desc: "Create 5 skills/agents.", icon: "⚒", category: "factory", predicate: (x) => c(x, "factory.skill") + c(x, "factory.agent") >= 5 },
   { id: "master-toolsmith", title: "Master Toolsmith", desc: "Create 20 skills/agents.", icon: "🏭", category: "factory", predicate: (x) => c(x, "factory.skill") + c(x, "factory.agent") >= 20 },
+  // workflow (checkpoints, actions, feature specs, auto-expand)
+  { id: "first-checkpoint", title: "Safe Keeper", desc: "Make your first checkpoint.", icon: "📍", category: "workflow", predicate: (x) => c(x, "checkpoint.create") >= 1 },
+  { id: "checkpoint-25", title: "Time Traveler", desc: "Make 25 checkpoints.", icon: "⏳", category: "workflow", predicate: (x) => c(x, "checkpoint.create") >= 25 },
+  { id: "first-action", title: "Press Start", desc: "Run your first reusable action.", icon: "▶️", category: "workflow", predicate: (x) => c(x, "action.run") >= 1 },
+  { id: "action-50", title: "Power User", desc: "Run 50 actions.", icon: "⚡", category: "workflow", predicate: (x) => c(x, "action.run") >= 50 },
+  { id: "first-feature-spec", title: "Drawing Board", desc: "Save your first feature spec.", icon: "📝", category: "workflow", predicate: (x) => c(x, "feature.save") >= 1 },
+  { id: "feature-architect", title: "Spec Architect", desc: "Save 10 feature specs.", icon: "📐", category: "workflow", predicate: (x) => c(x, "feature.save") >= 10 },
+  { id: "first-autoexpand", title: "Brainstormer", desc: "Finish your first Auto-Expand run.", icon: "💡", category: "workflow", predicate: (x) => c(x, "autoexpand.done") >= 1 },
+  { id: "autoexpand-10", title: "Idea Machine", desc: "Finish 10 Auto-Expand runs.", icon: "🧠", category: "workflow", predicate: (x) => c(x, "autoexpand.done") >= 10 },
+  // guardian (Sentinels)
+  { id: "first-sentinel", title: "On Watch", desc: "Run your first Sentinel check.", icon: "🛡", category: "guardian", predicate: (x) => c(x, "sentinel.run") >= 1 },
+  { id: "sentinel-25", title: "Vigilant", desc: "Run 25 Sentinel checks.", icon: "👁", category: "guardian", predicate: (x) => c(x, "sentinel.run") >= 25 },
+  { id: "sentinel-100", title: "Guardian", desc: "Run 100 Sentinel checks.", icon: "🦾", category: "guardian", predicate: (x) => c(x, "sentinel.run") >= 100 },
+  // tokens (burning tokens levels you up)
+  { id: "tokens-1m", title: "Token Tinkerer", desc: "Burn 1M tokens.", icon: "🪙", category: "tokens", predicate: (x) => x.tokensBurned >= 1e6 },
+  { id: "tokens-10m", title: "Token Furnace", desc: "Burn 10M tokens.", icon: "🔥", category: "tokens", predicate: (x) => x.tokensBurned >= 1e7 },
+  { id: "tokens-100m", title: "Token Inferno", desc: "Burn 100M tokens.", icon: "🌋", category: "tokens", predicate: (x) => x.tokensBurned >= 1e8 },
   // streak
   { id: "streak-3", title: "Warmed Up", desc: "Keep a 3-day streak.", icon: "🔥", category: "streak", predicate: (x) => x.streakLongest >= 3 },
   { id: "streak-7", title: "On Fire", desc: "Keep a 7-day streak.", icon: "🔥", category: "streak", predicate: (x) => x.streakLongest >= 7 },
@@ -3939,7 +4146,11 @@ const ACHIEVEMENTS = [
   { id: "early-bird", title: "Early Bird", desc: "Finish a turn between 5 and 8am.", icon: "🌅", category: "time", predicate: (x) => x.earlyTurns >= 1 },
   // level
   { id: "level-10", title: "Double Digits", desc: "Reach level 10.", icon: "⭐", category: "level", predicate: (x) => x.level >= 10 },
-  { id: "level-25", title: "Maestro Prime", desc: "Reach level 25.", icon: "🌟", category: "level", predicate: (x) => x.level >= 25 }
+  { id: "level-25", title: "Maestro Prime", desc: "Reach level 25.", icon: "🌟", category: "level", predicate: (x) => x.level >= 25 },
+  { id: "level-50", title: "Maestro Legend", desc: "Reach level 50.", icon: "👑", category: "level", predicate: (x) => x.level >= 50 },
+  // mastery (cross-cutting capstones)
+  { id: "polymath", title: "Polymath", desc: "Use sessions, parallel tasks, the Factory, feature specs and Sentinels.", icon: "🧩", category: "mastery", predicate: (x) => c(x, "session.create") >= 1 && c(x, "worktree.create") >= 1 && c(x, "factory.skill") + c(x, "factory.agent") >= 1 && c(x, "feature.save") >= 1 && c(x, "sentinel.run") >= 1 },
+  { id: "all-rounder", title: "All-Rounder", desc: "Merge a worktree, ship a feature and open a PR.", icon: "🏅", category: "mastery", predicate: (x) => c(x, "worktree.merge") >= 1 && c(x, "feature.merge") >= 1 && c(x, "worktree.pr") >= 1 }
 ];
 const DAILY_QUEST_POOL = [
   { id: "q-turns-5", title: "Finish 5 Claude turns", target: 5, reward: 30, events: ["session.turn"] },
@@ -3951,7 +4162,11 @@ const DAILY_QUEST_POOL = [
   { id: "q-conductor-3", title: "Have 3 Conductor turns", target: 3, reward: 30, events: ["conductor.turn"] },
   { id: "q-factory-1", title: "Create a skill or agent", target: 1, reward: 75, events: ["factory.skill", "factory.agent"] },
   { id: "q-feature-1", title: "Save a feature spec", target: 1, reward: 30, events: ["feature.save"] },
-  { id: "q-pr-1", title: "Open a pull request", target: 1, reward: 50, events: ["worktree.pr"] }
+  { id: "q-pr-1", title: "Open a pull request", target: 1, reward: 50, events: ["worktree.pr"] },
+  { id: "q-action-3", title: "Run 3 reusable actions", target: 3, reward: 30, events: ["action.run"] },
+  { id: "q-sentinel-1", title: "Run a Sentinel check", target: 1, reward: 25, events: ["sentinel.run"] },
+  { id: "q-autoexpand-1", title: "Finish an Auto-Expand run", target: 1, reward: 40, events: ["autoexpand.done"] },
+  { id: "q-checkpoint-3", title: "Make 3 checkpoints", target: 3, reward: 40, events: ["checkpoint.create"] }
 ];
 const questDef = (id) => DAILY_QUEST_POOL.find((q) => q.id === id);
 function hashStr(s) {
@@ -4017,6 +4232,8 @@ class GamificationStore {
       }
       s.nightTurns = num(s.nightTurns, 0);
       s.earlyTurns = num(s.earlyTurns, 0);
+      s.tokensBurned = num(s.tokensBurned, 0);
+      s.usageTokensSeen = num(s.usageTokensSeen, -1);
       s.xp = num(s.xp, 0);
       if (!s.createdAt) s.createdAt = Date.now();
       this.state = s;
@@ -4053,20 +4270,66 @@ class GamificationStore {
   }
 }
 const ACHIEVEMENT_XP = 25;
+const TOKEN_POLL_MS = 6e4;
 class GamificationService {
-  constructor(getWin2) {
+  /**
+   * @param getUsageTokens returns the lifetime input+output token total (from
+   *   UsageService). Polled to award XP for tokens burned since the last check.
+   */
+  constructor(getWin2, getUsageTokens) {
     this.getWin = getWin2;
+    this.getUsageTokens = getUsageTokens;
     this.state = this.store.load();
   }
   store = new GamificationStore();
   state;
+  tokenTimer = null;
+  /** Begin polling burned tokens (baselined on the first tick, so historical
+   *  usage is never retroactively dumped into XP). */
+  start() {
+    if (this.tokenTimer || !this.getUsageTokens) return;
+    this.pollTokenBurn();
+    this.tokenTimer = setInterval(() => this.pollTokenBurn(), TOKEN_POLL_MS);
+  }
   /** GameState + derived level fields (for the initial renderer fetch). */
   snapshot() {
     return { ...this.state, ...levelInfo(this.state.xp) };
   }
   dispose() {
+    if (this.tokenTimer) {
+      clearInterval(this.tokenTimer);
+      this.tokenTimer = null;
+    }
     this.store.saveNow();
   }
+  /**
+   * Reconcile burned tokens into XP. The first observation only records the
+   * baseline (no award). Afterward, each whole `TOKENS_PER_XP` of new input+
+   * output tokens grants 1 XP via a `tokens.burn` event; the sub-unit remainder
+   * is carried (the baseline advances only by tokens actually converted), so
+   * even light usage eventually counts. A drop in the total (pruned transcripts)
+   * silently re-baselines.
+   */
+  pollTokenBurn() {
+    if (!this.getUsageTokens) return;
+    try {
+      const total = this.getUsageTokens();
+      if (!Number.isFinite(total) || total < 0) return;
+      const seen = this.state.usageTokensSeen;
+      if (seen < 0 || total < seen) {
+        this.state.usageTokensSeen = total;
+        this.store.set(this.state);
+        return;
+      }
+      const units = Math.floor((total - seen) / TOKENS_PER_XP);
+      if (units <= 0) return;
+      const consumed = units * TOKENS_PER_XP;
+      this.state.usageTokensSeen = seen + consumed;
+      this.award({ type: "tokens.burn", meta: { tokens: consumed } });
+    } catch (err) {
+      console.error("Token-burn poll failed (ignored):", err);
+    }
+  }
   /**
    * Apply one event: bump counters, roll the day (streak + quests), add XP,
    * advance quests, unlock achievements — each guarded so nothing double-counts.
@@ -4092,7 +4355,11 @@ class GamificationService {
           });
         }
       }
-      s.counters[e.type] = (s.counters[e.type] ?? 0) + 1;
+      if (e.type === "tokens.burn") {
+        s.tokensBurned += Math.max(0, e.meta?.tokens ?? 0);
+      } else {
+        s.counters[e.type] = (s.counters[e.type] ?? 0) + 1;
+      }
       if (e.type === "session.turn" || e.type === "conductor.turn") {
         const hour = e.meta?.hour ?? now.getHours();
         if (hour >= 0 && hour < 5) s.nightTurns += 1;
@@ -4125,7 +4392,8 @@ class GamificationService {
           nightTurns: s.nightTurns,
           earlyTurns: s.earlyTurns,
           streakLongest: s.streak.longest,
-          level: levelForXp(s.xp)
+          level: levelForXp(s.xp),
+          tokensBurned: s.tokensBurned
         };
         for (const a of ACHIEVEMENTS) {
           if (s.achievements[a.id]) continue;
@@ -4281,6 +4549,182 @@ async function clearBackgroundImage() {
   } catch {
   }
 }
+const PROJECTS_DIR$1 = path.join(os.homedir(), ".claude", "projects");
+const PREVIEW_MAX_CHARS = 160;
+function encodeFolder(folder) {
+  return folder.replace(/[^a-zA-Z0-9]/g, "-");
+}
+function messageText(message) {
+  if (!message || typeof message !== "object") return null;
+  const content = message.content;
+  if (typeof content === "string") return content.trim() || null;
+  if (Array.isArray(content)) {
+    const parts = [];
+    for (const block of content) {
+      if (block && typeof block === "object" && block.type === "text" && typeof block.text === "string") {
+        parts.push(block.text);
+      }
+    }
+    const joined = parts.join(" ").trim();
+    return joined || null;
+  }
+  return null;
+}
+function toPreview(text) {
+  const oneLine = text.replace(/\s+/g, " ").trim();
+  return oneLine.length > PREVIEW_MAX_CHARS ? oneLine.slice(0, PREVIEW_MAX_CHARS) + "…" : oneLine;
+}
+function summarizeFile(path2, id) {
+  let raw;
+  try {
+    raw = fs.readFileSync(path2, "utf8");
+  } catch {
+    return null;
+  }
+  let messageCount = 0;
+  let lastActivityAt = 0;
+  let preview = "";
+  for (const line of raw.split("\n")) {
+    if (!line.trim()) continue;
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    const type = obj.type;
+    if (type !== "user" && type !== "assistant") continue;
+    messageCount++;
+    const at = Date.parse(typeof obj.timestamp === "string" ? obj.timestamp : "");
+    if (Number.isFinite(at) && at > lastActivityAt) lastActivityAt = at;
+    if (!preview && type === "user" && obj.isMeta !== true) {
+      const text = messageText(obj.message);
+      if (text) preview = toPreview(text);
+    }
+  }
+  return { id, lastActivityAt, messageCount, preview };
+}
+function listConversations(folder) {
+  const dir = path.join(PROJECTS_DIR$1, encodeFolder(folder));
+  if (!fs.existsSync(dir)) return [];
+  let files;
+  try {
+    files = fs.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
+  } catch {
+    return [];
+  }
+  const out = [];
+  for (const file of files) {
+    const summary = summarizeFile(path.join(dir, file), file.slice(0, -".jsonl".length));
+    if (summary) out.push(summary);
+  }
+  out.sort((a, b) => b.lastActivityAt - a.lastActivityAt);
+  return out;
+}
+const SEARCH_MIN_QUERY = 2;
+const SEARCH_MAX_PER_CONVERSATION = 50;
+const SEARCH_MAX_RESULTS = 100;
+const SNIPPET_BEFORE = 40;
+const SNIPPET_AFTER = 140;
+const searchCache = /* @__PURE__ */ new Map();
+function makeSnippet(text, matchIndex, queryLength) {
+  const start = Math.max(0, matchIndex - SNIPPET_BEFORE);
+  const end = Math.min(text.length, matchIndex + queryLength + SNIPPET_AFTER);
+  const core = text.slice(start, end).replace(/\s+/g, " ").trim();
+  return (start > 0 ? "… " : "") + core + (end < text.length ? " …" : "");
+}
+function parseForSearch(path2, id) {
+  const conv = { id, cwd: "", lastActivityAt: 0, messages: [] };
+  let raw;
+  try {
+    raw = fs.readFileSync(path2, "utf8");
+  } catch {
+    return conv;
+  }
+  for (const line of raw.split("\n")) {
+    if (!line.includes('"user"') && !line.includes('"assistant"')) continue;
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (obj.type !== "user" && obj.type !== "assistant") continue;
+    const text = messageText(obj.message);
+    if (text) conv.messages.push(text);
+    if (typeof obj.cwd === "string" && obj.cwd) conv.cwd = obj.cwd;
+    const at = Date.parse(typeof obj.timestamp === "string" ? obj.timestamp : "");
+    if (Number.isFinite(at) && at > conv.lastActivityAt) conv.lastActivityAt = at;
+  }
+  return conv;
+}
+function searchableFor(path2, id) {
+  let stat;
+  try {
+    stat = fs.statSync(path2);
+  } catch {
+    searchCache.delete(path2);
+    return { id, cwd: "", lastActivityAt: 0, messages: [] };
+  }
+  const cached = searchCache.get(path2);
+  if (cached && cached.mtimeMs === stat.mtimeMs && cached.size === stat.size) return cached.conv;
+  const conv = parseForSearch(path2, id);
+  searchCache.set(path2, { mtimeMs: stat.mtimeMs, size: stat.size, conv });
+  return conv;
+}
+function searchConversations(query) {
+  const q = query.trim();
+  if (q.length < SEARCH_MIN_QUERY) return [];
+  const needle = q.toLowerCase();
+  let projectDirs = [];
+  try {
+    if (fs.existsSync(PROJECTS_DIR$1)) projectDirs = fs.readdirSync(PROJECTS_DIR$1);
+  } catch {
+    return [];
+  }
+  const hits = [];
+  const liveFiles = /* @__PURE__ */ new Set();
+  for (const dir of projectDirs) {
+    const dirPath = path.join(PROJECTS_DIR$1, dir);
+    let files;
+    try {
+      files = fs.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl"));
+    } catch {
+      continue;
+    }
+    for (const file of files) {
+      const path$1 = path.join(dirPath, file);
+      liveFiles.add(path$1);
+      const conv = searchableFor(path$1, file.slice(0, -".jsonl".length));
+      let matchCount = 0;
+      let snippet = null;
+      for (const text of conv.messages) {
+        const lower = text.toLowerCase();
+        let idx = lower.indexOf(needle);
+        while (idx !== -1) {
+          if (!snippet) snippet = makeSnippet(text, idx, q.length);
+          if (++matchCount >= SEARCH_MAX_PER_CONVERSATION) break;
+          idx = lower.indexOf(needle, idx + needle.length);
+        }
+        if (matchCount >= SEARCH_MAX_PER_CONVERSATION) break;
+      }
+      if (matchCount > 0 && snippet) {
+        hits.push({
+          conversationId: conv.id,
+          cwd: conv.cwd,
+          lastActivityAt: conv.lastActivityAt,
+          matchCount,
+          snippet
+        });
+      }
+    }
+  }
+  for (const path2 of [...searchCache.keys()]) {
+    if (!liveFiles.has(path2)) searchCache.delete(path2);
+  }
+  hits.sort((a, b) => b.lastActivityAt - a.lastActivityAt);
+  return hits.slice(0, SEARCH_MAX_RESULTS);
+}
 const CREDENTIALS_PATH = path.join(os.homedir(), ".claude", ".credentials.json");
 const USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
 const OAUTH_BETA = "oauth-2025-04-20";
@@ -4357,216 +4801,74 @@ class UsageLimitsService {
     };
   }
 }
-const PROJECTS_DIR = path.join(os.homedir(), ".claude", "projects");
-const BLOCK_MS = 5 * 60 * 60 * 1e3;
-const HOUR_MS = 60 * 60 * 1e3;
-const PRICING = [
-  { match: /fable/, input: 10, output: 50 },
-  { match: /opus-4-[5-9]/, input: 5, output: 25 },
-  { match: /opus/, input: 15, output: 75 },
-  { match: /sonnet/, input: 3, output: 15 },
-  { match: /haiku-4/, input: 1, output: 5 },
-  { match: /3-5-haiku|haiku-3-5/, input: 0.8, output: 4 },
-  { match: /haiku/, input: 0.25, output: 1.25 }
-];
-function zeroTotals() {
-  return { inputTokens: 0, outputTokens: 0, cacheWriteTokens: 0, cacheReadTokens: 0, costUSD: 0 };
-}
-function add(t, e) {
-  t.inputTokens += e.input;
-  t.outputTokens += e.output;
-  t.cacheWriteTokens += e.cacheWrite5m + e.cacheWrite1h;
-  t.cacheReadTokens += e.cacheRead;
-  t.costUSD += e.costUSD;
-}
-function localDay(at) {
+function localDay$1(at) {
   const d = new Date(at);
   const m = String(d.getMonth() + 1).padStart(2, "0");
   const day = String(d.getDate()).padStart(2, "0");
   return `${d.getFullYear()}-${m}-${day}`;
 }
-function computeCost(entry) {
-  const price = PRICING.find((p) => p.match.test(entry.model));
-  if (!price) return 0;
-  return (entry.input * price.input + entry.output * price.output + entry.cacheWrite5m * price.input * 1.25 + entry.cacheWrite1h * price.input * 2 + entry.cacheRead * price.input * 0.1) / 1e6;
-}
-function computeProjection(points, now) {
-  if (points.length === 0) return null;
-  points.sort((a, b) => a.at - b.at);
-  const blocks = [];
-  let cur = null;
-  for (const p of points) {
-    if (!cur || p.at >= cur.start + BLOCK_MS || p.at - cur.lastAt >= BLOCK_MS) {
-      cur = { start: Math.floor(p.at / HOUR_MS) * HOUR_MS, firstAt: p.at, lastAt: p.at, tokens: 0 };
-      blocks.push(cur);
-    }
-    cur.lastAt = p.at;
-    cur.tokens += p.tokens;
+class BudgetAlerts {
+  constructor(getWin2) {
+    this.getWin = getWin2;
   }
-  const last = blocks[blocks.length - 1];
-  if (now < last.start || now >= last.start + BLOCK_MS) return null;
-  const blockEndAt = last.start + BLOCK_MS;
-  let maxBlockTokens = 0;
-  for (const b of blocks) {
-    if (b !== last && b.tokens > maxBlockTokens) maxBlockTokens = b.tokens;
+  daily = { period: "", fired: /* @__PURE__ */ new Set() };
+  monthly = { period: "", fired: /* @__PURE__ */ new Set() };
+  /** Re-evaluate both budgets against the latest snapshot; fire any new alerts. */
+  check(snap, settings) {
+    const threshold = clampThreshold(settings.budgetAlertThreshold);
+    const day = localDay$1(snap.updatedAt);
+    this.checkBudget(this.daily, "daily", day, snap.today.costUSD, settings.dailyBudgetUSD, threshold);
+    this.checkBudget(
+      this.monthly,
+      "monthly",
+      day.slice(0, 7),
+      snap.month.costUSD,
+      settings.monthlyBudgetUSD,
+      threshold
+    );
   }
-  const elapsedMin = Math.max(1, (now - last.firstAt) / 6e4);
-  const tokensPerMin = last.tokens / elapsedMin;
-  let runsOutAt = null;
-  if (maxBlockTokens > 0) {
-    if (last.tokens >= maxBlockTokens) {
-      runsOutAt = now;
-    } else if (tokensPerMin > 0) {
-      const eta = now + (maxBlockTokens - last.tokens) / tokensPerMin * 6e4;
-      if (eta < blockEndAt) runsOutAt = eta;
+  checkBudget(state, scope, period, spend, budget, thresholdPct) {
+    if (budget == null || budget <= 0) return;
+    if (state.period !== period) {
+      state.period = period;
+      state.fired.clear();
+    }
+    if (spend <= 0) return;
+    const thresholdValue = budget * thresholdPct / 100;
+    if (spend >= budget) {
+      if (!state.fired.has("limit")) {
+        this.fire(scope, "limit", spend, budget);
+        state.fired.add("limit");
+        state.fired.add("threshold");
+      }
+    } else if (spend >= thresholdValue) {
+      if (!state.fired.has("threshold")) {
+        this.fire(scope, "threshold", spend, budget);
+        state.fired.add("threshold");
+      }
     }
   }
-  return {
-    blockStartAt: last.start,
-    blockEndAt,
-    blockTokens: last.tokens,
-    maxBlockTokens,
-    tokensPerMin,
-    runsOutAt
-  };
-}
-function parseFile(path2) {
-  let raw;
-  try {
-    raw = fs.readFileSync(path2, "utf8");
-  } catch {
-    return [];
+  fire(scope, level, spend, budget) {
+    const win2 = this.getWin();
+    const pct = Math.round(spend / budget * 100);
+    const label = scope === "daily" ? "Daily" : "Monthly";
+    const title = level === "limit" ? `${label} spend budget reached` : `${label} spend budget alert`;
+    const body = `Spent ${fmtUSD(spend)} of your ${fmtUSD(budget)} ${scope} budget (${pct}%).`;
+    if (!(win2?.isFocused() ?? false)) win2?.flashFrame(true);
+    const notification = new electron.Notification({ title, body });
+    notification.on("click", () => {
+      win2?.show();
+      win2?.focus();
+    });
+    notification.show();
   }
-  const entries = [];
-  for (const line of raw.split("\n")) {
-    if (!line.includes('"assistant"') || !line.includes('"usage"')) continue;
-    let obj;
-    try {
-      obj = JSON.parse(line);
-    } catch {
-      continue;
-    }
-    if (obj.type !== "assistant") continue;
-    const message = obj.message;
-    const usage = message?.usage;
-    const model = typeof message?.model === "string" ? message.model : "";
-    if (!usage || !model || model === "<synthetic>") continue;
-    const num = (v) => typeof v === "number" && isFinite(v) ? v : 0;
-    const cacheCreation = usage.cache_creation;
-    const totalWrite = num(usage.cache_creation_input_tokens);
-    const write1h = num(cacheCreation?.ephemeral_1h_input_tokens);
-    const write5m = cacheCreation ? num(cacheCreation.ephemeral_5m_input_tokens) : totalWrite;
-    const at = Date.parse(typeof obj.timestamp === "string" ? obj.timestamp : "") || 0;
-    const msgId = typeof message?.id === "string" ? message.id : obj.uuid ?? "";
-    const entry = {
-      key: `${msgId}:${typeof obj.requestId === "string" ? obj.requestId : ""}`,
-      day: localDay(at),
-      at,
-      model,
-      input: num(usage.input_tokens),
-      output: num(usage.output_tokens),
-      cacheWrite5m: write5m,
-      cacheWrite1h: write1h,
-      cacheRead: num(usage.cache_read_input_tokens),
-      costUSD: 0
-    };
-    const precomputed = num(obj.costUSD);
-    entry.costUSD = precomputed > 0 ? precomputed : computeCost(entry);
-    entries.push(entry);
-  }
-  return entries;
 }
-class UsageService {
-  fileCache = /* @__PURE__ */ new Map();
-  snapshot() {
-    const now = Date.now();
-    const today = localDay(now);
-    const monthPrefix = today.slice(0, 7);
-    const total = zeroTotals();
-    const todayTotals = zeroTotals();
-    const month = zeroTotals();
-    const perModel = /* @__PURE__ */ new Map();
-    const perProject = [];
-    const seen = /* @__PURE__ */ new Set();
-    const liveFiles = /* @__PURE__ */ new Set();
-    const points = [];
-    let projectDirs = [];
-    try {
-      if (fs.existsSync(PROJECTS_DIR)) projectDirs = fs.readdirSync(PROJECTS_DIR);
-    } catch {
-      projectDirs = [];
-    }
-    for (const dir of projectDirs) {
-      const dirPath = path.join(PROJECTS_DIR, dir);
-      let files;
-      try {
-        files = fs.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl"));
-      } catch {
-        continue;
-      }
-      const project = {
-        dir,
-        total: zeroTotals(),
-        today: zeroTotals(),
-        lastActivityAt: 0
-      };
-      for (const file of files) {
-        const path$1 = path.join(dirPath, file);
-        liveFiles.add(path$1);
-        for (const entry of this.entriesFor(path$1)) {
-          if (seen.has(entry.key)) continue;
-          seen.add(entry.key);
-          if (entry.at > 0) {
-            points.push({
-              at: entry.at,
-              tokens: entry.input + entry.output + entry.cacheWrite5m + entry.cacheWrite1h + entry.cacheRead
-            });
-          }
-          add(total, entry);
-          add(project.total, entry);
-          if (entry.day === today) {
-            add(todayTotals, entry);
-            add(project.today, entry);
-          }
-          if (entry.day.startsWith(monthPrefix)) add(month, entry);
-          let m = perModel.get(entry.model);
-          if (!m) perModel.set(entry.model, m = zeroTotals());
-          add(m, entry);
-          if (entry.at > project.lastActivityAt) project.lastActivityAt = entry.at;
-        }
-      }
-      if (project.total.costUSD > 0 || project.total.outputTokens > 0) perProject.push(project);
-    }
-    for (const path2 of [...this.fileCache.keys()]) {
-      if (!liveFiles.has(path2)) this.fileCache.delete(path2);
-    }
-    perProject.sort((a, b) => b.total.costUSD - a.total.costUSD);
-    return {
-      total,
-      today: todayTotals,
-      month,
-      perProject,
-      perModel: [...perModel.entries()].map(([model, totals]) => ({ model, totals })).sort((a, b) => b.totals.costUSD - a.totals.costUSD),
-      projection: computeProjection(points, now),
-      updatedAt: now
-    };
-  }
-  entriesFor(path2) {
-    let stat;
-    try {
-      stat = fs.statSync(path2);
-    } catch {
-      this.fileCache.delete(path2);
-      return [];
-    }
-    const cached = this.fileCache.get(path2);
-    if (cached && cached.mtimeMs === stat.mtimeMs && cached.size === stat.size) {
-      return cached.entries;
-    }
-    const entries = parseFile(path2);
-    this.fileCache.set(path2, { mtimeMs: stat.mtimeMs, size: stat.size, entries });
-    return entries;
-  }
+function clampThreshold(pct) {
+  if (typeof pct !== "number" || !isFinite(pct) || pct <= 0) return 80;
+  return Math.min(100, pct);
+}
+function fmtUSD(v) {
+  return `$${v.toFixed(2)}`;
 }
 const CONDUCTOR_ATTACH_SCOPE = "conductor";
 function tokenize(template) {
@@ -4576,7 +4878,7 @@ function tokenize(template) {
   while (m = re.exec(template)) tokens.push(m[1] ?? m[2]);
   return tokens;
 }
-function registerIpc(sessions, fs2, persistence2, sentinels, features, autoExpand, conductor, factory, agents, tokenEff, gamification, getWin2) {
+function registerIpc(sessions, fs2, persistence2, sentinels, features, autoExpand, conductor, factory, agents, tokenEff, gamification, usage, getWin2) {
   const rootOf = (id) => {
     const config = sessions.getConfig(id);
     if (!config) throw new Error(`Unknown session: ${id}`);
@@ -4634,6 +4936,23 @@ function registerIpc(sessions, fs2, persistence2, sentinels, features, autoExpan
     (_e, sessionId, path2) => sessions.getGitFileDiff(sessionId, path2)
   );
   electron.ipcMain.handle("git:branches", (_e, sessionId) => sessions.listBranches(sessionId));
+  electron.ipcMain.handle("git:branchDiff", (_e, sessionId) => sessions.getBranchDiff(sessionId));
+  electron.ipcMain.handle(
+    "git:checkout",
+    (_e, sessionId, branch) => sessions.checkoutSessionBranch(sessionId, branch)
+  );
+  electron.ipcMain.handle(
+    "git:createBranch",
+    (_e, sessionId, branch) => sessions.createSessionBranch(sessionId, branch)
+  );
+  electron.ipcMain.handle(
+    "git:deleteBranch",
+    (_e, sessionId, branch) => sessions.deleteSessionBranch(sessionId, branch)
+  );
+  electron.ipcMain.handle(
+    "git:createBranchPr",
+    (_e, sessionId) => sessions.createBranchPr(sessionId)
+  );
   electron.ipcMain.handle(
     "checkpoint:create",
     (_e, sessionId, label) => sessions.createCheckpoint(sessionId, label)
@@ -4642,6 +4961,10 @@ function registerIpc(sessions, fs2, persistence2, sentinels, features, autoExpan
     "checkpoint:list",
     (_e, sessionId) => sessions.listCheckpoints(sessionId)
   );
+  electron.ipcMain.handle(
+    "checkpoint:diff",
+    (_e, sessionId, id) => sessions.getCheckpointDiff(sessionId, id)
+  );
   electron.ipcMain.handle(
     "checkpoint:restore",
     (_e, sessionId, id) => sessions.restoreCheckpoint(sessionId, id)
@@ -4913,10 +5236,16 @@ function registerIpc(sessions, fs2, persistence2, sentinels, features, autoExpan
     "tokenEff:detectTools",
     (_e, refresh) => tokenEff.detectTools(refresh ?? false)
   );
-  const usage = new UsageService();
-  electron.ipcMain.handle("usage:get", () => usage.snapshot());
+  const budgetAlerts = new BudgetAlerts(getWin2);
+  electron.ipcMain.handle("usage:get", () => {
+    const snap = usage.snapshot();
+    budgetAlerts.check(snap, persistence2.state.settings);
+    return snap;
+  });
   const usageLimits = new UsageLimitsService();
   electron.ipcMain.handle("usage:limits", () => usageLimits.limits());
+  electron.ipcMain.handle("conversations:list", (_e, folder) => listConversations(folder));
+  electron.ipcMain.handle("conversations:search", (_e, query) => searchConversations(query));
   electron.ipcMain.handle(
     "transcript:export",
     async (_e, sessionId, fileName, content) => {
@@ -4951,6 +5280,23 @@ function registerIpc(sessions, fs2, persistence2, sentinels, features, autoExpan
     getWin2()?.webContents.send("session:changed");
     if (patch.agentRegistryPath !== void 0) agents.refresh();
   });
+  electron.ipcMain.handle("github:listAccounts", () => listAccounts());
+  electron.ipcMain.handle("github:repoInfo", async (_e, sessionId) => {
+    const slug = await repoSlug(rootOf(sessionId));
+    const accounts = await listAccounts();
+    const current = slug ? persistence2.state.settings.githubRepoAccounts[slug] ?? null : null;
+    return { slug, current, accounts };
+  });
+  electron.ipcMain.handle(
+    "github:setRepoAccount",
+    (_e, slug, account) => {
+      const map = persistence2.state.settings.githubRepoAccounts;
+      if (account) map[slug] = account;
+      else delete map[slug];
+      persistence2.scheduleSave();
+      getWin2()?.webContents.send("session:changed");
+    }
+  );
 }
 const DEFAULT_TOKEN_EFFICIENCY = {
   enabled: false,
@@ -4982,7 +5328,11 @@ const DEFAULT_SETTINGS = {
   accentColor: null,
   gamificationEnabled: true,
   gamificationReduceMotion: false,
-  gamificationSound: false
+  gamificationSound: false,
+  dailyBudgetUSD: null,
+  monthlyBudgetUSD: null,
+  budgetAlertThreshold: 80,
+  githubRepoAccounts: {}
 };
 const DEFAULT_CATEGORIES = [
   {
@@ -5587,6 +5937,8 @@ const ACTION_SHELL_READY_MS = 1200;
 const CLAUDE_SUBMIT_DELAY_MS = 300;
 const QUEUE_IDLE_DELAY_MS = 3e3;
 const AUTO_COMPLETE_IDLE_DELAY_MS = 9e4;
+const PLAN_APPROVAL_RE = /(?:auto-accept edits|keep planning|manually approve)/i;
+const PLAN_ACCEPT_DELAY_MS = 600;
 const WATCHDOG_TICK_MS = 5e3;
 const SCROLLBACK_DIVIDER = "\r\n\x1B[0m\x1B[2m── restored from previous session ──\x1B[0m\r\n\r\n";
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
@@ -5635,6 +5987,10 @@ class SessionManager {
   autoCompleteTimers = /* @__PURE__ */ new Map();
   /** Worktree session ids with an auto-complete action in flight (fires once). */
   autoCompleteInFlight = /* @__PURE__ */ new Set();
+  /** Worktree session ids whose current plan-approval prompt Maestro has already
+   *  answered — re-armed when claude goes back to working, so each distinct plan
+   *  is auto-accepted exactly once. */
+  planAccepted = /* @__PURE__ */ new Set();
   /** On-disk tail of each terminal's output, replayed on app restart. */
   scrollback = new ScrollbackStore();
   /**
@@ -5699,14 +6055,15 @@ class SessionManager {
       claudeArgs: [],
       startMode: "continue"
     };
+    const terminals = opts?.terminals ?? [claudeTerminal];
     const config = {
       id: crypto.randomUUID(),
       name: opts?.name ?? path.basename(folder) ?? folder,
       folder,
       color: opts?.color ?? null,
       order: Math.max(0, ...this.state.sessions.map((s) => s.order + 1)),
-      terminals: opts?.terminals ?? [claudeTerminal],
-      activeTerminalId: claudeTerminal.id,
+      terminals,
+      activeTerminalId: terminals[0]?.id ?? null,
       expandedPaths: [],
       categoryId: opts?.categoryId ?? null
     };
@@ -5786,6 +6143,131 @@ class SessionManager {
     if (!config) return { branches: [], current: null, defaultBranch: null };
     return listBranches(config.folder);
   }
+  /**
+   * Switch a session's folder to an existing branch. Warn-and-block: refuses on
+   * any uncommitted change so the user's work is never disturbed (they commit,
+   * stash, or checkpoint first). git's own message is surfaced when the branch
+   * is busy in another worktree.
+   */
+  async checkoutSessionBranch(sessionId, branch) {
+    const config = this.getConfig(sessionId);
+    if (!config) return { ok: false, reason: "error", output: "Unknown session." };
+    const dirty = await dirtyCount(config.folder) ?? 0;
+    if (dirty > 0) {
+      return {
+        ok: false,
+        reason: "dirty",
+        output: `This folder has ${dirty} uncommitted file(s). Commit, stash, or take a checkpoint before switching branches, so nothing is lost.`
+      };
+    }
+    const res = await checkoutBranch(config.folder, branch);
+    if (res.code !== 0) {
+      const busy = /already (checked out|used by worktree)/i.test(res.output);
+      return { ok: false, reason: busy ? "busy" : "error", output: res.output };
+    }
+    this.notifyChanged();
+    return { ok: true, output: res.output };
+  }
+  /**
+   * Create a new branch off the session folder's current HEAD and switch to it.
+   * Same warn-and-block dirty guard as checkout; validates the branch name and
+   * reports a name clash distinctly so the UI can say "already exists".
+   */
+  async createSessionBranch(sessionId, branch) {
+    const config = this.getConfig(sessionId);
+    if (!config) return { ok: false, reason: "error", output: "Unknown session." };
+    const name = branch.trim();
+    if (!await isValidBranchName(name)) {
+      return { ok: false, reason: "invalid", output: `"${name}" is not a valid branch name.` };
+    }
+    if (await branchExists(config.folder, name)) {
+      return { ok: false, reason: "exists", output: `Branch "${name}" already exists.` };
+    }
+    const dirty = await dirtyCount(config.folder) ?? 0;
+    if (dirty > 0) {
+      return {
+        ok: false,
+        reason: "dirty",
+        output: `This folder has ${dirty} uncommitted file(s). Commit, stash, or take a checkpoint before creating a branch (it switches the working tree).`
+      };
+    }
+    const res = await createBranch(config.folder, name);
+    if (res.code !== 0) return { ok: false, reason: "error", output: res.output };
+    this.notifyChanged();
+    return { ok: true, output: res.output };
+  }
+  /**
+   * Delete a local branch in a session's repo. Refuses to delete the branch the
+   * folder currently has checked out, or one checked out in another worktree.
+   */
+  async deleteSessionBranch(sessionId, branch) {
+    const config = this.getConfig(sessionId);
+    if (!config) return { ok: false, reason: "error", output: "Unknown session." };
+    const listing = await listBranches(config.folder);
+    if (listing.current === branch) {
+      return {
+        ok: false,
+        reason: "busy",
+        output: `"${branch}" is the current branch — switch away before deleting it.`
+      };
+    }
+    const busyAt = await branchCheckedOutAt(config.folder, branch);
+    if (busyAt) {
+      return {
+        ok: false,
+        reason: "busy",
+        output: `"${branch}" is checked out in another worktree (${busyAt}) — close it first.`
+      };
+    }
+    await deleteBranch(config.folder, branch);
+    this.notifyChanged();
+    return { ok: true, output: `Deleted branch "${branch}".` };
+  }
+  /**
+   * Open a pull request for a NON-worktree session's current branch against the
+   * repo's default branch. Pushes the branch (via the per-repo GitHub account),
+   * then `gh pr create`. The worktree equivalent is createWorktreePr.
+   */
+  async createBranchPr(sessionId) {
+    const config = this.getConfig(sessionId);
+    if (!config) return { ok: false, output: "Unknown session." };
+    const listing = await listBranches(config.folder);
+    const branch = listing.current;
+    if (!branch) {
+      return { ok: false, output: "No branch is checked out (detached HEAD) — cannot open a PR." };
+    }
+    const baseBranch = listing.defaultBranch && listing.defaultBranch !== branch ? listing.defaultBranch : null;
+    if (!baseBranch) {
+      return {
+        ok: false,
+        output: `The current branch "${branch}" is the default branch — there is nothing to open a PR against. Switch to a feature branch first.`
+      };
+    }
+    const title = branch;
+    const body = `Opened by Maestro for branch \`${branch}\`.
+
+Merges \`${branch}\` into \`${baseBranch}\`.`;
+    const env = await accountEnvForRepo(
+      config.folder,
+      this.state.settings.githubRepoAccounts
+    );
+    const result = await createPullRequest(config.folder, branch, baseBranch, title, body, env);
+    if (result.ok) this.emitGame({ type: "worktree.pr" });
+    return result;
+  }
+  /**
+   * Cumulative diff of a worktree task's branch against its base branch (their
+   * merge-base), for the read-only "Review changes" tab. Returns an empty diff
+   * for a non-worktree session — the UI only offers this on worktree tasks.
+   */
+  async getBranchDiff(sessionId) {
+    const config = this.getConfig(sessionId);
+    const wt = config?.worktree;
+    if (!config || !wt) {
+      return { diff: "", truncated: false, files: [], branch: "", baseBranch: "" };
+    }
+    return branchDiff(config.folder, wt.branch, wt.baseBranch);
+  }
   /**
    * Initialize a git repository in a session's folder (so a non-repo session can
    * host parallel tasks). Returns the resulting git facts; throws git's message
@@ -5816,6 +6298,12 @@ class SessionManager {
     if (!config) return [];
     return listCheckpoints(config.folder);
   }
+  /** Read-only diff between a checkpoint and the current working tree. */
+  async getCheckpointDiff(sessionId, id) {
+    const config = this.getConfig(sessionId);
+    if (!config) return { diff: "", binary: false, truncated: false };
+    return checkpointDiff(config.folder, id);
+  }
   /** Restore a session's working tree back to a checkpoint (guarded, reversible). */
   async restoreCheckpoint(sessionId, id) {
     const config = this.getConfig(sessionId);
@@ -5868,13 +6356,15 @@ class SessionManager {
         console.error("copyWorktreeIncludes failed", err);
       }
     }
+    const claudeArgs = [];
+    if (opts.plan) claudeArgs.push("--permission-mode", "plan");
+    if (opts.model) claudeArgs.push("--model", opts.model);
     const claudeTerminal = {
       id: crypto.randomUUID(),
       kind: "claude",
       title: "claude",
       order: 0,
-      // A model picked for the task pins its claude via --model; absent = CLI default.
-      claudeArgs: opts.model ? ["--model", opts.model] : [],
+      claudeArgs,
       startMode: "fresh"
     };
     const config = {
@@ -5895,7 +6385,9 @@ class SessionManager {
         // Default to direct merge; only persist a PR/auto choice when set, so
         // existing tasks and the common case stay exactly as before.
         ...opts.completion && opts.completion !== "merge" ? { completion: opts.completion } : {},
-        ...opts.autoComplete ? { autoComplete: true } : {}
+        ...opts.autoComplete ? { autoComplete: true } : {},
+        ...opts.plan ? { plan: true } : {},
+        ...opts.plan && opts.autoAcceptPlan ? { autoAcceptPlan: true } : {}
       }
     };
     this.state.sessions.push(config);
@@ -5923,7 +6415,14 @@ class SessionManager {
   async getWorktreeTaskState(sessionId) {
     const config = this.getConfig(sessionId);
     if (!config?.worktree) {
-      return { folderExists: false, dirty: -1, ahead: -1, conflictFiles: null };
+      return {
+        folderExists: false,
+        dirty: -1,
+        ahead: -1,
+        conflictFiles: null,
+        baseDirty: -1,
+        baseBranchBusyPath: null
+      };
     }
     const folderExists = fs.existsSync(config.folder);
     const dirty = folderExists ? await dirtyCount(config.folder) : null;
@@ -5932,6 +6431,13 @@ class SessionManager {
       config.worktree.baseBranch,
       config.worktree.branch
     );
+    const baseDirty = await dirtyCount(config.worktree.baseFolder);
+    const busyAt = await branchCheckedOutAt(
+      config.worktree.baseFolder,
+      config.worktree.baseBranch
+    );
+    const baseNorm = config.worktree.baseFolder.replace(/\\/g, "/").replace(/\/+$/, "");
+    const baseBranchBusyPath = busyAt && busyAt.replace(/\/+$/, "") !== baseNorm ? busyAt : null;
     let conflictFiles = null;
     if (ahead !== null && ahead > 0) {
       try {
@@ -5946,7 +6452,14 @@ class SessionManager {
     } else if (ahead === 0) {
       conflictFiles = [];
     }
-    return { folderExists, dirty: dirty ?? -1, ahead: ahead ?? -1, conflictFiles };
+    return {
+      folderExists,
+      dirty: dirty ?? -1,
+      ahead: ahead ?? -1,
+      conflictFiles,
+      baseDirty: baseDirty ?? -1,
+      baseBranchBusyPath
+    };
   }
   /**
    * Merge a worktree task's branch back into its base branch (runs in the base
@@ -6020,9 +6533,13 @@ ${commit.output}` };
    * and push to GitHub", so if it has no upstream yet we publish it (push -u).
    */
   async pushAfterMerge(merge, baseFolder, baseBranch) {
-    let push = await pushBranch(baseFolder, baseBranch);
+    const env = await accountEnvForRepo(
+      baseFolder,
+      this.state.settings.githubRepoAccounts
+    );
+    let push = await pushBranch(baseFolder, baseBranch, env);
     if (!push && this.isAutoExpandBranch(baseBranch)) {
-      push = await publishBranch(baseFolder, baseBranch);
+      push = await publishBranch(baseFolder, baseBranch, env);
     }
     if (!push) return merge;
     if (push.ok) return { ...merge, pushed: true };
@@ -6097,17 +6614,21 @@ ${commit.output}` };
     }
     const title = prTitle(config.name, branch);
     const body = prBody(config.name, branch, baseBranch);
-    const result = await createPullRequest(config.folder, branch, baseBranch, title, body);
+    const env = await accountEnvForRepo(
+      config.folder,
+      this.state.settings.githubRepoAccounts
+    );
+    const result = await createPullRequest(config.folder, branch, baseBranch, title, body, env);
     if (result.ok) this.emitGame({ type: "worktree.pr" });
     return { ...result, autoCommitted };
   }
   // ---------- auto-complete (auto-merge / auto-PR when claude finishes) --------
   /**
    * (Re)start the auto-complete idle countdown for a worktree task whose claude
-   * just went idle. Only arms once the task's claude has actually worked (so the
-   * boot-time idle never counts), and never while a prompt queue is still
-   * draining or an action is already in flight / done. The fire handler
-   * re-checks everything, so a terminal that wakes mid-countdown is safe.
+   * just settled (done/idle). Only arms once the task's claude has actually
+   * worked (so the boot-time settle never counts), and never while a prompt
+   * queue is still draining or an action is already in flight / done. The fire
+   * handler re-checks everything, so a terminal that wakes mid-countdown is safe.
    */
   scheduleAutoComplete(sessionId) {
     const config = this.getConfig(sessionId);
@@ -6131,6 +6652,28 @@ ${commit.output}` };
     if (timer) clearTimeout(timer);
     this.autoCompleteTimers.delete(sessionId);
   }
+  /**
+   * Auto-approve the plan-mode prompt for an opted-in task. Runs once per
+   * attention episode (StatusDetector doesn't re-emit a held status, so a single
+   * timer per episode is enough). The regex is evaluated only AFTER a short
+   * settle — the terminal bell that raises attention can land a beat before the
+   * menu text finishes rendering — and only then, if the approval menu is
+   * actually on screen and not already handled, Maestro presses Enter to take
+   * the default option ("Yes, and auto-accept edits"). Non-plan attention
+   * prompts simply don't match the regex and are left for the user.
+   * `planAccepted` is cleared when claude resumes working, so a later plan (it
+   * can re-enter plan mode) is accepted too.
+   */
+  maybeAutoAcceptPlan(sessionId, terminalId) {
+    if (this.planAccepted.has(sessionId)) return;
+    setTimeout(() => {
+      const live = this.ptys.get(terminalId);
+      if (!live?.alive || this.planAccepted.has(sessionId)) return;
+      if (!PLAN_APPROVAL_RE.test(live.detector.recentText)) return;
+      this.planAccepted.add(sessionId);
+      live.write("\r");
+    }, PLAN_ACCEPT_DELAY_MS);
+  }
   /**
    * Run a task's chosen completion automatically. Re-checks the gates that may
    * have changed during the countdown (still a worktree task, claude alive and
@@ -6146,7 +6689,8 @@ ${commit.output}` };
     if (config.promptQueue?.length) return;
     const terminal = this.claudeTargetTerminal(config);
     const pty2 = terminal ? this.ptys.get(terminal.id) : null;
-    if (!pty2?.alive || pty2.detector.current !== "idle") return;
+    const settled = pty2?.detector.current === "done" || pty2?.detector.current === "idle";
+    if (!pty2?.alive || !settled) return;
     const dirty = await dirtyCount(config.folder) ?? 0;
     const ahead = await aheadCount(wt.baseFolder, wt.baseBranch, wt.branch) ?? 0;
     if (dirty === 0 && ahead === 0) return;
@@ -6264,6 +6808,7 @@ ${err.message}`
     this.tokenEff.clearApplied(sessionId);
     this.worktreeWorked.delete(sessionId);
     this.autoCompleteInFlight.delete(sessionId);
+    this.planAccepted.delete(sessionId);
     this.state.sessions = this.state.sessions.filter((s) => s.id !== sessionId);
     if (this.state.activeSessionId === sessionId) this.state.activeSessionId = null;
     this.persistence.scheduleSave();
@@ -6634,9 +7179,13 @@ ${err.message}`
     if (status === "done" || status === "idle") this.scheduleQueueDispatch(config.id);
     if (config.worktree?.autoComplete) {
       if (status === "working") this.worktreeWorked.add(config.id);
-      if (status === "idle") this.scheduleAutoComplete(config.id);
+      if (status === "done" || status === "idle") this.scheduleAutoComplete(config.id);
       else this.clearAutoCompleteTimer(config.id);
     }
+    if (config.worktree?.autoAcceptPlan) {
+      if (status === "working") this.planAccepted.delete(config.id);
+      if (status === "needs-attention") this.maybeAutoAcceptPlan(config.id, terminalId);
+    }
     if (status !== "needs-attention") return;
     const focused = win2?.isFocused() ?? false;
     const isActive = this.state.activeSessionId === config.id && config.activeTerminalId === terminalId;
@@ -7573,6 +8122,217 @@ class TokenEfficiencyService {
     }
   }
 }
+const PROJECTS_DIR = path.join(os.homedir(), ".claude", "projects");
+const BLOCK_MS = 5 * 60 * 60 * 1e3;
+const HOUR_MS = 60 * 60 * 1e3;
+const PRICING = [
+  { match: /fable/, input: 10, output: 50 },
+  { match: /opus-4-[5-9]/, input: 5, output: 25 },
+  { match: /opus/, input: 15, output: 75 },
+  { match: /sonnet/, input: 3, output: 15 },
+  { match: /haiku-4/, input: 1, output: 5 },
+  { match: /3-5-haiku|haiku-3-5/, input: 0.8, output: 4 },
+  { match: /haiku/, input: 0.25, output: 1.25 }
+];
+function zeroTotals() {
+  return { inputTokens: 0, outputTokens: 0, cacheWriteTokens: 0, cacheReadTokens: 0, costUSD: 0 };
+}
+function add(t, e) {
+  t.inputTokens += e.input;
+  t.outputTokens += e.output;
+  t.cacheWriteTokens += e.cacheWrite5m + e.cacheWrite1h;
+  t.cacheReadTokens += e.cacheRead;
+  t.costUSD += e.costUSD;
+}
+function localDay(at) {
+  const d = new Date(at);
+  const m = String(d.getMonth() + 1).padStart(2, "0");
+  const day = String(d.getDate()).padStart(2, "0");
+  return `${d.getFullYear()}-${m}-${day}`;
+}
+function computeCost(entry) {
+  const price = PRICING.find((p) => p.match.test(entry.model));
+  if (!price) return 0;
+  return (entry.input * price.input + entry.output * price.output + entry.cacheWrite5m * price.input * 1.25 + entry.cacheWrite1h * price.input * 2 + entry.cacheRead * price.input * 0.1) / 1e6;
+}
+function computeProjection(points, now) {
+  if (points.length === 0) return null;
+  points.sort((a, b) => a.at - b.at);
+  const blocks = [];
+  let cur = null;
+  for (const p of points) {
+    if (!cur || p.at >= cur.start + BLOCK_MS || p.at - cur.lastAt >= BLOCK_MS) {
+      cur = { start: Math.floor(p.at / HOUR_MS) * HOUR_MS, firstAt: p.at, lastAt: p.at, tokens: 0 };
+      blocks.push(cur);
+    }
+    cur.lastAt = p.at;
+    cur.tokens += p.tokens;
+  }
+  const last = blocks[blocks.length - 1];
+  if (now < last.start || now >= last.start + BLOCK_MS) return null;
+  const blockEndAt = last.start + BLOCK_MS;
+  let maxBlockTokens = 0;
+  for (const b of blocks) {
+    if (b !== last && b.tokens > maxBlockTokens) maxBlockTokens = b.tokens;
+  }
+  const elapsedMin = Math.max(1, (now - last.firstAt) / 6e4);
+  const tokensPerMin = last.tokens / elapsedMin;
+  let runsOutAt = null;
+  if (maxBlockTokens > 0) {
+    if (last.tokens >= maxBlockTokens) {
+      runsOutAt = now;
+    } else if (tokensPerMin > 0) {
+      const eta = now + (maxBlockTokens - last.tokens) / tokensPerMin * 6e4;
+      if (eta < blockEndAt) runsOutAt = eta;
+    }
+  }
+  return {
+    blockStartAt: last.start,
+    blockEndAt,
+    blockTokens: last.tokens,
+    maxBlockTokens,
+    tokensPerMin,
+    runsOutAt
+  };
+}
+function parseFile(path2) {
+  let raw;
+  try {
+    raw = fs.readFileSync(path2, "utf8");
+  } catch {
+    return [];
+  }
+  const entries = [];
+  for (const line of raw.split("\n")) {
+    if (!line.includes('"assistant"') || !line.includes('"usage"')) continue;
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (obj.type !== "assistant") continue;
+    const message = obj.message;
+    const usage = message?.usage;
+    const model = typeof message?.model === "string" ? message.model : "";
+    if (!usage || !model || model === "<synthetic>") continue;
+    const num = (v) => typeof v === "number" && isFinite(v) ? v : 0;
+    const cacheCreation = usage.cache_creation;
+    const totalWrite = num(usage.cache_creation_input_tokens);
+    const write1h = num(cacheCreation?.ephemeral_1h_input_tokens);
+    const write5m = cacheCreation ? num(cacheCreation.ephemeral_5m_input_tokens) : totalWrite;
+    const at = Date.parse(typeof obj.timestamp === "string" ? obj.timestamp : "") || 0;
+    const msgId = typeof message?.id === "string" ? message.id : obj.uuid ?? "";
+    const entry = {
+      key: `${msgId}:${typeof obj.requestId === "string" ? obj.requestId : ""}`,
+      day: localDay(at),
+      at,
+      model,
+      input: num(usage.input_tokens),
+      output: num(usage.output_tokens),
+      cacheWrite5m: write5m,
+      cacheWrite1h: write1h,
+      cacheRead: num(usage.cache_read_input_tokens),
+      costUSD: 0
+    };
+    const precomputed = num(obj.costUSD);
+    entry.costUSD = precomputed > 0 ? precomputed : computeCost(entry);
+    entries.push(entry);
+  }
+  return entries;
+}
+class UsageService {
+  fileCache = /* @__PURE__ */ new Map();
+  snapshot() {
+    const now = Date.now();
+    const today = localDay(now);
+    const monthPrefix = today.slice(0, 7);
+    const total = zeroTotals();
+    const todayTotals = zeroTotals();
+    const month = zeroTotals();
+    const perModel = /* @__PURE__ */ new Map();
+    const perProject = [];
+    const seen = /* @__PURE__ */ new Set();
+    const liveFiles = /* @__PURE__ */ new Set();
+    const points = [];
+    let projectDirs = [];
+    try {
+      if (fs.existsSync(PROJECTS_DIR)) projectDirs = fs.readdirSync(PROJECTS_DIR);
+    } catch {
+      projectDirs = [];
+    }
+    for (const dir of projectDirs) {
+      const dirPath = path.join(PROJECTS_DIR, dir);
+      let files;
+      try {
+        files = fs.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl"));
+      } catch {
+        continue;
+      }
+      const project = {
+        dir,
+        total: zeroTotals(),
+        today: zeroTotals(),
+        lastActivityAt: 0
+      };
+      for (const file of files) {
+        const path$1 = path.join(dirPath, file);
+        liveFiles.add(path$1);
+        for (const entry of this.entriesFor(path$1)) {
+          if (seen.has(entry.key)) continue;
+          seen.add(entry.key);
+          if (entry.at > 0) {
+            points.push({
+              at: entry.at,
+              tokens: entry.input + entry.output + entry.cacheWrite5m + entry.cacheWrite1h + entry.cacheRead
+            });
+          }
+          add(total, entry);
+          add(project.total, entry);
+          if (entry.day === today) {
+            add(todayTotals, entry);
+            add(project.today, entry);
+          }
+          if (entry.day.startsWith(monthPrefix)) add(month, entry);
+          let m = perModel.get(entry.model);
+          if (!m) perModel.set(entry.model, m = zeroTotals());
+          add(m, entry);
+          if (entry.at > project.lastActivityAt) project.lastActivityAt = entry.at;
+        }
+      }
+      if (project.total.costUSD > 0 || project.total.outputTokens > 0) perProject.push(project);
+    }
+    for (const path2 of [...this.fileCache.keys()]) {
+      if (!liveFiles.has(path2)) this.fileCache.delete(path2);
+    }
+    perProject.sort((a, b) => b.total.costUSD - a.total.costUSD);
+    return {
+      total,
+      today: todayTotals,
+      month,
+      perProject,
+      perModel: [...perModel.entries()].map(([model, totals]) => ({ model, totals })).sort((a, b) => b.totals.costUSD - a.totals.costUSD),
+      projection: computeProjection(points, now),
+      updatedAt: now
+    };
+  }
+  entriesFor(path2) {
+    let stat;
+    try {
+      stat = fs.statSync(path2);
+    } catch {
+      this.fileCache.delete(path2);
+      return [];
+    }
+    const cached = this.fileCache.get(path2);
+    if (cached && cached.mtimeMs === stat.mtimeMs && cached.size === stat.size) {
+      return cached.entries;
+    }
+    const entries = parseFile(path2);
+    this.fileCache.set(path2, { mtimeMs: stat.mtimeMs, size: stat.size, entries });
+    return entries;
+  }
+}
 let win = null;
 const getWin = () => win;
 const persistence = new Persistence();
@@ -7654,7 +8414,11 @@ if (!gotLock) {
     const conductor = new ConductorService(persistence, sessions, features, autoExpand, getWin);
     const factory = new FactoryService(getWin, emitGame);
     const agentRegistry = new AgentRegistryService(persistence, getWin);
-    const gamification = new GamificationService(getWin);
+    const usage = new UsageService();
+    const gamification = new GamificationService(getWin, () => {
+      const t = usage.snapshot().total;
+      return t.inputTokens + t.outputTokens;
+    });
     gameBus.on("game", (e) => gamification.award(e));
     registerIpc(
       sessions,
@@ -7668,6 +8432,7 @@ if (!gotLock) {
       agentRegistry,
       tokenEff,
       gamification,
+      usage,
       getWin
     );
     createWindow();
@@ -7677,6 +8442,7 @@ if (!gotLock) {
     autoExpand.start();
     tokenEff.start();
     factory.start();
+    gamification.start();
     conductor.onTurnComplete((messages) => {
       factory.considerConversation(messages);
       emitGame({ type: "conductor.turn" });