hatchee 0.1.3 → 0.1.5

package/dist/cli.mjs

@@ -11942,7 +11942,13 @@ class Daemon {
     });
     const hooks = createServer((req, res) => {
       const url = req.url ?? "";
-      if (req.method === "POST" && url === "/pair") {
+      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");
+          return;
+        }
         try {
           res.writeHead(200, { "content-type": "application/json" });
           res.end(JSON.stringify(self.pairingPayload()));
@@ -11952,7 +11958,7 @@ class Daemon {
         }
         return;
       }
-      if (req.method !== "POST" || url !== "/hook") {
+      if (!jsonPost || url !== "/hook") {
         res.writeHead(404).end("not found");
         return;
       }
@@ -12140,7 +12146,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()))
@@ -12158,12 +12169,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) {
@@ -12211,18 +12232,20 @@ 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 [
+  const system = ["/usr/bin", "/bin", "/usr/sbin", "/sbin"];
+  const userTool = [
     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(":");
+    join3(HOME, ".bun/bin"),
+    join3(HOME, ".npm-global/bin"),
+    join3(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;");
 }
 function copyStableBin() {
   mkdirSync3(BIN_DIR, { recursive: true });
@@ -12233,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">
@@ -12247,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>
 `;
@@ -12261,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
@@ -12273,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) {
@@ -12296,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}`);
@@ -12324,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`);
@@ -12361,7 +12408,7 @@ function uninstallService() {
 }
 
 // src/cli.ts
-var VERSION2 = "0.1.3";
+var VERSION2 = "0.1.5";
 var cmd = process.argv[2] ?? "help";
 switch (cmd) {
   case "up": {
@@ -12473,7 +12520,11 @@ function banner() {
 }
 async function remotePair(hookPort) {
   try {
-    const r = await fetch(`http://127.0.0.1:${hookPort}/pair`, { method: "POST", signal: AbortSignal.timeout(2500) });
+    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();

package/package.json

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