opensteer 0.6.2 → 0.6.4

package/dist/cli/server.js

@@ -1,11 +1,12 @@
 import {
   Opensteer
-} from "../chunk-F2VDVOJO.js";
+} from "../chunk-G6V2DJRN.js";
 import {
   normalizeError,
   resolveCloudSelection,
   resolveConfigWithEnv
-} from "../chunk-WDRMHPWL.js";
+} from "../chunk-KPPOTU3D.js";
+import "../chunk-K5CL76MG.js";
 import "../chunk-3H5RRIMZ.js";
 
 // src/cli/server.ts
@@ -382,10 +383,12 @@ function buildServerOpenConfig(options) {
       enabled: options.cursorEnabled
     },
     browser: {
-      headless: options.headless ?? false,
-      connectUrl: options.connectUrl,
-      channel: options.channel,
-      profileDir: options.profileDir
+      headless: options.headless,
+      mode: options.mode,
+      cdpUrl: options.cdpUrl,
+      userDataDir: options.userDataDir,
+      profileDirectory: options.profileDirectory,
+      executablePath: options.executablePath
     }
   };
   if (!options.cloudAuth) {
@@ -437,6 +440,19 @@ function normalizeAuthScheme(value) {
   );
 }
 
+// src/cli/open-browser-config.ts
+function resolveCliBrowserRequestConfig(options) {
+  const mode = options.browser ?? (options.profileDirectory || options.userDataDir || options.executablePath ? "real" : void 0);
+  return {
+    mode,
+    headless: options.headless ?? (mode === "real" ? true : void 0),
+    cdpUrl: options.cdpUrl,
+    profileDirectory: options.profileDirectory,
+    userDataDir: options.userDataDir,
+    executablePath: options.executablePath
+  };
+}
+
 // src/cli/server.ts
 var instance = null;
 var launchPromise = null;
@@ -597,9 +613,11 @@ async function handleRequest(request, socket) {
     try {
       const url = args.url;
       const headless = args.headless;
-      const connectUrl = args["connect-url"];
-      const channel = args.channel;
-      const profileDir = args["profile-dir"];
+      const browser = args.browser === "real" || args.browser === "chromium" ? args.browser : args.browser === void 0 ? void 0 : null;
+      const cdpUrl = args["cdp-url"];
+      const profileDirectory = args.profile;
+      const userDataDir = args["user-data-dir"];
+      const executablePath = args["browser-path"];
       const cloudProfileId = typeof args["cloud-profile-id"] === "string" ? args["cloud-profile-id"].trim() : void 0;
       const cloudProfileReuseIfActive = typeof args["cloud-profile-reuse-if-active"] === "boolean" ? args["cloud-profile-reuse-if-active"] : void 0;
       const requestedCloudProfileBinding = normalizeCloudProfileBinding({
@@ -614,6 +632,21 @@ async function handleRequest(request, socket) {
           "--cloud-profile-reuse-if-active requires --cloud-profile-id."
         );
       }
+      if (browser === null) {
+        throw new Error(
+          '--browser must be either "chromium" or "real".'
+        );
+      }
+      if (browser === "chromium" && (profileDirectory || userDataDir || executablePath)) {
+        throw new Error(
+          "--profile, --user-data-dir, and --browser-path require --browser real."
+        );
+      }
+      if (cdpUrl && browser === "real") {
+        throw new Error(
+          "--cdp-url cannot be combined with --browser real."
+        );
+      }
       const requestedCursor = normalizeCursorFlag(args.cursor);
       const requestedName = typeof args.name === "string" && args.name.trim().length > 0 ? sanitizeNamespace(args.name) : null;
       if (requestedCursor !== null) {
@@ -655,26 +688,45 @@ async function handleRequest(request, socket) {
           invalidateInstance();
         }
       }
+      const requestedBrowserConfig = resolveCliBrowserRequestConfig({
+        browser: browser ?? void 0,
+        headless,
+        cdpUrl,
+        profileDirectory,
+        userDataDir,
+        executablePath
+      });
       if (instance && !launchPromise) {
         assertCompatibleCloudProfileBinding(
           logicalSession,
           cloudProfileBinding,
           requestedCloudProfileBinding
         );
+        const existingBrowserConfig = instance.getConfig().browser || {};
+        const existingBrowserRecord = existingBrowserConfig;
+        const mismatch = Object.entries(requestedBrowserConfig).find(
+          ([key, value]) => value !== void 0 && existingBrowserRecord[key] !== value
+        );
+        if (mismatch) {
+          const [key, value] = mismatch;
+          throw new Error(
+            `Session '${logicalSession}' is already bound to browser setting "${key}"=${JSON.stringify(existingBrowserRecord[key])}. Requested ${JSON.stringify(value)} does not match. Use the same browser flags for this session or start a different --session.`
+          );
+        }
       }
+      let shouldLaunchInitialUrl = false;
       if (!instance) {
         instance = new Opensteer(
           buildServerOpenConfig({
             scopeDir,
             name: activeNamespace,
             cursorEnabled: effectiveCursorEnabled,
-            headless,
-            connectUrl,
-            channel,
-            profileDir,
+            ...requestedBrowserConfig,
             cloudAuth: cloudAuthOverride
           })
         );
+        const resolvedBrowserConfig = instance.getConfig().browser || {};
+        shouldLaunchInitialUrl = Boolean(url) && resolvedBrowserConfig.mode === "real" && !resolvedBrowserConfig.cdpUrl;
         const nextCloudProfileBinding = resolveSessionCloudProfileBinding(
           instance.getConfig(),
           requestedCloudProfileBinding
@@ -686,12 +738,13 @@ async function handleRequest(request, socket) {
           );
         }
         launchPromise = instance.launch({
-          headless: headless ?? false,
+          initialUrl: shouldLaunchInitialUrl ? url : void 0,
+          ...requestedBrowserConfig,
           cloudBrowserProfile: cloudProfileId ? {
             profileId: cloudProfileId,
             reuseIfActive: cloudProfileReuseIfActive
           } : void 0,
-          timeout: connectUrl ? 12e4 : 3e4
+          timeout: cdpUrl ? 12e4 : 3e4
         });
         try {
           await launchPromise;
@@ -709,7 +762,7 @@ async function handleRequest(request, socket) {
       } else if (requestedCursor !== null) {
         instance.setCursorEnabled(requestedCursor);
       }
-      if (url) {
+      if (url && !shouldLaunchInitialUrl) {
         await instance.goto(url);
       }
       sendResponse(socket, {