hatchee 0.2.0 → 0.4.0

package/dist/cli.mjs

@@ -7925,8 +7925,13 @@ function toolTitle(name, input) {
       return `WebSearch(${clip(String(input?.query ?? "?"), 64)})`;
     case "Task":
       return `Task(${clip(String(input?.description ?? "agent"), 64)})`;
-    case "TodoWrite":
-      return "Update Todos";
+    case "TodoWrite": {
+      const todos = Array.isArray(input?.todos) ? input.todos : [];
+      const done = todos.filter((t) => t?.status === "completed").length;
+      return todos.length ? `Update Todos (${done}/${todos.length} done)` : "Update Todos";
+    }
+    case "ExitPlanMode":
+      return "Plan ready for review";
     case "NotebookEdit":
       return `Edit(${clip(String(input?.notebook_path ?? "?"), 64)})`;
     default:
@@ -7953,6 +7958,14 @@ function toolDetail(name, input) {
       return String(input?.query ?? "");
     case "Task":
       return String(input?.prompt ?? input?.description ?? "").slice(0, 600);
+    case "TodoWrite": {
+      const todos = Array.isArray(input?.todos) ? input.todos : [];
+      const box = (s) => s === "completed" ? "☑" : s === "in_progress" ? "◐" : "☐";
+      return todos.map((t) => `${box(String(t?.status))} ${String(t?.content ?? "")}`).join(`
+`).slice(0, 1200);
+    }
+    case "ExitPlanMode":
+      return String(input?.plan ?? "").slice(0, 2000);
     default:
       try {
         const s = JSON.stringify(input);
@@ -8005,7 +8018,7 @@ function flattenItem(item) {
       return { text: item.text, color: item.color };
   }
 }
-var PROTOCOL_VERSION = 2, PROTOCOL_MIN = 1, AgentState, RuleAction, Rule, DiffStat, LineColor, TermLine, ToolDecision, TranscriptItem, SessionSnapshot, ServerHello, Encrypted, SessionUpsert, SessionRemoved, Line, Item, PermissionRequest, PermissionResolved, ErrorMsg, Pong, RulesUpdate, DirEntry, DirsUpdate, DaemonToPhone, DaemonInner, ClientHello, PermissionReply, RulesSync, UserMessage, SpawnMode, SpawnEffort, Spawn, Stop, ListDirs, Ping, PushRegister, PhoneToDaemon, PhoneInner, clip = (s, n) => s.length > n ? s.slice(0, n - 1) + "…" : s;
+var PROTOCOL_VERSION = 4, PROTOCOL_MIN = 1, AgentState, RuleAction, Rule, DiffStat, LineColor, TermLine, ToolDecision, TranscriptItem, SessionSnapshot, ServerHello, Encrypted, SessionUpsert, SessionRemoved, Line, Item, PermissionRequest, PermissionResolved, ErrorMsg, Pong, RulesUpdate, DirEntry, DirsUpdate, RecentSession, SessionsUpdate, DiffFile, DiffUpdate, DaemonToPhone, DaemonInner, ClientHello, PermissionReply, RulesSync, UserMessage, SpawnMode, SpawnEffort, Spawn, Stop, SetSession, Interrupt, ListDirs, ListSessions, GetDiff, Ping, PushRegister, PhoneToDaemon, PhoneInner, clip = (s, n) => s.length > n ? s.slice(0, n - 1) + "…" : s;
 var init_src = __esm(() => {
   init_zod();
   AgentState = exports_external.enum([
@@ -8076,6 +8089,7 @@ var init_src = __esm(() => {
     plan: exports_external.array(exports_external.string()).default([]),
     diff: exports_external.array(DiffStat).default([]),
     spawned: exports_external.boolean().default(false),
+    mode: exports_external.string().nullable().default(null),
     startedAt: exports_external.number(),
     updatedAt: exports_external.number()
   });
@@ -8138,6 +8152,26 @@ var init_src = __esm(() => {
     t: exports_external.literal("dirs"),
     dirs: exports_external.array(DirEntry)
   });
+  RecentSession = exports_external.object({
+    id: exports_external.string(),
+    cwd: exports_external.string(),
+    name: exports_external.string(),
+    summary: exports_external.string(),
+    updatedAt: exports_external.number()
+  });
+  SessionsUpdate = exports_external.object({
+    t: exports_external.literal("sessions"),
+    sessions: exports_external.array(RecentSession)
+  });
+  DiffFile = exports_external.object({
+    file: exports_external.string(),
+    patch: exports_external.string()
+  });
+  DiffUpdate = exports_external.object({
+    t: exports_external.literal("diff"),
+    sessionId: exports_external.string(),
+    files: exports_external.array(DiffFile)
+  });
   DaemonToPhone = exports_external.discriminatedUnion("t", [
     ServerHello,
     SessionUpsert,
@@ -8150,6 +8184,8 @@ var init_src = __esm(() => {
     Pong,
     RulesUpdate,
     DirsUpdate,
+    SessionsUpdate,
+    DiffUpdate,
     Encrypted
   ]);
   DaemonInner = exports_external.discriminatedUnion("t", [
@@ -8162,7 +8198,9 @@ var init_src = __esm(() => {
     ErrorMsg,
     Pong,
     RulesUpdate,
-    DirsUpdate
+    DirsUpdate,
+    SessionsUpdate,
+    DiffUpdate
   ]);
   ClientHello = exports_external.object({
     t: exports_external.literal("hello"),
@@ -8175,7 +8213,8 @@ var init_src = __esm(() => {
     t: exports_external.literal("permission_reply"),
     requestId: exports_external.string(),
     allow: exports_external.boolean(),
-    always: exports_external.boolean().default(false)
+    always: exports_external.boolean().default(false),
+    answer: exports_external.string().nullable().default(null)
   });
   RulesSync = exports_external.object({
     t: exports_external.literal("rules_sync"),
@@ -8194,13 +8233,26 @@ var init_src = __esm(() => {
     cwd: exports_external.string().nullable().default(null),
     mode: SpawnMode.default("edits"),
     model: exports_external.string().nullable().default(null),
-    effort: SpawnEffort.nullable().default(null)
+    effort: SpawnEffort.nullable().default(null),
+    resume: exports_external.string().nullable().default(null)
   });
   Stop = exports_external.object({
     t: exports_external.literal("stop"),
     sessionId: exports_external.string()
   });
+  SetSession = exports_external.object({
+    t: exports_external.literal("set_session"),
+    sessionId: exports_external.string(),
+    mode: SpawnMode.nullable().default(null),
+    model: exports_external.string().nullable().default(null)
+  });
+  Interrupt = exports_external.object({
+    t: exports_external.literal("interrupt"),
+    sessionId: exports_external.string()
+  });
   ListDirs = exports_external.object({ t: exports_external.literal("list_dirs") });
+  ListSessions = exports_external.object({ t: exports_external.literal("list_sessions") });
+  GetDiff = exports_external.object({ t: exports_external.literal("get_diff"), sessionId: exports_external.string() });
   Ping = exports_external.object({ t: exports_external.literal("ping") });
   PushRegister = exports_external.object({
     t: exports_external.literal("push_register"),
@@ -8215,7 +8267,11 @@ var init_src = __esm(() => {
     UserMessage,
     Spawn,
     Stop,
+    SetSession,
+    Interrupt,
     ListDirs,
+    ListSessions,
+    GetDiff,
     Ping,
     PushRegister,
     Encrypted
@@ -8226,7 +8282,11 @@ var init_src = __esm(() => {
     UserMessage,
     Spawn,
     Stop,
+    SetSession,
+    Interrupt,
     ListDirs,
+    ListSessions,
+    GetDiff,
     Ping,
     PushRegister
   ]);
@@ -8251,6 +8311,7 @@ class SpawnedSession {
   mode = "edits";
   claudeSessionId = null;
   stopped = false;
+  busy = false;
   constructor(daemon, sessionId, cwd, model = null, effort = null, claudeBin = process.env.DROVER_CLAUDE_BIN || "claude") {
     this.daemon = daemon;
     this.sessionId = sessionId;
@@ -8263,6 +8324,29 @@ class SpawnedSession {
     this.mode = mode;
     this.spawnProc(firstTask);
   }
+  resumeFrom(claudeSessionId) {
+    this.claudeSessionId = claudeSessionId;
+  }
+  reconfigure(mode, model) {
+    if (mode)
+      this.mode = mode;
+    if (model)
+      this.model = model;
+    if (this.proc && !this.busy) {
+      try {
+        this.proc.stdin.end();
+      } catch {}
+    }
+  }
+  interrupt() {
+    if (!this.proc?.stdin.writable)
+      return;
+    const msg = { type: "control_request", request_id: crypto.randomUUID(), request: { subtype: "interrupt" } };
+    try {
+      this.proc.stdin.write(JSON.stringify(msg) + `
+`);
+    } catch {}
+  }
   spawnProc(firstMessage) {
     const args = [
       "--print",
@@ -8297,6 +8381,7 @@ class SpawnedSession {
       this.send(firstMessage);
   }
   send(text) {
+    this.busy = true;
     if (this.proc?.stdin.writable) {
       const msg = { type: "user", message: { role: "user", content: text } };
       this.proc.stdin.write(JSON.stringify(msg) + `
@@ -8307,6 +8392,7 @@ class SpawnedSession {
   }
   onProcExit(_code) {
     this.proc = null;
+    this.busy = false;
     if (this.stopped)
       return;
     this.daemon.spawnState(this.sessionId, "waiting", "ready — send your next message");
@@ -8331,8 +8417,10 @@ class SpawnedSession {
     switch (m.type) {
       case "system":
         if (m.subtype === "init") {
-          if (typeof m.session_id === "string")
+          if (typeof m.session_id === "string") {
             this.claudeSessionId = m.session_id;
+            this.daemon.adoptClaudeSession(this.sessionId, m.session_id);
+          }
           this.daemon.spawnState(this.sessionId, "working", "session ready");
         }
         break;
@@ -8377,13 +8465,23 @@ class SpawnedSession {
         break;
       }
       case "result": {
+        this.busy = false;
         const ok = m.is_error !== true;
+        const u = m.usage;
+        if (u && (u.input_tokens || u.output_tokens)) {
+          const secs = m.duration_ms ? `${(m.duration_ms / 1000).toFixed(1)}s · ` : "";
+          this.daemon.spawnLine(this.sessionId, `⏱ ${secs}${fmtTokens(u.input_tokens)} in / ${fmtTokens(u.output_tokens)} out`, "muted");
+        }
         this.daemon.spawnState(this.sessionId, ok ? "waiting" : "error", ok ? "waiting for your next message" : String(m.result ?? "error"));
         break;
       }
     }
   }
 }
+function fmtTokens(n) {
+  const v = Number(n) || 0;
+  return v >= 1000 ? `${(v / 1000).toFixed(1)}k` : String(v);
+}
 function contentText(content) {
   if (typeof content === "string")
     return content;
@@ -11612,9 +11710,9 @@ function lanIPv4() {
 
 // src/server.ts
 import { createServer } from "node:http";
-import { readdirSync, statSync, existsSync as existsSync2 } from "node:fs";
-import { homedir as homedir2 } from "node:os";
-import { join as join2, basename } from "node:path";
+import { readdirSync as readdirSync2, statSync as statSync2, existsSync as existsSync3 } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { join as join3, basename as basename2 } from "node:path";
 
 // ../../node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
@@ -11688,6 +11786,258 @@ class Registry {
     });
     return { branch, branches, diff };
   }
+  gitDiff(cwd) {
+    let raw = "";
+    try {
+      raw = execSync("git diff", { cwd, stdio: ["ignore", "pipe", "ignore"], timeout: 3000, maxBuffer: 4 * 1024 * 1024 }).toString();
+    } catch {
+      return [];
+    }
+    if (!raw.trim())
+      return [];
+    const files = [];
+    for (const chunk of raw.split(/^diff --git /m).slice(1)) {
+      if (files.length >= 12)
+        break;
+      const header = chunk.split(`
+`, 1)[0] ?? "";
+      const file = header.match(/ b\/(.*)$/)?.[1] ?? header.split(" ").pop() ?? "?";
+      const body = chunk.split(`
+`).filter((l) => l.startsWith("@@") || l.startsWith("+") || l.startsWith("-") || l.startsWith(" ")).join(`
+`);
+      const lines = body.split(`
+`);
+      const clipped = lines.length > 120 ? lines.slice(0, 120).join(`
+`) + `
+… (+${lines.length - 120} more lines)` : body;
+      files.push({ file, patch: clipped.slice(0, 6000) });
+    }
+    return files;
+  }
+  prune(now = Date.now(), keepAlive = () => false) {
+    const ENDED_TTL = 60 * 60000;
+    const IDLE_TTL = 12 * 60 * 60000;
+    const removed = [];
+    for (const [id, s] of this.sessions) {
+      if (keepAlive(id))
+        continue;
+      const ttl = ["done", "canceled", "error"].includes(s.state) ? ENDED_TTL : IDLE_TTL;
+      if (now - s.updatedAt > ttl)
+        removed.push(id);
+    }
+    for (const id of removed) {
+      this.sessions.delete(id);
+      this.items.delete(id);
+    }
+    return removed;
+  }
+}
+
+// src/transcript.ts
+init_src();
+import { openSync, readSync, closeSync, fstatSync, readdirSync, statSync, existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { join as join2, basename, resolve, sep } from "node:path";
+var claudeDir = () => process.env.CLAUDE_CONFIG_DIR || join2(homedir2(), ".claude");
+function isSafeTranscriptPath(path) {
+  if (!path.endsWith(".jsonl"))
+    return false;
+  const real = resolve(path);
+  const root = resolve(claudeDir());
+  return real === root || real.startsWith(root + sep);
+}
+
+class TranscriptReader {
+  offsets = new Map;
+  static MAX_READ = 256 * 1024;
+  read(sessionId, path) {
+    if (typeof path !== "string" || !path || !isSafeTranscriptPath(path))
+      return [];
+    if (basename(path) !== `${sessionId}.jsonl`)
+      return [];
+    let fd;
+    try {
+      fd = openSync(path, "r");
+    } catch {
+      return [];
+    }
+    try {
+      const size = fstatSync(fd).size;
+      let off = this.offsets.get(sessionId) ?? 0;
+      if (off > size)
+        off = 0;
+      if (size <= off)
+        return [];
+      if (size - off > TranscriptReader.MAX_READ)
+        off = size - TranscriptReader.MAX_READ;
+      const buf = Buffer.alloc(size - off);
+      readSync(fd, buf, 0, buf.length, off);
+      const text = buf.toString("utf8");
+      const lastNL = text.lastIndexOf(`
+`);
+      if (lastNL < 0)
+        return [];
+      this.offsets.set(sessionId, off + Buffer.byteLength(text.slice(0, lastNL + 1)));
+      const items = [];
+      for (const line of text.slice(0, lastNL).split(`
+`)) {
+        parseEntry(line, items, { proseOnly: true });
+      }
+      return items;
+    } catch {
+      return [];
+    } finally {
+      try {
+        closeSync(fd);
+      } catch {}
+    }
+  }
+}
+function parseEntry(line, out, opts) {
+  if (!line.trim())
+    return;
+  let e;
+  try {
+    e = JSON.parse(line);
+  } catch {
+    return;
+  }
+  if (e.isSidechain)
+    return;
+  const uuid = String(e.uuid ?? "");
+  if (!uuid)
+    return;
+  const content = e.message?.content;
+  if (e.type === "user" && !opts.proseOnly) {
+    const text = typeof content === "string" ? content : Array.isArray(content) ? content.filter((b) => b?.type === "text").map((b) => String(b.text ?? "")).join(`
+`) : "";
+    if (text.trim() && !text.startsWith("<")) {
+      out.push({ kind: "user", id: `${uuid}:u`, text: clipOutput(text.trim(), 10, 500) });
+    }
+    return;
+  }
+  if (e.type !== "assistant" || !Array.isArray(content))
+    return;
+  content.forEach((b, idx) => {
+    if (b?.type === "text" && String(b.text ?? "").trim()) {
+      out.push({ kind: "text", id: `${uuid}:${idx}`, text: clipOutput(String(b.text).trim(), 60, 4000) });
+    } else if (b?.type === "thinking" && String(b.thinking ?? "").trim()) {
+      out.push({ kind: "thinking", id: `${uuid}:${idx}`, text: clipOutput(String(b.thinking).trim(), 40, 2000) });
+    }
+  });
+}
+function listRecentSessions(limit = 20) {
+  const root = join2(claudeDir(), "projects");
+  let dirs = [];
+  try {
+    dirs = readdirSync(root);
+  } catch {
+    return [];
+  }
+  const found = [];
+  for (const d of dirs) {
+    const dir = join2(root, d);
+    let files = [];
+    try {
+      files = readdirSync(dir);
+    } catch {
+      continue;
+    }
+    for (const f of files) {
+      if (!f.endsWith(".jsonl"))
+        continue;
+      const p = join2(dir, f);
+      let mtime = 0, size = 0;
+      try {
+        const st = statSync(p);
+        mtime = st.mtimeMs;
+        size = st.size;
+      } catch {
+        continue;
+      }
+      if (size < 200)
+        continue;
+      found.push({ id: f.slice(0, -6), cwd: "", name: "", summary: "", updatedAt: Math.round(mtime), mtime });
+      found[found.length - 1].path = p;
+    }
+  }
+  found.sort((a, b) => b.mtime - a.mtime);
+  const top = found.slice(0, limit);
+  for (const s of top) {
+    const meta = sessionMeta(s.path);
+    s.cwd = meta.cwd;
+    s.name = meta.cwd ? basename(meta.cwd) : "";
+    s.summary = meta.summary;
+  }
+  return top.filter((s) => s.summary).map(({ id, cwd, name, summary, updatedAt }) => ({ id, cwd, name, summary, updatedAt }));
+}
+function sessionMeta(path) {
+  let head = "";
+  try {
+    const fd = openSync(path, "r");
+    try {
+      const buf = Buffer.alloc(32 * 1024);
+      const n = readSync(fd, buf, 0, buf.length, 0);
+      head = buf.toString("utf8", 0, n);
+    } finally {
+      closeSync(fd);
+    }
+  } catch {
+    return { cwd: "", summary: "" };
+  }
+  let cwd = "", summary = "";
+  for (const line of head.split(`
+`)) {
+    if (!line.trim())
+      continue;
+    let e;
+    try {
+      e = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (!cwd && typeof e.cwd === "string")
+      cwd = e.cwd;
+    if (!summary && e.type === "summary" && typeof e.summary === "string")
+      summary = e.summary;
+    if (!summary && e.type === "user" && !e.isSidechain) {
+      const c = e.message?.content;
+      const text = typeof c === "string" ? c : Array.isArray(c) ? c.filter((b) => b?.type === "text").map((b) => String(b.text ?? "")).join(" ") : "";
+      if (text.trim() && !text.startsWith("<"))
+        summary = text.trim();
+    }
+    if (cwd && summary)
+      break;
+  }
+  return { cwd, summary: summary.replace(/\s+/g, " ").slice(0, 120) };
+}
+function backfillItems(resumeId, maxItems = 20) {
+  const root = join2(claudeDir(), "projects");
+  let path = "";
+  try {
+    for (const d of readdirSync(root)) {
+      const p = join2(root, d, `${resumeId}.jsonl`);
+      if (existsSync2(p)) {
+        path = p;
+        break;
+      }
+    }
+  } catch {
+    return [];
+  }
+  if (!path)
+    return [];
+  let raw = "";
+  try {
+    raw = readFileSync2(path, "utf8");
+  } catch {
+    return [];
+  }
+  const items = [];
+  for (const line of raw.split(`
+`))
+    parseEntry(line, items, { proseOnly: false });
+  return items.slice(-maxItems);
 }
 
 // src/server.ts
@@ -11704,6 +12054,8 @@ class Daemon {
   relayPush = null;
   spawned = new Map;
   openTools = new Map;
+  aliases = new Map;
+  transcripts = new TranscriptReader;
   defaultCwd = process.cwd();
   ephemeral;
   constructor(cfg, opts = {}) {
@@ -11748,6 +12100,11 @@ class Daemon {
       if (p.authed)
         this.sendTo(p, msg);
   }
+  broadcastV(minProto, msg) {
+    for (const p of this.phones)
+      if (p.authed && p.proto >= minProto)
+        this.sendTo(p, msg);
+  }
   emit(sessionId, item) {
     this.registry.appendItem(sessionId, item);
     for (const p of this.phones) {
@@ -11797,7 +12154,7 @@ class Daemon {
   relayLeave(conn) {
     this.phones.delete(conn);
   }
-  async spawnSession(task, cwd, mode = "edits", model = null, effort = null) {
+  async spawnSession(task, cwd, mode = "edits", model = null, effort = null, resume = null) {
     const { SpawnedSession: SpawnedSession2 } = await Promise.resolve().then(() => (init_spawn(), exports_spawn));
     const id = `spawn-${crypto.randomUUID()}`;
     const dir = cwd || this.defaultCwd;
@@ -11807,44 +12164,56 @@ class Daemon {
       agentName: "Claude Code",
       state: "working",
       spawned: true,
-      action: task ? task.slice(0, 60) : "starting…",
+      mode,
+      action: task ? task.slice(0, 60) : resume ? "continuing previous session…" : "starting…",
       ...this.registry.gitInfo(dir)
     }, this.cfg.host);
     this.broadcast({ t: "session_upsert", session: s });
+    if (resume) {
+      for (const item of backfillItems(resume))
+        this.emit(id, item);
+      this.aliases.set(resume, id);
+    }
     if (task)
       this.emit(id, { kind: "user", id: crypto.randomUUID(), text: task });
     const session = new SpawnedSession2(this, id, dir, model, effort);
+    if (resume)
+      session.resumeFrom(resume);
     this.spawned.set(id, session);
     session.start(task, mode);
   }
+  adoptClaudeSession(spawnId, claudeId) {
+    if (claudeId && claudeId !== spawnId)
+      this.aliases.set(claudeId, spawnId);
+  }
   listProjectDirs() {
-    const home = homedir2();
-    const roots = [home, ...["Projects", "code", "dev", "src", "repos", "Developer", "work"].map((d) => join2(home, d))];
+    const home = homedir3();
+    const roots = [home, ...["Projects", "code", "dev", "src", "repos", "Developer", "work"].map((d) => join3(home, d))];
     const out = new Map;
     const add2 = (p) => {
       if (out.has(p))
         return;
-      out.set(p, { path: p, name: basename(p) || p, git: existsSync2(join2(p, ".git")) });
+      out.set(p, { path: p, name: basename2(p) || p, git: existsSync3(join3(p, ".git")) });
     };
     add2(this.defaultCwd);
     for (const root of roots) {
       let entries = [];
       try {
-        entries = readdirSync(root);
+        entries = readdirSync2(root);
       } catch {
         continue;
       }
       for (const e of entries) {
         if (e.startsWith(".") || out.size > 80)
           continue;
-        const p = join2(root, e);
+        const p = join3(root, e);
         try {
-          if (!statSync(p).isDirectory())
+          if (!statSync2(p).isDirectory())
             continue;
         } catch {
           continue;
         }
-        if (root !== home || existsSync2(join2(p, ".git")))
+        if (root !== home || existsSync3(join3(p, ".git")))
           add2(p);
       }
     }
@@ -11869,6 +12238,14 @@ class Daemon {
     this.spawnState(sessionId, "error", "couldn't start Claude Code");
     this.spawned.delete(sessionId);
   }
+  pruneSessions(now = Date.now()) {
+    const removed = this.registry.prune(now, (id) => this.spawned.has(id));
+    for (const id of removed) {
+      this.openTools.delete(id);
+      this.broadcast({ t: "session_removed", sessionId: id });
+    }
+    return removed;
+  }
   wakePhones(server, danger) {
     if (!this.relayPush)
       return;
@@ -11973,20 +12350,20 @@ class Daemon {
           return;
         this.pending.delete(msg.requestId);
         clearTimeout(req.timer);
-        if (msg.always && msg.allow && !req.danger) {
+        if (msg.always && msg.allow && !req.danger && req.kind === "tool") {
           const pattern = req.command.split(/\s+/).slice(0, 2).join(" ");
           if (pattern && !this.cfg.rules.some((r) => r.pattern === pattern && r.scope === this.cfg.host)) {
             this.cfg.rules.unshift({ pattern, action: "allow", scope: this.cfg.host });
             this.persist();
           }
         }
-        req.resolve({ allow: msg.allow, always: msg.always, by: "phone" });
+        req.resolve({ allow: msg.allow, always: msg.always, by: "phone", answer: msg.answer ?? null });
         this.broadcast({ t: "permission_resolved", requestId: msg.requestId, allowed: msg.allow, by: "phone" });
         const s = this.registry.sessions.get(req.sessionId);
-        if (s) {
+        if (s && req.kind === "tool") {
           this.broadcast({
             t: "session_upsert",
-            session: this.registry.upsert({ id: s.id, state: msg.allow ? "working" : "canceled", action: msg.allow ? "continuing…" : "denied from phone", command: "" }, this.cfg.host)
+            session: this.registry.upsert({ id: s.id, state: msg.allow ? "working" : "canceled", action: msg.allow ? "continuing…" : "denied from phone", command: "", plan: [] }, this.cfg.host)
           });
         }
         break;
@@ -12025,12 +12402,38 @@ class Daemon {
         break;
       }
       case "spawn": {
-        this.spawnSession(msg.task ?? "", msg.cwd ?? null, msg.mode ?? "edits", msg.model ?? null, msg.effort ?? null);
+        this.spawnSession(msg.task ?? "", msg.cwd ?? null, msg.mode ?? "edits", msg.model ?? null, msg.effort ?? null, msg.resume ?? null);
+        break;
+      }
+      case "set_session": {
+        const owned = this.spawned.get(msg.sessionId);
+        if (!owned)
+          break;
+        owned.reconfigure(msg.mode ?? null, msg.model ?? null);
+        if (msg.mode) {
+          const s = this.registry.upsert({ id: msg.sessionId, mode: msg.mode }, this.cfg.host);
+          this.broadcast({ t: "session_upsert", session: s });
+        }
+        const what = [msg.mode && `mode → ${msg.mode}`, msg.model && `model → ${msg.model}`].filter(Boolean).join(" · ");
+        if (what)
+          this.note(msg.sessionId, `⏵ ${what} (applies from the next turn)`, "muted");
+        break;
+      }
+      case "interrupt": {
+        this.spawned.get(msg.sessionId)?.interrupt();
         break;
       }
       case "list_dirs":
         this.sendTo(p, { t: "dirs", dirs: this.listProjectDirs() });
         break;
+      case "list_sessions":
+        this.sendTo(p, { t: "sessions", sessions: listRecentSessions() });
+        break;
+      case "get_diff": {
+        const cwd = this.registry.sessions.get(msg.sessionId)?.cwd;
+        this.sendTo(p, { t: "diff", sessionId: msg.sessionId, files: cwd ? this.registry.gitDiff(cwd) : [] });
+        break;
+      }
       case "stop": {
         const owned = this.spawned.get(msg.sessionId);
         if (owned) {
@@ -12048,10 +12451,21 @@ class Daemon {
   }
   async handleHookEvent(body) {
     const event = body.hook_event_name ?? "";
-    const sessionId = body.session_id ?? "unknown";
+    const rawId = body.session_id ?? "unknown";
+    const sessionId = this.aliases.get(rawId) ?? rawId;
+    const isSpawned = sessionId !== rawId || this.spawned.has(sessionId);
     const cwd = body.cwd ?? "";
+    if (!isSpawned) {
+      for (const item of this.transcripts.read(sessionId, body.transcript_path)) {
+        const seen = this.registry.items.get(sessionId)?.some((i) => i.id === item.id);
+        if (!seen)
+          this.emit(sessionId, item);
+      }
+    }
     switch (event) {
       case "SessionStart": {
+        if (isSpawned)
+          return { body: { ok: true } };
         const git = this.registry.gitInfo(cwd);
         const s = this.registry.upsert({
           id: sessionId,
@@ -12066,6 +12480,8 @@ class Daemon {
         return { body: { ok: true } };
       }
       case "UserPromptSubmit": {
+        if (isSpawned)
+          return { body: { ok: true } };
         const prompt = String(body.prompt ?? "").slice(0, 500);
         this.emit(sessionId, { kind: "user", id: crypto.randomUUID(), text: prompt });
         const s = this.registry.upsert({ id: sessionId, cwd, state: "working", action: prompt.slice(0, 80) }, this.cfg.host);
@@ -12073,8 +12489,10 @@ class Daemon {
         return { body: { ok: true } };
       }
       case "PreToolUse":
-        return this.handlePreToolUse(body, sessionId, cwd);
+        return this.handlePreToolUse(body, sessionId, cwd, isSpawned);
       case "PostToolUse": {
+        if (isSpawned)
+          return { body: { ok: true } };
         const toolUseId = this.takeOpenTool(sessionId, body);
         const out = extractToolOutput(body.tool_response);
         this.emit(sessionId, {
@@ -12103,6 +12521,8 @@ class Daemon {
         return { body: { ok: true } };
       }
       case "Stop": {
+        if (isSpawned)
+          return { body: { ok: true } };
         const s = this.registry.upsert({ id: sessionId, cwd, state: "done", action: "finished", command: "" }, this.cfg.host);
         this.broadcast({ t: "session_upsert", session: s });
         return { body: { ok: true } };
@@ -12111,20 +12531,34 @@ class Daemon {
         return { body: { ok: true } };
     }
   }
-  async handlePreToolUse(body, sessionId, cwd) {
+  async handlePreToolUse(body, sessionId, cwd, isSpawned = false) {
+    if (body.tool_name === "AskUserQuestion")
+      return this.handleQuestion(body, sessionId, cwd);
     const command = toolSummary(body.tool_name, body.tool_input);
     const rawCommand = body.tool_name === "Bash" ? String(body.tool_input?.command ?? "") : command;
     const danger = isDangerous(rawCommand) || isDangerousTool(body.tool_name, body.tool_input);
-    const toolUseId = this.registerOpenTool(sessionId, body);
-    const mark = (d) => this.emit(sessionId, { kind: "tool_decision", id: crypto.randomUUID(), toolUseId, decision: d });
-    const ruled = verdict(this.cfg.rules, rawCommand, this.cfg.host);
+    const isPlan = body.tool_name === "ExitPlanMode";
+    const toolUseId = isPlan || isSpawned ? null : this.registerOpenTool(sessionId, body);
+    const mark = (d) => {
+      if (toolUseId) {
+        this.emit(sessionId, { kind: "tool_decision", id: crypto.randomUUID(), toolUseId, decision: d });
+      } else if (isSpawned && !isPlan) {
+        this.markStreamDecision(sessionId, body, d);
+      } else {
+        const line = flattenItem({ kind: "tool_decision", id: "", toolUseId: "", decision: d });
+        if (line)
+          this.note(sessionId, line.text, line.color);
+      }
+    };
+    const ruled = isPlan ? null : verdict(this.cfg.rules, rawCommand, this.cfg.host);
     if (!danger && ruled === "allow") {
       mark("auto");
       return decision("allow", "drover rule");
     }
     if (ruled === "deny") {
       mark("blocked");
-      this.closeOpenTool(sessionId, toolUseId);
+      if (toolUseId)
+        this.closeOpenTool(sessionId, toolUseId);
       const s2 = this.registry.upsert({ id: sessionId, cwd, state: "working", action: "blocked by your rules" }, this.cfg.host);
       this.broadcast({ t: "session_upsert", session: s2 });
       return decision("deny", "blocked by drover rule");
@@ -12135,13 +12569,17 @@ class Daemon {
       return decision("ask", "no phone connected");
     }
     const requestId = crypto.randomUUID();
+    const plan = isPlan ? String(body.tool_input?.plan ?? "").split(`
+`).map((l) => l.trim()).filter(Boolean).slice(0, 30) : [];
+    const displayCommand = isPlan ? "Review the plan" : command;
     const s = this.registry.upsert({
       id: sessionId,
       cwd,
       state: "approval",
-      action: danger ? "wants to run a DANGEROUS command" : `wants to run: ${command.slice(0, 60)}`,
-      command,
-      danger
+      action: isPlan ? "plan ready — review before anything runs" : danger ? "wants to run a DANGEROUS command" : `wants to run: ${command.slice(0, 60)}`,
+      command: displayCommand,
+      danger,
+      plan
     }, this.cfg.host);
     this.broadcast({ t: "session_upsert", session: s });
     this.broadcast({
@@ -12149,20 +12587,20 @@ class Daemon {
       requestId,
       sessionId,
       toolName: String(body.tool_name ?? ""),
-      command,
+      command: displayCommand,
       danger,
       expiresAt: Date.now() + HOOK_WAIT_MS
     });
     this.wakePhones(s.server, danger);
-    const result = await new Promise((resolve) => {
+    const result = await new Promise((resolve2) => {
       const timer = setTimeout(() => {
         this.pending.delete(requestId);
         this.broadcast({ t: "permission_resolved", requestId, allowed: false, by: "timeout" });
-        const back = this.registry.upsert({ id: sessionId, state: "working", action: "answer in the terminal (phone timed out)", command: "" }, this.cfg.host);
+        const back = this.registry.upsert({ id: sessionId, state: "working", action: "answer in the terminal (phone timed out)", command: "", plan: [] }, this.cfg.host);
         this.broadcast({ t: "session_upsert", session: back });
-        resolve({ allow: false, by: "timeout" });
+        resolve2({ allow: false, by: "timeout" });
       }, HOOK_WAIT_MS);
-      this.pending.set(requestId, { requestId, sessionId, command, danger, timer, resolve });
+      this.pending.set(requestId, { requestId, sessionId, command, danger, kind: "tool", timer, resolve: resolve2 });
     });
     if (result.by === "timeout") {
       mark("timeout");
@@ -12176,6 +12614,64 @@ class Daemon {
   note(sessionId, text, color) {
     this.emit(sessionId, { kind: "note", id: crypto.randomUUID(), text, color });
   }
+  async handleQuestion(body, sessionId, cwd) {
+    const qs = Array.isArray(body.tool_input?.questions) ? body.tool_input.questions : [];
+    const q = qs[0] ?? {};
+    const question = String(q.question ?? "Claude has a question").slice(0, 300);
+    const options = Array.isArray(q.options) ? q.options.map((o) => String(o?.label ?? o ?? "")).filter(Boolean).slice(0, 4) : [];
+    const connected = [...this.phones].some((p) => p.authed && p.proto >= 4);
+    const wakeable = [...this.pushTokens.values()].some((t) => t.apnsToken);
+    if (!connected && !wakeable)
+      return decision("ask", "no phone connected");
+    const requestId = crypto.randomUUID();
+    this.emit(sessionId, { kind: "note", id: crypto.randomUUID(), text: `? ${question}`, color: "warn" });
+    const s = this.registry.upsert({
+      id: sessionId,
+      cwd,
+      state: "waiting",
+      action: question.slice(0, 120),
+      answers: options,
+      command: ""
+    }, this.cfg.host);
+    this.broadcast({ t: "session_upsert", session: s });
+    this.broadcastV(4, {
+      t: "permission_request",
+      requestId,
+      sessionId,
+      toolName: "AskUserQuestion",
+      command: question,
+      danger: false,
+      expiresAt: Date.now() + HOOK_WAIT_MS
+    });
+    this.wakePhones(s.server, false);
+    const result = await new Promise((resolve2) => {
+      const timer = setTimeout(() => {
+        this.pending.delete(requestId);
+        this.broadcast({ t: "permission_resolved", requestId, allowed: false, by: "timeout" });
+        const back2 = this.registry.upsert({ id: sessionId, state: "working", action: "answer in the terminal (phone timed out)", answers: [] }, this.cfg.host);
+        this.broadcast({ t: "session_upsert", session: back2 });
+        resolve2({ allow: false, by: "timeout" });
+      }, HOOK_WAIT_MS);
+      this.pending.set(requestId, {
+        requestId,
+        sessionId,
+        command: question,
+        danger: false,
+        kind: "question",
+        timer,
+        resolve: resolve2
+      });
+    });
+    if (result.by === "timeout")
+      return decision("ask", "phone did not answer");
+    const answer = (result.answer ?? "").trim();
+    const back = this.registry.upsert({ id: sessionId, state: "working", action: "continuing…", answers: [] }, this.cfg.host);
+    this.broadcast({ t: "session_upsert", session: back });
+    if (!answer)
+      return decision("ask", "answer it in the terminal");
+    this.emit(sessionId, { kind: "user", id: crypto.randomUUID(), text: answer });
+    return decision("deny", `The user answered the question from their phone: "${answer}". Proceed with that answer — do not ask again.`);
+  }
   registerOpenTool(sessionId, body) {
     const id = typeof body.tool_use_id === "string" && body.tool_use_id ? body.tool_use_id : crypto.randomUUID();
     const tool = String(body.tool_name ?? "tool");
@@ -12193,6 +12689,34 @@ class Daemon {
     this.openTools.set(sessionId, open2);
     return id;
   }
+  streamToolTarget(sessionId, tool, detail) {
+    const items = this.registry.items.get(sessionId) ?? [];
+    const decided = new Set;
+    for (const i of items)
+      if (i.kind === "tool_decision")
+        decided.add(i.toolUseId);
+    for (let k = items.length - 1;k >= 0; k--) {
+      const i = items[k];
+      if (i.kind === "tool_use" && !decided.has(i.id) && i.tool === tool && i.input === detail)
+        return i.id;
+    }
+    return null;
+  }
+  async markStreamDecision(sessionId, body, d) {
+    const tool = String(body.tool_name ?? "");
+    const detail = toolDetail(tool, body.tool_input);
+    for (let attempt = 0;attempt < 6; attempt++) {
+      const target = this.streamToolTarget(sessionId, tool, detail);
+      if (target) {
+        this.emit(sessionId, { kind: "tool_decision", id: crypto.randomUUID(), toolUseId: target, decision: d });
+        return;
+      }
+      await new Promise((r) => setTimeout(r, 150));
+    }
+    const line = flattenItem({ kind: "tool_decision", id: "", toolUseId: "", decision: d });
+    if (line)
+      this.note(sessionId, line.text, line.color);
+  }
   closeOpenTool(sessionId, toolUseId) {
     const open2 = this.openTools.get(sessionId);
     if (!open2)
@@ -12220,6 +12744,8 @@ class Daemon {
   }
   listen(onListenError) {
     const self = this;
+    const sweeper = setInterval(() => self.pruneSessions(), 600000);
+    sweeper.unref?.();
     const wss = new import_websocket_server.default({ port: this.cfg.wsPort });
     if (onListenError)
       wss.on("error", onListenError);
@@ -12332,8 +12858,10 @@ function extractToolOutput(resp) {
 }
 function toolSummary(toolName, input) {
   switch (toolName) {
-    case "Bash":
-      return String(input?.command ?? "").slice(0, 500);
+    case "Bash": {
+      const cmd = String(input?.command ?? "");
+      return cmd.length > 500 ? cmd.slice(0, 480) + " …[truncated]" : cmd;
+    }
     case "Edit":
     case "MultiEdit":
       return `Edit ${input?.file_path ?? "?"}`;
@@ -12449,18 +12977,18 @@ function b64url2(bytes) {
 }
 
 // src/hooks.ts
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, existsSync as existsSync3, mkdirSync as mkdirSync2 } from "node:fs";
-import { homedir as homedir3 } from "node:os";
-import { join as join3 } from "node:path";
-var claudeDir = () => process.env.CLAUDE_CONFIG_DIR || join3(homedir3(), ".claude");
-var settingsPath = () => join3(claudeDir(), "settings.json");
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync as existsSync4, mkdirSync as mkdirSync2 } from "node:fs";
+import { homedir as homedir4 } from "node:os";
+import { join as join4 } from "node:path";
+var claudeDir2 = () => process.env.CLAUDE_CONFIG_DIR || join4(homedir4(), ".claude");
+var settingsPath = () => join4(claudeDir2(), "settings.json");
 var EVENTS = ["SessionStart", "UserPromptSubmit", "PreToolUse", "PostToolUse", "Notification", "Stop"];
 function installHooks(droverBin) {
-  mkdirSync2(claudeDir(), { recursive: true });
+  mkdirSync2(claudeDir2(), { recursive: true });
   let settings = {};
-  if (existsSync3(settingsPath())) {
+  if (existsSync4(settingsPath())) {
     try {
-      settings = JSON.parse(readFileSync2(settingsPath(), "utf8"));
+      settings = JSON.parse(readFileSync3(settingsPath(), "utf8"));
     } catch {
       settings = {};
     }
@@ -12495,10 +13023,10 @@ function isOurs(x) {
   return cmd.includes("hatchee") || cmd.includes("drover") || cmd.includes("daemon/src/cli.ts");
 }
 function uninstallHooks() {
-  if (!existsSync3(settingsPath()))
+  if (!existsSync4(settingsPath()))
     return;
   try {
-    const settings = JSON.parse(readFileSync2(settingsPath(), "utf8"));
+    const settings = JSON.parse(readFileSync3(settingsPath(), "utf8"));
     for (const event of Object.keys(settings.hooks ?? {})) {
       settings.hooks[event] = settings.hooks[event].filter((h) => !h?.hooks?.some(isOurs));
       if (settings.hooks[event].length === 0)
@@ -12508,13 +13036,13 @@ function uninstallHooks() {
   } catch {}
 }
 function readStdin() {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     let data = "";
     let done = false;
     const finish = () => {
       if (!done) {
         done = true;
-        resolve(data);
+        resolve2(data);
       }
     };
     process.stdin.setEncoding("utf8");
@@ -12560,27 +13088,27 @@ async function runHook(hookPort) {
 }
 
 // src/service.ts
-import { homedir as homedir4 } from "node:os";
-import { join as join4, dirname } from "node:path";
-import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync3, copyFileSync, chmodSync, existsSync as existsSync4, rmSync } from "node:fs";
+import { homedir as homedir5 } from "node:os";
+import { join as join5, dirname } from "node:path";
+import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync3, copyFileSync, chmodSync, existsSync as existsSync5, rmSync } from "node:fs";
 import { execFileSync } from "node:child_process";
-var HOME = homedir4();
-var HATCHEE_DIR = join4(HOME, ".hatchee");
-var BIN_DIR = join4(HATCHEE_DIR, "bin");
-var STABLE_BIN = join4(BIN_DIR, "hatchee.mjs");
-var LOG = join4(HATCHEE_DIR, "daemon.log");
+var HOME = homedir5();
+var HATCHEE_DIR = join5(HOME, ".hatchee");
+var BIN_DIR = join5(HATCHEE_DIR, "bin");
+var STABLE_BIN = join5(BIN_DIR, "hatchee.mjs");
+var LOG = join5(HATCHEE_DIR, "daemon.log");
 var LABEL = "cloud.hatchee.daemon";
-var PLIST = join4(HOME, "Library", "LaunchAgents", `${LABEL}.plist`);
-var UNIT = join4(HOME, ".config", "systemd", "user", "hatchee.service");
+var PLIST = join5(HOME, "Library", "LaunchAgents", `${LABEL}.plist`);
+var UNIT = join5(HOME, ".config", "systemd", "user", "hatchee.service");
 function servicePath(node) {
   const system = ["/usr/bin", "/bin", "/usr/sbin", "/sbin"];
   const userTool = [
     dirname(node),
     "/opt/homebrew/bin",
     "/usr/local/bin",
-    join4(HOME, ".bun/bin"),
-    join4(HOME, ".npm-global/bin"),
-    join4(HOME, ".local/bin")
+    join5(HOME, ".bun/bin"),
+    join5(HOME, ".npm-global/bin"),
+    join5(HOME, ".local/bin")
   ];
   const seen = new Set;
   return [...system, ...userTool].filter((p) => p && !seen.has(p) && seen.add(p)).join(":");
@@ -12731,12 +13259,12 @@ function uninstallService() {
   if (process.platform === "darwin") {
     const uid = String(process.getuid?.() ?? "");
     run("launchctl", ["bootout", `gui/${uid}/${LABEL}`]);
-    if (existsSync4(PLIST))
+    if (existsSync5(PLIST))
       rmSync(PLIST);
     console.log(`  ✓ background service removed (launchd: ${LABEL})`);
   } else if (process.platform === "linux") {
     run("systemctl", ["--user", "disable", "--now", "hatchee.service"]);
-    if (existsSync4(UNIT)) {
+    if (existsSync5(UNIT)) {
       rmSync(UNIT);
       run("systemctl", ["--user", "daemon-reload"]);
     }
@@ -12744,7 +13272,7 @@ function uninstallService() {
   } else {
     console.log(`  no background service on ${process.platform}.`);
   }
-  if (existsSync4(STABLE_BIN))
+  if (existsSync5(STABLE_BIN))
     rmSync(STABLE_BIN);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hatchee",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Your coding agents, alive on your iPhone lock screen — Hatchee daemon. Approve Claude Code / Codex from your phone.",
   "type": "module",
   "bin": {