claude-maestro 0.1.19 → 0.1.21

package/out/main/index.js

@@ -1,5 +1,6 @@
 "use strict";
 const electron = require("electron");
+const events = require("events");
 const path = require("path");
 const fs = require("fs");
 const os = require("os");
@@ -462,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 {
@@ -475,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;
   }
@@ -858,6 +901,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 };
@@ -938,6 +1008,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;
@@ -1009,8 +1083,8 @@ function resolveClaude() {
   if (!IS_WIN$1) {
     return candidates[0] ? { file: candidates[0], argsPrefix: [] } : null;
   }
-  const exe = candidates.find((c) => c.toLowerCase().endsWith(".exe"));
-  const cmd = candidates.find((c) => /\.(cmd|bat)$/i.test(c));
+  const exe = candidates.find((c2) => c2.toLowerCase().endsWith(".exe"));
+  const cmd = candidates.find((c2) => /\.(cmd|bat)$/i.test(c2));
   if (exe) return { file: exe, argsPrefix: [] };
   if (cmd) return { file: process.env.ComSpec ?? "cmd.exe", argsPrefix: ["/c", cmd] };
   return null;
@@ -1323,10 +1397,12 @@ const ALLOWED_TOOLS$2 = [
   "Bash(git rev-parse:*)"
 ];
 class AutoExpandService {
-  constructor(persistence2, features, getWin2) {
+  constructor(persistence2, features, getWin2, emitGame = () => {
+  }) {
     this.persistence = persistence2;
     this.features = features;
     this.getWin = getWin2;
+    this.emitGame = emitGame;
   }
   timer = null;
   /** Next scheduled run (ms epoch) per session id. */
@@ -1523,6 +1599,7 @@ class AutoExpandService {
     run.finishedAt = Date.now();
     run.status = status;
     this.broadcast(run.sessionId);
+    if (status === "done") this.emitGame({ type: "autoexpand.done" });
   }
   broadcast(sessionId) {
     this.getWin()?.webContents.send("autoexpand:runs", sessionId, this.listRuns(sessionId));
@@ -2021,9 +2098,9 @@ class ConductorService {
     const list = focusId ? this.sessions.list().filter((s) => s.config.id === focusId) : this.sessions.list();
     const sessions = await Promise.all(
       list.map(async (s) => {
-        const c = s.config;
-        const git2 = await this.sessions.getGitStatus(c.id).catch(() => null);
-        const feats = this.features.list(c.id).map((f) => ({
+        const c2 = s.config;
+        const git2 = await this.sessions.getGitStatus(c2.id).catch(() => null);
+        const feats = this.features.list(c2.id).map((f) => ({
           id: f.id,
           title: f.title,
           status: f.status,
@@ -2031,19 +2108,19 @@ class ConductorService {
           openSpecs: f.specs.filter((sp) => !sp.done).length
         }));
         const entry = {
-          id: c.id,
-          name: c.name,
-          folder: c.folder,
-          isActive: c.id === activeId,
+          id: c2.id,
+          name: c2.name,
+          folder: c2.folder,
+          isActive: c2.id === activeId,
           status: s.status,
-          categoryId: c.categoryId ?? null,
+          categoryId: c2.categoryId ?? null,
           terminals: s.terminals.map((t) => ({ kind: t.config.kind, status: t.status })),
-          worktree: c.worktree ? {
-            parentSessionId: c.worktree.parentSessionId,
-            branch: c.worktree.branch,
-            baseBranch: c.worktree.baseBranch
+          worktree: c2.worktree ? {
+            parentSessionId: c2.worktree.parentSessionId,
+            branch: c2.worktree.branch,
+            baseBranch: c2.worktree.baseBranch
           } : null,
-          autoExpand: c.autoExpand ? { enabled: c.autoExpand.enabled, branch: c.autoExpand.branch } : null,
+          autoExpand: c2.autoExpand ? { enabled: c2.autoExpand.enabled, branch: c2.autoExpand.branch } : null,
           git: git2 ? {
             branch: git2.branch,
             ahead: git2.ahead,
@@ -2052,8 +2129,8 @@ class ConductorService {
           } : null,
           features: feats
         };
-        if (c.worktree) {
-          const task = await this.sessions.getWorktreeTaskState(c.id).catch(() => null);
+        if (c2.worktree) {
+          const task = await this.sessions.getWorktreeTaskState(c2.id).catch(() => null);
           if (task) {
             entry.task = {
               dirty: task.dirty,
@@ -2493,7 +2570,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()}`;
 }
@@ -2504,8 +2581,10 @@ const KNOWN_LABELS = {
   github: "GitHub"
 };
 class FactoryService {
-  constructor(getWin2) {
+  constructor(getWin2, emitGame = () => {
+  }) {
     this.getWin = getWin2;
+    this.emitGame = emitGame;
     this.state = this.store.load();
     this.runs = restoreRuns(this.store.loadRuns());
     for (const s of this.state.suggestions) {
@@ -2623,23 +2702,23 @@ class FactoryService {
   absorbScanSuggestions(run) {
     let newest = null;
     let added = 0;
-    for (const c of run.candidates) {
-      if (c.status !== "proposed") continue;
-      if (this.suggestionDuplicate(c.kind, c.name, c.description)) continue;
+    for (const c2 of run.candidates) {
+      if (c2.status !== "proposed") continue;
+      if (this.suggestionDuplicate(c2.kind, c2.name, c2.description)) continue;
       newest = this.enqueueSuggestion({
-        suggestedKind: c.kind,
-        name: c.name,
-        title: c.description,
-        description: c.description,
-        rationale: c.rationale,
+        suggestedKind: c2.kind,
+        name: c2.name,
+        title: c2.description,
+        description: c2.description,
+        rationale: c2.rationale,
         origin: "scan",
         sourceRef: run.source,
         sourceLabel: run.sourceLabel,
         source: run.source,
         context: run.summary,
-        topics: c.topics,
-        keywords: c.keywords,
-        existing: c.existing,
+        topics: c2.topics,
+        keywords: c2.keywords,
+        existing: c2.existing,
         confidence: 0.8
       });
       added++;
@@ -2673,7 +2752,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);
@@ -2699,7 +2778,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(),
@@ -3262,7 +3341,7 @@ Lessons learned (respect these):
   /** Approve a candidate: author its file content and write it to ~/.claude. An errored candidate can be retried. */
   async approve(runId, candidateId) {
     const run = this.runs.find((r) => r.id === runId);
-    const candidate = run?.candidates.find((c) => c.id === candidateId);
+    const candidate = run?.candidates.find((c2) => c2.id === candidateId);
     if (!run || !candidate || candidate.status !== "proposed" && candidate.status !== "error") return;
     if (this.busy) return;
     this.setBusy(true);
@@ -3316,14 +3395,14 @@ Lessons learned (respect these):
   async approveAll(runId) {
     const run = this.runs.find((r) => r.id === runId);
     if (!run) return;
-    for (const c of run.candidates) {
-      if (c.status === "proposed") await this.approve(runId, c.id);
+    for (const c2 of run.candidates) {
+      if (c2.status === "proposed") await this.approve(runId, c2.id);
       if (this.cancelRequested) break;
     }
   }
   reject(runId, candidateId) {
     const run = this.runs.find((r) => r.id === runId);
-    const candidate = run?.candidates.find((c) => c.id === candidateId);
+    const candidate = run?.candidates.find((c2) => c2.id === candidateId);
     if (!candidate || candidate.status !== "proposed") return;
     candidate.status = "rejected";
     this.broadcastRuns();
@@ -3423,6 +3502,10 @@ Lessons learned (respect these):
         createdAt: now,
         updatedAt: now
       });
+      this.emitGame({
+        type: input.kind === "agent" ? "factory.agent" : "factory.skill",
+        meta: { name: input.name }
+      });
     }
     for (const a of this.state.artifacts) {
       if (related.includes(a.name) && !a.relatedArtifacts.includes(input.name)) {
@@ -3590,10 +3673,10 @@ function restoreRuns(runs) {
       run.finishedAt = run.finishedAt ?? Date.now();
       run.summary = run.summary || "Interrupted — the app was closed mid-scan.";
     }
-    for (const c of run.candidates) {
-      if (c.status === "authoring") {
-        c.status = "proposed";
-        c.result = void 0;
+    for (const c2 of run.candidates) {
+      if (c2.status === "authoring") {
+        c2.status = "proposed";
+        c2.result = void 0;
       }
     }
   }
@@ -3626,9 +3709,11 @@ Feature: ${feature.title}
 Read that spec file in full, then implement every spec it lists. Make your changes in this worktree and commit them as each part works. If any spec is ambiguous, ask before guessing.`;
 }
 class FeatureService {
-  constructor(persistence2, sessions) {
+  constructor(persistence2, sessions, emitGame = () => {
+  }) {
     this.persistence = persistence2;
     this.sessions = sessions;
+    this.emitGame = emitGame;
   }
   get features() {
     return this.persistence.state.features;
@@ -3649,8 +3734,12 @@ class FeatureService {
   save(feature) {
     const list = this.features;
     const idx = list.findIndex((f) => f.id === feature.id);
-    if (idx >= 0) list[idx] = feature;
-    else list.push(feature);
+    if (idx >= 0) {
+      list[idx] = feature;
+    } else {
+      list.push(feature);
+      this.emitGame({ type: "feature.save" });
+    }
     this.persistence.scheduleSave();
   }
   delete(id) {
@@ -3842,6 +3931,396 @@ 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,
+  "checkpoint.create": 10,
+  "sentinel.run": 12,
+  "session.create": 20,
+  "worktree.create": 25,
+  "feature.save": 30,
+  "autoexpand.done": 40,
+  "worktree.pr": 50,
+  "worktree.merge": 60,
+  "factory.skill": 75,
+  "factory.agent": 75,
+  "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;
+}
+function xpForLevel(n) {
+  if (n <= 1) return 0;
+  const k = n - 1;
+  return 50 * k * k + 50 * k;
+}
+function levelForXp(xp) {
+  if (xp <= 0) return 1;
+  return Math.max(1, Math.floor((-50 + Math.sqrt(2500 + 200 * xp)) / 100) + 1);
+}
+function levelInfo(xp) {
+  const level = levelForXp(xp);
+  const floor = xpForLevel(level);
+  const next = xpForLevel(level + 1);
+  return { level, xpIntoLevel: xp - floor, xpForNextLevel: next - floor };
+}
+const DEFAULT_GAME_STATE = {
+  xp: 0,
+  streak: { current: 0, longest: 0, lastDay: "" },
+  achievements: {},
+  todaysQuests: [],
+  questDay: "",
+  counters: {},
+  nightTurns: 0,
+  earlyTurns: 0,
+  tokensBurned: 0,
+  usageTokensSeen: -1,
+  createdAt: 0
+};
+const c = (ctx, t) => ctx.counters[t] ?? 0;
+const ACHIEVEMENTS = [
+  // sessions
+  { id: "first-session", title: "Hello, Maestro", desc: "Start your first session.", icon: "🎬", category: "sessions", predicate: (x) => c(x, "session.create") >= 1 },
+  { id: "ten-sessions", title: "Regular", desc: "Start 10 sessions.", icon: "📁", category: "sessions", predicate: (x) => c(x, "session.create") >= 10 },
+  { id: "worktree-novice", title: "Branching Out", desc: "Create your first parallel task.", icon: "🌱", category: "sessions", predicate: (x) => c(x, "worktree.create") >= 1 },
+  { id: "worktree-adept", title: "Multitasker", desc: "Create 10 parallel tasks.", icon: "🌳", category: "sessions", predicate: (x) => c(x, "worktree.create") >= 10 },
+  // merges
+  { id: "first-merge", title: "Merge One", desc: "Merge your first worktree.", icon: "🔀", category: "merges", predicate: (x) => c(x, "worktree.merge") >= 1 },
+  { id: "ten-merges", title: "Merge Maestro", desc: "Merge 10 worktrees.", icon: "🧬", category: "merges", predicate: (x) => c(x, "worktree.merge") >= 10 },
+  { id: "fifty-merges", title: "Merge Machine", desc: "Merge 50 worktrees.", icon: "⚙️", category: "merges", predicate: (x) => c(x, "worktree.merge") >= 50 },
+  { id: "pr-opener", title: "Pull Request", desc: "Open your first PR.", icon: "📤", category: "merges", predicate: (x) => c(x, "worktree.pr") >= 1 },
+  { id: "pr-prolific", title: "PR Prolific", desc: "Open 10 PRs.", icon: "🚀", category: "merges", predicate: (x) => c(x, "worktree.pr") >= 10 },
+  { id: "feature-shipper", title: "Ship It", desc: "Merge a feature you specced.", icon: "📦", category: "merges", predicate: (x) => c(x, "feature.merge") >= 1 },
+  // turns
+  { id: "first-turn", title: "First Light", desc: "Finish your first Claude turn.", icon: "✶", category: "turns", predicate: (x) => c(x, "session.turn") >= 1 },
+  { id: "hundred-turns", title: "Century", desc: "Finish 100 turns.", icon: "💯", category: "turns", predicate: (x) => c(x, "session.turn") >= 100 },
+  { id: "thousand-turns", title: "Marathoner", desc: "Finish 1,000 turns.", icon: "🏃", category: "turns", predicate: (x) => c(x, "session.turn") >= 1e3 },
+  { id: "conductor-curious", title: "Conductor Curious", desc: "Have your first Conductor turn.", icon: "✦", category: "turns", predicate: (x) => c(x, "conductor.turn") >= 1 },
+  { id: "conductor-regular", title: "Maestro of Maestro", desc: "Have 50 Conductor turns.", icon: "🎼", category: "turns", predicate: (x) => c(x, "conductor.turn") >= 50 },
+  // factory
+  { id: "first-skill", title: "Skill Smith", desc: "Create your first skill.", icon: "🛠", category: "factory", predicate: (x) => c(x, "factory.skill") >= 1 },
+  { 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 },
+  { id: "streak-30", title: "Unstoppable", desc: "Keep a 30-day streak.", icon: "☄️", category: "streak", predicate: (x) => x.streakLongest >= 30 },
+  // time of day
+  { id: "night-owl", title: "Night Owl", desc: "Finish a turn between midnight and 5am.", icon: "🦉", category: "time", predicate: (x) => x.nightTurns >= 1 },
+  { 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-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"] },
+  { id: "q-merge-1", title: "Merge a worktree", target: 1, reward: 40, events: ["worktree.merge"] },
+  { id: "q-merge-3", title: "Merge 3 worktrees", target: 3, reward: 100, events: ["worktree.merge"] },
+  { id: "q-create-1", title: "Start a session", target: 1, reward: 20, events: ["session.create"] },
+  { id: "q-worktree-2", title: "Spin up 2 parallel tasks", target: 2, reward: 50, events: ["worktree.create"] },
+  { id: "q-checkpoint", title: "Make a checkpoint", target: 1, reward: 20, events: ["checkpoint.create"] },
+  { 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-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) {
+  let h = 2166136261;
+  for (let i = 0; i < s.length; i++) {
+    h ^= s.charCodeAt(i);
+    h = Math.imul(h, 16777619);
+  }
+  return h >>> 0;
+}
+function mulberry32(seed) {
+  let a = seed >>> 0;
+  return () => {
+    a = a + 1831565813 | 0;
+    let t = Math.imul(a ^ a >>> 15, 1 | a);
+    t = t + Math.imul(t ^ t >>> 7, 61 | t) ^ t;
+    return ((t ^ t >>> 14) >>> 0) / 4294967296;
+  };
+}
+function pickDailyQuests(dayKey2, n = 3) {
+  const rnd = mulberry32(hashStr("quest:" + dayKey2));
+  const pool = [...DAILY_QUEST_POOL];
+  for (let i = pool.length - 1; i > 0; i--) {
+    const j = Math.floor(rnd() * (i + 1));
+    [pool[i], pool[j]] = [pool[j], pool[i]];
+  }
+  return pool.slice(0, Math.min(n, pool.length)).map((q) => ({
+    id: q.id,
+    target: q.target,
+    progress: 0,
+    rewarded: false
+  }));
+}
+function dayKey(d) {
+  return `${d.getFullYear()}-${d.getMonth() + 1}-${d.getDate()}`;
+}
+function prevDayKey(d) {
+  const y = new Date(d.getFullYear(), d.getMonth(), d.getDate() - 1);
+  return dayKey(y);
+}
+class GamificationStore {
+  file = path.join(electron.app.getPath("userData"), "gamification.json");
+  timer = null;
+  state = structuredClone(DEFAULT_GAME_STATE);
+  /** Load saved progress (best-effort; defaults on any error, back-compat via spread). */
+  load() {
+    try {
+      const raw = JSON.parse(fs.readFileSync(this.file, "utf8"));
+      const s = { ...structuredClone(DEFAULT_GAME_STATE), ...raw ?? {} };
+      const num = (v, fallback) => typeof v === "number" && Number.isFinite(v) ? v : Number.isFinite(Number(v)) ? Number(v) : fallback;
+      if (!s.streak || typeof s.streak !== "object") s.streak = { current: 0, longest: 0, lastDay: "" };
+      s.streak.current = num(s.streak.current, 0);
+      s.streak.longest = num(s.streak.longest, 0);
+      if (typeof s.streak.lastDay !== "string") s.streak.lastDay = "";
+      if (!s.achievements || typeof s.achievements !== "object" || Array.isArray(s.achievements)) {
+        s.achievements = {};
+      }
+      if (!Array.isArray(s.todaysQuests)) s.todaysQuests = [];
+      s.todaysQuests = s.todaysQuests.filter((q) => q && typeof q.id === "string").map((q) => ({ id: q.id, target: num(q.target, 1), progress: num(q.progress, 0), rewarded: !!q.rewarded }));
+      if (!s.counters || typeof s.counters !== "object" || Array.isArray(s.counters)) s.counters = {};
+      for (const k of Object.keys(s.counters)) {
+        s.counters[k] = num(s.counters[k], 0);
+      }
+      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;
+    } catch {
+      this.state = structuredClone(DEFAULT_GAME_STATE);
+      this.state.createdAt = Date.now();
+    }
+    return this.state;
+  }
+  get() {
+    return this.state;
+  }
+  set(state) {
+    this.state = state;
+    this.scheduleSave();
+  }
+  scheduleSave() {
+    if (this.timer) clearTimeout(this.timer);
+    this.timer = setTimeout(() => this.saveNow(), 500);
+  }
+  saveNow() {
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+    try {
+      fs.mkdirSync(path.dirname(this.file), { recursive: true });
+      const tmp = this.file + ".tmp";
+      fs.writeFileSync(tmp, JSON.stringify(this.state, null, 2), "utf8");
+      fs.renameSync(tmp, this.file);
+    } catch (err) {
+      console.error("Failed to persist gamification state:", err);
+    }
+  }
+}
+const ACHIEVEMENT_XP = 25;
+const TOKEN_POLL_MS = 6e4;
+class GamificationService {
+  /**
+   * @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.
+   * Wrapped so a gamification failure can never break the caller's turn/merge.
+   */
+  award(e) {
+    try {
+      const s = this.state;
+      const now = /* @__PURE__ */ new Date();
+      const today = dayKey(now);
+      const celebrations = [];
+      if (s.streak.lastDay !== today) {
+        s.streak.current = s.streak.lastDay === prevDayKey(now) ? s.streak.current + 1 : 1;
+        s.streak.longest = Math.max(s.streak.longest, s.streak.current);
+        s.streak.lastDay = today;
+        s.todaysQuests = pickDailyQuests(today);
+        s.questDay = today;
+        if (s.streak.current >= 2) {
+          celebrations.push({
+            kind: "streak",
+            seed: `streak:${today}:${s.streak.current}`,
+            current: s.streak.current
+          });
+        }
+      }
+      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;
+        else if (hour >= 5 && hour < 8) s.earlyTurns += 1;
+      }
+      const beforeLevel = levelForXp(s.xp);
+      s.xp += xpForEvent(e);
+      for (const q of s.todaysQuests) {
+        if (q.rewarded) continue;
+        const def = questDef(q.id);
+        if (!def || !def.events.includes(e.type)) continue;
+        q.progress = Math.min(q.target, q.progress + 1);
+        if (q.progress >= q.target) {
+          q.rewarded = true;
+          s.xp += def.reward;
+          celebrations.push({
+            kind: "quest",
+            seed: `quest:${today}:${q.id}`,
+            id: q.id,
+            title: def.title,
+            xp: def.reward
+          });
+        }
+      }
+      let unlockedThisPass = true;
+      while (unlockedThisPass) {
+        unlockedThisPass = false;
+        const ctx = {
+          counters: s.counters,
+          nightTurns: s.nightTurns,
+          earlyTurns: s.earlyTurns,
+          streakLongest: s.streak.longest,
+          level: levelForXp(s.xp),
+          tokensBurned: s.tokensBurned
+        };
+        for (const a of ACHIEVEMENTS) {
+          if (s.achievements[a.id]) continue;
+          if (a.predicate(ctx)) {
+            s.achievements[a.id] = { unlockedAt: Date.now() };
+            s.xp += ACHIEVEMENT_XP;
+            unlockedThisPass = true;
+            celebrations.push({
+              kind: "achievement",
+              seed: `ach:${a.id}`,
+              id: a.id,
+              title: a.title,
+              icon: a.icon,
+              xp: ACHIEVEMENT_XP
+            });
+          }
+        }
+      }
+      const afterLevel = levelForXp(s.xp);
+      for (let l = beforeLevel + 1; l <= afterLevel; l++) {
+        celebrations.push({ kind: "level-up", seed: `level:${l}`, level: l });
+      }
+      this.store.set(s);
+      this.broadcast();
+      for (const c2 of celebrations) this.celebrate(c2);
+    } catch (err) {
+      console.error("Gamification award failed (ignored):", err);
+    }
+  }
+  broadcast() {
+    this.getWin()?.webContents.send("gamification:changed", this.snapshot());
+  }
+  celebrate(c2) {
+    this.getWin()?.webContents.send("gamification:celebrate", c2);
+  }
+}
 const IMAGE_EXTS$1 = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg", ".gif", ".webp", ".bmp"]);
 const THUMB_HEIGHT = 64;
 const MAX_LISTED = 100;
@@ -3961,6 +4440,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";
@@ -4037,216 +4692,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 [];
-  }
-  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);
+  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();
   }
-  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) {
@@ -4256,7 +4769,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, 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}`);
@@ -4314,6 +4827,7 @@ 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(
     "checkpoint:create",
     (_e, sessionId, label) => sessions.createCheckpoint(sessionId, label)
@@ -4322,6 +4836,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)
@@ -4469,6 +4987,7 @@ function registerIpc(sessions, fs2, persistence2, sentinels, features, autoExpan
     (_e, id, kind) => factory.createFromSuggestion(id, kind)
   );
   electron.ipcMain.handle("factory:dismissSuggestion", (_e, id) => factory.dismissSuggestion(id));
+  electron.ipcMain.handle("gamification:get", () => gamification.snapshot());
   electron.ipcMain.handle("agents:get", () => agents.snapshot());
   electron.ipcMain.handle("agents:refresh", () => agents.refresh());
   electron.ipcMain.handle("agents:read", (_e, filePath) => agents.readAgentFile(filePath));
@@ -4592,10 +5111,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) => {
@@ -4656,7 +5181,15 @@ const DEFAULT_SETTINGS = {
   watchdogUnansweredMinutes: 5,
   tokenEfficiency: DEFAULT_TOKEN_EFFICIENCY,
   tokenEfficiencyRepoOverrides: {},
-  agentRegistryPath: "C:\\repos\\agent-factory\\registry\\registry.json"
+  agentRegistryPath: "C:\\repos\\agent-factory\\registry\\registry.json",
+  theme: "dark",
+  accentColor: null,
+  gamificationEnabled: true,
+  gamificationReduceMotion: false,
+  gamificationSound: false,
+  dailyBudgetUSD: null,
+  monthlyBudgetUSD: null,
+  budgetAlertThreshold: 80
 };
 const DEFAULT_CATEGORIES = [
   {
@@ -4826,9 +5359,11 @@ function gitHead$1(folder) {
   });
 }
 class SentinelService {
-  constructor(persistence2, getWin2) {
+  constructor(persistence2, getWin2, emitGame = () => {
+  }) {
     this.persistence = persistence2;
     this.getWin = getWin2;
+    this.emitGame = emitGame;
   }
   timer = null;
   /** Last observed HEAD per session id; baseline is set without firing. */
@@ -5008,6 +5543,7 @@ class SentinelService {
     run.summary = summary;
     run.findings = findings;
     this.broadcast(run.sessionId);
+    if (status !== "error") this.emitGame({ type: "sentinel.run" });
   }
   broadcast(sessionId) {
     this.getWin()?.webContents.send("sentinel:runs", sessionId, this.listRuns(sessionId));
@@ -5258,6 +5794,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));
@@ -5287,11 +5825,13 @@ const STATUS_PRIORITY = [
   "exited"
 ];
 class SessionManager {
-  constructor(persistence2, fs2, tokenEff, getWin2) {
+  constructor(persistence2, fs2, tokenEff, getWin2, emitGame = () => {
+  }) {
     this.persistence = persistence2;
     this.fs = fs2;
     this.tokenEff = tokenEff;
     this.getWin = getWin2;
+    this.emitGame = emitGame;
   }
   /** Keyed by terminal id, across all sessions. */
   ptys = /* @__PURE__ */ new Map();
@@ -5304,6 +5844,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();
   /**
@@ -5316,6 +5860,8 @@ class SessionManager {
   watchdog = /* @__PURE__ */ new Map();
   /** The watchdog interval; null until startWatchdog() runs. */
   watchdogTimer = null;
+  /** Per-terminal last status, used only to award a turn on the working→done edge. */
+  lastStatusForAward = /* @__PURE__ */ new Map();
   get state() {
     return this.persistence.state;
   }
@@ -5327,12 +5873,12 @@ class SessionManager {
   }
   categoryOf(config) {
     if (!config.categoryId) return null;
-    return this.state.categories.find((c) => c.id === config.categoryId) ?? null;
+    return this.state.categories.find((c2) => c2.id === config.categoryId) ?? null;
   }
   /** Every MCP server name owned by any category — our materialization namespace. */
   managedServerNames() {
     const names = /* @__PURE__ */ new Set();
-    for (const c of this.state.categories) for (const s of c.mcpServers) names.add(s.name);
+    for (const c2 of this.state.categories) for (const s of c2.mcpServers) names.add(s.name);
     return [...names];
   }
   /**
@@ -5366,14 +5912,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
     };
@@ -5383,6 +5930,7 @@ class SessionManager {
     for (const terminal of config.terminals) this.spawnTerminal(config, terminal, "fresh");
     this.fs.start(config.id, config.folder, []);
     this.notifyChanged();
+    this.emitGame({ type: "session.create" });
     return this.toInfo(config);
   }
   close(id) {
@@ -5452,6 +6000,19 @@ class SessionManager {
     if (!config) return { branches: [], current: null, defaultBranch: null };
     return listBranches(config.folder);
   }
+  /**
+   * 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
@@ -5472,7 +6033,9 @@ class SessionManager {
   async createCheckpoint(sessionId, label) {
     const config = this.getConfig(sessionId);
     if (!config) throw new Error("Unknown session");
-    return createCheckpoint(config.folder, label);
+    const checkpoint = await createCheckpoint(config.folder, label);
+    this.emitGame({ type: "checkpoint.create" });
+    return checkpoint;
   }
   /** Recent checkpoints for a session's repo, newest first. */
   async listCheckpoints(sessionId) {
@@ -5480,6 +6043,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);
@@ -5532,13 +6101,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 = {
@@ -5559,7 +6130,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);
@@ -5580,6 +6153,7 @@ class SessionManager {
       }, INITIAL_PROMPT_DELAY_MS);
     }
     this.notifyChanged();
+    this.emitGame({ type: "worktree.create" });
     return this.toInfo(config);
   }
   /** Live git facts about a worktree task (uncommitted files, commits ahead). */
@@ -5661,7 +6235,12 @@ ${commit.output}` };
     }
     const result = await mergeBranch(baseFolder, branch, baseBranch);
     if (!result.ok) return { ...result, autoCommitted };
-    return { ...await this.pushAfterMerge(result, baseFolder, baseBranch), autoCommitted };
+    const merged = { ...await this.pushAfterMerge(result, baseFolder, baseBranch), autoCommitted };
+    this.emitGame({ type: "worktree.merge", meta: { commits: ahead ?? 0 } });
+    if (this.state.features.some((f) => f.taskSessionId === sessionId)) {
+      this.emitGame({ type: "feature.merge" });
+    }
+    return merged;
   }
   /** True if `branch` is the dedicated expansion branch of any auto-expand config. */
   isAutoExpandBranch(branch) {
@@ -5756,15 +6335,16 @@ ${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);
+    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);
@@ -5788,6 +6368,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
@@ -5803,7 +6405,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;
@@ -5921,6 +6524,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();
@@ -6040,6 +6644,7 @@ ${err.message}`
     const action = this.state.actions.find((a) => a.id === actionId);
     const command = action?.command.trim();
     if (!config || !action || !command) return null;
+    this.emitGame({ type: "action.run" });
     if (action.shell === "claude") return this.runClaudeAction(config, command);
     let terminal = config.terminals.find((t) => t.actionId === action.id);
     let respawned = false;
@@ -6282,12 +6887,21 @@ ${err.message}`
     if (!config) return;
     const terminal = config.terminals.find((t) => t.id === terminalId);
     if (!terminal || terminal.kind !== "claude") return;
+    const prevForAward = this.lastStatusForAward.get(terminalId);
+    this.lastStatusForAward.set(terminalId, status);
+    if (status === "done" && prevForAward === "working") {
+      this.emitGame({ type: "session.turn" });
+    }
     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;
@@ -7224,6 +7838,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();
@@ -7286,18 +8111,31 @@ if (!gotLock) {
   electron.app.whenReady().then(() => {
     electron.app.setAppUserModelId("com.pedroferreira.maestro");
     persistence.load();
+    const gameBus = new events.EventEmitter();
+    const emitGame = (e) => {
+      try {
+        gameBus.emit("game", e);
+      } catch {
+      }
+    };
     const fsService = new FsService(
-      (sessionId, events) => getWin()?.webContents.send("fs:events", sessionId, events),
+      (sessionId, events2) => getWin()?.webContents.send("fs:events", sessionId, events2),
       () => persistence.state.settings.ignoreNames
     );
     const tokenEff = new TokenEfficiencyService(persistence);
-    const sessions = new SessionManager(persistence, fsService, tokenEff, getWin);
-    const sentinels = new SentinelService(persistence, getWin);
-    const features = new FeatureService(persistence, sessions);
-    const autoExpand = new AutoExpandService(persistence, features, getWin);
+    const sessions = new SessionManager(persistence, fsService, tokenEff, getWin, emitGame);
+    const sentinels = new SentinelService(persistence, getWin, emitGame);
+    const features = new FeatureService(persistence, sessions, emitGame);
+    const autoExpand = new AutoExpandService(persistence, features, getWin, emitGame);
     const conductor = new ConductorService(persistence, sessions, features, autoExpand, getWin);
-    const factory = new FactoryService(getWin);
+    const factory = new FactoryService(getWin, emitGame);
     const agentRegistry = new AgentRegistryService(persistence, 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,
       fsService,
@@ -7309,6 +8147,8 @@ if (!gotLock) {
       factory,
       agentRegistry,
       tokenEff,
+      gamification,
+      usage,
       getWin
     );
     createWindow();
@@ -7318,13 +8158,18 @@ if (!gotLock) {
     autoExpand.start();
     tokenEff.start();
     factory.start();
-    conductor.onTurnComplete((messages) => factory.considerConversation(messages));
+    gamification.start();
+    conductor.onTurnComplete((messages) => {
+      factory.considerConversation(messages);
+      emitGame({ type: "conductor.turn" });
+    });
     electron.app.on("activate", () => {
       if (electron.BrowserWindow.getAllWindows().length === 0) createWindow();
     });
     electron.app.on("before-quit", () => {
       tokenEff.dispose();
       agentRegistry.dispose();
+      gamification.dispose();
       factory.dispose();
       conductor.dispose();
       autoExpand.dispose();