diff options
Diffstat (limited to 'src/setup.ts')
| -rw-r--r-- | src/setup.ts | 84 |
1 files changed, 45 insertions, 39 deletions
diff --git a/src/setup.ts b/src/setup.ts index 3909603..561a343 100644 --- a/src/setup.ts +++ b/src/setup.ts @@ -1,37 +1,50 @@ /** - * Setup command — verifies Chrome is running with remote debugging - * and connects the pi agent to it. + * Setup — verifies Chrome is running with remote debugging and connects + * the pi agent to it. Exposed as both a slash command (/browser-setup) for + * users and a tool (browser_setup) for the agent to self-recover. */ -import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent"; +import type { ExtensionAPI } from "@mariozechner/pi-coding-agent"; import { execSync } from "node:child_process"; import type { BrowserClient } from "./client"; +import { ensureDaemon } from "./daemon/spawn"; + +// ── Public: register the /browser-setup slash command ────────────────────── export function registerSetupCommand(pi: ExtensionAPI, client: BrowserClient): void { pi.registerCommand("browser-setup", { description: "Connect pi to your Chrome browser", handler: async (_args, ctx) => { - await runSetup(ctx, client); + const result = await performSetup(client); + if (result.success) { + ctx.ui.notify(result.data, "info"); + } else { + ctx.ui.notify(result.error, "error"); + } }, }); } -async function runSetup(ctx: ExtensionContext, client: BrowserClient): Promise<void> { - ctx.ui.notify("browser setup: checking Chrome...", "info"); +// ── Shared setup result ──────────────────────────────────────────────────── + +export type SetupResult = { success: true; data: string } | { success: false; error: string }; + +// ── Shared setup logic (used by both the command and the tool) ───────────── +export async function performSetup(client: BrowserClient): Promise<SetupResult> { // Step 1: Check Chrome is running const chromeRunning = checkChromeRunning(); if (!chromeRunning) { - ctx.ui.notify( - "No browser instance running. Please open your browser and then run /browser-setup.", - "error", - ); - return; + return { success: false, error: "No browser instance running. Please open your browser and then run /browser-setup." }; } - ctx.ui.notify("Chrome is running ✓", "info"); - // Step 2: Try to connect to Chrome DevTools - ctx.ui.notify("Connecting to Chrome DevTools...", "info"); + // Step 2: Start the browser daemon (spawns if not running, silently reuses if alive) + const daemonReady = await ensureDaemon(); + if (!daemonReady) { + return { success: false, error: "Could not start the browser daemon. Check /tmp/pi-browser-daemon.sock." }; + } + + // Step 3: Connect to Chrome DevTools const startResult = await client.start(); if (!startResult.success) { const msg = startResult.error.message; @@ -43,30 +56,23 @@ async function runSetup(ctx: ExtensionContext, client: BrowserClient): Promise<v lower.includes("econnrefused") || lower.includes("cannot reach chrome devtools") ) { - ctx.ui.notify( - "Chrome remote debugging needs to be enabled.\n\n" + - "Open chrome://inspect/#remote-debugging in your browser, tick the\n" + - "\"Discover network targets\" / Allow checkbox, then run /browser-setup again.\n\n" + + return { + success: false, + error: + "Chrome remote debugging needs to be enabled.\n\n" + + 'Open chrome://inspect/#remote-debugging in your browser, tick the\n' + + '"Discover network targets" / Allow checkbox, then retry.\n\n' + "Or set BU_CDP_WS to a remote browser WebSocket URL.", - "warning", - ); - return; + }; } - ctx.ui.notify(`Connection failed: ${msg}`, "error"); - return; + return { success: false, error: `Connection failed: ${msg}` }; } - ctx.ui.notify("Connected to Chrome ✓", "info"); - // Step 3: Verify with test navigation - ctx.ui.notify("Testing browser control...", "info"); + // Step 4: Verify with test navigation const tabResult = await client.newTab("https://github.com"); if (!tabResult.success) { - ctx.ui.notify( - `Browser connected but test navigation failed: ${tabResult.error.message}`, - "warning", - ); - return; + return { success: false, error: `Browser connected but test navigation failed: ${tabResult.error.message}` }; } const info = await client.pageInfo(); @@ -75,24 +81,24 @@ async function runSetup(ctx: ExtensionContext, client: BrowserClient): Promise<v } const pageUrl = info.success && !("dialog" in info.data) ? info.data.url : "github.com"; - ctx.ui.notify(`Browser control verified ✓\nNavigated to: ${pageUrl}`, "info"); + return { success: true, data: `Browser connected ✓\nNavigated to: ${pageUrl}` }; } +// ── Chrome process detection ─────────────────────────────────────────────── + function checkChromeRunning(): boolean { try { if (process.platform === "darwin") { - // Exact line matching — excludes "Google Chrome Helper" etc. - // that linger after the user quits the browser. + // ps -o comm= returns the full executable path on modern macOS. + // We check for "Google Chrome" anywhere in the path (case-insensitive), + // excluding helper/renderer subprocesses. const out = execSync("ps -A -o comm=", { timeout: 5000 }).toString().toLowerCase(); const lines = out.split("\n").map((l) => l.trim()).filter(Boolean); - const browserProcesses = ["google chrome", "chromium", "microsoft edge"]; return lines.some((l) => { - if (l.includes("helper") || l.includes("renderer")) return false; - return browserProcesses.includes(l); + if (l.includes("helper") || l.includes("renderer") || l.includes("crashpad")) return false; + return l.includes("google chrome") || l.includes("chromium") || l.includes("microsoft edge"); }); } else if (process.platform === "linux") { - // Use args to distinguish the main browser process from sub-processes - // (GPU, renderer, utility, etc.) which carry --type= flags. const out = execSync("ps -A -o comm=,args=", { timeout: 5000 }).toString().toLowerCase(); const lines = out.split("\n").map((l) => l.trim()).filter(Boolean); const browserComms = ["chrome", "chromium", "chromium-browser", "msedge", "microsoft-edge", "google-chrome"]; |