hatchee 0.1.4 → 0.1.6

package/dist/cli.mjs

@@ -3942,16 +3942,24 @@ class SpawnedSession {
   daemon;
   sessionId;
   cwd;
+  model;
   claudeBin;
   proc = null;
-  buffer = "";
-  constructor(daemon, sessionId, cwd, claudeBin = process.env.DROVER_CLAUDE_BIN || "claude") {
+  mode = "edits";
+  claudeSessionId = null;
+  stopped = false;
+  constructor(daemon, sessionId, cwd, model = null, claudeBin = process.env.DROVER_CLAUDE_BIN || "claude") {
     this.daemon = daemon;
     this.sessionId = sessionId;
     this.cwd = cwd;
+    this.model = model;
     this.claudeBin = claudeBin;
   }
   start(firstTask, mode = "edits") {
+    this.mode = mode;
+    this.spawnProc(firstTask);
+  }
+  spawnProc(firstMessage) {
     const args = [
       "--print",
       "--output-format",
@@ -3960,7 +3968,9 @@ class SpawnedSession {
       "stream-json",
       "--verbose",
       "--permission-mode",
-      PERMISSION_MODE[mode] ?? "acceptEdits"
+      PERMISSION_MODE[this.mode] ?? "acceptEdits",
+      ...this.model ? ["--model", this.model] : [],
+      ...this.claudeSessionId ? ["--resume", this.claudeSessionId] : []
     ];
     let proc;
     try {
@@ -3976,22 +3986,28 @@ class SpawnedSession {
       if (s)
         this.daemon.spawnLine(this.sessionId, s, "muted");
     });
-    proc.on("exit", (code) => {
-      this.daemon.spawnExit(this.sessionId, code ?? 0);
-      this.proc = null;
-    });
+    proc.on("exit", (code) => this.onProcExit(code ?? 0));
     proc.on("error", (e) => this.daemon.spawnFailed(this.sessionId, String(e)));
-    if (firstTask.trim())
-      this.send(firstTask);
+    if (firstMessage.trim())
+      this.send(firstMessage);
   }
   send(text) {
-    if (!this.proc?.stdin.writable)
-      return;
-    const msg = { type: "user", message: { role: "user", content: text } };
-    this.proc.stdin.write(JSON.stringify(msg) + `
+    if (this.proc?.stdin.writable) {
+      const msg = { type: "user", message: { role: "user", content: text } };
+      this.proc.stdin.write(JSON.stringify(msg) + `
 `);
+    } else {
+      this.spawnProc(text);
+    }
+  }
+  onProcExit(_code) {
+    this.proc = null;
+    if (this.stopped)
+      return;
+    this.daemon.spawnState(this.sessionId, "waiting", "ready — send your next message");
   }
   stop() {
+    this.stopped = true;
     try {
       this.proc?.stdin.end();
     } catch {}
@@ -4009,8 +4025,11 @@ class SpawnedSession {
     }
     switch (m.type) {
       case "system":
-        if (m.subtype === "init")
+        if (m.subtype === "init") {
+          if (typeof m.session_id === "string")
+            this.claudeSessionId = m.session_id;
           this.daemon.spawnState(this.sessionId, "working", "session ready");
+        }
         break;
       case "assistant": {
         for (const block of m.message?.content ?? []) {
@@ -7263,6 +7282,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";
 
 // ../../node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
@@ -11343,6 +11365,11 @@ var RulesUpdate = exports_external.object({
   t: exports_external.literal("rules"),
   rules: exports_external.array(Rule)
 });
+var DirEntry = exports_external.object({ path: exports_external.string(), name: exports_external.string(), git: exports_external.boolean().default(false) });
+var DirsUpdate = exports_external.object({
+  t: exports_external.literal("dirs"),
+  dirs: exports_external.array(DirEntry)
+});
 var DaemonToPhone = exports_external.discriminatedUnion("t", [
   ServerHello,
   SessionUpsert,
@@ -11353,6 +11380,7 @@ var DaemonToPhone = exports_external.discriminatedUnion("t", [
   ErrorMsg,
   Pong,
   RulesUpdate,
+  DirsUpdate,
   Encrypted
 ]);
 var DaemonInner = exports_external.discriminatedUnion("t", [
@@ -11363,7 +11391,8 @@ var DaemonInner = exports_external.discriminatedUnion("t", [
   PermissionResolved,
   ErrorMsg,
   Pong,
-  RulesUpdate
+  RulesUpdate,
+  DirsUpdate
 ]);
 var ClientHello = exports_external.object({
   t: exports_external.literal("hello"),
@@ -11392,12 +11421,14 @@ var Spawn = exports_external.object({
   t: exports_external.literal("spawn"),
   task: exports_external.string().default(""),
   cwd: exports_external.string().nullable().default(null),
-  mode: SpawnMode.default("edits")
+  mode: SpawnMode.default("edits"),
+  model: exports_external.string().nullable().default(null)
 });
 var Stop = exports_external.object({
   t: exports_external.literal("stop"),
   sessionId: exports_external.string()
 });
+var ListDirs = exports_external.object({ t: exports_external.literal("list_dirs") });
 var Ping = exports_external.object({ t: exports_external.literal("ping") });
 var PushRegister = exports_external.object({
   t: exports_external.literal("push_register"),
@@ -11412,6 +11443,7 @@ var PhoneToDaemon = exports_external.discriminatedUnion("t", [
   UserMessage,
   Spawn,
   Stop,
+  ListDirs,
   Ping,
   PushRegister,
   Encrypted
@@ -11422,6 +11454,7 @@ var PhoneInner = exports_external.discriminatedUnion("t", [
   UserMessage,
   Spawn,
   Stop,
+  ListDirs,
   Ping,
   PushRegister
 ]);
@@ -11579,7 +11612,7 @@ class Daemon {
   relayLeave(conn) {
     this.phones.delete(conn);
   }
-  async spawnSession(task, cwd, mode = "edits") {
+  async spawnSession(task, cwd, mode = "edits", model = null) {
     const { SpawnedSession: SpawnedSession2 } = await Promise.resolve().then(() => (init_spawn(), exports_spawn));
     const id = `spawn-${crypto.randomUUID()}`;
     const dir = cwd || this.defaultCwd;
@@ -11597,10 +11630,43 @@ class Daemon {
       this.registry.appendLine(id, { text: `❯ ${task}`, color: "me" });
       this.broadcast({ t: "line", sessionId: id, line: { text: `❯ ${task}`, color: "me" } });
     }
-    const session = new SpawnedSession2(this, id, dir);
+    const session = new SpawnedSession2(this, id, dir, model);
     this.spawned.set(id, session);
     session.start(task, mode);
   }
+  listProjectDirs() {
+    const home = homedir2();
+    const roots = [home, ...["Projects", "code", "dev", "src", "repos", "Developer", "work"].map((d) => join2(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")) });
+    };
+    add2(this.defaultCwd);
+    for (const root of roots) {
+      let entries = [];
+      try {
+        entries = readdirSync(root);
+      } catch {
+        continue;
+      }
+      for (const e of entries) {
+        if (e.startsWith(".") || out.size > 80)
+          continue;
+        const p = join2(root, e);
+        try {
+          if (!statSync(p).isDirectory())
+            continue;
+        } catch {
+          continue;
+        }
+        if (root !== home || existsSync2(join2(p, ".git")))
+          add2(p);
+      }
+    }
+    return [...out.values()].sort((a, b) => Number(b.git) - Number(a.git) || a.name.localeCompare(b.name)).slice(0, 50);
+  }
   spawnLine(sessionId, text, color) {
     this.registry.appendLine(sessionId, { text, color });
     this.broadcast({ t: "line", sessionId, line: { text, color } });
@@ -11777,9 +11843,12 @@ class Daemon {
         break;
       }
       case "spawn": {
-        this.spawnSession(msg.task ?? "", msg.cwd ?? null, msg.mode ?? "edits");
+        this.spawnSession(msg.task ?? "", msg.cwd ?? null, msg.mode ?? "edits", msg.model ?? null);
         break;
       }
+      case "list_dirs":
+        this.sendTo(p, { t: "dirs", dirs: this.listProjectDirs() });
+        break;
       case "stop": {
         const owned = this.spawned.get(msg.sessionId);
         if (owned) {
@@ -11942,7 +12011,8 @@ class Daemon {
     });
     const hooks = createServer((req, res) => {
       const url = req.url ?? "";
-      const jsonPost = req.method === "POST" && String(req.headers["content-type"] ?? "").includes("application/json");
+      const ctEssence = String(req.headers["content-type"] ?? "").split(";")[0].trim().toLowerCase();
+      const jsonPost = req.method === "POST" && ctEssence === "application/json";
       if (url === "/pair") {
         if (!jsonPost) {
           res.writeHead(415).end("expected application/json");
@@ -12107,16 +12177,16 @@ function b64url2(bytes) {
 }
 
 // src/hooks.ts
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, existsSync as existsSync2, mkdirSync as mkdirSync2 } from "node:fs";
-import { homedir as homedir2 } from "node:os";
-import { join as join2 } from "node:path";
-var claudeDir = () => process.env.CLAUDE_CONFIG_DIR || join2(homedir2(), ".claude");
-var settingsPath = () => join2(claudeDir(), "settings.json");
+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");
 var EVENTS = ["SessionStart", "UserPromptSubmit", "PreToolUse", "PostToolUse", "Notification", "Stop"];
 function installHooks(droverBin) {
   mkdirSync2(claudeDir(), { recursive: true });
   let settings = {};
-  if (existsSync2(settingsPath())) {
+  if (existsSync3(settingsPath())) {
     try {
       settings = JSON.parse(readFileSync2(settingsPath(), "utf8"));
     } catch {
@@ -12153,7 +12223,7 @@ function isOurs(x) {
   return cmd.includes("hatchee") || cmd.includes("drover") || cmd.includes("daemon/src/cli.ts");
 }
 function uninstallHooks() {
-  if (!existsSync2(settingsPath()))
+  if (!existsSync3(settingsPath()))
     return;
   try {
     const settings = JSON.parse(readFileSync2(settingsPath(), "utf8"));
@@ -12218,31 +12288,30 @@ async function runHook(hookPort) {
 }
 
 // src/service.ts
-import { homedir as homedir3 } from "node:os";
-import { join as join3, dirname } from "node:path";
-import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync3, copyFileSync, chmodSync, existsSync as existsSync3, rmSync } from "node:fs";
+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 { execFileSync } from "node:child_process";
-var HOME = homedir3();
-var HATCHEE_DIR = join3(HOME, ".hatchee");
-var BIN_DIR = join3(HATCHEE_DIR, "bin");
-var STABLE_BIN = join3(BIN_DIR, "hatchee.mjs");
-var LOG = join3(HATCHEE_DIR, "daemon.log");
+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 LABEL = "cloud.hatchee.daemon";
-var PLIST = join3(HOME, "Library", "LaunchAgents", `${LABEL}.plist`);
-var UNIT = join3(HOME, ".config", "systemd", "user", "hatchee.service");
+var PLIST = join4(HOME, "Library", "LaunchAgents", `${LABEL}.plist`);
+var UNIT = join4(HOME, ".config", "systemd", "user", "hatchee.service");
 function servicePath(node) {
-  return [
+  const system = ["/usr/bin", "/bin", "/usr/sbin", "/sbin"];
+  const userTool = [
     dirname(node),
-    "/usr/bin",
-    "/bin",
-    "/usr/sbin",
-    "/sbin",
     "/opt/homebrew/bin",
     "/usr/local/bin",
-    join3(HOME, ".bun/bin"),
-    join3(HOME, ".npm-global/bin"),
-    join3(HOME, ".local/bin")
-  ].join(":");
+    join4(HOME, ".bun/bin"),
+    join4(HOME, ".npm-global/bin"),
+    join4(HOME, ".local/bin")
+  ];
+  const seen = new Set;
+  return [...system, ...userTool].filter((p) => p && !seen.has(p) && seen.add(p)).join(":");
 }
 function xmlEsc(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
@@ -12390,12 +12459,12 @@ function uninstallService() {
   if (process.platform === "darwin") {
     const uid = String(process.getuid?.() ?? "");
     run("launchctl", ["bootout", `gui/${uid}/${LABEL}`]);
-    if (existsSync3(PLIST))
+    if (existsSync4(PLIST))
       rmSync(PLIST);
     console.log(`  ✓ background service removed (launchd: ${LABEL})`);
   } else if (process.platform === "linux") {
     run("systemctl", ["--user", "disable", "--now", "hatchee.service"]);
-    if (existsSync3(UNIT)) {
+    if (existsSync4(UNIT)) {
       rmSync(UNIT);
       run("systemctl", ["--user", "daemon-reload"]);
     }
@@ -12403,12 +12472,12 @@ function uninstallService() {
   } else {
     console.log(`  no background service on ${process.platform}.`);
   }
-  if (existsSync3(STABLE_BIN))
+  if (existsSync4(STABLE_BIN))
     rmSync(STABLE_BIN);
 }
 
 // src/cli.ts
-var VERSION2 = "0.1.4";
+var VERSION2 = "0.1.6";
 var cmd = process.argv[2] ?? "help";
 switch (cmd) {
   case "up": {

package/package.json

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