hatchee 0.1.1 → 0.1.3

package/dist/cli.mjs

@@ -11521,6 +11521,24 @@ class Daemon {
   openPairingWindow(code, ttlMs = 5 * 60000) {
     this.pairing = { code, expiresAt: Date.now() + ttlMs };
   }
+  pairingPayload(forceCode) {
+    const code = forceCode || newPairingCode();
+    this.openPairingWindow(code);
+    const secret = b64.decode(this.cfg.secretKey);
+    const pk = b64.encode(publicKey(secret));
+    const room = b64url(publicKey(secret));
+    const lan = lanIPv4();
+    const payload = {
+      v: 1,
+      ...lan ? { ws: `ws://${lan}:${this.cfg.wsPort}` } : {},
+      code,
+      host: this.cfg.host,
+      pk,
+      relay: this.cfg.relayUrl,
+      room
+    };
+    return { payload, code, lan, room, relay: this.cfg.relayUrl, wsPort: this.cfg.wsPort };
+  }
   sealFor(p, msg) {
     return p.key ? encode({ t: "enc", b: seal(p.key, encode(msg)) }) : encode(msg);
   }
@@ -11923,7 +11941,18 @@ class Daemon {
       sock.on("error", () => self.phones.delete(conn));
     });
     const hooks = createServer((req, res) => {
-      if (req.method !== "POST" || (req.url ?? "") !== "/hook") {
+      const url = req.url ?? "";
+      if (req.method === "POST" && url === "/pair") {
+        try {
+          res.writeHead(200, { "content-type": "application/json" });
+          res.end(JSON.stringify(self.pairingPayload()));
+        } catch (e) {
+          res.writeHead(500, { "content-type": "application/json" });
+          res.end(JSON.stringify({ ok: false, error: String(e) }));
+        }
+        return;
+      }
+      if (req.method !== "POST" || url !== "/hook") {
         res.writeHead(404).end("not found");
         return;
       }
@@ -11951,6 +11980,9 @@ class Daemon {
 function decision(d, reason) {
   return { body: { decision: d, reason } };
 }
+function b64url(bytes) {
+  return Buffer.from(bytes).toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}
 function toolSummary(toolName, input) {
   switch (toolName) {
     case "Bash":
@@ -11984,7 +12016,7 @@ class RelayClient {
     this.secretKeyB64 = secretKeyB64;
   }
   get room() {
-    return b64url(publicKey(b64.decode(this.secretKeyB64)));
+    return b64url2(publicKey(b64.decode(this.secretKeyB64)));
   }
   url() {
     return `${this.relayBase.replace(/\/$/, "")}/c/${this.room}?role=daemon`;
@@ -12065,7 +12097,7 @@ class RelayClient {
     }
   }
 }
-function b64url(bytes) {
+function b64url2(bytes) {
   return Buffer.from(bytes).toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
 
@@ -12165,8 +12197,171 @@ async function runHook(hookPort) {
   process.exit(0);
 }
 
+// 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 { 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 LABEL = "cloud.hatchee.daemon";
+var PLIST = join3(HOME, "Library", "LaunchAgents", `${LABEL}.plist`);
+var UNIT = join3(HOME, ".config", "systemd", "user", "hatchee.service");
+function servicePath(node) {
+  return [
+    dirname(node),
+    join3(HOME, ".bun/bin"),
+    join3(HOME, ".npm-global/bin"),
+    join3(HOME, ".local/bin"),
+    "/opt/homebrew/bin",
+    "/usr/local/bin",
+    "/usr/bin",
+    "/bin",
+    "/usr/sbin",
+    "/sbin"
+  ].join(":");
+}
+function copyStableBin() {
+  mkdirSync3(BIN_DIR, { recursive: true });
+  const src = process.argv[1];
+  if (src && src !== STABLE_BIN) {
+    copyFileSync(src, STABLE_BIN);
+    chmodSync(STABLE_BIN, 493);
+  }
+}
+function plistContent(node, bin) {
+  const args = [node, bin, "up"].map((s) => `    <string>${s}</string>`).join(`
+`);
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key><string>${LABEL}</string>
+  <key>ProgramArguments</key>
+  <array>
+${args}
+  </array>
+  <key>RunAtLoad</key><true/>
+  <key>KeepAlive</key><true/>
+  <key>ThrottleInterval</key><integer>10</integer>
+  <key>StandardOutPath</key><string>${LOG}</string>
+  <key>StandardErrorPath</key><string>${LOG}</string>
+  <key>EnvironmentVariables</key>
+  <dict><key>PATH</key><string>${servicePath(node)}</string></dict>
+</dict>
+</plist>
+`;
+}
+function unitContent(node, bin) {
+  return `[Unit]
+Description=Hatchee — watch & approve your coding agents from your phone
+After=network-online.target
+
+[Service]
+ExecStart=${node} ${bin} up
+Restart=always
+RestartSec=10
+Environment=PATH=${servicePath(node)}
+
+[Install]
+WantedBy=default.target
+`;
+}
+function run(cmd, args) {
+  try {
+    execFileSync(cmd, args, { stdio: "pipe" });
+  } catch (e) {
+    console.log(`  · ${cmd} ${args.join(" ")} → ${String(e?.stderr || e?.message || e).trim().slice(0, 200)}`);
+  }
+}
+function installService(print = false) {
+  const node = process.execPath;
+  if (process.platform === "darwin") {
+    const content = plistContent(node, STABLE_BIN);
+    if (print) {
+      console.log(`
+  would write ${PLIST}:
+
+${content}
+  bundle → ${STABLE_BIN}
+  load → launchctl bootstrap gui/$(id -u) ${PLIST}
+`);
+      return;
+    }
+    copyStableBin();
+    mkdirSync3(dirname(PLIST), { recursive: true });
+    writeFileSync3(PLIST, content);
+    const uid = String(process.getuid?.() ?? "");
+    run("launchctl", ["bootout", `gui/${uid}/${LABEL}`]);
+    run("launchctl", ["bootstrap", `gui/${uid}`, PLIST]);
+    run("launchctl", ["enable", `gui/${uid}/${LABEL}`]);
+    console.log(`
+  ✓ Hatchee will now run in the background (launchd: ${LABEL})`);
+    console.log(`    logs    ${LOG}`);
+    console.log(`    pair    npx hatchee pair        (one terminal, once — to add a phone)`);
+    console.log(`    stop    npx hatchee uninstall-service`);
+    console.log(`
+  Don't also run \`hatchee up\` manually — the service is the single instance.
+`);
+    return;
+  }
+  if (process.platform === "linux") {
+    const content = unitContent(node, STABLE_BIN);
+    if (print) {
+      console.log(`
+  would write ${UNIT}:
+
+${content}
+  bundle → ${STABLE_BIN}
+  enable → systemctl --user enable --now hatchee.service (+ loginctl enable-linger)
+`);
+      return;
+    }
+    copyStableBin();
+    mkdirSync3(dirname(UNIT), { recursive: true });
+    writeFileSync3(UNIT, content);
+    run("systemctl", ["--user", "daemon-reload"]);
+    run("systemctl", ["--user", "enable", "--now", "hatchee.service"]);
+    run("loginctl", ["enable-linger", process.env.USER ?? ""]);
+    console.log(`
+  ✓ Hatchee will now run in the background (systemd --user: hatchee.service)`);
+    console.log(`    logs    journalctl --user -u hatchee.service -f`);
+    console.log(`    pair    npx hatchee pair`);
+    console.log(`    stop    npx hatchee uninstall-service
+`);
+    return;
+  }
+  console.log(`
+  Auto-start service isn't supported on ${process.platform} yet.`);
+  console.log(`  Run \`npx hatchee up\` in a terminal you keep open (or use WSL on Windows).
+`);
+}
+function uninstallService() {
+  if (process.platform === "darwin") {
+    const uid = String(process.getuid?.() ?? "");
+    run("launchctl", ["bootout", `gui/${uid}/${LABEL}`]);
+    if (existsSync3(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)) {
+      rmSync(UNIT);
+      run("systemctl", ["--user", "daemon-reload"]);
+    }
+    console.log(`  ✓ background service removed (systemd --user: hatchee.service)`);
+  } else {
+    console.log(`  no background service on ${process.platform}.`);
+  }
+  if (existsSync3(STABLE_BIN))
+    rmSync(STABLE_BIN);
+}
+
 // src/cli.ts
-var VERSION2 = "0.1.1";
+var VERSION2 = "0.1.3";
 var cmd = process.argv[2] ?? "help";
 switch (cmd) {
   case "up": {
@@ -12197,39 +12392,19 @@ switch (cmd) {
   }
   case "pair": {
     const cfg = loadConfig();
+    const remote = await remotePair(cfg.hookPort);
+    if (remote) {
+      printPairing(remote, true);
+      break;
+    }
     const daemon = new Daemon(cfg);
     if (!safeListen(daemon))
       break;
     const relay = new RelayClient(daemon, cfg.relayUrl, cfg.secretKey);
     relay.start();
     installHooks(hatcheeBin());
-    const code = process.env.DROVER_PAIR_CODE ?? newPairingCode();
-    daemon.openPairingWindow(code);
-    const myPub = b64.encode(publicKey(b64.decode(cfg.secretKey)));
-    const lan = lanIPv4();
-    const payload = JSON.stringify({
-      v: 1,
-      ...lan ? { ws: `ws://${lan}:${cfg.wsPort}` } : {},
-      code,
-      host: cfg.host,
-      pk: myPub,
-      relay: cfg.relayUrl,
-      room: relay.room
-    });
-    banner();
-    import_qrcode_terminal.default.generate(payload, { small: true }, (qr) => {
-      console.log(qr);
-      console.log(`  scan with the Hatchee iOS app \u2014 or enter manually:`);
-      if (lan)
-        console.log(`  LAN address   ${lan}:${cfg.wsPort}`);
-      else
-        console.log(`  LAN address   no LAN address (VPN?) \u2014 phone will use the relay`);
-      console.log(`  relay         ${cfg.relayUrl}/c/${relay.room}?role=phone`);
-      console.log(`  code          ${code}   (valid 5 minutes, single use)
-`);
-      console.log(`  keeping the daemon running after pairing\u2026 (^C to stop)`);
-      tips();
-    });
+    const info = daemon.pairingPayload(process.env.DROVER_PAIR_CODE);
+    printPairing(info, false);
     break;
   }
   case "hook":
@@ -12259,6 +12434,12 @@ switch (cmd) {
     console.log(`revoked ${dev.name}`);
     break;
   }
+  case "install-service":
+    installService(process.argv[3] === "--print" || process.argv[3] === "--dry-run");
+    break;
+  case "uninstall-service":
+    uninstallService();
+    break;
   case "uninstall-hooks":
     uninstallHooks();
     console.log("hatchee hooks removed from ~/.claude/settings.json");
@@ -12271,30 +12452,66 @@ switch (cmd) {
   default:
     banner();
     console.log(`  usage:
-    hatchee pair             pair a phone \u2014 prints a QR + 6-digit code (do this first)
-    hatchee up               start watching (no new pairing) \u2014 installs Claude Code hooks
-    hatchee devices          list paired phones
-    hatchee revoke <id>      revoke a lost phone
-    hatchee uninstall-hooks  remove Hatchee's hooks from ~/.claude/settings.json
+    hatchee pair              pair a phone \u2014 prints a QR + 6-digit code (do this first)
+    hatchee up                start watching (no new pairing) \u2014 installs Claude Code hooks
+    hatchee install-service   run in the background across logins/reboots (recommended)
+    hatchee uninstall-service stop running in the background
+    hatchee devices           list paired phones
+    hatchee revoke <id>       revoke a lost phone
+    hatchee uninstall-hooks   remove Hatchee's hooks from ~/.claude/settings.json
     hatchee version
 
-  update      npx hatchee@latest pair      (npx always fetches the newest)
-  uninstall   npx hatchee uninstall-hooks  then  rm -rf ~/.hatchee
-  config      ~/.hatchee/config.json       (your daemon identity + paired devices)`);
+  keep it on    npx hatchee install-service   (so it survives closing the terminal)
+  update        npx hatchee@latest pair       (npx always fetches the newest)
+  uninstall     npx hatchee uninstall-service && npx hatchee uninstall-hooks && rm -rf ~/.hatchee
+  config        ~/.hatchee/config.json        (your daemon identity + paired devices)`);
 }
 function banner() {
   console.log(`
   \uD83D\uDC23 hatchee ${VERSION2} \u2014 your coding agents, alive on your lock screen
 `);
 }
+async function remotePair(hookPort) {
+  try {
+    const r = await fetch(`http://127.0.0.1:${hookPort}/pair`, { method: "POST", signal: AbortSignal.timeout(2500) });
+    if (!r.ok)
+      return null;
+    const info = await r.json();
+    return info?.payload ? info : null;
+  } catch {
+    return null;
+  }
+}
+function printPairing(info, viaService) {
+  banner();
+  import_qrcode_terminal.default.generate(JSON.stringify(info.payload), { small: true }, (qr) => {
+    console.log(qr);
+    console.log(`  scan with the Hatchee iOS app \u2014 or enter manually:`);
+    if (info.lan)
+      console.log(`  LAN address   ${info.lan}:${info.wsPort}`);
+    else
+      console.log(`  LAN address   no LAN address (VPN?) \u2014 phone will use the relay`);
+    console.log(`  relay         ${info.relay}/c/${info.room}?role=phone`);
+    console.log(`  code          ${info.code}   (valid 5 minutes, single use)
+`);
+    if (viaService)
+      console.log(`  paired against the Hatchee already running here \u2014 it keeps running.
+`);
+    else {
+      console.log(`  keeping the daemon running after pairing\u2026 (^C to stop)`);
+      tips();
+    }
+  });
+}
 function tips() {
   console.log(`
   \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
-   stop       ^C   (your coding agents keep running \u2014 you just stop watching)
-   update     npx hatchee@latest pair
-   uninstall  npx hatchee uninstall-hooks    (removes our Claude Code hooks)
-              rm -rf ~/.hatchee              (also wipes pairing + identity)
-   help       npx hatchee
+   keep it on  npx hatchee install-service   (survives closing the terminal / reboot)
+   stop        ^C   (your coding agents keep running \u2014 you just stop watching)
+   update      npx hatchee@latest pair
+   uninstall   npx hatchee uninstall-service && npx hatchee uninstall-hooks
+               rm -rf ~/.hatchee              (also wipes pairing + identity)
+   help        npx hatchee
   \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500`);
 }
 function safeListen(daemon) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hatchee",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "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" },