@clawcard/cli 2.1.1 → 2.1.3

package/extension/background.js

@@ -1,28 +1,23 @@
 // ClawCard Pay — Background Service Worker
-// Bridges native messaging host (CLI) ↔ content scripts (page frames)
+// Polls localhost:7891 for pending fill commands from the CLI
 
-const NATIVE_HOST = "com.clawcard.pay";
-let nativePort = null;
+const POLL_URL = "http://localhost:7891/pending";
+const RESULT_URL = "http://localhost:7891/result";
+const POLL_INTERVAL = 500;
 
-function connectNative() {
+async function poll() {
   try {
-    nativePort = chrome.runtime.connectNative(NATIVE_HOST);
-
-    nativePort.onMessage.addListener((message) => {
-      if (message.action === "fill") {
-        fillActiveTab(message);
+    const res = await fetch(POLL_URL);
+    if (res.ok) {
+      const message = await res.json();
+      if (message && message.action === "fill") {
+        await fillActiveTab(message);
       }
-    });
-
-    nativePort.onDisconnect.addListener(() => {
-      nativePort = null;
-      // Reconnect after delay
-      setTimeout(connectNative, 3000);
-    });
-  } catch (e) {
-    // Native host not available — retry later
-    setTimeout(connectNative, 5000);
+    }
+  } catch {
+    // Server not running — CLI hasn't started a pay command
   }
+  setTimeout(poll, POLL_INTERVAL);
 }
 
 async function fillActiveTab(message) {
@@ -33,67 +28,67 @@ async function fillActiveTab(message) {
     });
 
     if (!tab) {
-      sendNativeResponse({ success: false, error: "No active tab" });
+      await sendResult({ success: false, error: "No active tab" });
       return;
     }
 
-    // Try main frame first
-    try {
-      const response = await chrome.tabs.sendMessage(tab.id, message);
-      if (response && response.filled && response.filled.length > 0) {
-        sendNativeResponse(response);
-        return;
-      }
-    } catch {
-      // Main frame didn't have content script or no fields — try subframes
-    }
-
-    // Try all subframes
+    // Get all frames in the tab
     const frames = await chrome.webNavigation.getAllFrames({ tabId: tab.id });
     if (!frames || frames.length === 0) {
-      sendNativeResponse({
-        success: false,
-        error: "No frames found on the current page",
-      });
+      await sendResult({ success: false, error: "No frames found" });
       return;
     }
 
+    // Inject content script into ALL frames first (handles dynamically added iframes)
+    for (const frame of frames) {
+      try {
+        await chrome.scripting.executeScript({
+          target: { tabId: tab.id, frameIds: [frame.frameId] },
+          files: ["content.js"],
+        });
+      } catch {
+        // Can't inject into this frame — that's fine
+      }
+    }
+
+    // Small delay to let injected scripts initialize
+    await new Promise((r) => setTimeout(r, 100));
+
+    // Now try sending the fill command to each frame
     for (const frame of frames) {
-      if (frame.frameId === 0) continue; // already tried main frame
       try {
         const response = await chrome.tabs.sendMessage(tab.id, message, {
           frameId: frame.frameId,
         });
         if (response && response.filled && response.filled.length > 0) {
-          sendNativeResponse(response);
+          await sendResult(response);
           return;
         }
       } catch {
-        // This frame doesn't have our content script or no fields — continue
+        // No content script in this frame or no fields — continue
       }
     }
 
-    sendNativeResponse({
+    await sendResult({
       success: false,
       error: "No payment form fields found on the current page",
     });
   } catch (err) {
-    sendNativeResponse({
-      success: false,
-      error: err.message || "Unknown error",
-    });
+    await sendResult({ success: false, error: err.message || "Unknown error" });
   }
 }
 
-function sendNativeResponse(response) {
-  if (nativePort) {
-    try {
-      nativePort.postMessage(response);
-    } catch {
-      // Port disconnected
-    }
+async function sendResult(result) {
+  try {
+    await fetch(RESULT_URL, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(result),
+    });
+  } catch {
+    // CLI server might have timed out
   }
 }
 
-// Start native messaging connection
-connectNative();
+// Start polling
+poll();

package/extension/content.js

@@ -92,6 +92,13 @@ function fillField(el, value) {
   el.dispatchEvent(new Event("blur", { bubbles: true }));
 }
 
+// Guard against duplicate injection
+if (window.__clawcardPayInjected) {
+  // Already injected — just re-register listener
+} else {
+  window.__clawcardPayInjected = true;
+}
+
 // Listen for fill commands from background script
 chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
   if (message.action !== "fill") return;

package/extension/manifest.json

@@ -1,9 +1,9 @@
 {
   "manifest_version": 3,
   "name": "ClawCard Pay",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Fills payment form fields for ClawCard agents",
-  "permissions": ["nativeMessaging", "webNavigation"],
+  "permissions": ["webNavigation", "scripting", "activeTab"],
   "host_permissions": ["<all_urls>"],
   "background": {
     "service_worker": "background.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawcard/cli",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "The ClawCard CLI — manage your agent keys, billing, and setup from the terminal",
   "bin": {
     "clawcard": "./bin/clawcard.mjs"

package/src/commands/agent.js

@@ -239,14 +239,7 @@ export async function agentActivityCmd(options) {
 
 // ── Pay (fill payment form via browser extension) ──
 export async function agentPayCmd(options) {
-  const { writeFileSync, existsSync, readFileSync, unlinkSync, mkdirSync } =
-    await import("fs");
-  const { join } = await import("path");
-  const { homedir } = await import("os");
-
-  const clawcardDir = join(homedir(), ".clawcard");
-  const pendingPath = join(clawcardDir, "pending-pay.json");
-  const responsePath = join(clawcardDir, "pay-response.json");
+  const http = await import("http");
 
   // Get card details
   const agentId = await getAgentId();
@@ -266,45 +259,95 @@ export async function agentPayCmd(options) {
     return;
   }
 
-  // Format expiry as MM/YY
   const exp = `${String(card.exp_month).padStart(2, "0")}/${String(card.exp_year).slice(-2)}`;
+  const fillData = { action: "fill", pan: card.pan, exp, cvc: card.cvv };
 
-  // Clean up old response
-  try {
-    unlinkSync(responsePath);
-  } catch {}
-
-  // Write fill command for native host
-  mkdirSync(clawcardDir, { recursive: true });
-  writeFileSync(
-    pendingPath,
-    JSON.stringify({ action: "fill", pan: card.pan, exp, cvc: card.cvv })
-  );
-
-  // Poll for response (5 second timeout)
-  const start = Date.now();
-  while (Date.now() - start < 5000) {
-    if (existsSync(responsePath)) {
-      try {
-        const response = JSON.parse(readFileSync(responsePath, "utf-8"));
-        unlinkSync(responsePath);
-        if (options.json) return output(response, true);
-        if (response.success) {
-          console.log(`  Payment fields filled: ${response.filled.join(", ")}`);
+  // Start localhost HTTP server — extension polls this
+  const PORT = 7891;
+
+  const result = await new Promise((resolve) => {
+    let settled = false;
+
+    const server = http.createServer((req, res) => {
+      // CORS headers for extension
+      res.setHeader("Access-Control-Allow-Origin", "*");
+      res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
+      res.setHeader("Access-Control-Allow-Headers", "Content-Type");
+
+      if (req.method === "OPTIONS") {
+        res.writeHead(204);
+        res.end();
+        return;
+      }
+
+      // Extension polls this for pending fill commands
+      if (req.method === "GET" && req.url === "/pending") {
+        if (!settled) {
+          res.writeHead(200, { "Content-Type": "application/json" });
+          res.end(JSON.stringify(fillData));
         } else {
-          console.log(`  Error: ${response.error}`);
+          res.writeHead(204);
+          res.end();
         }
         return;
-      } catch {
-        // File being written — retry
       }
-    }
-    await new Promise((r) => setTimeout(r, 200));
-  }
 
-  // Timeout
-  const err =
-    "ClawCard extension not responding. Make sure it's installed: load ~/.clawcard/extension/ in chrome://extensions";
-  if (options.json) return output({ success: false, error: err }, true);
-  console.log(`  Error: ${err}`);
+      // Extension posts fill result here
+      if (req.method === "POST" && req.url === "/result") {
+        let body = "";
+        req.on("data", (chunk) => (body += chunk));
+        req.on("end", () => {
+          res.writeHead(200);
+          res.end("ok");
+          if (!settled) {
+            settled = true;
+            try {
+              resolve(JSON.parse(body));
+            } catch {
+              resolve({ success: false, error: "Invalid response from extension" });
+            }
+            server.close();
+          }
+        });
+        return;
+      }
+
+      res.writeHead(404);
+      res.end();
+    });
+
+    server.listen(PORT, "127.0.0.1", () => {
+      // Server started — extension will pick up the fill command
+    });
+
+    server.on("error", (err) => {
+      if (!settled) {
+        settled = true;
+        resolve({
+          success: false,
+          error: `Could not start pay server on port ${PORT}: ${err.message}`,
+        });
+      }
+    });
+
+    // Timeout after 10 seconds
+    setTimeout(() => {
+      if (!settled) {
+        settled = true;
+        server.close();
+        resolve({
+          success: false,
+          error:
+            "ClawCard extension not responding. Make sure it's loaded in Chrome: chrome://extensions → Load Unpacked → ~/.clawcard/extension/",
+        });
+      }
+    }, 10000);
+  });
+
+  if (options.json) return output(result, true);
+  if (result.success) {
+    console.log(`  Payment fields filled: ${result.filled.join(", ")}`);
+  } else {
+    console.log(`  Error: ${result.error}`);
+  }
 }

package/src/commands/setup.js

@@ -164,91 +164,6 @@ export async function setupCommand() {
 
     copyDir(extensionSource, extensionDest);
 
-    // Create native host wrapper script (Chrome requires an executable, not a .js file)
-    const nativeHostScript = join(home, ".clawcard", "native-host.js");
-    const nativeHostWrapper = join(home, ".clawcard", "native-host.sh");
-    const nativeHostSource = join(__dirname, "..", "native-host.js");
-
-    // Copy native host JS
-    copyFileSync(nativeHostSource, nativeHostScript);
-
-    // Create shell wrapper
-    const nodePath = process.execPath;
-    writeFileSync(
-      nativeHostWrapper,
-      `#!/bin/bash\nexec "${nodePath}" "${nativeHostScript}"\n`
-    );
-    // Make wrapper executable
-    const { chmodSync } = await import("fs");
-    chmodSync(nativeHostWrapper, "755");
-
-    // Detect extension ID from Chrome (or use broad matching with key)
-    // Read the extension ID from the installed manifest
-    const extensionManifestPath = join(extensionDest, "manifest.json");
-    const extensionManifest = JSON.parse(readFileSync(extensionManifestPath, "utf-8"));
-
-    // If no key in manifest, we need to accept any extension ID
-    // Chrome requires exact IDs — we'll add a stable key to the manifest
-    // For now, prompt user for their extension ID
-    let extensionId = "PLACEHOLDER";
-    try {
-      // Try to read from a saved config
-      const savedConfig = JSON.parse(readFileSync(join(home, ".clawcard", "extension-id.txt"), "utf-8"));
-      extensionId = savedConfig;
-    } catch {}
-
-    if (extensionId === "PLACEHOLDER") {
-      p.log.info("After loading the extension in Chrome, find its ID on chrome://extensions");
-      const idInput = await p.text({
-        message: "Enter the extension ID from chrome://extensions",
-        placeholder: "abcdefghijklmnopqrstuvwxyz123456",
-        validate: (v) => {
-          if (!v || v.length < 10) return "Paste the full extension ID from Chrome";
-        },
-      });
-      if (!p.isCancel(idInput)) {
-        extensionId = idInput;
-        writeFileSync(join(home, ".clawcard", "extension-id.txt"), JSON.stringify(extensionId));
-      }
-    }
-
-    // Register native messaging host
-    const platform = process.platform;
-    let nativeHostDir;
-
-    if (platform === "darwin") {
-      nativeHostDir = join(
-        home,
-        "Library",
-        "Application Support",
-        "Google",
-        "Chrome",
-        "NativeMessagingHosts"
-      );
-    } else {
-      nativeHostDir = join(
-        home,
-        ".config",
-        "google-chrome",
-        "NativeMessagingHosts"
-      );
-    }
-
-    mkdirSync(nativeHostDir, { recursive: true });
-
-    const nativeHostManifest = {
-      name: "com.clawcard.pay",
-      description: "ClawCard payment form filler",
-      path: nativeHostWrapper,
-      type: "stdio",
-      allowed_origins: [`chrome-extension://${extensionId}/`],
-    };
-
-    writeFileSync(
-      join(nativeHostDir, "com.clawcard.pay.json"),
-      JSON.stringify(nativeHostManifest, null, 2)
-    );
-
     s4.stop("Extension installed!");
 
     p.note(