wispy-cli 2.7.8 → 2.7.10

package/bin/wispy.mjs

@@ -49,6 +49,8 @@ Usage:
                                Manage configuration
   wispy model                  Show or change AI model
   wispy doctor                 Check system health
+  wispy browser [tabs|attach|navigate|screenshot|doctor]
+                               Browser control via local-browser-bridge
   wispy trust [level|log]      Security level & audit
   wispy ws [start-client|run-debug]
                                WebSocket operations
@@ -161,6 +163,27 @@ if (command === "doctor") {
     for (const c of checks) {
       console.log(`  ${c.ok ? "✓" : "✗"} ${c.name}`);
     }
+
+    // Browser bridge check
+    try {
+      const { BrowserBridge } = await import(join(rootDir, "core/browser.mjs"));
+      const bridge = new BrowserBridge();
+      const h = await bridge.health();
+      if (h?.ok || (!h?.error && h !== null)) {
+        const caps = await bridge.capabilities().catch(() => ({}));
+        const browsers = Array.isArray(caps?.browsers) ? caps.browsers : [];
+        const session = bridge._session;
+        const detail = browsers.length
+          ? `${browsers.join(", ")} available${session ? ", session active" : ""}`
+          : "running";
+        console.log(`  ✓ Browser bridge    ${detail}`);
+      } else {
+        console.log(`  ✗ Browser bridge    not running (start with: npx local-browser-bridge serve)`);
+      }
+    } catch {
+      console.log(`  ✗ Browser bridge    not running (start with: npx local-browser-bridge serve)`);
+    }
+
     console.log("");
 
     if (!provider?.key) {
@@ -175,6 +198,146 @@ if (command === "doctor") {
   process.exit(0);
 }
 
+// ── Browser ───────────────────────────────────────────────────────────────────
+
+if (command === "browser") {
+  try {
+    const { BrowserBridge } = await import(join(rootDir, "core/browser.mjs"));
+    const bridge = new BrowserBridge();
+    const sub = args[1];
+
+    if (!sub || sub === "status") {
+      // wispy browser — show status
+      const h = await bridge.health();
+      const status = bridge.status();
+      const running = h?.ok || (!h?.error && h !== null);
+      console.log(`\n  Browser Bridge`);
+      console.log(`  URL:      ${bridge.baseUrl}`);
+      console.log(`  Status:   ${running ? "✓ running" : "✗ not running"}`);
+      if (!running) {
+        console.log(`  Hint:     npx local-browser-bridge serve`);
+      } else {
+        const caps = await bridge.capabilities().catch(() => ({}));
+        if (caps?.browsers?.length) {
+          console.log(`  Browsers: ${caps.browsers.join(", ")}`);
+        }
+      }
+      if (status.session) {
+        console.log(`  Session:  ${status.session.id} (${status.session.browser ?? "unknown"})`);
+      } else {
+        console.log(`  Session:  none`);
+      }
+      console.log("");
+    } else if (sub === "tabs") {
+      // wispy browser tabs
+      const browser = args[2];
+      const result = await bridge.listTabs(browser);
+      if (result?.error) {
+        console.error(`  ✗ ${result.error}`);
+      } else {
+        const tabs = result?.tabs ?? result;
+        console.log(`\n  Open tabs:`);
+        if (Array.isArray(tabs)) {
+          for (const t of tabs) {
+            const title = t.title ?? t.name ?? "(no title)";
+            const url = t.url ?? "";
+            console.log(`    • ${title}${url ? `  —  ${url}` : ""}`);
+          }
+        } else {
+          console.log(JSON.stringify(tabs, null, 2));
+        }
+        console.log("");
+      }
+    } else if (sub === "attach") {
+      // wispy browser attach [browser]
+      const browser = args[2];
+      console.log(`\n  Attaching to ${browser ?? "best available browser"}...`);
+      let result;
+      if (browser) {
+        result = await bridge.attach(browser);
+      } else {
+        result = await bridge.autoAttach();
+      }
+      if (result?.error) {
+        console.error(`  ✗ ${result.error}`);
+      } else {
+        const id = result?.id ?? result?.sessionId ?? "?";
+        const br = result?.browser ?? browser ?? "unknown";
+        console.log(`  ✓ Attached (${br}, session: ${id})`);
+      }
+      console.log("");
+    } else if (sub === "navigate") {
+      // wispy browser navigate <url>
+      const url = args[2];
+      if (!url) { console.error("  Usage: wispy browser navigate <url>"); process.exit(1); }
+      console.log(`\n  Navigating to ${url}...`);
+      const result = await bridge.navigate(url);
+      if (result?.error) {
+        console.error(`  ✗ ${result.error}`);
+      } else {
+        console.log(`  ✓ Navigated`);
+      }
+      console.log("");
+    } else if (sub === "screenshot") {
+      // wispy browser screenshot
+      const result = await bridge.screenshot();
+      if (result?.error) {
+        console.error(`  ✗ ${result.error}`);
+      } else {
+        const data = result?.screenshot ?? result?.data;
+        if (data) {
+          console.log(`\n  Screenshot captured (${data.length} base64 chars)`);
+          // Optionally save to file
+          const outFile = args[2] ?? `wispy-screenshot-${Date.now()}.png`;
+          const buf = Buffer.from(data, "base64");
+          const { writeFile: wf } = await import("node:fs/promises");
+          await wf(outFile, buf);
+          console.log(`  Saved to: ${outFile}`);
+        } else {
+          console.log(`  Screenshot result:`, JSON.stringify(result, null, 2));
+        }
+        console.log("");
+      }
+    } else if (sub === "doctor") {
+      // wispy browser doctor — full diagnostics
+      console.log(`\n  Browser Bridge Diagnostics`);
+      console.log(`  URL: ${bridge.baseUrl}`);
+
+      const h = await bridge.health();
+      const running = h?.ok || (!h?.error && h !== null);
+      console.log(`  Health: ${running ? "✓ ok" : "✗ not running"}`);
+
+      if (running) {
+        const caps = await bridge.capabilities();
+        console.log(`\n  Capabilities:`);
+        console.log(JSON.stringify(caps, null, 2).split("\n").map(l => "    " + l).join("\n"));
+
+        const browsers = Array.isArray(caps?.browsers) ? caps.browsers : [];
+        for (const br of browsers) {
+          const diag = await bridge.diagnostics(br);
+          console.log(`\n  Diagnostics (${br}):`);
+          console.log(JSON.stringify(diag, null, 2).split("\n").map(l => "    " + l).join("\n"));
+        }
+
+        const sessions = await bridge.listSessions();
+        console.log(`\n  Sessions:`);
+        console.log(JSON.stringify(sessions, null, 2).split("\n").map(l => "    " + l).join("\n"));
+      } else {
+        console.log(`  Start with: npx local-browser-bridge serve`);
+      }
+      console.log("");
+    } else {
+      console.error(`  Unknown subcommand: ${sub}`);
+      console.log(`  Usage: wispy browser [status|tabs|attach|navigate <url>|screenshot|doctor]`);
+      process.exit(1);
+    }
+  } catch (err) {
+    console.error("Browser command error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
 // ── Trust ─────────────────────────────────────────────────────────────────────
 
 if (command === "trust") {

package/core/browser.mjs

@@ -0,0 +1,327 @@
+/**
+ * core/browser.mjs — Native browser integration via local-browser-bridge
+ *
+ * Connects to the local-browser-bridge HTTP API for browser control.
+ * Supports: health check, capabilities, diagnostics, tabs, attach,
+ * navigate, activate, screenshot, sessions.
+ *
+ * All HTTP calls use native fetch() (Node 18+).
+ */
+
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+
+const execAsync = promisify(execFile);
+const NOT_RUNNING_MSG =
+  "Bridge not running. Start with: npx local-browser-bridge serve";
+
+/**
+ * BrowserBridge — HTTP client for local-browser-bridge API.
+ *
+ * Usage:
+ *   const bridge = new BrowserBridge();
+ *   await bridge.ensureRunning();
+ *   const session = await bridge.autoAttach();
+ *   await bridge.navigate("https://example.com");
+ */
+export class BrowserBridge {
+  constructor(options = {}) {
+    this.baseUrl = options.baseUrl ?? "http://127.0.0.1:3000";
+    this.defaultBrowser = options.browser ?? "safari";
+    this._session = null; // current active session
+    this._engine = options.engine ?? null; // optional WispyEngine ref for audit/trust
+  }
+
+  // ── Private helpers ──────────────────────────────────────────────────────────
+
+  async _get(path, params = {}) {
+    const url = new URL(`${this.baseUrl}${path}`);
+    for (const [k, v] of Object.entries(params)) {
+      if (v !== undefined && v !== null) url.searchParams.set(k, v);
+    }
+    try {
+      const res = await fetch(url.toString(), {
+        signal: AbortSignal.timeout(10_000),
+      });
+      if (!res.ok) {
+        const body = await res.text().catch(() => "");
+        return { error: `HTTP ${res.status}: ${body.slice(0, 200)}` };
+      }
+      return res.json();
+    } catch (err) {
+      if (err.name === "AbortError" || err.name === "TimeoutError") {
+        return { error: NOT_RUNNING_MSG };
+      }
+      if (err.code === "ECONNREFUSED" || err.cause?.code === "ECONNREFUSED") {
+        return { error: NOT_RUNNING_MSG };
+      }
+      return { error: err.message ?? NOT_RUNNING_MSG };
+    }
+  }
+
+  async _post(path, body = {}) {
+    try {
+      const res = await fetch(`${this.baseUrl}${path}`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(body),
+        signal: AbortSignal.timeout(30_000),
+      });
+      if (!res.ok) {
+        const text = await res.text().catch(() => "");
+        return { error: `HTTP ${res.status}: ${text.slice(0, 200)}` };
+      }
+      return res.json();
+    } catch (err) {
+      if (err.name === "AbortError" || err.name === "TimeoutError") {
+        return { error: NOT_RUNNING_MSG };
+      }
+      if (err.code === "ECONNREFUSED" || err.cause?.code === "ECONNREFUSED") {
+        return { error: NOT_RUNNING_MSG };
+      }
+      return { error: err.message ?? NOT_RUNNING_MSG };
+    }
+  }
+
+  _audit(action, details = {}) {
+    if (!this._engine?.audit) return;
+    this._engine.audit.log({
+      type: "BROWSER_ACTION",
+      action,
+      ...details,
+    }).catch(() => {});
+  }
+
+  _trustLevel() {
+    if (!this._engine) return "careful";
+    return this._engine.config?.trustLevel ?? this._engine.permissions?.level ?? "careful";
+  }
+
+  _mayLog(action, detail) {
+    const level = this._trustLevel();
+    if (level !== "yolo") {
+      if (process.env.WISPY_DEBUG) {
+        process.stderr.write(`[browser] ${action}: ${detail}\n`);
+      }
+    }
+    this._audit(action, { detail });
+  }
+
+  // ── Health & discovery ───────────────────────────────────────────────────────
+
+  /** GET /health → { ok: true } */
+  async health() {
+    return this._get("/health");
+  }
+
+  /** GET /v1/capabilities?browser=X */
+  async capabilities(browser) {
+    return this._get("/v1/capabilities", { browser });
+  }
+
+  /** GET /v1/diagnostics?browser=X */
+  async diagnostics(browser) {
+    return this._get("/v1/diagnostics", { browser });
+  }
+
+  // ── Tab inspection ───────────────────────────────────────────────────────────
+
+  /** GET /v1/front-tab?browser=X */
+  async frontTab(browser) {
+    return this._get("/v1/front-tab", { browser: browser ?? this.defaultBrowser });
+  }
+
+  /**
+   * GET /v1/tab?browser=X&...
+   * query: { browser?, signature?, windowIndex?, tabIndex?, url?, title? }
+   */
+  async getTab(query = {}) {
+    const params = { browser: query.browser ?? this.defaultBrowser, ...query };
+    return this._get("/v1/tab", params);
+  }
+
+  /** GET /v1/tabs?browser=X */
+  async listTabs(browser) {
+    return this._get("/v1/tabs", { browser: browser ?? this.defaultBrowser });
+  }
+
+  // ── Session management ───────────────────────────────────────────────────────
+
+  /**
+   * POST /v1/attach { browser, mode?, tabTarget? }
+   * Stores the resulting session as this._session.
+   */
+  async attach(browser, opts = {}) {
+    const body = {
+      browser: browser ?? this.defaultBrowser,
+      ...opts,
+    };
+    const result = await this._post("/v1/attach", body);
+    if (!result.error) {
+      this._session = result;
+    }
+    return result;
+  }
+
+  /** GET /v1/sessions */
+  async listSessions() {
+    return this._get("/v1/sessions");
+  }
+
+  /** GET /v1/sessions/:id */
+  async getSession(id) {
+    return this._get(`/v1/sessions/${encodeURIComponent(id)}`);
+  }
+
+  /** POST /v1/sessions/:id/resume */
+  async resumeSession(id) {
+    const result = await this._post(`/v1/sessions/${encodeURIComponent(id)}/resume`);
+    if (!result.error) {
+      this._session = result;
+    }
+    return result;
+  }
+
+  // ── Actions (require active session) ─────────────────────────────────────────
+
+  /**
+   * Navigate to a URL.
+   * Uses session-scoped endpoint if sessionId/this._session is available.
+   */
+  async navigate(url, sessionId) {
+    this._mayLog("navigate", url);
+
+    const sid = sessionId ?? this._session?.id ?? this._session?.sessionId;
+    if (sid) {
+      return this._post(`/v1/sessions/${encodeURIComponent(sid)}/navigate`, { url });
+    }
+    return this._post("/v1/navigate", { url });
+  }
+
+  /**
+   * Bring browser tab to front / focus.
+   */
+  async activate(sessionId) {
+    this._mayLog("activate", sessionId ?? this._session?.id ?? "default");
+
+    const sid = sessionId ?? this._session?.id ?? this._session?.sessionId;
+    if (sid) {
+      return this._post(`/v1/sessions/${encodeURIComponent(sid)}/activate`);
+    }
+    return this._post("/v1/activate");
+  }
+
+  /**
+   * Take a screenshot.
+   * Returns { screenshot: "<base64>" } or { error }
+   */
+  async screenshot(sessionId) {
+    const sid = sessionId ?? this._session?.id ?? this._session?.sessionId;
+    if (sid) {
+      // Some implementations support GET, some POST
+      return this._get(`/v1/sessions/${encodeURIComponent(sid)}/screenshot`);
+    }
+    return this._post("/v1/screenshot");
+  }
+
+  // ── Lifecycle ────────────────────────────────────────────────────────────────
+
+  /**
+   * Check health, attempt to start bridge if not running.
+   * Returns { ok: boolean, started: boolean }
+   */
+  async ensureRunning() {
+    // 1. Try health
+    const h = await this.health();
+    if (h?.ok || (!h?.error && h !== null)) {
+      return { ok: true, started: false };
+    }
+
+    // 2. Try to start the bridge
+    let started = false;
+    try {
+      execFile("/bin/sh", ["-c", "npx local-browser-bridge serve --port 3000 &"], {
+        detached: true,
+        stdio: "ignore",
+      });
+      started = true;
+    } catch {
+      // ignore — may not have npx or may already be running
+    }
+
+    // 3. Wait up to 5 seconds for health to respond
+    const deadline = Date.now() + 5000;
+    while (Date.now() < deadline) {
+      await new Promise((r) => setTimeout(r, 500));
+      const h2 = await this.health();
+      if (h2?.ok || (!h2?.error && h2 !== null)) {
+        return { ok: true, started };
+      }
+    }
+
+    return { ok: false, started };
+  }
+
+  /**
+   * Auto-discover and attach to the best available browser.
+   * Order: safari-actionable > safari-readonly > chrome-actionable > chrome-readonly
+   */
+  async autoAttach() {
+    // 1. Get capabilities
+    const caps = await this.capabilities();
+    if (caps?.error) return { error: caps.error };
+
+    const browsers = Array.isArray(caps?.browsers)
+      ? caps.browsers
+      : Object.keys(caps ?? {}).filter((k) => k !== "error");
+
+    if (browsers.length === 0) {
+      return { error: "No browsers available via local-browser-bridge" };
+    }
+
+    // 2. Get diagnostics for each browser
+    const diagResults = [];
+    for (const browser of browsers) {
+      const d = await this.diagnostics(browser);
+      diagResults.push({ browser, diag: d });
+    }
+
+    // 3. Pick the best actionable browser
+    const priority = [
+      (d) => d.browser === "safari" && d.diag?.actionable === true,
+      (d) => d.browser === "chrome" && d.diag?.actionable === true,
+      (d) => d.diag?.actionable === true,
+      (d) => d.browser === "safari",
+      (d) => true,
+    ];
+
+    let chosen = null;
+    for (const pred of priority) {
+      chosen = diagResults.find(pred);
+      if (chosen) break;
+    }
+
+    if (!chosen) return { error: "No suitable browser found" };
+
+    // 4. Attach
+    const session = await this.attach(chosen.browser);
+    return session;
+  }
+
+  /** Summary status for display */
+  status() {
+    return {
+      baseUrl: this.baseUrl,
+      defaultBrowser: this.defaultBrowser,
+      session: this._session
+        ? {
+            id: this._session.id ?? this._session.sessionId,
+            browser: this._session.browser,
+            mode: this._session.mode,
+          }
+        : null,
+    };
+  }
+}
+
+export default BrowserBridge;