@steipete/oracle 0.9.0 → 0.11.0

package/dist/src/cli/browserConfig.js

@@ -1,57 +1,62 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { CHATGPT_URL, DEFAULT_MODEL_STRATEGY, DEFAULT_MODEL_TARGET, isTemporaryChatUrl, normalizeChatgptUrl, parseDuration } from '../browserMode.js';
-import { normalizeBrowserModelStrategy } from '../browser/modelStrategy.js';
-import { getOracleHomeDir } from '../oracleHome.js';
+import fs from "node:fs/promises";
+import path from "node:path";
+import { CHATGPT_URL, DEFAULT_MODEL_STRATEGY, DEFAULT_MODEL_TARGET, isTemporaryChatUrl, normalizeChatgptUrl, parseDuration, } from "../browserMode.js";
+import { normalizeBrowserModelStrategy } from "../browser/modelStrategy.js";
+import { getOracleHomeDir } from "../oracleHome.js";
 const DEFAULT_BROWSER_TIMEOUT_MS = 1_200_000;
 const DEFAULT_BROWSER_INPUT_TIMEOUT_MS = 60_000;
 const DEFAULT_BROWSER_RECHECK_TIMEOUT_MS = 120_000;
 const DEFAULT_BROWSER_AUTO_REATTACH_TIMEOUT_MS = 120_000;
-const DEFAULT_CHROME_PROFILE = 'Default';
+const DEFAULT_CHROME_PROFILE = "Default";
 // Ordered array: most specific models first to ensure correct selection.
 // The browser label is passed to the model picker which fuzzy-matches against ChatGPT's UI.
 const BROWSER_MODEL_LABELS = [
     // Most specific first (e.g., "gpt-5.2-thinking" before "gpt-5.2")
-    ['gpt-5.4-pro', 'GPT-5.4 Pro'],
-    ['gpt-5.2-thinking', 'GPT-5.2 Thinking'],
-    ['gpt-5.2-instant', 'GPT-5.2 Instant'],
-    ['gpt-5.2-pro', 'GPT-5.4 Pro'],
-    ['gpt-5.1-pro', 'GPT-5.4 Pro'],
-    ['gpt-5-pro', 'GPT-5.4 Pro'],
+    ["gpt-5.5-pro", "GPT-5.5 Pro"],
+    ["gpt-5.5", "Thinking 5.5"],
+    ["gpt-5.4-pro", "GPT-5.4 Pro"],
+    ["gpt-5.2-thinking", "GPT-5.2 Thinking"],
+    ["gpt-5.2-instant", "GPT-5.2 Instant"],
+    ["gpt-5.2-pro", "GPT-5.5 Pro"],
+    ["gpt-5.1-pro", "GPT-5.5 Pro"],
+    ["gpt-5-pro", "GPT-5.5 Pro"],
     // Base models last (least specific)
-    ['gpt-5.4', 'Thinking 5.4'],
-    ['gpt-5.2', 'GPT-5.2'], // Selects "Auto" in ChatGPT UI
-    ['gpt-5.1', 'GPT-5.2'], // Legacy alias → Auto
-    ['gemini-3-pro', 'Gemini 3 Pro'],
-    ['gemini-3-pro-deep-think', 'gemini-3-deep-think'],
+    ["gpt-5.4", "Thinking 5.4"],
+    ["gpt-5.2", "GPT-5.2"], // Selects "Auto" in ChatGPT UI
+    ["gpt-5.1", "GPT-5.2"], // Legacy alias → Auto
+    ["gemini-3-pro", "Gemini 3 Pro"],
+    ["gemini-3-pro-deep-think", "gemini-3-deep-think"],
 ];
 export function normalizeChatGptModelForBrowser(model) {
     const normalized = model.toLowerCase();
-    if (!normalized.startsWith('gpt-') || normalized.includes('codex')) {
+    if (!normalized.startsWith("gpt-") || normalized.includes("codex")) {
         return model;
     }
-    if (normalized === 'gpt-5.4-pro' || normalized === 'gpt-5.4') {
+    if (normalized === "gpt-5.5-pro" ||
+        normalized === "gpt-5.5" ||
+        normalized === "gpt-5.4-pro" ||
+        normalized === "gpt-5.4") {
         return normalized;
     }
     // Pro variants: resolve to the latest Pro model in ChatGPT.
-    if (normalized === 'gpt-5-pro' || normalized === 'gpt-5.1-pro' || normalized === 'gpt-5.2-pro') {
-        return 'gpt-5.4-pro';
+    if (normalized === "gpt-5-pro" || normalized === "gpt-5.1-pro" || normalized === "gpt-5.2-pro") {
+        return "gpt-5.5-pro";
     }
     // Explicit model variants: keep as-is (they have their own browser labels)
-    if (normalized === 'gpt-5.2-thinking' || normalized === 'gpt-5.2-instant') {
+    if (normalized === "gpt-5.2-thinking" || normalized === "gpt-5.2-instant") {
         return normalized;
     }
     // Legacy aliases: map to base GPT-5.2 (Auto)
-    if (normalized === 'gpt-5.1') {
-        return 'gpt-5.2';
+    if (normalized === "gpt-5.1") {
+        return "gpt-5.2";
     }
     return model;
 }
 export async function buildBrowserConfig(options) {
     const desiredModelOverride = options.browserModelLabel?.trim();
-    const normalizedOverride = desiredModelOverride?.toLowerCase() ?? '';
+    const normalizedOverride = desiredModelOverride?.toLowerCase() ?? "";
     const baseModel = options.model.toLowerCase();
-    const isChatGptModel = baseModel.startsWith('gpt-') && !baseModel.includes('codex');
+    const isChatGptModel = baseModel.startsWith("gpt-") && !baseModel.includes("codex");
     const shouldUseOverride = !isChatGptModel && normalizedOverride.length > 0 && normalizedOverride !== baseModel;
     const modelStrategy = normalizeBrowserModelStrategy(options.browserModelStrategy) ?? DEFAULT_MODEL_STRATEGY;
     const cookieNames = parseCookieNames(options.browserCookieNames ?? process.env.ORACLE_BROWSER_COOKIE_NAMES);
@@ -62,13 +67,18 @@ export async function buildBrowserConfig(options) {
         envFile: process.env.ORACLE_BROWSER_COOKIES_FILE,
         cwd: process.cwd(),
     });
-    if (inline?.source?.startsWith('home:') && options.browserNoCookieSync !== true) {
+    if (inline?.source?.startsWith("home:") && options.browserNoCookieSync !== true) {
         inline = undefined;
     }
     let remoteChrome;
     if (options.remoteChrome) {
         remoteChrome = parseRemoteChromeTarget(options.remoteChrome);
     }
+    const attachRunning = options.browserAttachRunning === true;
+    validateAttachRunningOptions(options, {
+        attachRunning,
+        hasInlineCookies: Boolean(inline?.cookies),
+    });
     const rawUrl = options.chatgptUrl ?? options.browserUrl;
     const url = rawUrl ? normalizeChatgptUrl(rawUrl, CHATGPT_URL) : undefined;
     const desiredModel = isChatGptModel
@@ -76,17 +86,23 @@ export async function buildBrowserConfig(options) {
         : shouldUseOverride
             ? desiredModelOverride
             : mapModelToBrowserLabel(options.model);
-    if (modelStrategy === 'select' && url && isTemporaryChatUrl(url) && /\bpro\b/i.test(desiredModel ?? '')) {
-        throw new Error('Temporary Chat mode does not expose Pro models in the ChatGPT model picker. ' +
+    if (modelStrategy === "select" &&
+        url &&
+        isTemporaryChatUrl(url) &&
+        /\bpro\b/i.test(desiredModel ?? "")) {
+        throw new Error("Temporary Chat mode does not expose Pro models in the ChatGPT model picker. " +
             'Remove "temporary-chat=true" from --chatgpt-url (or omit --chatgpt-url), or use a non-Pro model (e.g. --model gpt-5.2).');
     }
     return {
         chromeProfile: options.browserChromeProfile ?? DEFAULT_CHROME_PROFILE,
         chromePath: options.browserChromePath ?? null,
         chromeCookiePath: options.browserCookiePath ?? null,
+        attachRunning,
         url,
         debugPort: selectBrowserPort(options),
-        timeoutMs: options.browserTimeout ? parseDuration(options.browserTimeout, DEFAULT_BROWSER_TIMEOUT_MS) : undefined,
+        timeoutMs: options.browserTimeout
+            ? parseDuration(options.browserTimeout, DEFAULT_BROWSER_TIMEOUT_MS)
+            : undefined,
         inputTimeoutMs: options.browserInputTimeout
             ? parseDuration(options.browserInputTimeout, DEFAULT_BROWSER_INPUT_TIMEOUT_MS)
             : undefined,
@@ -96,10 +112,13 @@ export async function buildBrowserConfig(options) {
         assistantRecheckTimeoutMs: options.browserRecheckTimeout
             ? parseDuration(options.browserRecheckTimeout, DEFAULT_BROWSER_RECHECK_TIMEOUT_MS)
             : undefined,
-        reuseChromeWaitMs: options.browserReuseWait ? parseDuration(options.browserReuseWait, 0) : undefined,
+        reuseChromeWaitMs: options.browserReuseWait
+            ? parseDuration(options.browserReuseWait, 0)
+            : undefined,
         profileLockTimeoutMs: options.browserProfileLockTimeout
             ? parseDuration(options.browserProfileLockTimeout, 0)
             : undefined,
+        maxConcurrentTabs: parseMaxConcurrentTabs(options.browserMaxConcurrentTabs),
         autoReattachDelayMs: options.browserAutoReattachDelay
             ? parseDuration(options.browserAutoReattachDelay, 0)
             : undefined,
@@ -109,7 +128,9 @@ export async function buildBrowserConfig(options) {
         autoReattachTimeoutMs: options.browserAutoReattachTimeout
             ? parseDuration(options.browserAutoReattachTimeout, DEFAULT_BROWSER_AUTO_REATTACH_TIMEOUT_MS)
             : undefined,
-        cookieSyncWaitMs: options.browserCookieWait ? parseDuration(options.browserCookieWait, 0) : undefined,
+        cookieSyncWaitMs: options.browserCookieWait
+            ? parseDuration(options.browserCookieWait, 0)
+            : undefined,
         cookieSync: options.browserNoCookieSync ? false : undefined,
         cookieNames,
         inlineCookies: inline?.cookies,
@@ -125,9 +146,33 @@ export async function buildBrowserConfig(options) {
         // Allow cookie failures by default so runs can continue without Chrome/Keychain secrets.
         allowCookieErrors: options.browserAllowCookieErrors ?? true,
         remoteChrome,
+        browserTabRef: options.browserTab ?? undefined,
         thinkingTime: options.browserThinkingTime,
+        researchMode: options.browserResearch === "deep" ? "deep" : "off",
+        archiveConversations: options.browserArchive,
     };
 }
+function validateAttachRunningOptions(options, { attachRunning, hasInlineCookies, }) {
+    if (!attachRunning) {
+        return;
+    }
+    const conflicts = [
+        options.browserChromeProfile ? "--browser-chrome-profile" : null,
+        options.browserCookiePath ? "--browser-cookie-path" : null,
+        options.browserNoCookieSync ? "--browser-no-cookie-sync" : null,
+        options.browserHideWindow ? "--browser-hide-window" : null,
+        options.browserKeepBrowser ? "--browser-keep-browser" : null,
+        options.browserManualLogin ? "--browser-manual-login" : null,
+        options.browserManualLoginProfileDir ? "--browser-manual-login-profile-dir" : null,
+        hasInlineCookies ? "--browser-inline-cookies/--browser-inline-cookies-file" : null,
+        options.browserPort != null || options.browserDebugPort != null
+            ? "--browser-port/--browser-debug-port"
+            : null,
+    ].filter((value) => Boolean(value));
+    if (conflicts.length > 0) {
+        throw new Error(`--browser-attach-running cannot be combined with ${conflicts.join(", ")} because attach mode reuses an already-running browser instead of launching and configuring its own Chrome instance.`);
+    }
+}
 function selectBrowserPort(options) {
     const candidate = options.browserPort ?? options.browserDebugPort;
     if (candidate === undefined || candidate === null)
@@ -137,6 +182,15 @@ function selectBrowserPort(options) {
     }
     return candidate;
 }
+function parseMaxConcurrentTabs(raw) {
+    if (!raw)
+        return undefined;
+    const value = Number.parseInt(raw, 10);
+    if (!Number.isFinite(value) || value <= 0) {
+        throw new Error(`Invalid browser max concurrent tabs: ${raw}. Expected a positive integer.`);
+    }
+    return Math.trunc(value);
+}
 export function mapModelToBrowserLabel(model) {
     const normalized = normalizeChatGptModelForBrowser(model);
     // Iterate ordered array to find first match (most specific first)
@@ -148,7 +202,7 @@ export function mapModelToBrowserLabel(model) {
     return DEFAULT_MODEL_TARGET;
 }
 export function resolveBrowserModelLabel(input, model) {
-    const trimmed = input?.trim?.() ?? '';
+    const trimmed = input?.trim?.() ?? "";
     if (!trimmed) {
         return mapModelToBrowserLabel(model);
     }
@@ -161,7 +215,7 @@ export function resolveBrowserModelLabel(input, model) {
 function parseRemoteChromeTarget(raw) {
     const target = raw.trim();
     if (!target) {
-        throw new Error('Invalid remote-chrome value: expected host:port but received an empty string.');
+        throw new Error("Invalid remote-chrome value: expected host:port but received an empty string.");
     }
     const ipv6Match = target.match(/^\[(.+)]:(\d+)$/);
     let host;
@@ -171,22 +225,22 @@ function parseRemoteChromeTarget(raw) {
         portSegment = ipv6Match[2]?.trim();
     }
     else {
-        const lastColon = target.lastIndexOf(':');
+        const lastColon = target.lastIndexOf(":");
         if (lastColon === -1) {
             throw new Error(`Invalid remote-chrome format: ${target}. Expected host:port (IPv6 must use [host]:port notation).`);
         }
         host = target.slice(0, lastColon).trim();
         portSegment = target.slice(lastColon + 1).trim();
-        if (host.includes(':')) {
+        if (host.includes(":")) {
             throw new Error(`Invalid remote-chrome format: ${target}. Wrap IPv6 addresses in brackets, e.g. --remote-chrome "[2001:db8::1]:9222".`);
         }
     }
     if (!host) {
         throw new Error(`Invalid remote-chrome format: ${target}. Host portion is missing; expected host:port.`);
     }
-    const port = Number.parseInt(portSegment ?? '', 10);
+    const port = Number.parseInt(portSegment ?? "", 10);
     if (!Number.isFinite(port) || port <= 0 || port > 65_535) {
-        throw new Error(`Invalid remote-chrome port: "${portSegment ?? ''}". Expected a number between 1 and 65535.`);
+        throw new Error(`Invalid remote-chrome port: "${portSegment ?? ""}". Expected a number between 1 and 65535.`);
     }
     return { host, port };
 }
@@ -194,7 +248,7 @@ function parseCookieNames(raw) {
     if (!raw)
         return undefined;
     const names = raw
-        .split(',')
+        .split(",")
         .map((entry) => entry.trim())
         .filter(Boolean);
     return names.length ? names : undefined;
@@ -211,7 +265,7 @@ async function resolveInlineCookies({ inlineArg, inlineFileArg, envPayload, envF
             try {
                 const stat = await fs.stat(resolved);
                 if (stat.isFile()) {
-                    const fileContent = await fs.readFile(resolved, 'utf8');
+                    const fileContent = await fs.readFile(resolved, "utf8");
                     const parsed = parseInlineCookiesPayload(fileContent);
                     if (parsed)
                         return parsed;
@@ -224,10 +278,10 @@ async function resolveInlineCookies({ inlineArg, inlineFileArg, envPayload, envF
         return parseInlineCookiesPayload(trimmed);
     };
     const sources = [
-        { value: inlineFileArg, allowPath: true, source: 'inline-file' },
-        { value: inlineArg, allowPath: true, source: 'inline-arg' },
-        { value: envFile, allowPath: true, source: 'env-file' },
-        { value: envPayload, allowPath: false, source: 'env-payload' },
+        { value: inlineFileArg, allowPath: true, source: "inline-file" },
+        { value: inlineArg, allowPath: true, source: "inline-arg" },
+        { value: envFile, allowPath: true, source: "env-file" },
+        { value: envPayload, allowPath: false, source: "env-payload" },
     ];
     for (const { value, allowPath, source } of sources) {
         const parsed = await tryLoad(value, allowPath);
@@ -236,14 +290,14 @@ async function resolveInlineCookies({ inlineArg, inlineFileArg, envPayload, envF
     }
     // fallback: ~/.oracle/cookies.{json,base64}
     const oracleHome = getOracleHomeDir();
-    const candidates = ['cookies.json', 'cookies.base64'];
+    const candidates = ["cookies.json", "cookies.base64"];
     for (const file of candidates) {
         const fullPath = path.join(oracleHome, file);
         try {
             const stat = await fs.stat(fullPath);
             if (!stat.isFile())
                 continue;
-            const content = await fs.readFile(fullPath, 'utf8');
+            const content = await fs.readFile(fullPath, "utf8");
             const parsed = parseInlineCookiesPayload(content);
             if (parsed)
                 return { cookies: parsed, source: `home:${file}` };
@@ -263,8 +317,8 @@ function parseInlineCookiesPayload(raw) {
     let jsonPayload = text;
     // Attempt base64 decode first; fall back to raw text on failure.
     try {
-        const decoded = Buffer.from(text, 'base64').toString('utf8');
-        if (decoded.trim().startsWith('[')) {
+        const decoded = Buffer.from(text, "base64").toString("utf8");
+        if (decoded.trim().startsWith("[")) {
             jsonPayload = decoded;
         }
     }

package/dist/src/cli/browserDefaults.js

@@ -1,81 +1,106 @@
-import { normalizeChatgptUrl, CHATGPT_URL } from '../browserMode.js';
+import { normalizeChatgptUrl, CHATGPT_URL } from "../browserMode.js";
 export function applyBrowserDefaultsFromConfig(options, config, getSource) {
     const browser = config.browser;
     if (!browser)
         return;
     const isUnset = (key) => {
         const source = getSource(key);
-        return source === undefined || source === 'default';
+        return source === undefined || source === "default";
     };
+    const attachRunningRequested = options.browserAttachRunning === true ||
+        (isUnset("browserAttachRunning") && browser.attachRunning === true);
     const configuredChatgptUrl = browser.chatgptUrl ?? browser.url;
     const cliChatgptSet = options.chatgptUrl !== undefined || options.browserUrl !== undefined;
-    if (isUnset('chatgptUrl') && !cliChatgptSet && configuredChatgptUrl !== undefined) {
-        options.chatgptUrl = normalizeChatgptUrl(configuredChatgptUrl ?? '', CHATGPT_URL);
+    if (isUnset("chatgptUrl") && !cliChatgptSet && configuredChatgptUrl !== undefined) {
+        options.chatgptUrl = normalizeChatgptUrl(configuredChatgptUrl ?? "", CHATGPT_URL);
     }
-    if (isUnset('browserChromeProfile') && browser.chromeProfile !== undefined) {
+    if (!attachRunningRequested &&
+        isUnset("browserChromeProfile") &&
+        browser.chromeProfile !== undefined) {
         options.browserChromeProfile = browser.chromeProfile ?? undefined;
     }
-    if (isUnset('browserChromePath') && browser.chromePath !== undefined) {
+    if (isUnset("browserChromePath") && browser.chromePath !== undefined) {
         options.browserChromePath = browser.chromePath ?? undefined;
     }
-    if (isUnset('browserCookiePath') && browser.chromeCookiePath !== undefined) {
+    if (!attachRunningRequested &&
+        isUnset("browserCookiePath") &&
+        browser.chromeCookiePath !== undefined) {
         options.browserCookiePath = browser.chromeCookiePath ?? undefined;
     }
-    if (isUnset('browserUrl') && options.browserUrl === undefined && browser.url !== undefined) {
+    if (isUnset("browserAttachRunning") && browser.attachRunning !== undefined) {
+        options.browserAttachRunning = browser.attachRunning;
+    }
+    if (isUnset("browserUrl") && options.browserUrl === undefined && browser.url !== undefined) {
         options.browserUrl = browser.url;
     }
-    if (isUnset('browserTimeout') && typeof browser.timeoutMs === 'number') {
+    if (isUnset("browserTimeout") && typeof browser.timeoutMs === "number") {
         options.browserTimeout = String(browser.timeoutMs);
     }
-    if (isUnset('browserPort') && typeof browser.debugPort === 'number') {
+    if (!attachRunningRequested && isUnset("browserPort") && typeof browser.debugPort === "number") {
         options.browserPort = browser.debugPort;
     }
-    if (isUnset('browserInputTimeout') && typeof browser.inputTimeoutMs === 'number') {
+    if (isUnset("browserInputTimeout") && typeof browser.inputTimeoutMs === "number") {
         options.browserInputTimeout = String(browser.inputTimeoutMs);
     }
-    if (isUnset('browserRecheckDelay') && typeof browser.assistantRecheckDelayMs === 'number') {
+    if (isUnset("browserRecheckDelay") && typeof browser.assistantRecheckDelayMs === "number") {
         options.browserRecheckDelay = String(browser.assistantRecheckDelayMs);
     }
-    if (isUnset('browserRecheckTimeout') && typeof browser.assistantRecheckTimeoutMs === 'number') {
+    if (isUnset("browserRecheckTimeout") && typeof browser.assistantRecheckTimeoutMs === "number") {
         options.browserRecheckTimeout = String(browser.assistantRecheckTimeoutMs);
     }
-    if (isUnset('browserReuseWait') && typeof browser.reuseChromeWaitMs === 'number') {
+    if (isUnset("browserReuseWait") && typeof browser.reuseChromeWaitMs === "number") {
         options.browserReuseWait = String(browser.reuseChromeWaitMs);
     }
-    if (isUnset('browserProfileLockTimeout') && typeof browser.profileLockTimeoutMs === 'number') {
+    if (isUnset("browserProfileLockTimeout") && typeof browser.profileLockTimeoutMs === "number") {
         options.browserProfileLockTimeout = String(browser.profileLockTimeoutMs);
     }
-    if (isUnset('browserAutoReattachDelay') && typeof browser.autoReattachDelayMs === 'number') {
+    if (isUnset("browserMaxConcurrentTabs") && typeof browser.maxConcurrentTabs === "number") {
+        options.browserMaxConcurrentTabs = String(browser.maxConcurrentTabs);
+    }
+    if (isUnset("browserAutoReattachDelay") && typeof browser.autoReattachDelayMs === "number") {
         options.browserAutoReattachDelay = String(browser.autoReattachDelayMs);
     }
-    if (isUnset('browserAutoReattachInterval') && typeof browser.autoReattachIntervalMs === 'number') {
+    if (isUnset("browserAutoReattachInterval") &&
+        typeof browser.autoReattachIntervalMs === "number") {
         options.browserAutoReattachInterval = String(browser.autoReattachIntervalMs);
     }
-    if (isUnset('browserAutoReattachTimeout') && typeof browser.autoReattachTimeoutMs === 'number') {
+    if (isUnset("browserAutoReattachTimeout") && typeof browser.autoReattachTimeoutMs === "number") {
         options.browserAutoReattachTimeout = String(browser.autoReattachTimeoutMs);
     }
-    if (isUnset('browserCookieWait') && typeof browser.cookieSyncWaitMs === 'number') {
+    if (isUnset("browserCookieWait") && typeof browser.cookieSyncWaitMs === "number") {
         options.browserCookieWait = String(browser.cookieSyncWaitMs);
     }
-    if (isUnset('browserHeadless') && browser.headless !== undefined) {
+    if (isUnset("browserHeadless") && browser.headless !== undefined) {
         options.browserHeadless = browser.headless;
     }
-    if (isUnset('browserHideWindow') && browser.hideWindow !== undefined) {
+    if (!attachRunningRequested && isUnset("browserHideWindow") && browser.hideWindow !== undefined) {
         options.browserHideWindow = browser.hideWindow;
     }
-    if (isUnset('browserKeepBrowser') && browser.keepBrowser !== undefined) {
+    if (!attachRunningRequested &&
+        isUnset("browserKeepBrowser") &&
+        browser.keepBrowser !== undefined) {
         options.browserKeepBrowser = browser.keepBrowser;
     }
-    if (isUnset('browserModelStrategy') && browser.modelStrategy !== undefined) {
+    if (isUnset("browserModelStrategy") && browser.modelStrategy !== undefined) {
         options.browserModelStrategy = browser.modelStrategy;
     }
-    if (isUnset('browserThinkingTime') && browser.thinkingTime !== undefined) {
+    if (isUnset("browserThinkingTime") && browser.thinkingTime !== undefined) {
         options.browserThinkingTime = browser.thinkingTime;
     }
-    if (isUnset('browserManualLogin') && browser.manualLogin !== undefined) {
+    if (isUnset("browserResearch") && browser.researchMode !== undefined) {
+        options.browserResearch = browser.researchMode;
+    }
+    if (isUnset("browserArchive") && browser.archiveConversations !== undefined) {
+        options.browserArchive = browser.archiveConversations;
+    }
+    if (!attachRunningRequested &&
+        isUnset("browserManualLogin") &&
+        browser.manualLogin !== undefined) {
         options.browserManualLogin = browser.manualLogin;
     }
-    if (isUnset('browserManualLoginProfileDir') && browser.manualLoginProfileDir !== undefined) {
+    if (!attachRunningRequested &&
+        isUnset("browserManualLoginProfileDir") &&
+        browser.manualLoginProfileDir !== undefined) {
         options.browserManualLoginProfileDir = browser.manualLoginProfileDir;
     }
 }