harlay 0.1.1 → 0.1.3

package/app/dist/main.cjs

@@ -2,9 +2,9 @@
 
 // src/main.ts
 var import_electron = require("electron");
-var import_promises12 = require("node:fs/promises");
+var import_promises16 = require("node:fs/promises");
 var import_node_os2 = require("node:os");
-var import_node_path14 = require("node:path");
+var import_node_path18 = require("node:path");
 
 // ../../packages/core/src/types.ts
 var TOOLS = ["claude-code", "codex", "cursor"];
@@ -29,20 +29,112 @@ var LaunchError = class extends HarlayError {
   written;
 };
 
+// ../../packages/core/src/launch/launchers.ts
+var import_node_child_process = require("node:child_process");
+var import_promises = require("node:fs/promises");
+var import_node_path = require("node:path");
+var import_node_util = require("node:util");
+var pexec = (0, import_node_util.promisify)(import_node_child_process.execFile);
+var HANDOFF_PROMPT = "Read .harlay/HANDOFF.md and continue the task.";
+var DEFAULT_MODES = { "claude-code": "app", codex: "app", cursor: "app" };
+var PROMPT_LIMIT = {
+  "claude-code": { app: 6e3, terminal: 1e5 },
+  codex: { app: 6e3, terminal: 1e5 },
+  cursor: { app: 9900, terminal: 1e5 }
+};
+function promptFits(target, mode, prompt) {
+  const length = mode === "app" ? encodeURIComponent(prompt).length : prompt.length;
+  return length <= PROMPT_LIMIT[target][mode];
+}
+var defaultRunner = {
+  async open(args) {
+    await pexec("/usr/bin/open", args);
+  },
+  async writeExecutable(path, content) {
+    await (0, import_promises.mkdir)((0, import_node_path.dirname)(path), { recursive: true });
+    await (0, import_promises.writeFile)(path, content, { mode: 493 });
+    await (0, import_promises.chmod)(path, 493);
+  },
+  sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms))
+};
+function shq(s) {
+  return `'${s.replace(/'/g, `'\\''`)}'`;
+}
+var enc = encodeURIComponent;
+function planLaunch(o) {
+  if (o.mode === "app") {
+    switch (o.target) {
+      case "claude-code":
+        return { target: o.target, mode: o.mode, steps: [{ kind: "open", args: [`claude://code/new?folder=${enc(o.cwd)}&q=${enc(o.prompt)}`] }] };
+      case "codex":
+        return { target: o.target, mode: o.mode, steps: [{ kind: "open", args: [`codex://threads/new?path=${enc(o.cwd)}&prompt=${enc(o.prompt)}`] }] };
+      case "cursor":
+        return {
+          target: o.target,
+          mode: o.mode,
+          steps: [
+            { kind: "open", args: ["-a", "Cursor", o.cwd] },
+            { kind: "wait", ms: 1500 },
+            { kind: "open", args: [`cursor://anysphere.cursor-deeplink/prompt?text=${enc(o.prompt)}`] }
+          ]
+        };
+    }
+  }
+  const bin = o.binaries[o.target];
+  if (!bin) throw new HarlayError(`${TOOL_LABEL[o.target]} CLI not found. Install it or switch ${TOOL_LABEL[o.target]} to app mode.`);
+  const argv = o.target === "codex" ? [bin, "-C", o.cwd, o.prompt] : o.target === "cursor" ? [bin, "--workspace", o.cwd, o.prompt] : [bin, o.prompt];
+  const path = (0, import_node_path.join)(o.scriptDir, `continue-${o.target}.command`);
+  const content = `#!/bin/zsh -l
+cd -- ${shq(o.cwd)} || exit 1
+exec ${argv.map(shq).join(" ")}
+`;
+  return {
+    target: o.target,
+    mode: o.mode,
+    steps: [
+      { kind: "script", path, content },
+      { kind: "open", args: ["-a", o.terminalApp, path] }
+    ]
+  };
+}
+async function executeLaunch(plan, runner = defaultRunner) {
+  for (const step of plan.steps) {
+    if (step.kind === "open") await runner.open(step.args);
+    else if (step.kind === "script") await runner.writeExecutable(step.path, step.content);
+    else await runner.sleep(step.ms);
+  }
+}
+
 // ../../packages/core/src/util/text.ts
 var CHARS_PER_TOKEN = 4;
-function clip(s, maxTokens, pointer) {
-  const max = maxTokens * CHARS_PER_TOKEN;
-  if (s.length <= max) return s;
-  const note = pointer ? ` \u2026 (truncated, see ${pointer})` : " \u2026 (truncated)";
-  return s.slice(0, Math.max(0, max - note.length)).trimEnd() + note;
-}
+var isHigh = (c) => c >= 55296 && c <= 56319;
+var isLow = (c) => c >= 56320 && c <= 57343;
 function tail(s, maxChars) {
-  return s.length <= maxChars ? s : "\u2026" + s.slice(s.length - maxChars + 1);
+  if (s.length <= maxChars) return s;
+  let start = s.length - maxChars + 1;
+  if (start < s.length && isLow(s.charCodeAt(start))) start++;
+  return "\u2026" + s.slice(start);
+}
+var LONE_SURROGATE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
+function wellFormed(s) {
+  return s.replace(LONE_SURROGATE, "\uFFFD");
 }
 function oneLine(s, max = 120) {
   const t = s.replace(/\s+/g, " ").trim();
-  return t.length <= max ? t : t.slice(0, max - 1) + "\u2026";
+  if (t.length <= max) return t;
+  let end = max - 1;
+  if (end > 0 && isHigh(t.charCodeAt(end - 1))) end--;
+  return t.slice(0, end) + "\u2026";
+}
+function wordCount(s) {
+  return s.split(/\s+/).filter(Boolean).length;
+}
+function clipWords(s, max) {
+  const w = s.split(/\s+/).filter(Boolean);
+  return w.length <= max ? w.join(" ") : w.slice(0, max).join(" ") + " \u2026";
+}
+function splitSentences(s) {
+  return s.split(/(?<=[.!?])\s+|\n+/).map((x) => x.trim()).filter(Boolean);
 }
 var CONTEXT_BLOCK_RE = /<(ide_opened_file|ide_selection|artifact-view-context|artifact-content-authored-by-others)\b[^>]*?(?:\/>|>[\s\S]*?<\/\1\s*>)/g;
 var MACHINE_TAG_RE = /^<(command-name|command-message|command-args|local-command-stdout|local-command-stderr|local-command-caveat|task-notification|bash-input|bash-stdout|bash-stderr|environment_context|user_instructions)\b/;
@@ -53,8 +145,27 @@ function cleanPrompt(raw) {
   if (MACHINE_TAG_RE.test(s)) return null;
   return s ? s : null;
 }
-function isHandoffPrompt(p) {
-  return p.length <= 300 && p.includes(".harlay/HANDOFF.md");
+var HANDOFF_TAG = '<handoff from="';
+var HANDOFF_END = "</handoff>";
+var CLOSING_RE = /^\s*Continue from (?:the most recent user message|where it stopped)\. Start with the next concrete step\./;
+var HANDOFF_ID_RE = /Only if you need more: \.harlay\/handoffs\/([^/\s]+)\//g;
+function splitHandoffPrompt(p) {
+  const start = p.indexOf(HANDOFF_TAG);
+  const end = p.lastIndexOf(HANDOFF_END);
+  if (start !== -1 && end > start) {
+    const before = p.slice(0, start).trim();
+    const after = p.slice(end + HANDOFF_END.length).replace(CLOSING_RE, "").trim();
+    const id = [...p.slice(start, end).matchAll(HANDOFF_ID_RE)].at(-1)?.[1] ?? null;
+    return { handoff: true, rest: [before, after].filter(Boolean).join("\n\n"), id };
+  }
+  if (p.trimStart().startsWith(HANDOFF_TAG) || p.trim() === HANDOFF_PROMPT) return { handoff: true, rest: "", id: null };
+  return { handoff: false, rest: p, id: null };
+}
+var OSC_RE = /\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g;
+var CSI_RE = /\x1b\[[0-?]*[ -/]*[@-~]/g;
+var CONTROL_RE = /[\x00-\x08\x0b-\x1f\x7f-\x9f]/g;
+function stripControl(s) {
+  return s.replace(OSC_RE, "").replace(CSI_RE, "").replace(CONTROL_RE, "");
 }
 function slugify(s, max = 40) {
   const slug = s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, max).replace(/-+$/, "");
@@ -62,25 +173,25 @@ function slugify(s, max = 40) {
 }
 
 // ../../packages/core/src/sources/claude.ts
-var import_promises2 = require("node:fs/promises");
-var import_node_path2 = require("node:path");
+var import_promises3 = require("node:fs/promises");
+var import_node_path3 = require("node:path");
 
 // ../../packages/core/src/util/files.ts
-var import_promises = require("node:fs/promises");
-var import_node_path = require("node:path");
+var import_promises2 = require("node:fs/promises");
+var import_node_path2 = require("node:path");
 async function listSessionFiles(root, accept) {
   let names;
   try {
-    names = await (0, import_promises.readdir)(root, { recursive: true });
+    names = await (0, import_promises2.readdir)(root, { recursive: true });
   } catch {
     return [];
   }
   const out = [];
   for (const name of names) {
-    const path = (0, import_node_path.join)(root, name);
+    const path = (0, import_node_path2.join)(root, name);
     if (!accept(path)) continue;
     try {
-      const s = await (0, import_promises.stat)(path);
+      const s = await (0, import_promises2.stat)(path);
       if (s.isFile()) out.push({ path, mtime: s.mtime });
     } catch {
     }
@@ -88,7 +199,7 @@ async function listSessionFiles(root, accept) {
   return out.sort((a, b) => b.mtime.getTime() - a.mtime.getTime());
 }
 async function readFirstLine(file, maxBytes = 8 * 1024 * 1024) {
-  const fh = await (0, import_promises.open)(file, "r");
+  const fh = await (0, import_promises2.open)(file, "r");
   try {
     const chunks = [];
     const buf = Buffer.alloc(65536);
@@ -142,9 +253,9 @@ function blockText(content) {
 
 // ../../packages/core/src/sources/todos.ts
 var STATUSES = /* @__PURE__ */ new Set(["pending", "in_progress", "completed", "cancelled"]);
-function applyTodoWrite(current, input) {
-  if (!isObj(input) || !Array.isArray(input.todos)) return current ?? /* @__PURE__ */ new Map();
-  const next = input.merge === true && current ? new Map(current) : /* @__PURE__ */ new Map();
+function applyTodoWrite(current2, input) {
+  if (!isObj(input) || !Array.isArray(input.todos)) return current2 ?? /* @__PURE__ */ new Map();
+  const next = input.merge === true && current2 ? new Map(current2) : /* @__PURE__ */ new Map();
   input.todos.forEach((raw, i) => {
     if (!isObj(raw)) return;
     const id = raw.id !== void 0 && raw.id !== null ? String(raw.id) : `#${i}`;
@@ -272,10 +383,10 @@ function normalizeClaude(records, ref, invalid = 0) {
 }
 async function loadDesktopTitles(dir) {
   const out = /* @__PURE__ */ new Map();
-  const files = await listSessionFiles(dir, (f) => (0, import_node_path2.basename)(f).startsWith("local_") && f.endsWith(".json"));
+  const files = await listSessionFiles(dir, (f) => (0, import_node_path3.basename)(f).startsWith("local_") && f.endsWith(".json"));
   for (const f of files) {
     try {
-      const d = JSON.parse(await (0, import_promises2.readFile)(f.path, "utf8"));
+      const d = JSON.parse(await (0, import_promises3.readFile)(f.path, "utf8"));
       if (isObj(d) && typeof d.cliSessionId === "string" && typeof d.title === "string" && d.title && !out.has(d.cliSessionId)) {
         out.set(d.cliSessionId, d.title);
       }
@@ -285,14 +396,14 @@ async function loadDesktopTitles(dir) {
   return out;
 }
 function createClaudeReader(o) {
-  const root = (0, import_node_path2.join)(o.home, ".claude", "projects");
-  const indexDir = (0, import_node_path2.join)(o.home, "Library", "Application Support", "Claude", "claude-code-sessions");
-  const isSessionFile = (file) => file.startsWith(root + import_node_path2.sep) && file.endsWith(".jsonl") && (0, import_node_path2.relative)(root, file).split(import_node_path2.sep).length === 2;
+  const root = (0, import_node_path3.join)(o.home, ".claude", "projects");
+  const indexDir = (0, import_node_path3.join)(o.home, "Library", "Application Support", "Claude", "claude-code-sessions");
+  const isSessionFile = (file) => file.startsWith(root + import_node_path3.sep) && file.endsWith(".jsonl") && (0, import_node_path3.relative)(root, file).split(import_node_path3.sep).length === 2;
   const cache = /* @__PURE__ */ new Map();
   async function refForFile(file, titles) {
     let st;
     try {
-      st = await (0, import_promises2.stat)(file);
+      st = await (0, import_promises3.stat)(file);
     } catch {
       return null;
     }
@@ -300,7 +411,7 @@ function createClaudeReader(o) {
     if (!entry || entry.size !== st.size || entry.mtimeMs !== st.mtimeMs) {
       let text;
       try {
-        text = await (0, import_promises2.readFile)(file, "utf8");
+        text = await (0, import_promises3.readFile)(file, "utf8");
       } catch {
         return null;
       }
@@ -325,7 +436,7 @@ function createClaudeReader(o) {
       entry = { size: st.size, mtimeMs: st.mtimeMs, cwd, fileTitle: custom ?? ai, ref: null };
       cache.set(file, entry);
     }
-    const id = (0, import_node_path2.basename)(file, ".jsonl");
+    const id = (0, import_node_path3.basename)(file, ".jsonl");
     const title = entry.fileTitle ?? (titles ?? await loadDesktopTitles(indexDir)).get(id) ?? null;
     if (!entry.ref || entry.ref.title !== title) entry.ref = { tool: "claude-code", id, file, cwd: entry.cwd, title, lastActivityAt: st.mtime };
     return entry.ref;
@@ -334,7 +445,7 @@ function createClaudeReader(o) {
     tool: "claude-code",
     root,
     isSessionFile,
-    idFromPath: (file) => isSessionFile(file) ? (0, import_node_path2.basename)(file, ".jsonl") : null,
+    idFromPath: (file) => isSessionFile(file) ? (0, import_node_path3.basename)(file, ".jsonl") : null,
     refForFile: (file) => refForFile(file),
     async listSessions(limit = 20) {
       const files = await listSessionFiles(root, isSessionFile);
@@ -348,7 +459,7 @@ function createClaudeReader(o) {
       return refs;
     },
     async readSession(ref) {
-      const { records, invalid } = parseJsonLines(await (0, import_promises2.readFile)(ref.file, "utf8"));
+      const { records, invalid } = parseJsonLines(await (0, import_promises3.readFile)(ref.file, "utf8"));
       return normalizeClaude(records, ref, invalid);
     },
     detect(record) {
@@ -361,8 +472,8 @@ function createClaudeReader(o) {
 }
 
 // ../../packages/core/src/sources/codex.ts
-var import_promises3 = require("node:fs/promises");
-var import_node_path3 = require("node:path");
+var import_promises4 = require("node:fs/promises");
+var import_node_path4 = require("node:path");
 var OUTPUT_TAIL2 = 2e4;
 var ROLLOUT_ID_RE = /-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/i;
 var KIND = { add: "create", update: "modify", delete: "delete" };
@@ -379,25 +490,25 @@ function usageOf(p) {
   if (!primary || typeof primary.used_percent !== "number") return null;
   return { usedPercent: primary.used_percent, resetsAt: typeof primary.resets_at === "number" ? new Date(primary.resets_at * 1e3) : null };
 }
-function reachedHalt(p, usage) {
+function reachedHalt(p, usage2) {
   const rl = isObj(p.rate_limits) ? p.rate_limits : null;
   const t = rl ? rl.rate_limit_reached_type : null;
   if (t === null || t === void 0) return null;
-  return { reason: "usage_limit", message: `Codex usage limit reached (${String(t)})`, resetsAt: usage?.resetsAt ?? null };
+  return { reason: "usage_limit", message: `Codex usage limit reached (${String(t)})`, resetsAt: usage2?.resetsAt ?? null };
 }
-function taskHalt(p, usage) {
+function taskHalt(p, usage2) {
   const e = isObj(p.error) ? p.error : null;
   const message = e ? str(e.message) : null;
   if (!e || !message) return null;
   const limited = e.codex_error_info === "usage_limit_exceeded" || /usage limit|rate limit/i.test(message);
-  return { reason: limited ? "usage_limit" : "crash", message, resetsAt: usage?.resetsAt ?? null };
+  return { reason: limited ? "usage_limit" : "crash", message, resetsAt: usage2?.resetsAt ?? null };
 }
 function normalizeCodex(records, ref, invalid = 0) {
   const timeline = [];
   const fallbackPrompts = [];
   let sawItemPrompt = false;
   let model = null;
-  let usage = null;
+  let usage2 = null;
   let halt = null;
   let unknown = invalid;
   for (const rec of records) {
@@ -440,16 +551,16 @@ function normalizeCodex(records, ref, invalid = 0) {
       const text = typeof p.message === "string" ? cleanPrompt(p.message) : null;
       if (text) fallbackPrompts.push(text);
     } else if (p.type === "token_count") {
-      usage = usageOf(p) ?? usage;
-      halt = reachedHalt(p, usage) ?? halt;
+      usage2 = usageOf(p) ?? usage2;
+      halt = reachedHalt(p, usage2) ?? halt;
     } else if (p.type === "task_complete") {
-      halt = taskHalt(p, usage);
+      halt = taskHalt(p, usage2);
     }
   }
   if (!sawItemPrompt && fallbackPrompts.length) {
     timeline.unshift(...fallbackPrompts.map((text) => ({ kind: "user", text })));
   }
-  return { ref, model, timeline, todos: null, halt, usage, unknownRecords: unknown };
+  return { ref, model, timeline, todos: null, halt, usage: usage2, unknownRecords: unknown };
 }
 function parseSessionMeta(line) {
   let r;
@@ -468,7 +579,7 @@ async function loadTitles(file) {
   const out = /* @__PURE__ */ new Map();
   let text;
   try {
-    text = await (0, import_promises3.readFile)(file, "utf8");
+    text = await (0, import_promises4.readFile)(file, "utf8");
   } catch {
     return out;
   }
@@ -478,14 +589,14 @@ async function loadTitles(file) {
   return out;
 }
 function createCodexReader(o) {
-  const root = (0, import_node_path3.join)(o.home, ".codex", "sessions");
-  const indexFile = (0, import_node_path3.join)(o.home, ".codex", "session_index.jsonl");
-  const isSessionFile = (file) => file.startsWith(root + import_node_path3.sep) && (0, import_node_path3.basename)(file).startsWith("rollout-") && file.endsWith(".jsonl");
+  const root = (0, import_node_path4.join)(o.home, ".codex", "sessions");
+  const indexFile = (0, import_node_path4.join)(o.home, ".codex", "session_index.jsonl");
+  const isSessionFile = (file) => file.startsWith(root + import_node_path4.sep) && (0, import_node_path4.basename)(file).startsWith("rollout-") && file.endsWith(".jsonl");
   const cache = /* @__PURE__ */ new Map();
   async function refForFile(file, titles) {
     let st;
     try {
-      st = await (0, import_promises3.stat)(file);
+      st = await (0, import_promises4.stat)(file);
     } catch {
       return null;
     }
@@ -510,7 +621,7 @@ function createCodexReader(o) {
     tool: "codex",
     root,
     isSessionFile,
-    idFromPath: (file) => isSessionFile(file) ? ROLLOUT_ID_RE.exec((0, import_node_path3.basename)(file))?.[1] ?? null : null,
+    idFromPath: (file) => isSessionFile(file) ? ROLLOUT_ID_RE.exec((0, import_node_path4.basename)(file))?.[1] ?? null : null,
     refForFile: (file) => refForFile(file),
     async listSessions(limit = 20) {
       const files = await listSessionFiles(root, isSessionFile);
@@ -524,7 +635,7 @@ function createCodexReader(o) {
       return refs;
     },
     async readSession(ref) {
-      const { records, invalid } = parseJsonLines(await (0, import_promises3.readFile)(ref.file, "utf8"));
+      const { records, invalid } = parseJsonLines(await (0, import_promises4.readFile)(ref.file, "utf8"));
       return normalizeCodex(records, ref, invalid);
     },
     detect(record) {
@@ -549,21 +660,21 @@ function createCodexReader(o) {
 }
 
 // ../../packages/core/src/sources/cursor.ts
-var import_promises4 = require("node:fs/promises");
-var import_node_path4 = require("node:path");
+var import_promises5 = require("node:fs/promises");
+var import_node_path5 = require("node:path");
 var norm = (name) => name.replace(/[^A-Za-z0-9]/g, "-");
 async function resolveCursorSlug(slug, rootDir = "/") {
   if (!slug || /^\d+$/.test(slug)) return null;
   async function walk(dir, rest, depth) {
     if (depth > 16) return null;
-    const entries = await (0, import_promises4.readdir)(dir, { withFileTypes: true }).catch(() => null);
+    const entries = await (0, import_promises5.readdir)(dir, { withFileTypes: true }).catch(() => null);
     if (!entries) return null;
     for (const e of entries) {
       if (!e.isDirectory()) continue;
       const n = norm(e.name);
-      if (rest === n) return (0, import_node_path4.join)(dir, e.name);
+      if (rest === n) return (0, import_node_path5.join)(dir, e.name);
       if (rest.startsWith(n + "-")) {
-        const found = await walk((0, import_node_path4.join)(dir, e.name), rest.slice(n.length + 1), depth + 1);
+        const found = await walk((0, import_node_path5.join)(dir, e.name), rest.slice(n.length + 1), depth + 1);
         if (found) return found;
       }
     }
@@ -623,7 +734,7 @@ function normalizeCursor(records, ref, invalid = 0) {
   return { ref, model: null, timeline, todos: todos ? [...todos.values()] : null, halt, usage: null, unknownRecords: unknown };
 }
 function createCursorReader(o) {
-  const root = (0, import_node_path4.join)(o.home, ".cursor", "projects");
+  const root = (0, import_node_path5.join)(o.home, ".cursor", "projects");
   const slugCache = /* @__PURE__ */ new Map();
   const cwdFor = (slug) => {
     let p = slugCache.get(slug);
@@ -634,17 +745,17 @@ function createCursorReader(o) {
     return p;
   };
   const isSessionFile = (file) => {
-    if (!file.startsWith(root + import_node_path4.sep) || !file.endsWith(".jsonl")) return false;
-    const parts = (0, import_node_path4.relative)(root, file).split(import_node_path4.sep);
+    if (!file.startsWith(root + import_node_path5.sep) || !file.endsWith(".jsonl")) return false;
+    const parts = (0, import_node_path5.relative)(root, file).split(import_node_path5.sep);
     return parts.length === 4 && parts[1] === "agent-transcripts" && parts[3] === `${parts[2]}.jsonl`;
   };
   const cache = /* @__PURE__ */ new Map();
   async function refForFile(file) {
     if (!isSessionFile(file)) return null;
-    const parts = (0, import_node_path4.relative)(root, file).split(import_node_path4.sep);
+    const parts = (0, import_node_path5.relative)(root, file).split(import_node_path5.sep);
     let st;
     try {
-      st = await (0, import_promises4.stat)(file);
+      st = await (0, import_promises5.stat)(file);
     } catch {
       return null;
     }
@@ -652,7 +763,7 @@ function createCursorReader(o) {
     if (hit && hit.size === st.size && hit.mtimeMs === st.mtimeMs) return hit.ref;
     let text;
     try {
-      text = await (0, import_promises4.readFile)(file, "utf8");
+      text = await (0, import_promises5.readFile)(file, "utf8");
     } catch {
       return null;
     }
@@ -660,8 +771,9 @@ function createCursorReader(o) {
     for (const r of parseJsonLines(text).records) {
       if (isObj(r) && r.role === "user" && isObj(r.message)) {
         const p = cleanPrompt(blockText(r.message.content));
-        if (p && !isHandoffPrompt(p)) {
-          title = oneLine(p, 60);
+        const rest = p ? splitHandoffPrompt(p).rest : "";
+        if (rest) {
+          title = oneLine(rest, 60);
           break;
         }
       }
@@ -674,7 +786,7 @@ function createCursorReader(o) {
     tool: "cursor",
     root,
     isSessionFile,
-    idFromPath: (file) => isSessionFile(file) ? (0, import_node_path4.relative)(root, file).split(import_node_path4.sep)[2] : null,
+    idFromPath: (file) => isSessionFile(file) ? (0, import_node_path5.relative)(root, file).split(import_node_path5.sep)[2] : null,
     refForFile,
     async listSessions(limit = 20) {
       const files = await listSessionFiles(root, isSessionFile);
@@ -687,7 +799,7 @@ function createCursorReader(o) {
       return refs;
     },
     async readSession(ref) {
-      const { records, invalid } = parseJsonLines(await (0, import_promises4.readFile)(ref.file, "utf8"));
+      const { records, invalid } = parseJsonLines(await (0, import_promises5.readFile)(ref.file, "utf8"));
       return normalizeCursor(records, ref, invalid);
     },
     detect(record) {
@@ -700,14 +812,14 @@ function createCursorReader(o) {
 }
 
 // ../../packages/core/src/git/snapshot.ts
-var import_node_child_process = require("node:child_process");
+var import_node_child_process2 = require("node:child_process");
 var import_node_crypto = require("node:crypto");
-var import_node_util = require("node:util");
-var pexec = (0, import_node_util.promisify)(import_node_child_process.execFile);
+var import_node_util2 = require("node:util");
+var pexec2 = (0, import_node_util2.promisify)(import_node_child_process2.execFile);
 var MAX_DIFF_CHARS = 2e6;
 var MAX_FILES = 500;
 async function git(cwd, args) {
-  const { stdout } = await pexec("git", args, {
+  const { stdout } = await pexec2("git", args, {
     cwd,
     maxBuffer: 64 * 1024 * 1024,
     env: { ...process.env, GIT_OPTIONAL_LOCKS: "0" }
@@ -861,12 +973,76 @@ var Redactor = class {
 };
 
 // ../../packages/core/src/extract/extract.ts
-var import_node_path5 = require("node:path");
-var DECISION_RE = /\b(don['’]t|do not|never|must|always|keep|avoid|make sure|without|instead of)\b/i;
+var import_node_path6 = require("node:path");
+
+// ../../packages/core/src/extract/recent.ts
+var RECENT = { budgetTokens: 450, min: 2, max: 6, words: 120 };
+function pickRecentMessages(prompts) {
+  const out = [];
+  let used = 0;
+  for (let i = prompts.length - 1; i >= 0 && out.length < RECENT.max; i--) {
+    const m = clipWords(prompts[i], RECENT.words);
+    if (!m) continue;
+    const cost = Math.ceil(m.length / CHARS_PER_TOKEN);
+    if (out.length >= RECENT.min && used + cost > RECENT.budgetTokens) break;
+    out.unshift(m);
+    used += cost;
+  }
+  return out;
+}
+
+// ../../packages/core/src/extract/rules.ts
+var RULES2 = { maxRules: 10, budgetTokens: 300, words: 40, pastedWords: 400 };
+var DIRECTIVE_RE = /\b(never|always|don['’]?t|do not|must|make sure|prefer|avoid|no need to|instead of|from now on|going forward|remember|stop|only)\b/i;
+var norm2 = (s) => s.toLowerCase().replace(/\s+/g, " ").trim();
+function findPinnedRules(prompts, recent) {
+  const recentText = norm2(recent.join("\n"));
+  const found = [];
+  prompts.forEach((p, message) => {
+    if (wordCount(p) > RULES2.pastedWords) return;
+    for (const sentence of splitSentences(p)) {
+      if (sentence.endsWith("?") || sentence.endsWith(":") || !DIRECTIVE_RE.test(sentence)) continue;
+      if (recentText.includes(norm2(sentence))) continue;
+      found.push({ text: clipWords(sentence, RULES2.words), message });
+    }
+  });
+  return capRules(latestCopies(found));
+}
+function mergePinnedRules(older, newer, recent) {
+  const recentText = norm2(recent.join("\n"));
+  const all = [...older.map((r) => ({ text: r.text, message: -1 })), ...newer].filter((r) => !recentText.includes(norm2(r.text)));
+  return capRules(latestCopies(all));
+}
+function latestCopies(rules) {
+  const byKey = /* @__PURE__ */ new Map();
+  for (const r of rules) {
+    const key = norm2(r.text);
+    byKey.delete(key);
+    byKey.set(key, r);
+  }
+  return [...byKey.values()];
+}
+function capRules(all) {
+  const kept = [];
+  let used = 0;
+  for (let i = all.length - 1; i >= 0 && kept.length < RULES2.maxRules; i--) {
+    const cost = Math.ceil(all[i].text.length / CHARS_PER_TOKEN);
+    if (used + cost > RULES2.budgetTokens) break;
+    kept.unshift(all[i]);
+    used += cost;
+  }
+  return { rules: kept, more: all.length - kept.length };
+}
+
+// ../../packages/core/src/extract/extract.ts
 var TRANSCRIPT_MAX = 2e5;
+var SLASH_COMMAND_RE = /^\/[a-z][\w-]*(\s|$)/i;
+function isSlashCommand(p) {
+  return SLASH_COMMAND_RE.test(p.trim());
+}
 function isSubstantive(p) {
   const t = p.trim();
-  return !t.startsWith("/") && t.split(/\s+/).length >= 3;
+  return !isSlashCommand(t) && t.split(/\s+/).length >= 3;
 }
 var PROBES = /* @__PURE__ */ new Set([
   "rg",
@@ -901,95 +1077,96 @@ function isProbeCommand(cmd) {
   let s = cmd;
   for (let m = LEADING_CD_RE.exec(s); m; m = LEADING_CD_RE.exec(s)) s = s.slice(m[0].length);
   const words = s.trim().split(/\s+/);
-  const first = (0, import_node_path5.basename)(words[0] ?? "");
+  const first = (0, import_node_path6.basename)(words[0] ?? "");
   if (first !== "git") return PROBES.has(first);
   let i = 1;
   while (i < words.length && words[i].startsWith("-")) i += words[i] === "-C" || words[i] === "-c" ? 2 : 1;
   return GIT_PROBES.has(words[i] ?? "");
 }
-function findBlocker(cmds) {
-  for (let i = cmds.length - 1; i >= 0; i--) {
-    const c = cmds[i];
-    if (c.exitCode === null || c.exitCode === 0 || isProbeCommand(c.cmd)) continue;
-    if (!cmds.slice(i + 1).some((d) => d.cmd === c.cmd && d.exitCode === 0)) return c;
+var FAILURE_WINDOW = 5;
+function findLastFailure(cmds) {
+  const real = cmds.filter((c) => !isProbeCommand(c.cmd));
+  for (let i = real.length - 1; i >= Math.max(0, real.length - FAILURE_WINDOW); i--) {
+    const c = real[i];
+    if (c.exitCode === null || c.exitCode === 0) continue;
+    if (real.slice(i + 1).some((d) => d.cmd === c.cmd && d.exitCode === 0)) continue;
+    return { cmd: c.cmd, exitCode: c.exitCode, output: dropPartialLine(c.output) };
   }
   return null;
 }
-function findDeadEnds(cmds, blocker) {
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  cmds.forEach((c, i) => {
-    if (c.exitCode === null || c.exitCode === 0 || seen.has(c.cmd) || isProbeCommand(c.cmd)) return;
-    if (blocker && c.cmd === blocker.cmd) return;
-    if (cmds.slice(i + 1).some((d) => d.cmd === c.cmd && d.exitCode === 0)) return;
-    seen.add(c.cmd);
-    out.push({ cmd: c.cmd, exitCode: c.exitCode });
-  });
-  return out.slice(-5);
+function dropPartialLine(output) {
+  if (!output.startsWith("\u2026")) return output;
+  const nl = output.indexOf("\n");
+  return nl === -1 ? "" : output.slice(nl + 1);
 }
-function findDecisions(prompts) {
-  const out = [];
-  for (const p of prompts) {
-    for (const s of p.split(/(?<=[.!?])\s+|\n+/)) {
-      const t = s.trim();
-      if (t.length >= 8 && t.length <= 300 && DECISION_RE.test(t) && !out.includes(t)) out.push(t);
-    }
-  }
-  return out.slice(-8);
-}
-function buildTranscript(s, title, rel) {
+function buildTranscript(s, title, rel, redactor) {
+  const r = (x) => redactor.apply(x);
   const lines = [`# Condensed transcript: ${title}`, "", `Source: ${TOOL_LABEL[s.ref.tool]} session \`${s.ref.id}\``, ""];
   for (const t of s.timeline) {
-    if (t.kind === "user") lines.push("**User:**", t.text, "");
-    else if (t.kind === "assistant") lines.push("**Agent:**", t.text.length > 600 ? t.text.slice(0, 599) + "\u2026" : t.text, "");
-    else if (t.kind === "command") lines.push(`\`$ ${oneLine(t.run.cmd, 200)}\`${t.run.exitCode === null ? "" : ` \u2192 exit ${t.run.exitCode}`}`, "");
-    else lines.push(`Edited \`${rel(t.edit.path)}\` (${t.edit.kind})`, "");
+    if (t.kind === "user") {
+      const { handoff: handoff2, rest } = splitHandoffPrompt(t.text);
+      if (handoff2) lines.push("**Harlay handoff prompt** (from the previous agent; context is in the brief)", "");
+      if (rest) lines.push("**User:**", r(rest), "");
+    } else if (t.kind === "assistant") {
+      const text = r(t.text);
+      lines.push("**Agent:**", text.length > 600 ? text.slice(0, 599) + "\u2026" : text, "");
+    } else if (t.kind === "command") lines.push(`\`$ ${oneLine(r(t.run.cmd), 200)}\`${t.run.exitCode === null ? "" : ` \u2192 exit ${t.run.exitCode}`}`, "");
+    else lines.push(`Edited \`${r(rel(t.edit.path))}\` (${t.edit.kind})`, "");
   }
   const out = lines.join("\n");
-  return out.length > TRANSCRIPT_MAX ? "\u2026(earlier transcript truncated)\n" + out.slice(out.length - TRANSCRIPT_MAX) : out;
+  if (out.length <= TRANSCRIPT_MAX) return out;
+  const cut = out.slice(out.length - TRANSCRIPT_MAX);
+  const nl = cut.indexOf("\n");
+  return "\u2026(earlier transcript truncated)\n" + (nl === -1 ? cut : cut.slice(nl + 1));
 }
 function extractHandoff(s, git2, o) {
   const cwd = s.ref.cwd;
   if (!cwd) throw new HarlayError("This session has no known working directory, so Harlay cannot hand it off.");
   const workdir = git2?.root ?? cwd;
   const rel = (p) => {
-    if (!(0, import_node_path5.isAbsolute)(p)) return p;
-    const r = (0, import_node_path5.relative)(workdir, p);
-    return r.startsWith("..") || (0, import_node_path5.isAbsolute)(r) ? p : r;
+    if (!(0, import_node_path6.isAbsolute)(p)) return p;
+    const r = (0, import_node_path6.relative)(workdir, p);
+    return r.startsWith("..") || (0, import_node_path6.isAbsolute)(r) ? p : r;
   };
-  const allPrompts = s.timeline.flatMap((t) => t.kind === "user" ? [t.text] : []);
-  const prompts = allPrompts.filter((p) => !isHandoffPrompt(p));
+  const split = s.timeline.flatMap((t) => t.kind === "user" ? [splitHandoffPrompt(t.text)] : []);
+  const prompts = split.flatMap((p) => p.rest ? [p.rest] : []);
   const agentTexts = s.timeline.flatMap((t) => t.kind === "assistant" ? [t.text] : []);
   const cmds = s.timeline.flatMap((t) => t.kind === "command" ? [t.run] : []);
   const edits = s.timeline.flatMap((t) => t.kind === "edit" ? [t.edit] : []);
-  const carried = o.previous && o.previous.goal !== null && prompts.length < allPrompts.length ? o.previous : null;
-  const goal = carried ? carried.goal : prompts.find(isSubstantive) ?? prompts[0] ?? null;
-  const last = carried ? [...prompts].reverse().find(isSubstantive) ?? null : prompts.length ? prompts[prompts.length - 1] : null;
-  const latestInstruction = last !== null && last !== goal && isSubstantive(last) ? last : null;
+  const redactor = new Redactor();
+  const realPrompts = prompts.filter((p) => !isSlashCommand(p)).map((p) => redactor.apply(p));
+  const prev = o.previous;
+  const fromPrev = prev ? split.some((p) => p.handoff && (p.id === null || p.id === prev.id)) : false;
+  const carried = prev && prev.goal !== null && fromPrev ? prev : null;
+  const carriedRecent = carried ? carried.recentUserMessages.map((m) => redactor.apply(m)) : [];
+  const recentUserMessages = pickRecentMessages([...carriedRecent, ...realPrompts]);
+  let { rules: pinnedRules, more: moreRules } = findPinnedRules(realPrompts, recentUserMessages);
+  if (carried) {
+    const older = [...carried.pinnedRules.map((r) => ({ ...r, text: redactor.apply(r.text) })), ...findPinnedRules(carriedRecent, []).rules];
+    const merged = mergePinnedRules(older, pinnedRules, recentUserMessages);
+    moreRules += merged.more + carried.moreRules;
+    pinnedRules = merged.rules;
+  }
+  const originalGoal = carried ? carried.goal === null ? null : redactor.apply(carried.goal) : realPrompts.find(isSubstantive) ?? realPrompts[0] ?? null;
   const todos = (s.todos ?? []).filter((t) => t.status !== "cancelled");
-  const nextTodo = todos.find((t) => t.status === "in_progress") ?? todos.find((t) => t.status === "pending");
   const lastAgent = agentTexts.length ? agentTexts[agentTexts.length - 1] : null;
-  const nextStep = nextTodo ? { text: nextTodo.text, source: "todo" } : lastAgent ? { text: lastAgent, source: "agent" } : null;
-  const blocker = findBlocker(cmds);
-  const editedFiles = [];
-  const counts = /* @__PURE__ */ new Map();
-  for (const e of edits) {
+  const whereItStopped = lastAgent === null ? null : clipWords(redactor.apply(lastAgent), 150);
+  const openTodos = todos.flatMap((t) => t.status === "in_progress" || t.status === "pending" ? [{ text: redactor.apply(t.text).replace(/\s+/g, " ").trim(), status: t.status }] : []).slice(0, 8);
+  const failure = findLastFailure(cmds);
+  const lastFailure = failure ? { ...failure, cmd: redactor.apply(failure.cmd), output: redactor.apply(failure.output) } : null;
+  const filesTouched = [];
+  for (const e of [...edits].reverse()) {
     const r = rel(e.path);
-    if (!editedFiles.includes(r)) editedFiles.push(r);
-    counts.set(r, (counts.get(r) ?? 0) + 1);
+    if (!(0, import_node_path6.isAbsolute)(r) && !filesTouched.includes(r)) filesTouched.push(r);
+    if (filesTouched.length === 12) break;
   }
-  const readFirst = [...editedFiles].sort((a, b) => (counts.get(b) ?? 0) - (counts.get(a) ?? 0)).slice(0, 3);
-  const progress = todos.length ? todos.map((t) => ({ text: t.text, done: t.status === "completed" })) : editedFiles.map((f) => ({ text: `\`${f}\``, done: true }));
-  const progressSource = todos.length ? "todos" : editedFiles.length ? "edits" : "none";
-  const redactor = new Redactor();
-  const title = carried ? carried.title : s.ref.title ?? (goal ? oneLine(redactor.apply(goal), 60) : "Untitled task");
+  const title = carried ? carried.title : s.ref.title ?? (originalGoal ? oneLine(redactor.apply(originalGoal), 60) : "Untitled task");
   const pad = (n2) => String(n2).padStart(2, "0");
   const n = o.now;
   const baseId = `${pad(n.getMonth() + 1)}${pad(n.getDate())}-${pad(n.getHours())}${pad(n.getMinutes())}-${slugify(redactor.apply(title))}`;
   return {
     baseId,
     title,
-    status: "in_progress",
     createdAt: o.now,
     from: {
       tool: s.ref.tool,
@@ -1001,142 +1178,155 @@ function extractHandoff(s, git2, o) {
     },
     workdir,
     git: git2,
-    goal,
-    latestInstruction,
-    nextStep,
-    blocker: blocker && blocker.exitCode !== null ? { cmd: blocker.cmd, exitCode: blocker.exitCode, output: blocker.output } : null,
-    progress,
-    progressSource,
-    editedFiles,
-    decisions: findDecisions(prompts),
-    deadEnds: findDeadEnds(cmds, blocker),
-    readFirst,
-    transcript: buildTranscript(s, title, rel),
-    unknownRecords: s.unknownRecords
+    originalGoal,
+    recentUserMessages,
+    pinnedRules,
+    moreRules,
+    whereItStopped,
+    todos: openTodos,
+    filesTouched,
+    lastFailure,
+    transcript: buildTranscript(s, title, rel, redactor),
+    unknownRecords: s.unknownRecords,
+    redactions: { ...redactor.counts },
+    carriedFrom: carried ? carried.id : null
   };
 }
 
-// ../../packages/core/src/brief/render.ts
-var BUDGET = { goal: 150, latest: 100, next: 200, blocker: 250, progress: 300, files: 300, decisions: 250, deadEnds: 200 };
+// ../../packages/core/src/brief/write.ts
+var import_promises6 = require("node:fs/promises");
+var import_node_path7 = require("node:path");
+
+// ../../packages/core/src/brief/prompt.ts
+var TIER_MAX = { full: 6e3, compact: 3e3 };
 var REASON_TEXT = {
   usage_limit: "it hit a usage limit",
   crash: "it stopped with an error",
   manual: "the user handed it off"
 };
-var j = (v) => JSON.stringify(v ?? null);
-function quote(s) {
-  return s.split("\n").map((l) => l.trim() ? `> ${l}` : ">").join("\n");
-}
-function listWithin(lines, maxTokens, pointer) {
-  const max = maxTokens * CHARS_PER_TOKEN;
-  const out = [];
-  let used = 0;
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    if (out.length > 0 && used + line.length + 1 > max) {
-      out.push(`- \u2026 ${lines.length - i} more (see \`${pointer}\`)`);
-      break;
-    }
-    out.push(line);
-    used += line.length + 1;
-  }
-  return out;
-}
-function tailWithin(s, maxTokens) {
-  const max = maxTokens * CHARS_PER_TOKEN;
-  const t = s.trimEnd();
-  if (t.length <= max) return t;
-  const cut = t.slice(t.length - max);
-  const nl = cut.indexOf("\n");
-  return "\u2026\n" + (nl >= 0 ? cut.slice(nl + 1) : cut);
-}
-function fenceFor(body) {
-  const longest = Math.max(0, ...(body.match(/`+/g) ?? []).map((r) => r.length));
-  return "`".repeat(Math.max(3, longest + 1));
-}
-function fileLine(f) {
-  const counts = f.added !== null && f.removed !== null ? `, +${f.added} -${f.removed}` : "";
-  return `- \`${f.path}\` (${f.status}${counts})`;
-}
-function renderBrief(d, id, opts = {}) {
-  const dir = `.harlay/handoffs/${id}`;
-  const transcript = `${dir}/transcript.md`;
-  const front = [
-    "---",
-    "harlay: 1",
-    `id: ${j(id)}`,
-    `status: ${j(d.status)}`,
-    `created: ${j(d.createdAt.toISOString())}`,
-    "from:",
-    `  tool: ${j(d.from.tool)}`,
-    `  model: ${j(d.from.model)}`,
-    `  session: ${j(d.from.session)}`,
-    `  reason: ${j(d.from.reason)}`,
-    `  resets_at: ${j(d.from.resetsAt ? d.from.resetsAt.toISOString() : null)}`,
-    "repo:",
-    `  path: ${j(d.workdir)}`,
-    ...d.git ? [`  branch: ${j(d.git.branch)}`, `  base_commit: ${j(d.git.head)}`, `  dirty_files: ${d.git.files.length}`, `  diff_sha: ${j(d.git.diffSha.slice(0, 12))}`] : ["  git: false"],
-    "---"
-  ];
-  const header = [
-    `# Continue: ${d.title}`,
-    "",
-    `> You are continuing a coding task that another AI agent (${TOOL_LABEL[d.from.tool]}) started but could not finish (${REASON_TEXT[d.from.reason]}).`,
-    "> This brief was extracted from its session log and the repo.",
-    d.git ? '> First run `git status` and check it matches "Changed files". Do not redo finished work.' : "> Check the files listed below before editing. Do not redo finished work."
+var OUR_TAGS = /<(\/?)(handoff|original_goal|rules_from_user|recent_user_messages|where_it_stopped|files|last_failure)\b/gi;
+function safe(s) {
+  return s.replace(OUR_TAGS, "\u2039$1$2");
+}
+var attr = (s) => safe(s).replace(/"/g, "'").replace(/\s+/g, " ").trim();
+var norm3 = (s) => s.toLowerCase().replace(/\s+/g, " ").trim();
+function goalIsRecent(goal, recent) {
+  const g = norm3(goal.replace(/\s…$/, ""));
+  return recent.some((m) => norm3(m).startsWith(g));
+}
+function renderPrompt(rec, tier) {
+  const full = tier === "full";
+  const from = TOOL_LABEL[rec.from.tool];
+  const dir = `.harlay/handoffs/${rec.id}`;
+  const out = [
+    `<handoff from="${from}" reason="${rec.from.reason}" task="${attr(rec.task.title)}">`,
+    `You are taking over a coding session that ${from} could not finish (${REASON_TEXT[rec.from.reason]}). What you need to start is below; don't re-read the repo to rebuild it.`
   ];
-  const goal = ["## 1. Goal (user's words)", d.goal ? quote(clip(d.goal, BUDGET.goal, transcript)) : "Not recorded. See the transcript."];
-  if (d.latestInstruction) goal.push("", "Latest instruction:", quote(clip(d.latestInstruction, BUDGET.latest, transcript)));
-  const next = ["## 2. Next step"];
-  if (!d.nextStep) next.push("Not recorded. Re-read the goal and the changed files, then decide.");
-  else if (d.nextStep.source === "todo") next.push(clip(oneLine(d.nextStep.text, 200), BUDGET.next));
-  else next.push("From the agent's last message:", quote(clip(d.nextStep.text, BUDGET.next)));
-  const blocker = ["## 3. Blocker"];
-  if (d.blocker) {
-    const body = tailWithin(d.blocker.output, BUDGET.blocker);
-    const fence = fenceFor(body);
-    blocker.push(`\`${oneLine(d.blocker.cmd, 200)}\` failed (exit ${d.blocker.exitCode}):`, `${fence}text`, body, fence, `Full output: \`${dir}/last-error.txt\``);
-  } else {
-    blocker.push("No failing command recorded.");
+  const goal = rec.task.originalGoal;
+  const noRecent = rec.task.recentUserMessages.length === 0;
+  if (goal && (full ? !goalIsRecent(goal, rec.task.recentUserMessages) : noRecent)) out.push("", "<original_goal>", safe(goal), "</original_goal>");
+  if (rec.task.pinnedRules.length) {
+    out.push("", "<rules_from_user>", ...rec.task.pinnedRules.map((r) => `- ${safe(r.text)}`));
+    if (rec.task.moreRules) out.push(`(${rec.task.moreRules} more in the transcript)`);
+    out.push("</rules_from_user>");
+  }
+  const recent = full ? rec.task.recentUserMessages : rec.task.recentUserMessages.slice(-2);
+  if (recent.length) out.push("", '<recent_user_messages oldest_first="true">', ...recent.map((m) => `- ${safe(m)}`), "</recent_user_messages>");
+  const where = rec.state.whereItStopped === null ? null : full ? rec.state.whereItStopped : clipWords(rec.state.whereItStopped, 60);
+  const todos = rec.state.todos.map((t) => `[${t.status === "in_progress" ? "in progress" : "pending"}] ${safe(t.text)}`);
+  if (where || todos.length) {
+    out.push("", "<where_it_stopped>");
+    if (where) out.push(safe(where));
+    if (todos.length) out.push(`Open todos: ${todos.join("; ")}`);
+    out.push("</where_it_stopped>");
+  }
+  if (full && (rec.files.touched.length || rec.files.uncommitted.length)) {
+    out.push("", "<files>");
+    if (rec.files.touched.length) out.push(`Touched: ${rec.files.touched.map(safe).join(", ")}`);
+    if (rec.files.uncommitted.length) {
+      const list = rec.files.uncommitted.map((f) => `${safe(f.path)} (${f.status}${f.added !== null && f.removed !== null ? `, +${f.added} -${f.removed}` : ""})`);
+      out.push(`Uncommitted: ${list.join(", ")}${rec.files.moreUncommitted ? `, and ${rec.files.moreUncommitted} more` : ""}`);
+    }
+    out.push("</files>");
   }
-  const progress = ["## 4. Progress"];
-  if (d.progressSource === "none") progress.push("Nothing recorded yet.");
-  else {
-    if (d.progressSource === "edits") progress.push("No task list was recorded. Files the agent edited:");
-    progress.push(...listWithin(d.progress.map((p) => `- [${p.done ? "x" : " "}] ${oneLine(p.text, 200)}`), BUDGET.progress, transcript));
+  if (rec.lastFailure) {
+    out.push("", "<last_failure>", `$ ${safe(rec.lastFailure.cmd)} (exit ${rec.lastFailure.exitCode})`);
+    if (full) out.push(safe(rec.lastFailure.outputTail));
+    out.push("</last_failure>");
   }
-  const files = [];
-  if (d.git) {
-    files.push("## 5. Changed files (uncommitted)");
-    if (d.git.files.length === 0) files.push("Working tree is clean.");
-    else files.push(...listWithin(d.git.files.map(fileLine), BUDGET.files, `${dir}/diff.patch`), `Full diff: \`${dir}/diff.patch\``);
-  } else {
-    files.push("## 5. Changed files", "Not a git repository." + (d.editedFiles.length ? " Files the agent edited:" : ""));
-    files.push(...listWithin(d.editedFiles.map((f) => `- \`${f}\``), BUDGET.files, transcript));
+  const more = [`${dir}/transcript.md (search it, don't read it all)`];
+  if (rec.details.diff) more.push(`${dir}/diff.patch`);
+  const next = noRecent ? "Continue from where it stopped." : "Continue from the most recent user message.";
+  out.push("", `Only if you need more: ${more.join(" and ")}.`, "</handoff>", "", `${next} Start with the next concrete step.`);
+  return wellFormed(out.join("\n"));
+}
+function choosePrompt(rec, fits) {
+  for (const tier of ["full", "compact"]) {
+    const text = renderPrompt(rec, tier);
+    if (text.length <= TIER_MAX[tier] && fits(text)) return { tier, text };
   }
-  const decisions = [
-    "## 6. Decisions and constraints",
-    ...d.decisions.length ? listWithin(d.decisions.map((s) => `- "${oneLine(s, 300)}"`), BUDGET.decisions, transcript) : ["None recorded."]
-  ];
-  const deadEnds = [
-    "## 7. Dead ends (don't retry)",
-    ...d.deadEnds.length ? listWithin(d.deadEnds.map((e) => `- \`${oneLine(e.cmd, 160)}\` failed (exit ${e.exitCode})`), BUDGET.deadEnds, transcript) : ["None recorded."]
-  ];
-  const more = ["## 8. Read more", `- Condensed transcript: \`${transcript}\``];
-  if (opts.previousBrief) more.push(`- Previous brief (as last updated by the previous agent): \`${dir}/previous-HANDOFF.md\``);
-  if (d.readFirst.length) more.push(`- Read these first: ${d.readFirst.map((f) => `\`${f}\``).join(", ")}`);
-  const stop = ["## 9. When you stop", "Before ending your turn, update sections 2\u20134 and `status:` in this file so the next agent can continue."];
-  return [front, header, goal, next, blocker, progress, files, decisions, deadEnds, more, stop].map((s) => s.join("\n")).join("\n\n") + "\n";
+  return { tier: "pointer", text: HANDOFF_PROMPT };
+}
+
+// ../../packages/core/src/brief/record.ts
+var RECORD_SCHEMA = "harlay/handoff@2";
+var MAX_UNCOMMITTED = 15;
+function buildRecord(d, id, previousId, r) {
+  const a = (s) => r.apply(stripControl(s));
+  const files = d.git?.files ?? [];
+  return {
+    schema: RECORD_SCHEMA,
+    id,
+    createdAt: d.createdAt.toISOString(),
+    from: {
+      tool: d.from.tool,
+      model: d.from.model,
+      session: d.from.session,
+      reason: d.from.reason,
+      resetsAt: d.from.resetsAt ? d.from.resetsAt.toISOString() : null,
+      message: d.from.message === null ? null : a(d.from.message)
+    },
+    repo: { root: d.workdir, git: d.git !== null, branch: d.git?.branch ?? null, head: d.git?.head ?? null, dirtyFiles: files.length },
+    task: {
+      title: a(d.title),
+      originalGoal: d.originalGoal === null ? null : clipWords(a(d.originalGoal), 60),
+      recentUserMessages: d.recentUserMessages.map(a),
+      pinnedRules: d.pinnedRules.map((p) => ({ text: a(p.text), message: p.message })),
+      moreRules: d.moreRules
+    },
+    state: {
+      whereItStopped: d.whereItStopped === null ? null : a(d.whereItStopped),
+      todos: d.todos.map((t) => ({ text: oneLine(a(t.text), 200), status: t.status }))
+    },
+    files: {
+      touched: d.filesTouched.map(a),
+      uncommitted: files.slice(0, MAX_UNCOMMITTED).map((f) => ({ path: a(f.path), status: f.status, added: f.added, removed: f.removed })),
+      moreUncommitted: Math.max(0, files.length - MAX_UNCOMMITTED)
+    },
+    lastFailure: d.lastFailure ? { cmd: clipWords(a(d.lastFailure.cmd), 30), exitCode: d.lastFailure.exitCode, outputTail: a(d.lastFailure.output).split("\n").slice(-8).join("\n") } : null,
+    details: { transcript: "transcript.md", diff: d.git ? "diff.patch" : null, lastError: d.lastFailure ? "last-error.txt" : null },
+    previous: previousId ? { id: previousId } : null,
+    unknownRecords: d.unknownRecords
+  };
+}
+var isStr = (v) => typeof v === "string";
+var isObj2 = (v) => typeof v === "object" && v !== null;
+function validateRecord(raw) {
+  if (!isObj2(raw) || raw.schema !== RECORD_SCHEMA || !isStr(raw.id) || !isStr(raw.createdAt)) return null;
+  const { task, from } = raw;
+  if (!isObj2(from) || !isTool(from.tool)) return null;
+  if (!isObj2(task) || !isStr(task.title) || !(task.originalGoal === null || isStr(task.originalGoal))) return null;
+  if (!Array.isArray(task.recentUserMessages) || !task.recentUserMessages.every(isStr)) return null;
+  if (!Array.isArray(task.pinnedRules) || !task.pinnedRules.every((r) => isObj2(r) && isStr(r.text) && typeof r.message === "number")) return null;
+  return raw;
 }
 
 // ../../packages/core/src/brief/write.ts
-var import_promises5 = require("node:fs/promises");
-var import_node_path6 = require("node:path");
 async function allocateHandoffId(handoffsDir, baseId) {
   for (let i = 1; i < 1e3; i++) {
     const id = i === 1 ? baseId : `${baseId}-${i}`;
     try {
-      await (0, import_promises5.access)((0, import_node_path6.join)(handoffsDir, id));
+      await (0, import_promises6.access)((0, import_node_path7.join)(handoffsDir, id));
     } catch {
       return id;
     }
@@ -1145,22 +1335,22 @@ async function allocateHandoffId(handoffsDir, baseId) {
 }
 async function ensureGitExclude(workdir) {
   const p = (await git(workdir, ["rev-parse", "--git-path", "info/exclude"])).trim();
-  const file = (0, import_node_path6.isAbsolute)(p) ? p : (0, import_node_path6.join)(workdir, p);
-  let current = "";
+  const file = (0, import_node_path7.isAbsolute)(p) ? p : (0, import_node_path7.join)(workdir, p);
+  let current2 = "";
   try {
-    current = await (0, import_promises5.readFile)(file, "utf8");
+    current2 = await (0, import_promises6.readFile)(file, "utf8");
   } catch {
-    current = "";
+    current2 = "";
   }
-  if (current.split("\n").some((l) => l.trim() === ".harlay/" || l.trim() === ".harlay")) return;
-  await (0, import_promises5.mkdir)((0, import_node_path6.dirname)(file), { recursive: true });
-  await (0, import_promises5.appendFile)(file, `${current && !current.endsWith("\n") ? "\n" : ""}.harlay/
+  if (current2.split("\n").some((l) => l.trim() === ".harlay/" || l.trim() === ".harlay")) return;
+  await (0, import_promises6.mkdir)((0, import_node_path7.dirname)(file), { recursive: true });
+  await (0, import_promises6.appendFile)(file, `${current2 && !current2.endsWith("\n") ? "\n" : ""}.harlay/
 `);
 }
 async function readHandoffState(workdir) {
   let raw;
   try {
-    raw = JSON.parse(await (0, import_promises5.readFile)((0, import_node_path6.join)(workdir, ".harlay", "state.json"), "utf8"));
+    raw = JSON.parse(await (0, import_promises6.readFile)((0, import_node_path7.join)(workdir, ".harlay", "state.json"), "utf8"));
   } catch {
     return null;
   }
@@ -1172,118 +1362,61 @@ async function readHandoffState(workdir) {
 }
 async function readIfExists(file) {
   try {
-    return await (0, import_promises5.readFile)(file, "utf8");
+    return await (0, import_promises6.readFile)(file, "utf8");
   } catch {
     return null;
   }
 }
-async function writeHandoff(d) {
-  const harlayDir = (0, import_node_path6.join)(d.workdir, ".harlay");
-  const latestPath = (0, import_node_path6.join)(harlayDir, "HANDOFF.md");
-  const id = await allocateHandoffId((0, import_node_path6.join)(harlayDir, "handoffs"), d.baseId);
-  const dir = (0, import_node_path6.join)(harlayDir, "handoffs", id);
-  await (0, import_promises5.mkdir)(dir, { recursive: true });
-  const r = new Redactor();
-  const previous = await readIfExists(latestPath);
-  if (previous !== null) await (0, import_promises5.writeFile)((0, import_node_path6.join)(dir, "previous-HANDOFF.md"), r.apply(previous));
-  const brief = r.apply(renderBrief(d, id, { previousBrief: previous !== null }));
-  const briefPath = (0, import_node_path6.join)(dir, "HANDOFF.md");
-  await (0, import_promises5.writeFile)(briefPath, brief);
-  await (0, import_promises5.writeFile)((0, import_node_path6.join)(dir, "transcript.md"), r.apply(d.transcript));
-  if (d.git) await (0, import_promises5.writeFile)((0, import_node_path6.join)(dir, "diff.patch"), r.apply(d.git.diff));
-  if (d.blocker) await (0, import_promises5.writeFile)((0, import_node_path6.join)(dir, "last-error.txt"), r.apply(d.blocker.output));
-  const from = {
-    ...d.from,
-    message: d.from.message === null ? null : r.apply(d.from.message),
-    resetsAt: d.from.resetsAt ? d.from.resetsAt.toISOString() : null
-  };
-  const goal = d.goal === null ? null : r.apply(d.goal);
-  const title = r.apply(d.title);
-  const meta = {
-    harlay: 1,
-    id,
-    createdAt: d.createdAt.toISOString(),
-    title,
-    goal,
-    from,
-    workdir: d.workdir,
-    unknownRecords: d.unknownRecords,
-    git: d.git ? { branch: d.git.branch, head: d.git.head, files: d.git.files.length, diffSha: d.git.diffSha } : null,
-    redactions: { ...r.counts }
-  };
-  await (0, import_promises5.writeFile)((0, import_node_path6.join)(dir, "meta.json"), JSON.stringify(meta, null, 2) + "\n");
-  await (0, import_promises5.writeFile)(latestPath, brief);
-  const state2 = { harlay: 1, lastId: id, goal, title };
-  await (0, import_promises5.writeFile)((0, import_node_path6.join)(harlayDir, "state.json"), JSON.stringify(state2, null, 2) + "\n");
-  if (d.git) await ensureGitExclude(d.workdir);
-  return { id, dir, briefPath, latestPath, redactions: { ...r.counts } };
-}
-
-// ../../packages/core/src/launch/launchers.ts
-var import_node_child_process2 = require("node:child_process");
-var import_promises6 = require("node:fs/promises");
-var import_node_path7 = require("node:path");
-var import_node_util2 = require("node:util");
-var pexec2 = (0, import_node_util2.promisify)(import_node_child_process2.execFile);
-var HANDOFF_PROMPT = "Read .harlay/HANDOFF.md and continue the task.";
-var DEFAULT_MODES = { "claude-code": "app", codex: "app", cursor: "app" };
-var defaultRunner = {
-  async open(args) {
-    await pexec2("/usr/bin/open", args);
-  },
-  async writeExecutable(path, content) {
-    await (0, import_promises6.mkdir)((0, import_node_path7.dirname)(path), { recursive: true });
-    await (0, import_promises6.writeFile)(path, content, { mode: 493 });
-    await (0, import_promises6.chmod)(path, 493);
-  },
-  sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms))
-};
-function shq(s) {
-  return `'${s.replace(/'/g, `'\\''`)}'`;
-}
-var enc = encodeURIComponent;
-function planLaunch(o) {
-  if (o.mode === "app") {
-    switch (o.target) {
-      case "claude-code":
-        return { target: o.target, mode: o.mode, steps: [{ kind: "open", args: [`claude://code/new?folder=${enc(o.cwd)}&q=${enc(o.prompt)}`] }] };
-      case "codex":
-        return { target: o.target, mode: o.mode, steps: [{ kind: "open", args: [`codex://threads/new?path=${enc(o.cwd)}&prompt=${enc(o.prompt)}`] }] };
-      case "cursor":
-        return {
-          target: o.target,
-          mode: o.mode,
-          steps: [
-            { kind: "open", args: ["-a", "Cursor", o.cwd] },
-            { kind: "wait", ms: 1500 },
-            { kind: "open", args: [`cursor://anysphere.cursor-deeplink/prompt?text=${enc(o.prompt)}`] }
-          ]
-        };
+async function readPreviousHandoff(workdir) {
+  const raw = await readIfExists((0, import_node_path7.join)(workdir, ".harlay", "handoff.json"));
+  if (raw !== null) {
+    let rec;
+    try {
+      rec = validateRecord(JSON.parse(raw));
+    } catch {
+      return null;
     }
+    if (!rec) return null;
+    const { task } = rec;
+    return {
+      id: rec.id,
+      goal: task.originalGoal,
+      title: task.title,
+      recentUserMessages: task.recentUserMessages,
+      pinnedRules: task.pinnedRules,
+      moreRules: typeof task.moreRules === "number" ? task.moreRules : 0
+    };
   }
-  const bin = o.binaries[o.target];
-  if (!bin) throw new HarlayError(`${TOOL_LABEL[o.target]} CLI not found. Install it or switch ${TOOL_LABEL[o.target]} to app mode.`);
-  const argv = o.target === "codex" ? [bin, "-C", o.cwd, o.prompt] : o.target === "cursor" ? [bin, "--workspace", o.cwd, o.prompt] : [bin, o.prompt];
-  const path = (0, import_node_path7.join)(o.scriptDir, `continue-${o.target}.command`);
-  const content = `#!/bin/zsh -l
-cd -- ${shq(o.cwd)} || exit 1
-exec ${argv.map(shq).join(" ")}
-`;
-  return {
-    target: o.target,
-    mode: o.mode,
-    steps: [
-      { kind: "script", path, content },
-      { kind: "open", args: ["-a", o.terminalApp, path] }
-    ]
-  };
+  const state2 = await readHandoffState(workdir);
+  return state2 ? { id: state2.lastId, goal: state2.goal, title: state2.title, recentUserMessages: [], pinnedRules: [], moreRules: 0 } : null;
 }
-async function executeLaunch(plan, runner = defaultRunner) {
-  for (const step of plan.steps) {
-    if (step.kind === "open") await runner.open(step.args);
-    else if (step.kind === "script") await runner.writeExecutable(step.path, step.content);
-    else await runner.sleep(step.ms);
-  }
+function addCounts(a, b) {
+  const out = { ...a };
+  for (const [k, n] of Object.entries(b)) out[k] = (out[k] ?? 0) + n;
+  return out;
+}
+async function writeHandoff(d, o) {
+  const harlayDir = (0, import_node_path7.join)(d.workdir, ".harlay");
+  const latestPath = (0, import_node_path7.join)(harlayDir, "HANDOFF.md");
+  const id = await allocateHandoffId((0, import_node_path7.join)(harlayDir, "handoffs"), d.baseId);
+  const dir = (0, import_node_path7.join)(harlayDir, "handoffs", id);
+  await (0, import_promises6.mkdir)(dir, { recursive: true });
+  const r = new Redactor();
+  const body = buildRecord(d, id, o.previousId, r);
+  const chosen = choosePrompt(body, (p) => promptFits(o.target, o.mode, p));
+  const record = { ...body, prompt: { target: o.target, tier: chosen.tier, chars: chosen.text.length } };
+  const json = JSON.stringify(record, null, 2) + "\n";
+  const recordPath = (0, import_node_path7.join)(dir, "handoff.json");
+  await (0, import_promises6.writeFile)(recordPath, json);
+  await (0, import_promises6.writeFile)((0, import_node_path7.join)(dir, "prompt.md"), chosen.text + "\n");
+  await (0, import_promises6.writeFile)((0, import_node_path7.join)(dir, "transcript.md"), r.apply(stripControl(d.transcript)));
+  if (d.git) await (0, import_promises6.writeFile)((0, import_node_path7.join)(dir, "diff.patch"), r.apply(d.git.diff));
+  if (d.lastFailure) await (0, import_promises6.writeFile)((0, import_node_path7.join)(dir, "last-error.txt"), r.apply(stripControl(d.lastFailure.output)));
+  await (0, import_promises6.writeFile)(latestPath, renderPrompt(body, "full") + "\n");
+  await (0, import_promises6.writeFile)((0, import_node_path7.join)(harlayDir, "handoff.json"), json);
+  if (d.git) await ensureGitExclude(d.workdir);
+  const redactions = addCounts(d.redactions ?? {}, r.counts);
+  return { id, dir, recordPath, latestPath, prompt: chosen.text, tier: chosen.tier, redactions };
 }
 
 // ../../packages/core/src/launch/resolve.ts
@@ -1385,10 +1518,9 @@ async function runHandoff(o) {
   }
   const session = await readerFor(o.readers, o.session.tool).readSession(o.session);
   const git2 = await takeGitSnapshot(cwd);
-  const state2 = await readHandoffState(git2?.root ?? cwd);
-  const previous = state2 ? { id: state2.lastId, goal: state2.goal, title: state2.title } : null;
+  const previous = await readPreviousHandoff(git2?.root ?? cwd);
   const data = extractHandoff(session, git2, { now: o.now ?? /* @__PURE__ */ new Date(), reason: o.reason, previous });
-  const written = await writeHandoff(data);
+  const written = await writeHandoff(data, { target: o.target, mode: o.mode, previousId: data.carriedFrom });
   if (o.launch === false) return { written, plan: null, data };
   let plan;
   try {
@@ -1397,7 +1529,7 @@ async function runHandoff(o) {
       target: o.target,
       mode: o.mode,
       cwd: data.workdir,
-      prompt: HANDOFF_PROMPT,
+      prompt: written.prompt,
       scriptDir: written.dir,
       binaries,
       terminalApp: o.terminalApp ?? "Terminal"
@@ -1591,12 +1723,535 @@ var Watcher = class extends import_node_events.EventEmitter {
   }
 };
 
-// src/menu.ts
-var import_node_path11 = require("node:path");
+// ../../packages/core/src/usage/types.ts
+var WINDOW_MINUTES = { five_hour: 300, weekly: 10080 };
+function windowKind(minutes) {
+  if (minutes === 300) return "five_hour";
+  if (minutes === 10080) return "weekly";
+  return "other";
+}
+function windowLabel(kind, minutes) {
+  if (kind === "five_hour") return "5h";
+  if (kind === "weekly") return "Week";
+  if (!minutes) return "Limit";
+  return minutes % 1440 === 0 ? `${minutes / 1440}d` : `${Math.round(minutes / 60)}h`;
+}
+function fullestWindow(s) {
+  let best = null;
+  for (const w of s.windows) if (!best || w.usedPercent > best.usedPercent) best = w;
+  return best;
+}
 
-// src/settings.ts
+// ../../packages/core/src/usage/codex.ts
+var import_node_child_process3 = require("node:child_process");
 var import_promises10 = require("node:fs/promises");
 var import_node_path10 = require("node:path");
+var PACE_MS = 60 * 6e4;
+var TAIL_BYTES = 1024 * 1024;
+function num(x) {
+  return typeof x === "number" && Number.isFinite(x) ? x : null;
+}
+function codexWindows(rl) {
+  const out = [];
+  for (const key of ["primary", "secondary"]) {
+    const w = rl[key];
+    if (!isObj(w)) continue;
+    const pct = num(w.used_percent) ?? num(w.usedPercent);
+    if (pct === null) continue;
+    const minutes = num(w.window_minutes) ?? num(w.windowDurationMins);
+    const resets = num(w.resets_at) ?? num(w.resetsAt);
+    const kind = windowKind(minutes);
+    out.push({ kind, label: windowLabel(kind, minutes), usedPercent: pct, resetsAt: resets === null ? null : new Date(resets * 1e3), exact: true });
+  }
+  return out;
+}
+function planOf(rl) {
+  const p = rl.plan_type ?? rl.planType;
+  return typeof p === "string" ? p : null;
+}
+async function readTail(file, bytes) {
+  const fh = await (0, import_promises10.open)(file, "r");
+  try {
+    const { size } = await fh.stat();
+    const start = Math.max(0, size - bytes);
+    const buf = Buffer.alloc(size - start);
+    await fh.read(buf, 0, buf.length, start);
+    const text = buf.toString("utf8");
+    return start > 0 ? text.slice(text.indexOf("\n") + 1) : text;
+  } finally {
+    await fh.close();
+  }
+}
+async function readCodexReadings(home2, files = 8) {
+  const logs = (await listSessionFiles((0, import_node_path10.join)(home2, ".codex", "sessions"), (f) => f.endsWith(".jsonl"))).slice(0, files);
+  const out = [];
+  for (const { path } of logs) {
+    let text;
+    try {
+      text = await readTail(path, TAIL_BYTES);
+    } catch {
+      continue;
+    }
+    for (const line of text.split("\n")) {
+      if (!line.includes('"rate_limits":{')) continue;
+      try {
+        const rec = JSON.parse(line);
+        const p = isObj(rec.payload) ? rec.payload : null;
+        const rl = p && isObj(p.rate_limits) ? p.rate_limits : null;
+        const at = typeof rec.timestamp === "string" ? new Date(rec.timestamp) : null;
+        if (!rl || !at || Number.isNaN(at.getTime())) continue;
+        const windows = codexWindows(rl);
+        if (windows.length) out.push({ at, windows, plan: planOf(rl), resetCredits: null });
+      } catch {
+      }
+    }
+  }
+  return out.sort((a, b) => a.at.getTime() - b.at.getTime());
+}
+function minutesToFull(points, now) {
+  const recent = points.filter((p) => now.getTime() - p.at.getTime() <= PACE_MS);
+  if (recent.length < 2) return null;
+  const first = recent[0];
+  const last = recent[recent.length - 1];
+  const minutes = (last.at.getTime() - first.at.getTime()) / 6e4;
+  const rise = last.pct - first.pct;
+  if (minutes < 5 || rise <= 0) return null;
+  return Math.max(0, (100 - last.pct) / (rise / minutes));
+}
+function current(w, now) {
+  return w.resetsAt && w.resetsAt.getTime() <= now.getTime() ? { ...w, usedPercent: 0, resetsAt: null } : w;
+}
+function codexSnapshot(readings, now, query = null) {
+  const all = query ? [...readings, query].sort((a, b) => a.at.getTime() - b.at.getTime()) : readings;
+  const latest = all[all.length - 1];
+  if (!latest) return null;
+  const windows = latest.windows.map((w) => current(w, now));
+  const fullest = windows.reduce((b, w) => !b || w.usedPercent > b.usedPercent ? w : b, null);
+  let minutesToLimit = null;
+  if (fullest && fullest.usedPercent > 0) {
+    const series = all.flatMap((r) => r.windows.filter((w) => w.kind === fullest.kind).map((w) => ({ at: r.at, pct: w.usedPercent })));
+    minutesToLimit = minutesToFull(series, now);
+    if (minutesToLimit !== null && fullest.resetsAt && now.getTime() + minutesToLimit * 6e4 >= fullest.resetsAt.getTime()) minutesToLimit = null;
+  }
+  return {
+    tool: "codex",
+    windows,
+    observedAt: latest.at,
+    minutesToLimit,
+    plan: latest.plan ?? query?.plan ?? null,
+    resetCredits: query?.resetCredits ?? null
+  };
+}
+function queryCodexUsage(codexBin, timeoutMs = 15e3) {
+  return new Promise((resolve) => {
+    let done = false;
+    let buf = "";
+    const child = (0, import_node_child_process3.spawn)(codexBin, ["app-server"], { stdio: ["pipe", "pipe", "ignore"] });
+    const finish = (r) => {
+      if (done) return;
+      done = true;
+      clearTimeout(timer);
+      child.kill();
+      resolve(r);
+    };
+    const timer = setTimeout(() => finish(null), timeoutMs);
+    child.on("error", () => finish(null));
+    child.stdin.on("error", () => finish(null));
+    child.on("exit", () => finish(null));
+    child.stdout.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => {
+      buf += chunk;
+      let nl;
+      while ((nl = buf.indexOf("\n")) !== -1) {
+        const line = buf.slice(0, nl);
+        buf = buf.slice(nl + 1);
+        let msg;
+        try {
+          msg = JSON.parse(line);
+        } catch {
+          continue;
+        }
+        if (msg.id !== 2) continue;
+        const res = isObj(msg.result) ? msg.result : null;
+        const rl = res && isObj(res.rateLimits) ? res.rateLimits : null;
+        if (!res || !rl) return finish(null);
+        const credits = isObj(res.rateLimitResetCredits) ? num(res.rateLimitResetCredits.availableCount) : null;
+        finish({ at: /* @__PURE__ */ new Date(), windows: codexWindows(rl), plan: planOf(rl), resetCredits: credits });
+      }
+    });
+    const send = (o) => child.stdin.write(JSON.stringify(o) + "\n");
+    send({ method: "initialize", id: 1, params: { clientInfo: { name: "harlay", version: "1" } } });
+    send({ method: "initialized" });
+    send({ method: "account/rateLimits/read", id: 2 });
+  });
+}
+
+// ../../packages/core/src/usage/claude.ts
+var import_promises11 = require("node:fs/promises");
+var import_node_path11 = require("node:path");
+var HOUR = 36e5;
+var SAMPLE_MAX_AGE_MS = 30 * 24 * HOUR;
+var DISPROVE_FACTOR = 1.15;
+var MIN_CALIBRATION_PCT = 5;
+var PACE_MS2 = 30 * 6e4;
+function replyUnits(usage2, model) {
+  const n = (k) => typeof usage2[k] === "number" ? usage2[k] : 0;
+  const tokens = n("input_tokens") + 1.25 * n("cache_creation_input_tokens") + 0.1 * n("cache_read_input_tokens") + 5 * n("output_tokens");
+  const tier = /opus/i.test(model) ? 5 : /haiku/i.test(model) ? 1 : 3;
+  return tokens * tier;
+}
+function limitKind(t) {
+  if (t === "five_hour") return "five_hour";
+  if (t === "seven_day" || t === "weekly") return "weekly";
+  return null;
+}
+var ClaudeUsageLog = class {
+  constructor(home2) {
+    this.home = home2;
+  }
+  home;
+  files = /* @__PURE__ */ new Map();
+  replies = /* @__PURE__ */ new Map();
+  hits = /* @__PURE__ */ new Map();
+  async refresh(now = /* @__PURE__ */ new Date(), maxAgeMs = 8 * 24 * HOUR) {
+    const root = (0, import_node_path11.join)(this.home, ".claude", "projects");
+    let names;
+    try {
+      names = await (0, import_promises11.readdir)(root, { recursive: true });
+    } catch {
+      return;
+    }
+    for (const name of names) {
+      if (!name.endsWith(".jsonl")) continue;
+      const path = (0, import_node_path11.join)(root, name);
+      try {
+        const s = await (0, import_promises11.stat)(path);
+        if (now.getTime() - s.mtimeMs > maxAgeMs) continue;
+        await this.readFrom(path, s.size);
+      } catch {
+      }
+    }
+    const cutoff = now.getTime() - maxAgeMs;
+    for (const [k, e] of this.replies) if (e.at < cutoff) this.replies.delete(k);
+    for (const [k, h] of this.hits) if (h.at < cutoff - SAMPLE_MAX_AGE_MS) this.hits.delete(k);
+  }
+  async readFrom(path, size) {
+    const st = this.files.get(path) ?? { offset: 0, partial: "" };
+    if (size < st.offset) Object.assign(st, { offset: 0, partial: "" });
+    if (size === st.offset) return;
+    const fh = await (0, import_promises11.open)(path, "r");
+    try {
+      const buf = Buffer.alloc(size - st.offset);
+      await fh.read(buf, 0, buf.length, st.offset);
+      st.offset = size;
+      const text = st.partial + buf.toString("utf8");
+      const lines = text.split("\n");
+      st.partial = lines.pop() ?? "";
+      for (const line of lines) this.ingest(line);
+    } finally {
+      await fh.close();
+      this.files.set(path, st);
+    }
+  }
+  ingest(line) {
+    if (!line.includes('"assistant"')) return;
+    let r;
+    try {
+      r = JSON.parse(line);
+    } catch {
+      return;
+    }
+    if (r.type !== "assistant" || typeof r.timestamp !== "string") return;
+    const at = Date.parse(r.timestamp);
+    if (Number.isNaN(at)) return;
+    if (r.isApiErrorMessage === true) {
+      const q = isObj(r.quotaLimits) ? r.quotaLimits : null;
+      const kind = q ? limitKind(q.rateLimitType) : null;
+      if (q && kind && q.status === "rejected" && typeof q.resetsAt === "number") {
+        this.hits.set(`${kind}|${q.resetsAt}`, { at, kind, resetsAt: q.resetsAt * 1e3 });
+      }
+      return;
+    }
+    const m = isObj(r.message) ? r.message : null;
+    const usage2 = m && isObj(m.usage) ? m.usage : null;
+    const model = m && typeof m.model === "string" ? m.model : "";
+    if (!m || !usage2 || model === "<synthetic>") return;
+    const key = `${String(m.id)}|${String(r.requestId)}`;
+    this.replies.set(key, { at, units: replyUnits(usage2, model) });
+  }
+  entries() {
+    return [...this.replies.values()].sort((a, b) => a.at - b.at);
+  }
+  limitHits() {
+    return [...this.hits.values()].sort((a, b) => a.at - b.at);
+  }
+};
+function parseClaudeStatusline(json, at) {
+  if (!isObj(json) || !isObj(json.rate_limits)) return null;
+  const rl = json.rate_limits;
+  const windows = [];
+  for (const [key, kind] of [["five_hour", "five_hour"], ["seven_day", "weekly"]]) {
+    const w = rl[key];
+    if (!isObj(w) || typeof w.used_percentage !== "number" || typeof w.resets_at !== "number") continue;
+    windows.push({ kind, usedPercent: w.used_percentage, resetsAt: w.resets_at * 1e3 });
+  }
+  return windows.length ? { at, windows } : null;
+}
+var prefixCache = /* @__PURE__ */ new WeakMap();
+function prefixOf(entries) {
+  let p = prefixCache.get(entries);
+  if (!p) {
+    const at = [];
+    const sum = [0];
+    for (const e of entries) {
+      at.push(e.at);
+      sum.push(sum[sum.length - 1] + e.units);
+    }
+    p = { at, sum };
+    prefixCache.set(entries, p);
+  }
+  return p;
+}
+function bound(at, t, after) {
+  let lo = 0;
+  let hi = at.length;
+  while (lo < hi) {
+    const mid = lo + hi >> 1;
+    if (after ? at[mid] <= t : at[mid] < t) lo = mid + 1;
+    else hi = mid;
+  }
+  return lo;
+}
+function sumUnits(entries, from, to) {
+  if (to < from) return 0;
+  const p = prefixOf(entries);
+  return p.sum[bound(p.at, to, true)] - p.sum[bound(p.at, from, false)];
+}
+function windowMs(kind) {
+  return kind === "weekly" ? WINDOW_MINUTES.weekly * 6e4 : WINDOW_MINUTES.five_hour * 6e4;
+}
+function capacitySamples(entries, hits, exact) {
+  const out = [];
+  for (const h of hits) {
+    const units = sumUnits(entries, h.resetsAt - windowMs(h.kind), h.at);
+    if (units > 0) out.push({ kind: h.kind, capacity: units, at: h.at, source: "limit" });
+  }
+  for (const w of exact?.windows ?? []) {
+    if (w.usedPercent < MIN_CALIBRATION_PCT || !exact) continue;
+    const units = sumUnits(entries, w.resetsAt - windowMs(w.kind), exact.at);
+    if (units > 0) out.push({ kind: w.kind, capacity: units / (w.usedPercent / 100), at: exact.at, source: "exact" });
+  }
+  return out;
+}
+function mergeSamples(stored, fresh, now) {
+  const byKey = /* @__PURE__ */ new Map();
+  for (const s of [...stored, ...fresh]) byKey.set(`${s.kind}|${s.source}|${Math.round(s.at / 6e4)}`, s);
+  const kept = [...byKey.values()].filter((s) => now.getTime() - s.at <= SAMPLE_MAX_AGE_MS).sort((a, b) => b.at - a.at);
+  const perKind = /* @__PURE__ */ new Map();
+  return kept.filter((s) => {
+    const n = (perKind.get(s.kind) ?? 0) + 1;
+    perKind.set(s.kind, n);
+    return n <= 20;
+  });
+}
+function pickCapacity(kind, samples, entries, hits, now) {
+  const len = windowMs(kind);
+  for (const s of samples.filter((x) => x.kind === kind).sort((a, b) => b.at - a.at)) {
+    let disproved = false;
+    for (let start = s.at; start < now.getTime() && !disproved; start += len / 5) {
+      const end = Math.min(start + len, now.getTime());
+      const hitInside = hits.some((h) => h.kind === kind && h.at > start && h.at <= end);
+      if (!hitInside && sumUnits(entries, start, end) > s.capacity * DISPROVE_FACTOR) disproved = true;
+    }
+    if (!disproved) return s.capacity;
+  }
+  return null;
+}
+function currentFiveHourStart(entries, now) {
+  const len = windowMs("five_hour");
+  let start = null;
+  for (const e of entries) {
+    if (e.at > now.getTime()) break;
+    if (start === null || e.at >= start + len) start = Math.floor(e.at / HOUR) * HOUR;
+  }
+  return start !== null && now.getTime() < start + len ? start : null;
+}
+function claudeSnapshot({ entries, hits, exact, samples, now }) {
+  const t = now.getTime();
+  const windows = [];
+  let minutesToLimit = null;
+  let observedAt = 0;
+  for (const kind of ["five_hour", "weekly"]) {
+    const len = windowMs(kind);
+    const cap = pickCapacity(kind, samples, entries, hits, now);
+    const ex = exact?.windows.find((w) => w.kind === kind && w.resetsAt > t);
+    const hit = [...hits].reverse().find((h) => h.kind === kind && h.resetsAt > t);
+    let start;
+    let resetsAt;
+    let pct = null;
+    let isExact = false;
+    if (ex && exact) {
+      start = ex.resetsAt - len;
+      resetsAt = ex.resetsAt;
+      const since = sumUnits(entries, exact.at + 1, t);
+      if (since === 0) {
+        pct = ex.usedPercent;
+        isExact = true;
+      } else if (cap) {
+        pct = ex.usedPercent + since / cap * 100;
+      } else {
+        pct = ex.usedPercent;
+      }
+      observedAt = Math.max(observedAt, exact.at);
+    } else if (hit) {
+      start = hit.resetsAt - len;
+      resetsAt = hit.resetsAt;
+      pct = 100;
+      isExact = true;
+      observedAt = Math.max(observedAt, hit.at);
+    } else if (kind === "five_hour") {
+      start = currentFiveHourStart(entries, now);
+      resetsAt = start === null ? null : start + len;
+      if (start === null) {
+        if (cap) {
+          windows.push({ kind, label: "5h", usedPercent: 0, resetsAt: null, exact: false });
+        }
+        continue;
+      }
+      if (cap) pct = sumUnits(entries, start, t) / cap * 100;
+    } else {
+      continue;
+    }
+    if (pct === null) continue;
+    pct = Math.min(100, Math.max(0, pct));
+    windows.push({ kind, label: kind === "five_hour" ? "5h" : "Week", usedPercent: pct, resetsAt: resetsAt === null ? null : new Date(resetsAt), exact: isExact });
+    if (cap && pct < 100) {
+      const recent = sumUnits(entries, t - PACE_MS2, t);
+      if (recent > 0) {
+        const perMinute = recent / (PACE_MS2 / 6e4);
+        const minutes = cap * (1 - pct / 100) / perMinute;
+        const fitsBeforeReset = resetsAt === null || t + minutes * 6e4 < resetsAt;
+        if (fitsBeforeReset && (minutesToLimit === null || minutes < minutesToLimit)) minutesToLimit = minutes;
+      }
+    }
+  }
+  const last = entries[entries.length - 1];
+  if (last) observedAt = Math.max(observedAt, last.at);
+  if (!windows.length) return null;
+  return { tool: "claude-code", windows, observedAt: new Date(observedAt || t), minutesToLimit, plan: null, resetCredits: null };
+}
+
+// ../../packages/core/src/usage/bridge.ts
+var import_promises12 = require("node:fs/promises");
+var import_node_path12 = require("node:path");
+var BRIDGE_MARKER = "# harlay-usage";
+function claudeSettingsPath(home2) {
+  return (0, import_node_path12.join)(home2, ".claude", "settings.json");
+}
+function claudeStatusFile(dataDir2) {
+  return (0, import_node_path12.join)(dataDir2, "claude-status.json");
+}
+var scriptPath = (dataDir2) => (0, import_node_path12.join)(dataDir2, "claude-statusline.sh");
+var previousJson = (dataDir2) => (0, import_node_path12.join)(dataDir2, "claude-statusline.previous.json");
+var previousCommand = (dataDir2) => (0, import_node_path12.join)(dataDir2, "claude-statusline.previous");
+var BRIDGE_SCRIPT = `#!/bin/sh
+# Harlay's Claude Code status line. Saves Claude Code's status line input (it includes your exact usage)
+# for Harlay, then shows your previous status line, or a short usage summary if you had none.
+# Turn it off in Harlay: Settings > Usage > Exact Claude usage.
+dir=$(dirname "$0")
+input=$(cat)
+printf '%s' "$input" > "$dir/claude-status.json.tmp" && mv -f "$dir/claude-status.json.tmp" "$dir/claude-status.json"
+if [ -s "$dir/claude-statusline.previous" ]; then
+  printf '%s' "$input" | "\${SHELL:-/bin/sh}" -c "$(cat "$dir/claude-statusline.previous")"
+  exit $?
+fi
+pct() {
+  printf '%s' "$input" | tr -d '\\n' | sed -n "s/.*\\"$1\\"[^}]*\\"used_percentage\\"[[:space:]]*:[[:space:]]*\\([0-9][0-9]*\\).*/\\1/p"
+}
+five=$(pct five_hour)
+week=$(pct seven_day)
+out=""
+[ -n "$five" ] && out="5h $five%"
+[ -n "$week" ] && out="\${out:+$out \xB7 }wk $week%"
+printf '%s' "$out"
+`;
+function bridgeCommand(dataDir2) {
+  const q = `'${scriptPath(dataDir2).replace(/'/g, `'\\''`)}'`;
+  return `${q} ${BRIDGE_MARKER}`;
+}
+function isObj3(x) {
+  return typeof x === "object" && x !== null && !Array.isArray(x);
+}
+function isOurs(statusLine) {
+  return isObj3(statusLine) && typeof statusLine.command === "string" && statusLine.command.includes(BRIDGE_MARKER);
+}
+async function readSettings(path) {
+  let text;
+  try {
+    text = await (0, import_promises12.readFile)(path, "utf8");
+  } catch (e) {
+    if (e.code === "ENOENT") return {};
+    throw e;
+  }
+  const parsed = JSON.parse(text);
+  if (!isObj3(parsed)) throw new Error(`${path} is not a JSON object`);
+  return parsed;
+}
+async function writeAtomic(path, text) {
+  const tmp = `${path}.harlay-tmp`;
+  await (0, import_promises12.writeFile)(tmp, text);
+  await (0, import_promises12.rename)(tmp, path);
+}
+async function bridgeState(home2) {
+  try {
+    return isOurs((await readSettings(claudeSettingsPath(home2))).statusLine) ? "on" : "off";
+  } catch {
+    return "unavailable";
+  }
+}
+async function installBridge(home2, dataDir2) {
+  const path = claudeSettingsPath(home2);
+  const s = await readSettings(path);
+  await (0, import_promises12.mkdir)(dataDir2, { recursive: true });
+  await (0, import_promises12.writeFile)(scriptPath(dataDir2), BRIDGE_SCRIPT);
+  await (0, import_promises12.chmod)(scriptPath(dataDir2), 493);
+  if (isOurs(s.statusLine)) return;
+  const prev = s.statusLine;
+  if (prev !== void 0) {
+    await writeAtomic(previousJson(dataDir2), JSON.stringify(prev, null, 2) + "\n");
+    const cmd = isObj3(prev) && typeof prev.command === "string" ? prev.command : "";
+    await writeAtomic(previousCommand(dataDir2), cmd);
+  } else {
+    await (0, import_promises12.rm)(previousJson(dataDir2), { force: true });
+    await (0, import_promises12.rm)(previousCommand(dataDir2), { force: true });
+  }
+  s.statusLine = { ...isObj3(prev) ? prev : {}, type: "command", command: bridgeCommand(dataDir2) };
+  await (0, import_promises12.mkdir)((0, import_node_path12.join)(home2, ".claude"), { recursive: true });
+  await writeAtomic(path, JSON.stringify(s, null, 2) + "\n");
+}
+async function removeBridge(home2, dataDir2) {
+  const path = claudeSettingsPath(home2);
+  const s = await readSettings(path);
+  if (!isOurs(s.statusLine)) return;
+  let prev;
+  try {
+    prev = JSON.parse(await (0, import_promises12.readFile)(previousJson(dataDir2), "utf8"));
+  } catch {
+    prev = void 0;
+  }
+  if (prev === void 0) delete s.statusLine;
+  else s.statusLine = prev;
+  await writeAtomic(path, JSON.stringify(s, null, 2) + "\n");
+  await (0, import_promises12.rm)(previousJson(dataDir2), { force: true });
+  await (0, import_promises12.rm)(previousCommand(dataDir2), { force: true });
+}
+
+// src/menu.ts
+var import_node_path14 = require("node:path");
+
+// src/settings.ts
+var import_promises13 = require("node:fs/promises");
+var import_node_path13 = require("node:path");
 var THEMES = ["system", "light", "dark"];
 var isTheme = (x) => THEMES.includes(x);
 var DEFAULT_SETTINGS = {
@@ -1606,12 +2261,13 @@ var DEFAULT_SETTINGS = {
   usageThreshold: 90,
   terminalApp: "Terminal",
   openAtLogin: true,
-  theme: "system"
+  theme: "system",
+  claudeBridgeAsked: false
 };
 async function loadSettings(file) {
   let raw = {};
   try {
-    raw = JSON.parse(await (0, import_promises10.readFile)(file, "utf8"));
+    raw = JSON.parse(await (0, import_promises13.readFile)(file, "utf8"));
   } catch {
     raw = {};
   }
@@ -1621,6 +2277,7 @@ async function loadSettings(file) {
   if (typeof r.autoContinue === "boolean") s.autoContinue = r.autoContinue;
   if (typeof r.openAtLogin === "boolean") s.openAtLogin = r.openAtLogin;
   if (isTheme(r.theme)) s.theme = r.theme;
+  if (typeof r.claudeBridgeAsked === "boolean") s.claudeBridgeAsked = r.claudeBridgeAsked;
   if (typeof r.terminalApp === "string" && r.terminalApp.trim()) s.terminalApp = r.terminalApp.trim();
   if (typeof r.usageThreshold === "number" && r.usageThreshold > 0 && r.usageThreshold <= 100) s.usageThreshold = r.usageThreshold;
   if (typeof r.modes === "object" && r.modes !== null) {
@@ -1632,12 +2289,12 @@ async function loadSettings(file) {
   return s;
 }
 async function saveSettings(file, s) {
-  await (0, import_promises10.mkdir)((0, import_node_path10.dirname)(file), { recursive: true });
-  await (0, import_promises10.writeFile)(file, JSON.stringify(s, null, 2) + "\n");
+  await (0, import_promises13.mkdir)((0, import_node_path13.dirname)(file), { recursive: true });
+  await (0, import_promises13.writeFile)(file, JSON.stringify(s, null, 2) + "\n");
 }
 
 // src/state.ts
-var import_promises11 = require("node:fs/promises");
+var import_promises14 = require("node:fs/promises");
 var DEFAULT_LIMIT_MS = 60 * 6e4;
 var sessionKey = (ref) => `${ref.tool}:${ref.id}`;
 function createState() {
@@ -1702,7 +2359,7 @@ function latestSession(state2) {
 async function existingBrief(t) {
   if (!t?.briefPath) return null;
   try {
-    await (0, import_promises11.access)(t.briefPath);
+    await (0, import_promises14.access)(t.briefPath);
     return t.briefPath;
   } catch {
     return null;
@@ -1715,7 +2372,7 @@ var DOT = { limit: "\u25CF", warning: "\u25D0", idle: "\u25CB", handed_off: "\u2
 var MODES = ["app", "terminal"];
 var THEME_LABEL = { system: "System", light: "Light", dark: "Dark" };
 function sessionTitle(t) {
-  return t.ref.title ?? (t.ref.cwd ? (0, import_node_path11.basename)(t.ref.cwd) : t.ref.id.slice(0, 8));
+  return t.ref.title ?? (t.ref.cwd ? (0, import_node_path14.basename)(t.ref.cwd) : t.ref.id.slice(0, 8));
 }
 function buildMenuModel(sessions, settings2, available2) {
   const nodes = [
@@ -1775,14 +2432,14 @@ function buildMenuModel(sessions, settings2, available2) {
 }
 
 // src/notifications.ts
-var import_node_path12 = require("node:path");
+var import_node_path15 = require("node:path");
 function haltNotificationBody(t, first) {
-  const what = t.ref.cwd ? `${t.detail} \xB7 ${(0, import_node_path12.basename)(t.ref.cwd)}` : t.detail;
+  const what = t.ref.cwd ? `${t.detail} \xB7 ${(0, import_node_path15.basename)(t.ref.cwd)}` : t.detail;
   return first ? `${what}. Click to continue in ${TOOL_LABEL[first]}.` : `${what}. No other agent is available.`;
 }
 
 // src/popover.ts
-var import_node_path13 = require("node:path");
+var import_node_path16 = require("node:path");
 var POPOVER_WIDTH = 392;
 function timeAgo(d, now) {
   const s = Math.max(0, Math.floor((now.getTime() - d.getTime()) / 1e3));
@@ -1793,7 +2450,44 @@ function timeAgo(d, now) {
   if (h < 24) return `${h}h ago`;
   return `${Math.floor(h / 24)}d ago`;
 }
-function buildPopoverModel(sessions, settings2, available2, busy, now) {
+function resetsText(d, now) {
+  if (!d) return null;
+  const ms = d.getTime() - now.getTime();
+  if (ms <= 0) return null;
+  if (ms < 36e5) return `resets in ${Math.max(1, Math.round(ms / 6e4))}m`;
+  const time = d.toLocaleTimeString("en-US", { hour: "numeric", minute: "2-digit" });
+  return ms < 20 * 36e5 ? `resets ${time}` : `resets ${d.toLocaleDateString("en-US", { weekday: "short" })} ${time}`;
+}
+function paceText(minutes) {
+  if (minutes === null) return null;
+  const m = Math.max(1, Math.round(minutes));
+  return m < 90 ? `\u2248 ${m} min to limit at this pace` : `\u2248 ${Math.round(m / 60)}h to limit at this pace`;
+}
+function buildUsageRows(snapshots, available2, bridge, now) {
+  const rows = [];
+  for (const tool of TOOLS) {
+    const snap = snapshots[tool];
+    const installed = available2[tool].app || available2[tool].terminal;
+    if (!snap && !installed) continue;
+    const row = { tool, label: TOOL_LABEL[tool], windows: [], pace: null, note: null, usagePage: false };
+    if (snap) {
+      row.windows = snap.windows.map((w) => ({ label: w.label, pct: Math.round(w.usedPercent), exact: w.exact, resets: resetsText(w.resetsAt, now) }));
+      row.pace = paceText(snap.minutesToLimit);
+      if (snap.resetCredits) row.note = `${snap.resetCredits} free limit reset${snap.resetCredits === 1 ? "" : "s"} available`;
+      else if (tool === "claude-code" && snap.windows.some((w) => !w.exact)) row.note = "\u2248 estimated from your session logs";
+    } else if (tool === "claude-code") {
+      row.note = bridge === "on" ? "Updates after your next Claude Code reply in Terminal" : "Not measured yet. Turn on Exact Claude usage in Settings, or Harlay learns it at the next Claude limit.";
+    } else if (tool === "codex") {
+      row.note = "Updates after your next Codex turn";
+    } else {
+      row.note = "Cursor keeps no usage on this Mac";
+      row.usagePage = true;
+    }
+    rows.push(row);
+  }
+  return rows;
+}
+function buildPopoverModel(sessions, settings2, available2, busy, now, usage2 = [], claudeBridge2 = "off", askClaudeBridge = false) {
   const order = [settings2.defaultTarget, ...TOOLS.filter((t) => t !== settings2.defaultTarget)];
   return {
     sessions: sessions.map((t) => {
@@ -1805,13 +2499,15 @@ function buildPopoverModel(sessions, settings2, available2, busy, now) {
         status: t.status,
         detail: t.detail,
         cwd: t.ref.cwd ?? null,
-        repo: t.ref.cwd ? (0, import_node_path13.basename)(t.ref.cwd) : null,
+        repo: t.ref.cwd ? (0, import_node_path16.basename)(t.ref.cwd) : null,
         ago: timeAgo(t.updatedAt, now),
         busy: busy.has(key),
         targets: order.filter((x) => x !== t.ref.tool).map((x) => ({ tool: x, label: TOOL_LABEL[x], enabled: available2[x][settings2.modes[x]], isDefault: x === settings2.defaultTarget }))
       };
     }),
-    settings: { defaultTarget: settings2.defaultTarget, autoContinue: settings2.autoContinue, openAtLogin: settings2.openAtLogin, theme: settings2.theme },
+    usage: usage2,
+    askClaudeBridge,
+    settings: { defaultTarget: settings2.defaultTarget, autoContinue: settings2.autoContinue, openAtLogin: settings2.openAtLogin, theme: settings2.theme, claudeBridge: claudeBridge2 },
     tools: TOOLS.map((x) => ({ tool: x, label: TOOL_LABEL[x], mode: settings2.modes[x], ...available2[x] })),
     hotkey: HOTKEY.label
   };
@@ -1834,6 +2530,10 @@ function isMenuAction(x) {
       return isTool(a.target) && (a.mode === "app" || a.mode === "terminal");
     case "toggleAuto":
     case "toggleLogin":
+    case "answerClaudeBridge":
+      return typeof a.allow === "boolean";
+    case "toggleClaudeBridge":
+    case "openCursorUsage":
     case "quit":
       return true;
     default:
@@ -1847,6 +2547,163 @@ function pickTargets(source, defaultTarget, available2, modes, limitedUntil = {}
   return order.filter((t) => t !== source && available2[t][modes[t]] && !((limitedUntil[t]?.getTime() ?? 0) > now.getTime()));
 }
 
+// src/usage.ts
+var import_node_events2 = require("node:events");
+var import_node_fs3 = require("node:fs");
+var import_promises15 = require("node:fs/promises");
+var import_node_path17 = require("node:path");
+var CODEX_STALE_MS = 30 * 6e4;
+var CODEX_QUERY_GAP_MS = 30 * 6e4;
+var DEBOUNCE_MS = 2e3;
+var ETA_WARN_PCT = 50;
+var ETA_WARN_MIN = 20;
+function clock2(d, now) {
+  const time = d.toLocaleTimeString([], { hour: "numeric", minute: "2-digit" });
+  return d.getTime() - now.getTime() < 20 * 36e5 ? time : `${d.toLocaleDateString([], { weekday: "short" })} ${time}`;
+}
+var NAME = { "claude-code": "Claude", codex: "Codex", cursor: "Cursor" };
+var UsageMonitor = class extends import_node_events2.EventEmitter {
+  constructor(opts) {
+    super();
+    this.opts = opts;
+    this.claudeLog = new ClaudeUsageLog(opts.home);
+  }
+  opts;
+  claudeLog;
+  watchers = [];
+  timers = /* @__PURE__ */ new Map();
+  alerted = /* @__PURE__ */ new Set();
+  snapshots = {};
+  samples = [];
+  codexQuery = null;
+  lastCodexQueryAt = 0;
+  stopped = false;
+  get statusFile() {
+    return claudeStatusFile(this.opts.dataDir);
+  }
+  get samplesFile() {
+    return (0, import_node_path17.join)(this.opts.dataDir, "usage-calibration.json");
+  }
+  current() {
+    return this.snapshots;
+  }
+  async start() {
+    await (0, import_promises15.mkdir)(this.opts.dataDir, { recursive: true });
+    try {
+      const raw = JSON.parse(await (0, import_promises15.readFile)(this.samplesFile, "utf8"));
+      if (Array.isArray(raw)) this.samples = raw.filter((s) => typeof s?.capacity === "number" && typeof s?.at === "number" && typeof s?.kind === "string");
+    } catch {
+      this.samples = [];
+    }
+    const watchDir = (dir, tool, recursive) => {
+      try {
+        const w = (0, import_node_fs3.watch)(dir, { recursive }, (_e, name) => {
+          if (!name || String(name).endsWith(".jsonl") || String(name).startsWith("claude-status")) this.schedule(tool);
+        });
+        w.on("error", () => void 0);
+        this.watchers.push(w);
+      } catch {
+      }
+    };
+    watchDir((0, import_node_path17.join)(this.opts.home, ".codex", "sessions"), "codex", true);
+    watchDir((0, import_node_path17.join)(this.opts.home, ".claude", "projects"), "claude-code", true);
+    watchDir(this.opts.dataDir, "claude-code", false);
+    await Promise.all([this.update("codex"), this.update("claude-code")]);
+    void this.topUpCodex();
+  }
+  stop() {
+    this.stopped = true;
+    for (const w of this.watchers) w.close();
+    for (const t of this.timers.values()) clearTimeout(t);
+  }
+  /** Re-derives readings (e.g. reset times passing) from what is already loaded; cheap. */
+  async refresh() {
+    await Promise.all([this.update("codex"), this.update("claude-code")]);
+  }
+  /** Asks Codex directly if its logs have nothing recent; called when the popover opens. */
+  async topUpCodex() {
+    const now = Date.now();
+    const snap = this.snapshots.codex;
+    if (snap && now - snap.observedAt.getTime() < CODEX_STALE_MS) return;
+    if (now - this.lastCodexQueryAt < CODEX_QUERY_GAP_MS) return;
+    const bin = await this.opts.codexBin();
+    if (!bin) return;
+    this.lastCodexQueryAt = now;
+    const reading = await queryCodexUsage(bin);
+    if (reading) {
+      this.codexQuery = reading;
+      await this.update("codex");
+    }
+  }
+  schedule(tool) {
+    if (this.stopped) return;
+    clearTimeout(this.timers.get(tool));
+    this.timers.set(tool, setTimeout(() => void this.update(tool), DEBOUNCE_MS));
+  }
+  async update(tool) {
+    const now = /* @__PURE__ */ new Date();
+    let snap = null;
+    try {
+      if (tool === "codex") {
+        snap = codexSnapshot(await readCodexReadings(this.opts.home), now, this.codexQuery);
+        if (snap && snap.resetCredits === null && this.codexQuery) snap.resetCredits = this.codexQuery.resetCredits;
+      } else if (tool === "claude-code") {
+        snap = await this.claude(now);
+      }
+    } catch (e) {
+      console.error("[harlay] usage update failed", e);
+      return;
+    }
+    if (snap) this.snapshots[tool] = snap;
+    else delete this.snapshots[tool];
+    this.emit("update", this.snapshots);
+    if (snap) this.checkAlerts(snap, now);
+  }
+  async claude(now) {
+    await this.claudeLog.refresh(now);
+    let exact = null;
+    try {
+      const s = await (0, import_promises15.stat)(this.statusFile);
+      exact = parseClaudeStatusline(JSON.parse(await (0, import_promises15.readFile)(this.statusFile, "utf8")), s.mtimeMs);
+    } catch {
+      exact = null;
+    }
+    const entries = this.claudeLog.entries();
+    const hits = this.claudeLog.limitHits();
+    const merged = mergeSamples(this.samples, capacitySamples(entries, hits, exact), now);
+    if (JSON.stringify(merged) !== JSON.stringify(this.samples)) {
+      this.samples = merged;
+      await (0, import_promises15.writeFile)(this.samplesFile, JSON.stringify(merged)).catch(() => void 0);
+    }
+    return claudeSnapshot({ entries, hits, exact, samples: this.samples, now });
+  }
+  checkAlerts(s, now) {
+    const threshold = this.opts.threshold();
+    const fire = (key, alert) => {
+      if (this.alerted.has(key)) return;
+      this.alerted.add(key);
+      this.emit("alert", alert);
+    };
+    const resetKey = (w) => w.resetsAt ? Math.round(w.resetsAt.getTime() / 6e5) : "none";
+    for (const w of s.windows) {
+      if (w.usedPercent >= 100 || w.usedPercent < threshold) continue;
+      fire(`${s.tool}|${w.kind}|${resetKey(w)}|level`, {
+        tool: s.tool,
+        title: `${NAME[s.tool]} is at ${w.exact ? "" : "\u2248"}${Math.round(w.usedPercent)}% of its ${w.label === "5h" ? "5-hour" : "weekly"} limit`,
+        body: w.resetsAt ? `Resets ${clock2(w.resetsAt, now)}. Click to hand off the latest ${NAME[s.tool]} session.` : `Click to hand off the latest ${NAME[s.tool]} session.`
+      });
+    }
+    const full = fullestWindow(s);
+    if (full && s.minutesToLimit !== null && s.minutesToLimit <= ETA_WARN_MIN && full.usedPercent >= ETA_WARN_PCT && full.usedPercent < threshold) {
+      fire(`${s.tool}|${full.kind}|${resetKey(full)}|pace`, {
+        tool: s.tool,
+        title: `${NAME[s.tool]} may hit its limit in about ${Math.max(1, Math.round(s.minutesToLimit))} min`,
+        body: `At the current pace. It's at ${full.exact ? "" : "\u2248"}${Math.round(full.usedPercent)}% of its ${full.label === "5h" ? "5-hour" : "weekly"} limit.`
+      });
+    }
+  }
+};
+
 // src/main.ts
 var MAX_LIVE_NOTIFICATIONS = 50;
 var AUTO_HANDOFF_COOLDOWN_MS = 2 * 6e4;
@@ -1862,6 +2719,8 @@ var tray = null;
 var popover = null;
 var popoverHiddenAt = 0;
 var watcher = null;
+var usage = null;
+var claudeBridge = "off";
 var lastAutoHandoffAt = 0;
 var previewedBriefs = /* @__PURE__ */ new Map();
 var errorMessage = (e) => e instanceof Error ? e.message : String(e);
@@ -1881,7 +2740,11 @@ function toElectron(nodes) {
 }
 function refreshUi() {
   if (!popover || popover.isDestroyed()) return;
-  popover.webContents.send("harlay:model", buildPopoverModel(recentSessions(state, 8), settings, available, handoffsInFlight, /* @__PURE__ */ new Date()));
+  const now = /* @__PURE__ */ new Date();
+  const rows = buildUsageRows(usage?.current() ?? {}, available, claudeBridge, now);
+  const claudeInstalled = available["claude-code"].app || available["claude-code"].terminal;
+  const ask = !settings.claudeBridgeAsked && claudeBridge === "off" && claudeInstalled;
+  popover.webContents.send("harlay:model", buildPopoverModel(recentSessions(state, 8), settings, available, handoffsInFlight, now, rows, claudeBridge, ask));
 }
 function nativeMenu() {
   return import_electron.Menu.buildFromTemplate(toElectron(buildMenuModel(recentSessions(state, 8), settings, available)));
@@ -1946,14 +2809,14 @@ async function previewBrief(ref) {
       path = res.written.latestPath;
     }
     previewedBriefs.set(key, path);
-    send({ path, text: await (0, import_promises12.readFile)(path, "utf8") });
+    send({ path, text: await (0, import_promises16.readFile)(path, "utf8") });
   } catch (e) {
     send({ error: errorMessage(e) });
   }
 }
 async function copyBrief(key) {
   const path = previewedBriefs.get(key);
-  if (path) import_electron.clipboard.writeText(await (0, import_promises12.readFile)(path, "utf8"));
+  if (path) import_electron.clipboard.writeText(await (0, import_promises16.readFile)(path, "utf8"));
 }
 async function persist() {
   await saveSettings(settingsFile, settings);
@@ -2002,6 +2865,24 @@ async function onAction(a) {
         if (import_electron.app.isPackaged) import_electron.app.setLoginItemSettings({ openAtLogin: settings.openAtLogin });
         await persist();
         break;
+      case "toggleClaudeBridge":
+      case "answerClaudeBridge": {
+        const on = a.type === "answerClaudeBridge" ? a.allow : claudeBridge !== "on";
+        settings.claudeBridgeAsked = true;
+        await saveSettings(settingsFile, settings);
+        try {
+          if (on) await installBridge(home, dataDir());
+          else if (a.type === "toggleClaudeBridge") await removeBridge(home, dataDir());
+        } catch (e) {
+          notify("Harlay could not change Claude Code settings", errorMessage(e));
+        }
+        claudeBridge = await bridgeState(home);
+        refreshUi();
+        break;
+      }
+      case "openCursorUsage":
+        await import_electron.shell.openExternal("https://cursor.com/dashboard?tab=usage");
+        break;
       case "quit":
         import_electron.app.quit();
         break;
@@ -2024,33 +2905,36 @@ function onWatchEvent(ev) {
       void handoff(ev.ref, first);
       return;
     }
-    const n2 = new import_electron.Notification({
+    const n = new import_electron.Notification({
       title: `${TOOL_LABEL[ev.ref.tool]} stopped: ${name}`,
       body: haltNotificationBody(tracked, first),
       actions: targets.map((t) => ({ type: "button", text: `Continue in ${TOOL_LABEL[t]}` }))
     });
-    keep(n2);
-    n2.on("action", (_e, index) => {
+    keep(n);
+    n.on("action", (_e, index) => {
       const t = targets[index];
       if (t) void handoff(ev.ref, t);
     });
-    n2.on("click", () => {
+    n.on("click", () => {
       if (first) void handoff(ev.ref, first);
     });
-    n2.show();
+    n.show();
     return;
   }
-  if (ev.event.usage.usedPercent >= 100) return;
-  const n = new import_electron.Notification({
-    title: `${TOOL_LABEL[ev.ref.tool]} is at ${Math.round(ev.event.usage.usedPercent)}% of its limit`,
-    body: first ? `${name}. Click to hand off to ${TOOL_LABEL[first]} now.` : name
-  });
+}
+function onUsageAlert(a) {
+  const latest = recentSessions(state, 50).find((t) => t.ref.tool === a.tool && t.status !== "handed_off");
+  const [target] = latest ? pickTargets(a.tool, settings.defaultTarget, available, settings.modes, state.limitedUntil, /* @__PURE__ */ new Date()) : [];
+  const n = new import_electron.Notification({ title: a.title, body: latest && target ? a.body : a.body.replace(/ ?Click to hand off.*$/, "") });
   keep(n);
   n.on("click", () => {
-    if (first) void handoff(ev.ref, first);
+    if (latest && target) void handoff(latest.ref, target);
   });
   n.show();
 }
+function dataDir() {
+  return import_electron.app.getPath("userData");
+}
 function onHotkey() {
   const latest = latestSession(state);
   if (!latest) {
@@ -2088,13 +2972,13 @@ function createPopover() {
     fullscreenable: false,
     skipTaskbar: true,
     alwaysOnTop: true,
-    webPreferences: { preload: (0, import_node_path14.join)(__dirname, "preload.cjs"), contextIsolation: true, nodeIntegration: false, sandbox: true }
+    webPreferences: { preload: (0, import_node_path18.join)(__dirname, "preload.cjs"), contextIsolation: true, nodeIntegration: false, sandbox: true }
   });
   win.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
   win.on("blur", hidePopover);
   win.webContents.on("will-navigate", (e) => e.preventDefault());
   win.webContents.setWindowOpenHandler(() => ({ action: "deny" }));
-  void win.loadFile((0, import_node_path14.join)(__dirname, "..", "renderer", "popover.html"));
+  void win.loadFile((0, import_node_path18.join)(__dirname, "..", "renderer", "popover.html"));
   return win;
 }
 function showPopover() {
@@ -2104,6 +2988,7 @@ function showPopover() {
   const x = Math.min(Math.max(t.x + t.width / 2 - POPOVER_WIDTH / 2, area.x), area.x + area.width - POPOVER_WIDTH);
   popover.setPosition(Math.round(x), Math.round(t.y + t.height));
   refreshUi();
+  void usage?.topUpCodex();
   popover.show();
   popover.focus();
   popover.webContents.send("harlay:shown");
@@ -2142,7 +3027,7 @@ function listenToPopover() {
   });
   import_electron.ipcMain.on("harlay:action", (e, action) => {
     if (!fromPopover(e) || !isMenuAction(action)) return;
-    if (action.type === "handoff" || action.type === "openBrief") hidePopover();
+    if (action.type === "handoff" || action.type === "openBrief" || action.type === "openCursorUsage") hidePopover();
     void onAction(action);
   });
 }
@@ -2155,12 +3040,12 @@ if (!import_electron.app.requestSingleInstanceLock()) {
   import_electron.app.on("second-instance", revealPopover);
   import_electron.app.whenReady().then(async () => {
     import_electron.app.dock?.hide();
-    settingsFile = (0, import_node_path14.join)(import_electron.app.getPath("userData"), "settings.json");
+    settingsFile = (0, import_node_path18.join)(import_electron.app.getPath("userData"), "settings.json");
     settings = await loadSettings(settingsFile);
     import_electron.nativeTheme.themeSource = settings.theme;
     if (import_electron.app.isPackaged) import_electron.app.setLoginItemSettings({ openAtLogin: settings.openAtLogin });
     available = await availableTargets(defaultResolveOptions());
-    const iconPath = (0, import_node_path14.join)(__dirname, "..", "assets", "trayTemplate.png");
+    const iconPath = (0, import_node_path18.join)(__dirname, "..", "assets", "trayTemplate.png");
     const icon = import_electron.nativeImage.createFromPath(iconPath);
     icon.setTemplateImage(true);
     tray = new import_electron.Tray(icon);
@@ -2175,11 +3060,25 @@ if (!import_electron.app.requestSingleInstanceLock()) {
     listenToPopover();
     popover = createPopover();
     await refreshSessions();
-    setInterval(() => void refreshSessions(), 6e4);
+    setInterval(() => {
+      void refreshSessions();
+      void usage?.refresh();
+    }, 6e4);
     watcher = new Watcher(readers, { usageThreshold: settings.usageThreshold });
     watcher.on("event", onWatchEvent);
     watcher.on("error", (e) => console.error("[harlay] watcher error", e));
     await watcher.start();
+    usage = new UsageMonitor({
+      home,
+      dataDir: dataDir(),
+      codexBin: () => resolveBinary("codex", defaultResolveOptions()),
+      threshold: () => settings.usageThreshold
+    });
+    usage.on("update", refreshUi);
+    usage.on("alert", onUsageAlert);
+    claudeBridge = await bridgeState(home);
+    if (claudeBridge === "on") await installBridge(home, dataDir()).catch((e) => console.error("[harlay] status line refresh failed", e));
+    await usage.start().catch((e) => console.error("[harlay] usage monitor failed to start", e));
     if (!import_electron.globalShortcut.register(HOTKEY.accelerator, onHotkey)) console.error(`[harlay] could not register ${HOTKEY.accelerator}`);
     if (!import_electron.app.getLoginItemSettings().wasOpenedAtLogin) revealPopover();
   }).catch((e) => {
@@ -2190,5 +3089,6 @@ if (!import_electron.app.requestSingleInstanceLock()) {
   import_electron.app.on("will-quit", () => {
     import_electron.globalShortcut.unregisterAll();
     watcher?.stop();
+    usage?.stop();
   });
 }