hatchee 0.3.0 → 0.4.0

package/dist/cli.mjs

@@ -8018,7 +8018,7 @@ function flattenItem(item) {
       return { text: item.text, color: item.color };
   }
 }
-var PROTOCOL_VERSION = 3, 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, DaemonToPhone, DaemonInner, ClientHello, PermissionReply, RulesSync, UserMessage, SpawnMode, SpawnEffort, Spawn, Stop, SetSession, Interrupt, ListDirs, ListSessions, 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([
@@ -8163,6 +8163,15 @@ var init_src = __esm(() => {
     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,
@@ -8176,6 +8185,7 @@ var init_src = __esm(() => {
     RulesUpdate,
     DirsUpdate,
     SessionsUpdate,
+    DiffUpdate,
     Encrypted
   ]);
   DaemonInner = exports_external.discriminatedUnion("t", [
@@ -8189,7 +8199,8 @@ var init_src = __esm(() => {
     Pong,
     RulesUpdate,
     DirsUpdate,
-    SessionsUpdate
+    SessionsUpdate,
+    DiffUpdate
   ]);
   ClientHello = exports_external.object({
     t: exports_external.literal("hello"),
@@ -8202,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"),
@@ -8240,6 +8252,7 @@ var init_src = __esm(() => {
   });
   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"),
@@ -8258,6 +8271,7 @@ var init_src = __esm(() => {
     Interrupt,
     ListDirs,
     ListSessions,
+    GetDiff,
     Ping,
     PushRegister,
     Encrypted
@@ -8272,6 +8286,7 @@ var init_src = __esm(() => {
     Interrupt,
     ListDirs,
     ListSessions,
+    GetDiff,
     Ping,
     PushRegister
   ]);
@@ -11771,19 +11786,74 @@ 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 } from "node:path";
+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)
+    if (typeof path !== "string" || !path || !isSafeTranscriptPath(path))
+      return [];
+    if (basename(path) !== `${sessionId}.jsonl`)
       return [];
     let fd;
     try {
@@ -11798,6 +11868,8 @@ class TranscriptReader {
         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");
@@ -12028,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) {
@@ -12161,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;
@@ -12265,17 +12350,17 @@ 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: "", plan: [] }, this.cfg.host)
@@ -12344,6 +12429,11 @@ class Daemon {
       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) {
@@ -12442,14 +12532,18 @@ class Daemon {
     }
   }
   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 isPlan = body.tool_name === "ExitPlanMode";
-    const toolUseId = isPlan ? null : isSpawned ? this.streamToolTarget(sessionId) : this.registerOpenTool(sessionId, body);
+    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)
@@ -12498,15 +12592,15 @@ class Daemon {
       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: "", 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");
@@ -12520,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");
@@ -12537,20 +12689,34 @@ class Daemon {
     this.openTools.set(sessionId, open2);
     return id;
   }
-  streamToolTarget(sessionId) {
+  streamToolTarget(sessionId, tool, detail) {
     const items = this.registry.items.get(sessionId) ?? [];
-    const settled = new Set;
-    for (const i of items) {
-      if (i.kind === "tool_result" || i.kind === "tool_decision")
-        settled.add(i.toolUseId);
-    }
+    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" && !settled.has(i.id))
+      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)
@@ -12578,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);
@@ -12690,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 ?? "?"}`;
@@ -12866,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");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hatchee",
-  "version": "0.3.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": {