tabclaude-host 0.1.0 → 0.1.1

package/claude-client.js

@@ -1,25 +1,37 @@
-import { execFile } from "node:child_process";
+import { spawn } from "node:child_process";
 import { stderr } from "node:process";
 
 const claudeBin = process.env.CLAUDE_PATH || "claude";
-const CLAUDE_TIMEOUT = 30000;
+const CLAUDE_TIMEOUT = 600000;
 
 function runClaude(prompt) {
   return new Promise((resolve, reject) => {
-    const child = execFile(
-      claudeBin,
-      ["--print", "--", prompt],
-      { timeout: CLAUDE_TIMEOUT, maxBuffer: 1024 * 1024 },
-      (err, stdoutData, stderrData) => {
-        if (err) {
-          if (stderrData) stderr.write(`claude stderr: ${stderrData}\n`);
-          reject(new Error(`Claude CLI failed: ${err.message}`));
-          return;
-        }
-        resolve(stdoutData.trim());
-      },
-    );
-    // Close stdin so claude CLI doesn't wait for input
+    const child = spawn(claudeBin, ["--print"], {
+      env: process.env,
+      timeout: CLAUDE_TIMEOUT,
+    });
+
+    let stdoutData = "";
+    let stderrData = "";
+
+    child.stdout.on("data", (data) => { stdoutData += data; });
+    child.stderr.on("data", (data) => { stderrData += data; });
+
+    child.on("error", (err) => {
+      reject(new Error(`Claude spawn error: ${err.message}`));
+    });
+
+    child.on("close", (code) => {
+      if (code !== 0) {
+        if (stderrData) stderr.write(`claude stderr: ${stderrData}\n`);
+        reject(new Error(`Claude CLI exited with code ${code}`));
+        return;
+      }
+      resolve(stdoutData.trim());
+    });
+
+    // Send prompt via stdin (not as CLI arg) — required for auth env to work
+    child.stdin.write(prompt);
     child.stdin.end();
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabclaude-host",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Tabclaude Native Messaging Host with Claude CLI integration",
   "author": "Brady",
   "license": "MIT",

package/scripts/setup.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { writeFileSync, mkdirSync, chmodSync, existsSync } from "node:fs";
+import { writeFileSync, mkdirSync, chmodSync, existsSync, realpathSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { platform, homedir } from "node:os";
@@ -8,24 +8,42 @@ import { execSync } from "node:child_process";
 
 const HOST_NAME = "com.tabclaude.host";
 
+// Returns true if the path resolves (via symlinks) to a .js file — not a real binary
+function isJsWrapper(p) {
+  try {
+    return realpathSync(p).endsWith(".js");
+  } catch {
+    return false;
+  }
+}
+
 function findClaude() {
+  const candidates = [];
+
   // 1. which claude
   try {
     const p = execSync("which claude", { encoding: "utf-8" }).trim();
-    if (p) return p;
+    if (p) candidates.push(p);
   } catch {}
 
-  // 2. sibling of node
-  const sibling = join(dirname(process.execPath), "claude");
-  if (existsSync(sibling)) return sibling;
+  // 2. sibling of node binary
+  candidates.push(join(dirname(process.execPath), "claude"));
 
-  // 3. /usr/local/bin/claude
-  if (existsSync("/usr/local/bin/claude")) return "/usr/local/bin/claude";
+  // 3. common paths
+  candidates.push(
+    "/usr/local/bin/claude",
+    "/opt/homebrew/bin/claude",
+  );
 
-  // 4. /opt/homebrew/bin/claude
-  if (existsSync("/opt/homebrew/bin/claude")) return "/opt/homebrew/bin/claude";
+  // Prefer real binaries over JS wrappers (e.g. npm-installed symlinks to cli.js)
+  for (const p of candidates) {
+    if (existsSync(p) && !isJsWrapper(p)) return p;
+  }
+  // Fall back to JS wrappers if no real binary found
+  for (const p of candidates) {
+    if (existsSync(p)) return p;
+  }
 
-  // 5. fallback
   console.warn(
     `[${HOST_NAME}] WARNING: Claude CLI not found. Install it and ensure it's in PATH.`
   );