hatchee 0.1.2 → 0.1.4

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,23 @@ 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 ?? "";
+      const jsonPost = req.method === "POST" && String(req.headers["content-type"] ?? "").includes("application/json");
+      if (url === "/pair") {
+        if (!jsonPost) {
+          res.writeHead(415).end("expected application/json");
+          return;
+        }
+        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 (!jsonPost || url !== "/hook") {
         res.writeHead(404).end("not found");
         return;
       }
@@ -11951,6 +11985,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 +12021,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 +12102,7 @@ class RelayClient {
     }
   }
 }
-function b64url(bytes) {
+function b64url2(bytes) {
   return Buffer.from(bytes).toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
 
@@ -12108,7 +12145,12 @@ function installHooks(droverBin) {
   return settingsPath();
 }
 function isOurs(x) {
-  return typeof x?.command === "string" && /\bhook'?\s*$/.test(x.command.trimEnd()) && (x.command.includes("hatchee") || x.command.includes("cli.ts") || x.command.includes("cli.mjs") || x.command.includes("drover"));
+  if (typeof x?.command !== "string")
+    return false;
+  const cmd = x.command.trimEnd();
+  if (!/\bhook'?\s*$/.test(cmd))
+    return false;
+  return cmd.includes("hatchee") || cmd.includes("drover") || cmd.includes("daemon/src/cli.ts");
 }
 function uninstallHooks() {
   if (!existsSync2(settingsPath()))
@@ -12126,12 +12168,22 @@ function uninstallHooks() {
 function readStdin() {
   return new Promise((resolve) => {
     let data = "";
+    let done = false;
+    const finish = () => {
+      if (!done) {
+        done = true;
+        resolve(data);
+      }
+    };
     process.stdin.setEncoding("utf8");
     process.stdin.on("data", (c) => {
       data += c;
     });
-    process.stdin.on("end", () => resolve(data));
-    setTimeout(() => resolve(data), 2000);
+    process.stdin.on("end", finish);
+    setTimeout(() => {
+      if (data === "")
+        finish();
+    }, 2000);
   });
 }
 async function runHook(hookPort) {
@@ -12181,17 +12233,20 @@ 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"
+    "/sbin",
+    "/opt/homebrew/bin",
+    "/usr/local/bin",
+    join3(HOME, ".bun/bin"),
+    join3(HOME, ".npm-global/bin"),
+    join3(HOME, ".local/bin")
   ].join(":");
 }
+function xmlEsc(s) {
+  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
 function copyStableBin() {
   mkdirSync3(BIN_DIR, { recursive: true });
   const src = process.argv[1];
@@ -12201,7 +12256,7 @@ function copyStableBin() {
   }
 }
 function plistContent(node, bin) {
-  const args = [node, bin, "up"].map((s) => `    <string>${s}</string>`).join(`
+  const args = [node, bin, "up"].map((s) => `    <string>${xmlEsc(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">
@@ -12215,10 +12270,10 @@ ${args}
   <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>StandardOutPath</key><string>${xmlEsc(LOG)}</string>
+  <key>StandardErrorPath</key><string>${xmlEsc(LOG)}</string>
   <key>EnvironmentVariables</key>
-  <dict><key>PATH</key><string>${servicePath(node)}</string></dict>
+  <dict><key>PATH</key><string>${xmlEsc(servicePath(node))}</string></dict>
 </dict>
 </plist>
 `;
@@ -12229,10 +12284,10 @@ Description=Hatchee — watch & approve your coding agents from your phone
 After=network-online.target
 
 [Service]
-ExecStart=${node} ${bin} up
+ExecStart="${node}" "${bin}" up
 Restart=always
 RestartSec=10
-Environment=PATH=${servicePath(node)}
+Environment="PATH=${servicePath(node)}"
 
 [Install]
 WantedBy=default.target
@@ -12241,12 +12296,22 @@ WantedBy=default.target
 function run(cmd, args) {
   try {
     execFileSync(cmd, args, { stdio: "pipe" });
+    return true;
   } catch (e) {
     console.log(`  · ${cmd} ${args.join(" ")} → ${String(e?.stderr || e?.message || e).trim().slice(0, 200)}`);
+    return false;
   }
 }
 function installService(print = false) {
   const node = process.execPath;
+  const src = process.argv[1] ?? "";
+  if (!print && src && !/\.(mjs|cjs|js)$/.test(src)) {
+    console.log(`
+  ⚠ running from source (${src}); the service needs the built bundle.`);
+    console.log(`    use \`npx hatchee install-service\` for a real install.
+`);
+    return;
+  }
   if (process.platform === "darwin") {
     const content = plistContent(node, STABLE_BIN);
     if (print) {
@@ -12264,8 +12329,15 @@ ${content}
     writeFileSync3(PLIST, content);
     const uid = String(process.getuid?.() ?? "");
     run("launchctl", ["bootout", `gui/${uid}/${LABEL}`]);
-    run("launchctl", ["bootstrap", `gui/${uid}`, PLIST]);
+    const ok = run("launchctl", ["bootstrap", `gui/${uid}`, PLIST]);
     run("launchctl", ["enable", `gui/${uid}/${LABEL}`]);
+    if (!ok) {
+      console.log(`
+  ⚠ wrote ${PLIST} but launchctl bootstrap failed (see the message above).`);
+      console.log(`    try manually:  launchctl bootstrap gui/${uid} ${PLIST}
+`);
+      return;
+    }
     console.log(`
   ✓ Hatchee will now run in the background (launchd: ${LABEL})`);
     console.log(`    logs    ${LOG}`);
@@ -12292,8 +12364,15 @@ ${content}
     mkdirSync3(dirname(UNIT), { recursive: true });
     writeFileSync3(UNIT, content);
     run("systemctl", ["--user", "daemon-reload"]);
-    run("systemctl", ["--user", "enable", "--now", "hatchee.service"]);
+    const ok = run("systemctl", ["--user", "enable", "--now", "hatchee.service"]);
     run("loginctl", ["enable-linger", process.env.USER ?? ""]);
+    if (!ok) {
+      console.log(`
+  ⚠ wrote ${UNIT} but \`systemctl --user enable --now\` failed (see above).`);
+      console.log(`    is the user systemd bus available? try manually: systemctl --user enable --now hatchee.service
+`);
+      return;
+    }
     console.log(`
   ✓ Hatchee will now run in the background (systemd --user: hatchee.service)`);
     console.log(`    logs    journalctl --user -u hatchee.service -f`);
@@ -12329,7 +12408,7 @@ function uninstallService() {
 }
 
 // src/cli.ts
-var VERSION2 = "0.1.2";
+var VERSION2 = "0.1.4";
 var cmd = process.argv[2] ?? "help";
 switch (cmd) {
   case "up": {
@@ -12360,39 +12439,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":
@@ -12459,6 +12518,42 @@ function banner() {
   \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",
+      headers: { "content-type": "application/json" },
+      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

package/package.json

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