hatchee 0.1.2 → 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(/=+$/, "");
 }
 
@@ -12329,7 +12361,7 @@ function uninstallService() {
 }
 
 // src/cli.ts
-var VERSION2 = "0.1.2";
+var VERSION2 = "0.1.3";
 var cmd = process.argv[2] ?? "help";
 switch (cmd) {
   case "up": {
@@ -12360,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":
@@ -12459,6 +12471,38 @@ 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", 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.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" },