@instaclaw/dispatch 0.3.0 → 0.4.0

package/dist/executor.js

@@ -62,6 +62,9 @@ async function doClick(params) {
     const usecomputer = await getUC();
     const x = Number(params.x);
     const y = Number(params.y);
+    if (isNaN(x) || isNaN(y) || x < 0 || y < 0) {
+        return { success: false, error: `Invalid coordinates: (${params.x}, ${params.y}). Must be non-negative numbers.` };
+    }
     const coordMap = params.coordMap ? String(params.coordMap) : lastCoordMap;
     let point = { x, y };
     if (coordMap) {

package/dist/index.js

@@ -3,8 +3,9 @@
  * @instaclaw/dispatch — Local relay for InstaClaw agents to control your computer.
  *
  * Usage:
- *   npx @instaclaw/dispatch                    # Interactive setup
- *   npx @instaclaw/dispatch --token XXX --vm HOST  # Direct connect
+ *   npx @instaclaw/dispatch                          # Interactive (pairing code)
+ *   npx @instaclaw/dispatch --pair ABCD-1234         # Pair with code
+ *   npx @instaclaw/dispatch --token XXX --vm HOST    # Direct connect (advanced)
  */
 import { loadConfig, saveConfig, getConfigPath } from "./config.js";
 import { checkPermissions, printPermissionGuide, runPermissionTest } from "./permissions.js";
@@ -13,6 +14,7 @@ import { closeSupervisor, setMode } from "./supervisor.js";
 import chalk from "chalk";
 import readline from "readline";
 import os from "os";
+const API_BASE = "https://instaclaw.io";
 async function main() {
     console.log(`
   ${chalk.bold("InstaClaw Dispatch")} ${chalk.dim("— Remote Computer Control")}
@@ -25,33 +27,37 @@ async function main() {
         printPermissionGuide(perms);
         if (perms.screenRecording === false || perms.accessibility === false) {
             await waitForEnter();
-            // Re-check after user grants
-            const recheck = checkPermissions();
-            if (recheck.screenRecording === false) {
-                console.log("  Warning: Screen Recording still not granted. Screenshots may fail.\n");
-            }
-            if (recheck.accessibility === false) {
-                console.log("  Warning: Accessibility still not granted. Click/type may fail.\n");
-            }
         }
         else {
-            // Run a functional test to be sure
             console.log("  Running permission test...");
             const test = await runPermissionTest();
             if (test.ok) {
-                console.log("  Permissions: all OK\n");
+                console.log(`  ${chalk.green("✓")} Permissions: all OK\n`);
             }
             else {
-                console.log(`  Warning: ${test.error}`);
+                console.log(`  ${chalk.yellow("⚠")} ${test.error}`);
                 console.log("  Continuing anyway — some commands may fail.\n");
             }
         }
     }
-    // 2. Load or create config
+    // 2. Resolve config: --pair, --token+--vm, saved config, or interactive
     let config = loadConfig();
     const args = parseArgs();
-    if (args.token && args.vm) {
-        // CLI args override config
+    // Path A: Pairing code (simplest)
+    if (args.pair) {
+        console.log(`  Redeeming pairing code ${chalk.bold(args.pair)}...`);
+        const result = await redeemPairingCode(args.pair);
+        if (result) {
+            config = { gatewayToken: result.token, vmAddress: result.vmAddress, port: 8765, mode: "supervised" };
+            saveConfig(config);
+            console.log(`  ${chalk.green("✓")} Paired successfully\n`);
+        }
+        else {
+            process.exit(1);
+        }
+    }
+    // Path B: Direct token + VM (advanced)
+    else if (args.token && args.vm) {
         config = {
             gatewayToken: args.token,
             vmAddress: args.vm,
@@ -60,40 +66,39 @@ async function main() {
         };
         saveConfig(config);
     }
-    if (!config?.gatewayToken || !config?.vmAddress) {
-        // Interactive setup
+    // Path C: No args — interactive setup
+    else if (!config?.gatewayToken || !config?.vmAddress) {
         config = await interactiveSetup(config);
         saveConfig(config);
         console.log(`  Config saved to ${getConfigPath()}\n`);
     }
     // Set supervisor mode
-    if (config.mode === "autonomous") {
+    if (config.mode === "autonomous" || args.autonomous) {
+        config.mode = "autonomous";
         setMode("autonomous");
     }
-    console.log(`  VM:   ${config.vmAddress}:${config.port}`);
-    console.log(`  Mode: ${config.mode}`);
-    console.log(`  Token: ${config.gatewayToken.substring(0, 8)}...\n`);
+    console.log(`  ${chalk.dim("VM:")}   ${config.vmAddress}:${config.port}`);
+    console.log(`  ${chalk.dim("Mode:")} ${config.mode}`);
+    console.log(`  ${chalk.dim("Token:")} ${config.gatewayToken.substring(0, 8)}...\n`);
     // 3. Connect to VM
     connect({
         vmAddress: config.vmAddress,
         port: config.port,
         gatewayToken: config.gatewayToken,
         mode: config.mode,
-        rejectUnauthorized: false, // Accept self-signed (TOFU)
+        rejectUnauthorized: false,
         certFingerprint: config.certFingerprint,
         onConnect: () => {
-            if (config.mode === "autonomous") {
-                console.log(`\n  Dispatch mode: AUTONOMOUS`);
-                console.log(`  All actions auto-approved (dangerous actions still require confirmation).`);
-            }
-            else {
-                console.log(`\n  Dispatch mode: SUPERVISED`);
-                console.log(`  Screenshots auto-approved. Actions require [Enter] to confirm.`);
-            }
-            console.log(`  Press 'a' to toggle autonomous mode. Press Ctrl+C to disconnect.\n`);
-            // Runtime mode switching via keypress
+            console.log("");
+            console.log(`  ${chalk.green("✓")} ${chalk.bold("Connected to your agent!")}`);
+            console.log(`  ${chalk.dim("Mode:")} ${config.mode === "autonomous" ? chalk.yellow("Autonomous") : chalk.green("Supervised")}`);
+            console.log(`  ${chalk.dim("Your agent can now control this computer.")}`);
+            console.log("");
+            console.log(`  ${chalk.dim("Press 'a' to toggle mode. Ctrl+C to disconnect.")}`);
+            console.log("");
+            // Runtime mode switching
             if (process.stdin.isTTY) {
-                process.stdin.setRawMode?.(false); // Ensure line mode for supervisor readline
+                process.stdin.setRawMode?.(false);
                 process.stdin.on("data", (chunk) => {
                     const key = chunk.toString().trim().toLowerCase();
                     if (key === "a") {
@@ -101,50 +106,101 @@ async function main() {
                         config.mode = newMode;
                         setMode(newMode);
                         saveConfig(config);
-                        console.log(`\n  Mode switched to: ${newMode.toUpperCase()}\n`);
+                        console.log(`\n  Mode: ${newMode === "autonomous" ? chalk.yellow("AUTONOMOUS") : chalk.green("SUPERVISED")}\n`);
                     }
                 });
             }
         },
-        onDisconnect: () => {
-            // Will auto-reconnect
-        },
+        onDisconnect: () => { },
         onCertFingerprint: (fp) => {
-            // TOFU: save fingerprint on first connection
             if (config && !config.certFingerprint) {
                 config.certFingerprint = fp;
                 saveConfig(config);
-                console.log(`  TLS fingerprint saved (TOFU): ${fp.substring(0, 20)}...`);
             }
         },
     });
-    // 4. Handle Ctrl+C
+    // 4. Ctrl+C
     process.on("SIGINT", () => {
-        console.log("\n  Disconnecting...");
+        console.log(`\n  ${chalk.dim("Disconnecting...")}`);
         disconnect();
         closeSupervisor();
         process.exit(0);
     });
 }
+// ── Pairing Code ──
+async function redeemPairingCode(code) {
+    try {
+        const res = await fetch(`${API_BASE}/api/vm/dispatch-pair/${encodeURIComponent(code)}`);
+        const data = await res.json();
+        if (data.error) {
+            console.log(`  ${chalk.red("✗")} ${data.error}`);
+            return null;
+        }
+        return { token: data.token, vmAddress: data.vmAddress };
+    }
+    catch (err) {
+        console.log(`  ${chalk.red("✗")} Failed to redeem pairing code: ${err}`);
+        return null;
+    }
+}
+// ── Interactive Setup ──
 async function interactiveSetup(existing) {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     const ask = (q, def) => new Promise((resolve) => {
         const prompt = def ? `${q} [${def}]: ` : `${q}: `;
         rl.question(`  ${prompt}`, (ans) => resolve(ans.trim() || def || ""));
     });
-    console.log("  First-time setup:\n");
-    const token = await ask("Gateway token", existing?.gatewayToken);
-    const vm = await ask("VM address (IP or hostname)", existing?.vmAddress);
-    const portStr = await ask("Port", String(existing?.port || 8765));
+    console.log(`  ${chalk.bold("Welcome!")} Let's connect to your agent.\n`);
+    console.log(`  Got a pairing code from ${chalk.underline("instaclaw.io/settings")}?`);
+    const input = await ask("Enter pairing code (or 'a' for advanced setup)");
+    // Check if it's a pairing code (format: XXXX-YYYY)
+    if (input.toLowerCase() === "a") {
+        // Advanced: manual token + IP
+        console.log("");
+        let token = await ask("Gateway token", existing?.gatewayToken);
+        let vm = await ask("VM address (IP)", existing?.vmAddress);
+        // Swap detection
+        const isHexLong = (s) => /^[0-9a-f]{32,}$/i.test(s);
+        const isIPish = (s) => /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(s);
+        if (isHexLong(vm)) {
+            console.log(chalk.yellow("\n  That looks like a gateway token, not an IP address."));
+            const swap = await ask("Enter your VM IP");
+            if (swap) {
+                token = vm;
+                vm = swap;
+            }
+        }
+        else if (isIPish(token)) {
+            console.log(chalk.yellow("\n  That looks like an IP, not a gateway token."));
+            const swap = await ask("Enter your gateway token");
+            if (swap) {
+                vm = token;
+                token = swap;
+            }
+        }
+        rl.close();
+        return { gatewayToken: token, vmAddress: vm, port: 8765, mode: "supervised" };
+    }
+    // It's a pairing code or something else
+    const isHexLong = (s) => /^[0-9a-f]{32,}$/i.test(s);
+    if (isHexLong(input)) {
+        console.log(chalk.yellow("\n  That looks like a gateway token, not a pairing code."));
+        console.log(`  Get your pairing code at ${chalk.underline("instaclaw.io/settings")}`);
+        console.log(`  Or press 'a' for advanced setup.\n`);
+        rl.close();
+        return interactiveSetup(existing); // Retry
+    }
+    // Try to redeem as pairing code
     rl.close();
-    return {
-        gatewayToken: token,
-        vmAddress: vm,
-        port: parseInt(portStr, 10) || 8765,
-        mode: "supervised",
-        certFingerprint: existing?.certFingerprint,
-    };
+    const result = await redeemPairingCode(input);
+    if (result) {
+        return { gatewayToken: result.token, vmAddress: result.vmAddress, port: 8765, mode: "supervised" };
+    }
+    // Failed — fall back to advanced
+    console.log("  Falling back to advanced setup...\n");
+    return interactiveSetup(existing);
 }
+// ── Arg Parsing ──
 function parseArgs() {
     const args = process.argv.slice(2);
     const result = {};
@@ -161,6 +217,9 @@ function parseArgs() {
         else if (args[i] === "--autonomous" || args[i] === "--auto") {
             result.autonomous = true;
         }
+        else if ((args[i] === "--pair" || args[i] === "--code") && args[i + 1]) {
+            result.pair = args[++i];
+        }
     }
     return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instaclaw/dispatch",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Let your InstaClaw AI agent control your computer — screenshots, clicks, typing, and more via a secure WebSocket relay",
   "bin": {
     "instaclaw-dispatch": "./dist/index.js"