@houwert/conductor 0.6.0 → 0.7.0

package/dist/daemon/server.js

@@ -25,6 +25,14 @@ const web_server_js_1 = require("./web-server.js");
 const log_collector_js_1 = require("./log-collector.js");
 const session_js_1 = require("../session.js");
 const sessionName = process.argv[2] ?? 'default';
+/**
+ * CDP URL for connecting to an external browser (e.g. Stagehand's embedded
+ * webview). When set, the web driver attaches via Playwright's connectOverCDP
+ * instead of launching its own browser.
+ *
+ * Set by the host IDE (Stagehand) via the agent subprocess environment.
+ */
+const cdpUrl = process.env.CONDUCTOR_CDP_URL || undefined;
 const SOCKET_PATH = (0, protocol_js_1.socketPath)(sessionName);
 const PID_FILE = (0, protocol_js_1.pidFile)(sessionName);
 const LOG_FILE = (0, protocol_js_1.logFile)(sessionName);
@@ -75,7 +83,7 @@ async function ensureDriverRunning() {
                 await (0, bootstrap_js_1.startTvOSDriver)(sessionName, driverPort, /* dismissAfterLaunch */ false);
             }
             else if (driverPlatform === 'web') {
-                await (0, web_server_js_1.startWebServer)(driverPort, (0, bootstrap_js_1.webBrowserName)(sessionName), dlog);
+                await (0, web_server_js_1.startWebServer)(driverPort, (0, bootstrap_js_1.webBrowserName)(sessionName), dlog, cdpUrl);
             }
             else {
                 await (0, bootstrap_js_1.startAndroidDriver)(sessionName, driverPort);
@@ -277,7 +285,9 @@ async function main() {
                         await (0, bootstrap_js_1.installDriver)(sessionName);
                         dlog(`Driver installation complete`);
                     }
-                    else if (platform === 'web') {
+                    else if (platform === 'web' && !cdpUrl) {
+                        // Only install Playwright browser when launching standalone.
+                        // In CDP mode we attach to the host app's browser (e.g. Electron).
                         const browser = (0, bootstrap_js_1.webBrowserName)(sessionName);
                         await (0, bootstrap_js_1.ensurePlaywrightBrowser)(browser, dlog);
                     }
@@ -291,7 +301,7 @@ async function main() {
                             await (0, bootstrap_js_1.startTvOSDriver)(sessionName, driverPort, /* dismissAfterLaunch */ true);
                         }
                         else if (platform === 'web') {
-                            await (0, web_server_js_1.startWebServer)(driverPort, (0, bootstrap_js_1.webBrowserName)(sessionName), dlog);
+                            await (0, web_server_js_1.startWebServer)(driverPort, (0, bootstrap_js_1.webBrowserName)(sessionName), dlog, cdpUrl);
                         }
                         else {
                             await (0, bootstrap_js_1.startAndroidDriver)(sessionName, driverPort);

package/dist/daemon/web-server.js

@@ -426,19 +426,59 @@ let _browser = null;
 let _context = null;
 let _page = null;
 let _server = null;
-async function startWebServer(port, browserName = 'chromium', dlog = () => { }) {
-    const browserType = browserName === 'firefox' ? playwright_core_1.firefox : browserName === 'webkit' ? playwright_core_1.webkit : playwright_core_1.chromium;
-    dlog(`Launching ${browserName} browser...`);
-    _browser = await browserType.launch({
-        headless: false,
-        args: browserName === 'chromium' ? ['--disable-search-engine-choice-screen'] : undefined,
-    });
-    _context = await _browser.newContext({
-        viewport: DEFAULT_VIEWPORT,
-    });
-    _page = await _context.newPage();
-    attachConsoleListeners(_page);
-    dlog(`Browser ready, page created`);
+/**
+ * True when connected to an external browser via CDP (e.g. Stagehand's
+ * embedded webview). In this mode we must NOT close the browser on shutdown
+ * — we only disconnect.
+ */
+let _cdpMode = false;
+async function startWebServer(port, browserName = 'chromium', dlog = () => { }, cdpUrl) {
+    if (cdpUrl) {
+        // ── CDP mode: attach to an existing browser (e.g. Electron webview) ───
+        dlog(`Connecting to existing browser via CDP: ${cdpUrl}`);
+        _browser = await playwright_core_1.chromium.connectOverCDP(cdpUrl);
+        _cdpMode = true;
+        // Use the first existing context and page. The host app (e.g. Stagehand)
+        // already created them — we just take a handle.
+        const contexts = _browser.contexts();
+        if (contexts.length === 0) {
+            throw new Error('No browser contexts found via CDP — is the webview loaded?');
+        }
+        // Find the context with a real page (not about:blank, not the host app).
+        for (const ctx of contexts) {
+            const pages = ctx.pages();
+            const candidate = pages.find((p) => p.url() !== 'about:blank' && !p.url().startsWith('file://'));
+            if (candidate) {
+                _context = ctx;
+                _page = candidate;
+                break;
+            }
+        }
+        // Fallback: just use the first context's first page.
+        if (!_page) {
+            _context = contexts[0];
+            const pages = _context.pages();
+            _page = pages[0] ?? (await _context.newPage());
+        }
+        attachConsoleListeners(_page);
+        dlog(`CDP connected — page: ${_page.url()}`);
+    }
+    else {
+        // ── Standalone mode: launch a fresh browser ───────────────────────────
+        const browserType = browserName === 'firefox' ? playwright_core_1.firefox : browserName === 'webkit' ? playwright_core_1.webkit : playwright_core_1.chromium;
+        dlog(`Launching ${browserName} browser...`);
+        _browser = await browserType.launch({
+            headless: false,
+            args: browserName === 'chromium' ? ['--disable-search-engine-choice-screen'] : undefined,
+        });
+        _context = await _browser.newContext({
+            viewport: DEFAULT_VIEWPORT,
+        });
+        _page = await _context.newPage();
+        attachConsoleListeners(_page);
+        dlog(`Browser ready, page created`);
+        _cdpMode = false;
+    }
     _server = http_1.default.createServer(async (req, res) => {
         try {
             await handleRequest(req, res, dlog);
@@ -462,18 +502,38 @@ async function stopWebServer() {
         _server.close();
         _server = null;
     }
-    if (_page) {
-        await _page.close().catch(() => { });
+    if (_cdpMode) {
+        // CDP mode: we don't own the browser — just release our handles.
+        // Do NOT close the page, context, or browser.
         _page = null;
-    }
-    if (_context) {
-        await _context.close().catch(() => { });
         _context = null;
+        if (_browser) {
+            // Playwright's connectOverCDP browser supports disconnect() but not close().
+            try {
+                _browser.close().catch(() => { });
+            }
+            catch {
+                /* not all CDP browsers support close gracefully */
+            }
+            _browser = null;
+        }
     }
-    if (_browser) {
-        await _browser.close().catch(() => { });
-        _browser = null;
+    else {
+        // Standalone mode: we launched the browser, so tear it all down.
+        if (_page) {
+            await _page.close().catch(() => { });
+            _page = null;
+        }
+        if (_context) {
+            await _context.close().catch(() => { });
+            _context = null;
+        }
+        if (_browser) {
+            await _browser.close().catch(() => { });
+            _browser = null;
+        }
     }
+    _cdpMode = false;
 }
 /** Playwright / CDP errors when the tab, context, or session died but our JS refs still exist. */
 function isClosedLikeError(err) {
@@ -483,20 +543,40 @@ function isClosedLikeError(err) {
 /**
  * Drop the context and open a fresh one. Used when newPage/goto fails after the user closed
  * the last tab (Chromium can quit the window) or the CDP target is gone while isConnected stays true.
+ *
+ * In CDP mode, we can't create new contexts — the host app owns the browser.
+ * Instead we try to re-acquire an existing context/page.
  */
 async function recreateBrowserContext(dlog) {
     dlog?.('Web driver: recreating browser context');
-    if (_context) {
-        await _context.close().catch(() => { });
-        _context = null;
-    }
-    _page = null;
     if (!_browser) {
         throw new Error('No page available');
     }
     if (!_browser.isConnected()) {
         throw new Error('Browser has been closed. Restart the web driver (e.g. conductor daemon-start --device web).');
     }
+    if (_cdpMode) {
+        // In CDP mode, try to re-acquire a page from existing contexts.
+        _page = null;
+        _context = null;
+        const contexts = _browser.contexts();
+        for (const ctx of contexts) {
+            const pages = ctx.pages();
+            const candidate = pages.find((p) => !p.isClosed());
+            if (candidate) {
+                _context = ctx;
+                _page = candidate;
+                attachConsoleListeners(_page);
+                return;
+            }
+        }
+        throw new Error('No live pages found via CDP — is the webview still open?');
+    }
+    if (_context) {
+        await _context.close().catch(() => { });
+        _context = null;
+    }
+    _page = null;
     _context = await _browser.newContext({
         viewport: DEFAULT_VIEWPORT,
     });

package/dist/index.js

@@ -46,6 +46,9 @@ const delete_device_js_1 = require("./commands/delete-device.js");
 const logs_js_1 = require("./commands/logs.js");
 const device_picker_js_1 = require("./device-picker.js");
 const update_check_js_1 = require("./update-check.js");
+const pkg_root_js_1 = require("./pkg-root.js");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const COMMAND_HELP = {
     'start-device': start_device_js_1.HELP,
     'delete-device': delete_device_js_1.HELP,
@@ -96,6 +99,7 @@ const OPTIONS_HELP = `Options:
   --platform <p>    Filter to devices of this platform (ios, android, tvos, web)
   --json            Output as machine-readable JSON
   --verbose, -v     Log daemon calls, fallbacks, and raw output
+  --version, -V     Print version number
   --help, -h        Show this help`;
 const HELP = `Usage: conductor <command> [args] [options]
 
@@ -109,6 +113,7 @@ async function main() {
         boolean: [
             'json',
             'help',
+            'version',
             'clear',
             'list',
             'verbose',
@@ -155,12 +160,18 @@ async function main() {
             'metro-port',
             'level',
         ],
-        alias: { h: 'help', v: 'verbose' },
+        alias: { h: 'help', v: 'verbose', V: 'version' },
     });
     if (argv['verbose'])
         (0, verbose_js_1.setVerbose)(true);
     const [command, ...rest] = argv._;
     const opts = { json: argv['json'] };
+    if (argv['version']) {
+        const pkgRoot = (0, pkg_root_js_1.findPkgRoot)(__dirname);
+        const pkg = JSON.parse(fs_1.default.readFileSync(path_1.default.join(pkgRoot, 'package.json'), 'utf-8'));
+        console.log(pkg.version);
+        process.exit(0);
+    }
     // Handle help and unknown commands before device resolution —
     // no point prompting for a device if we're just printing help or erroring out.
     if (!command || argv['help']) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@houwert/conductor",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "CLI tool for mobile app interactions — optimized for AI agents",
   "license": "MIT",
   "repository": {

package/skills/conductor/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: conductor
-version: 0.6.0
+version: 0.7.0
 description: "Token-efficient CLI for mobile UI testing (iOS simulator + Android emulator), designed for AI agents"
 metadata.openclaw:
   category: service

package/skills/skills.yaml

@@ -3,6 +3,6 @@ skills:
     path: conductor/SKILL.md
     description: "Token-efficient CLI for mobile UI testing, designed for AI agents"
     category: service
-    version: 0.6.0
+    version: 0.7.0
     requires:
       bins: [conductor]