@agentrhq/webcmd 0.2.0 → 0.2.1

package/dist/src/execution.js

@@ -18,7 +18,7 @@ import { executePipeline } from './pipeline/index.js';
 import { adapterLoadError, ArgumentError, CommandExecutionError, attachTraceReceipt, getErrorMessage } from './errors.js';
 import { shouldUseBrowserSession } from './capabilityRouting.js';
 import { getBrowserFactory, browserSession, runWithTimeout, DEFAULT_BROWSER_COMMAND_TIMEOUT } from './runtime.js';
-import { resolveProfileContextId } from './browser/profile.js';
+import { profileRouteParams, resolveProfileSelection } from './browser/profile.js';
 import { setDaemonCommandTimeoutSeconds } from './browser/daemon-client.js';
 import { emitHook } from './hooks.js';
 import { log } from './logger.js';
@@ -211,7 +211,9 @@ export async function executeCommand(cmd, rawKwargs, debug = false, opts = {}) {
                 }
             }
             const BrowserFactory = getBrowserFactory(cmd.site);
-            const contextId = resolveProfileContextId(opts.profile);
+            const profileSelection = resolveProfileSelection(opts.profile);
+            const profileRouting = profileRouteParams(profileSelection);
+            const contextId = profileSelection?.contextId;
             const internal = cmd;
             const siteSession = resolveSiteSession(cmd, opts.siteSession);
             const session = resolveAdapterBrowserSession(cmd, siteSession);
@@ -332,7 +334,7 @@ export async function executeCommand(cmd, rawKwargs, debug = false, opts = {}) {
                         await page.closeWindow?.().catch(() => { });
                     throw err;
                 }
-            }, { session, cdpEndpoint, contextId, windowMode, surface: 'adapter', siteSession });
+            }, { session, cdpEndpoint, ...profileRouting, windowMode, surface: 'adapter', siteSession });
         }
         else {
             // Non-browser commands: enforce a timeout only when the command exposes

package/dist/src/external.js

@@ -161,16 +161,34 @@ export function executeExternalCli(name, args, preloaded) {
         }
     }
     // 3. Passthrough execution with stdio inherited
-    const result = spawnSync(cli.binary, args, { stdio: 'inherit' });
+    const result = spawnPassthrough(cli.binary, args);
     if (result.error) {
         log.error(`Failed to execute '${cli.binary}': ${result.error.message}`);
         process.exitCode = EXIT_CODES.GENERIC_ERROR;
         return;
     }
+    if (result.signal) {
+        process.exitCode = EXIT_CODES.GENERIC_ERROR;
+        return;
+    }
     if (result.status !== null) {
         process.exitCode = result.status;
     }
 }
+function quoteForCmdShell(token) {
+    if (token !== '' && !/[\s"^&|<>%()]/.test(token))
+        return token;
+    return `"${token.replace(/"/g, '""')}"`;
+}
+function spawnPassthrough(binary, args) {
+    const direct = spawnSync(binary, args, { stdio: 'inherit' });
+    const errorCode = direct.error?.code;
+    if (os.platform() === 'win32' && (errorCode === 'EINVAL' || errorCode === 'ENOENT')) {
+        const command = [binary, ...args].map(quoteForCmdShell).join(' ');
+        return spawnSync(command, { stdio: 'inherit', shell: true });
+    }
+    return direct;
+}
 export function registerExternalCli(name, opts) {
     const userPath = getUserRegistryPath();
     const configDir = path.dirname(userPath);

package/dist/src/external.test.js

@@ -18,7 +18,8 @@ vi.mock('node:os', async () => {
         platform: mockPlatform,
     };
 });
-import { formatExternalCliLabel, installExternalCli, parseCommand } from './external.js';
+import { spawnSync } from 'node:child_process';
+import { executeExternalCli, formatExternalCliLabel, installExternalCli, parseCommand } from './external.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 describe('parseCommand', () => {
     it('splits binaries and quoted arguments without invoking a shell', () => {
@@ -93,3 +94,38 @@ describe('installExternalCli', () => {
         expect(mockExecFileSync).toHaveBeenCalledTimes(1);
     });
 });
+describe('executeExternalCli passthrough', () => {
+    const spawnMock = vi.mocked(spawnSync);
+    const cli = { name: 'tg', binary: 'tg', description: '' };
+    beforeEach(() => {
+        spawnMock.mockReset();
+        mockExecFileSync.mockReset();
+        mockExecFileSync.mockReturnValue(Buffer.from(''));
+        mockPlatform.mockReturnValue('darwin');
+        process.exitCode = undefined;
+    });
+    it('retries through the shell on Windows when the binary is a .cmd shim', () => {
+        mockPlatform.mockReturnValue('win32');
+        const einval = Object.assign(new Error('spawnSync tg EINVAL'), { code: 'EINVAL' });
+        spawnMock
+            .mockReturnValueOnce({ error: einval, status: null, signal: null })
+            .mockReturnValueOnce({ status: 0, signal: null });
+        executeExternalCli('tg', ['send', 'hello world', '--to', 'a"b'], [cli]);
+        expect(spawnMock).toHaveBeenCalledTimes(2);
+        expect(spawnMock).toHaveBeenNthCalledWith(1, 'tg', ['send', 'hello world', '--to', 'a"b'], { stdio: 'inherit' });
+        expect(spawnMock).toHaveBeenNthCalledWith(2, 'tg send "hello world" --to "a""b"', { stdio: 'inherit', shell: true });
+        expect(process.exitCode).toBe(0);
+    });
+    it('does not retry through the shell on non-Windows platforms', () => {
+        const einval = Object.assign(new Error('spawnSync tg EINVAL'), { code: 'EINVAL' });
+        spawnMock.mockReturnValueOnce({ error: einval, status: null, signal: null });
+        executeExternalCli('tg', [], [cli]);
+        expect(spawnMock).toHaveBeenCalledTimes(1);
+        expect(process.exitCode).toBe(1);
+    });
+    it('reports a non-zero exit code when the child dies from a signal', () => {
+        spawnMock.mockReturnValueOnce({ status: null, signal: 'SIGKILL' });
+        executeExternalCli('tg', [], [cli]);
+        expect(process.exitCode).toBe(1);
+    });
+});

package/dist/src/main.js

@@ -21,7 +21,6 @@ import { findPackageRoot, getCliManifestPath } from './package-paths.js';
 import { PKG_VERSION } from './version.js';
 import { EXIT_CODES } from './errors.js';
 import { isSupportedNodeVersion, MIN_SUPPORTED_NODE_MAJOR } from './runtime-detect.js';
-import { unsupportedDaemonPortEnvMessage } from './constants.js';
 import { CONFIG_DIR_NAME } from './brand.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -41,10 +40,6 @@ if (typeof globalThis.Bun === 'undefined' && !isSupportedNodeVersion(process.ver
     ].join('\n'));
     process.exit(EXIT_CODES.CONFIG_ERROR);
 }
-if (process.env.WEBCMD_DAEMON_PORT) {
-    process.stderr.write(`error: ${unsupportedDaemonPortEnvMessage(process.env.WEBCMD_DAEMON_PORT)}\n`);
-    process.exit(EXIT_CODES.CONFIG_ERROR);
-}
 // Fast path: --version (only when it's the top-level intent, not passed to a subcommand)
 // e.g. `webcmd --version` or `webcmd -V`, but NOT `webcmd gh --version`
 if (argv[0] === '--version' || argv[0] === '-V') {

package/dist/src/node-network.test.js

@@ -22,9 +22,9 @@ describe('node network proxy decisions', () => {
     });
     it('bypasses proxies for loopback addresses', () => {
         const env = { https_proxy: 'http://127.0.0.1:7897', http_proxy: 'http://127.0.0.1:7897' };
-        expect(decideProxy(new URL('http://127.0.0.1:19825/status'), env)).toEqual({ mode: 'direct' });
-        expect(decideProxy(new URL('http://localhost:19825/status'), env)).toEqual({ mode: 'direct' });
-        expect(decideProxy(new URL('http://[::1]:19825/status'), env)).toEqual({ mode: 'direct' });
+        expect(decideProxy(new URL('http://127.0.0.1:9777/status'), env)).toEqual({ mode: 'direct' });
+        expect(decideProxy(new URL('http://localhost:9777/status'), env)).toEqual({ mode: 'direct' });
+        expect(decideProxy(new URL('http://[::1]:9777/status'), env)).toEqual({ mode: 'direct' });
     });
     it('honors NO_PROXY domain matches', () => {
         const decision = decideProxy(new URL('https://api.example.com/v1/items'), {

package/dist/src/runtime-identity.test.js

@@ -1,6 +1,5 @@
 import { describe, expect, it } from 'vitest';
 import * as path from 'node:path';
-import { unsupportedDaemonPortEnvMessage } from './constants.js';
 import { getUserWebcmdDir, getUserClisDir, getPluginsDir } from './discovery.js';
 describe('webcmd runtime identity', () => {
     it('uses webcmd runtime directories', async () => {
@@ -8,11 +7,4 @@ describe('webcmd runtime identity', () => {
         expect(getUserClisDir('/home/tester')).toBe(path.join('/home/tester', '.webcmd', 'clis'));
         expect(getPluginsDir('/home/tester')).toBe(path.join('/home/tester', '.webcmd', 'plugins'));
     });
-    it('reports unsupported daemon port with WEBCMD env names', () => {
-        const legacyEnvName = ['OPEN', 'CLI_DAEMON_PORT'].join('');
-        expect(unsupportedDaemonPortEnvMessage('1234')).toContain('WEBCMD_DAEMON_PORT');
-        expect(unsupportedDaemonPortEnvMessage('1234')).toContain('Webcmd');
-        expect(unsupportedDaemonPortEnvMessage('1234')).toContain('rerun webcmd');
-        expect(unsupportedDaemonPortEnvMessage('1234')).not.toContain(legacyEnvName);
-    });
 });

package/dist/src/runtime.d.ts

@@ -29,6 +29,7 @@ export interface IBrowserFactory {
         session?: string;
         cdpEndpoint?: string;
         contextId?: string;
+        preferredContextId?: string;
         idleTimeout?: number;
         windowMode?: BrowserWindowMode;
         surface?: BrowserSurface;
@@ -40,6 +41,7 @@ export declare function browserSession<T>(BrowserFactory: new () => IBrowserFact
     session?: string;
     cdpEndpoint?: string;
     contextId?: string;
+    preferredContextId?: string;
     idleTimeout?: number;
     windowMode?: BrowserWindowMode;
     surface?: BrowserSurface;

package/dist/src/runtime.js

@@ -41,6 +41,7 @@ export async function browserSession(BrowserFactory, fn, opts = {}) {
             session: opts.session,
             cdpEndpoint: opts.cdpEndpoint,
             contextId: opts.contextId,
+            preferredContextId: opts.preferredContextId,
             idleTimeout: opts.idleTimeout,
             windowMode: opts.windowMode,
             surface: opts.surface,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentrhq/webcmd",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Turn websites, browser sessions, desktop apps, and local tools into deterministic CLI surfaces for humans and AI agents.",
   "engines": {
     "node": ">=20.0.0"
@@ -48,7 +48,7 @@
     "generate-release-notes": "tsx scripts/generate-release-notes.ts",
     "start": "node dist/src/main.js",
     "start:bun": "bun dist/src/main.js",
-    "preuninstall": "node -e \"fetch('http://127.0.0.1:19825/shutdown',{method:'POST',headers:{'X-Webcmd':'1'},signal:AbortSignal.timeout(3000)}).catch(()=>{})\" || true",
+    "preuninstall": "node -e \"fetch('http://127.0.0.1:9777/shutdown',{method:'POST',headers:{'X-Webcmd':'1'},signal:AbortSignal.timeout(3000)}).catch(()=>{})\" || true",
     "postinstall": "node scripts/postinstall.js || true; node scripts/fetch-adapters.js || true",
     "typecheck": "tsc --noEmit",
     "prepare": "[ -d src ] && npm run build || true",