@steipete/oracle 0.15.2 → 0.16.0

package/dist/src/cli/browserTabs.js

@@ -3,10 +3,32 @@ import { createHash } from "node:crypto";
 import chalk from "chalk";
 import { sessionStore } from "../sessionStore.js";
 import { collectChatGptTabs, DEFAULT_REMOTE_CHROME_HOST, DEFAULT_REMOTE_CHROME_PORT, extractConversationIdFromUrl, formatBrowserTabState, harvestChatGptTab, sessionMatchesTab, } from "../browser/liveTabs.js";
-import { recoverConversationTab } from "../browser/recoverConversation.js";
+import { isRecoveredConversationHarvestReady, recoverConversationTab, } from "../browser/recoverConversation.js";
 import { resolveOutputPath } from "./writeOutputPath.js";
 const LIVE_POLL_MS = 2000;
 const DEFAULT_STALL_THRESHOLD_MS = 60_000;
+function isRecoverableMissingTabError(message) {
+    return (message.includes("No ChatGPT tab matched") ||
+        message.includes("No live ChatGPT tabs found") ||
+        message.includes("ECONNREFUSED") ||
+        message.includes("Could not connect"));
+}
+function finishRecoveredChrome(recoveredChrome, closeAfterRecover) {
+    if (!recoveredChrome) {
+        return;
+    }
+    try {
+        if (closeAfterRecover) {
+            recoveredChrome.kill();
+        }
+        else {
+            recoveredChrome.process?.unref?.();
+        }
+    }
+    catch {
+        // best-effort cleanup
+    }
+}
 function sessionBrowserEndpoint(meta) {
     const runtime = meta?.browser?.runtime ?? {};
     const remote = meta?.browser?.config?.remoteChrome ?? {};
@@ -150,12 +172,13 @@ export async function harvestSessionBrowserOutput(sessionId, options = {}) {
     if (!meta) {
         throw new Error(`No session found with ID ${sessionId}.`);
     }
-    const initialEndpoint = sessionBrowserEndpoint(meta) ?? {
+    const recordedEndpoint = sessionBrowserEndpoint(meta);
+    const initialEndpoint = recordedEndpoint ?? {
         host: DEFAULT_REMOTE_CHROME_HOST,
         port: DEFAULT_REMOTE_CHROME_PORT,
     };
     const ref = options.browserTabRef ?? resolveSessionTabRef(meta);
-    const recoverIfMissing = options.recoverIfMissing !== false;
+    const recoverIfMissing = options.recoverIfMissing !== false && !options.browserTabRef;
     let recoveredChrome = null;
     try {
         let harvested;
@@ -169,19 +192,18 @@ export async function harvestSessionBrowserOutput(sessionId, options = {}) {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            const isMissingTabError = message.includes("No ChatGPT tab matched") ||
-                message.includes("ECONNREFUSED") ||
-                message.includes("Could not connect");
-            if (!isMissingTabError || !recoverIfMissing) {
+            if (!isRecoverableMissingTabError(message) || !recoverIfMissing) {
                 throw error;
             }
             console.log(chalk.yellow(`No live ChatGPT tab matched session "${sessionId}". Attempting recovery by reopening the saved conversation URL.`));
-            const recovered = await recoverConversationTab(meta, (line) => console.log(line));
+            const recovered = await recoverConversationTab(meta, (line) => console.log(line), {
+                existingEndpoint: recordedEndpoint ?? undefined,
+            });
             recoveredChrome = recovered.chrome;
             harvested = await harvestChatGptTab({
                 host: recovered.host,
                 port: recovered.port,
-                ref: recovered.url,
+                ref: recovered.ref,
                 stallWindowMs: options.stallWindowMs,
             });
         }
@@ -197,14 +219,7 @@ export async function harvestSessionBrowserOutput(sessionId, options = {}) {
         return harvested;
     }
     finally {
-        if (recoveredChrome && options.closeAfterRecover) {
-            try {
-                recoveredChrome.kill();
-            }
-            catch {
-                // best-effort cleanup
-            }
-        }
+        finishRecoveredChrome(recoveredChrome, options.closeAfterRecover);
     }
 }
 export async function liveTailSessionBrowserOutput(sessionId, options = {}) {
@@ -212,16 +227,19 @@ export async function liveTailSessionBrowserOutput(sessionId, options = {}) {
     if (!meta) {
         throw new Error(`No session found with ID ${sessionId}.`);
     }
-    let endpoint = sessionBrowserEndpoint(meta) ?? {
+    const recordedEndpoint = sessionBrowserEndpoint(meta);
+    let endpoint = recordedEndpoint ?? {
         host: DEFAULT_REMOTE_CHROME_HOST,
         port: DEFAULT_REMOTE_CHROME_PORT,
     };
     let browserTabRef = options.browserTabRef ?? resolveSessionTabRef(meta);
-    const recoverIfMissing = options.recoverIfMissing !== false;
+    const recoverIfMissing = options.recoverIfMissing !== false && !options.browserTabRef;
     let recoveredChrome = null;
     const stallThresholdMs = options.stallThresholdMs ?? DEFAULT_STALL_THRESHOLD_MS;
     let lastHash = null;
     let unchangedSince = Date.now();
+    let requireRecoveredContent = false;
+    let recoveredContentDeadlineMs = 0;
     try {
         // Probe once to see if the live tab is still alive; recover if not.
         try {
@@ -233,17 +251,19 @@ export async function liveTailSessionBrowserOutput(sessionId, options = {}) {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            const isMissingTabError = message.includes("No ChatGPT tab matched") ||
-                message.includes("ECONNREFUSED") ||
-                message.includes("Could not connect");
-            if (!isMissingTabError || !recoverIfMissing) {
+            if (!isRecoverableMissingTabError(message) || !recoverIfMissing) {
                 throw error;
             }
             console.log(chalk.yellow(`No live ChatGPT tab matched session "${sessionId}". Attempting recovery by reopening the saved conversation URL.`));
-            const recovered = await recoverConversationTab(meta, (line) => console.log(line));
+            const recovered = await recoverConversationTab(meta, (line) => console.log(line), {
+                existingEndpoint: recordedEndpoint ?? undefined,
+                waitForReady: false,
+            });
             recoveredChrome = recovered.chrome;
             endpoint = { host: recovered.host, port: recovered.port };
-            browserTabRef = recovered.url;
+            browserTabRef = recovered.ref;
+            requireRecoveredContent = true;
+            recoveredContentDeadlineMs = Date.now() + stallThresholdMs;
         }
         while (true) {
             const harvested = await harvestChatGptTab({
@@ -252,6 +272,14 @@ export async function liveTailSessionBrowserOutput(sessionId, options = {}) {
                 ref: browserTabRef,
             });
             const fullText = harvested.lastAssistantMarkdown ?? harvested.lastAssistantText ?? "";
+            if (requireRecoveredContent && !isRecoveredConversationHarvestReady(harvested)) {
+                if (Date.now() < recoveredContentDeadlineMs) {
+                    await new Promise((resolve) => setTimeout(resolve, LIVE_POLL_MS));
+                    continue;
+                }
+                throw new Error("Recovered ChatGPT conversation did not become ready in time.");
+            }
+            requireRecoveredContent = false;
             const hash = createHash("sha1").update(fullText).digest("hex");
             if (hash !== lastHash) {
                 lastHash = hash;
@@ -291,13 +319,6 @@ export async function liveTailSessionBrowserOutput(sessionId, options = {}) {
         }
     }
     finally {
-        if (recoveredChrome && options.closeAfterRecover) {
-            try {
-                recoveredChrome.kill();
-            }
-            catch {
-                // best-effort cleanup
-            }
-        }
+        finishRecoveredChrome(recoveredChrome, options.closeAfterRecover);
     }
 }

package/dist/src/cli/options.js

@@ -255,6 +255,20 @@ export function resolveApiModel(modelValue) {
     // Passthrough for custom/OpenRouter model IDs.
     return normalized;
 }
+function parseBrowserGpt56Label(modelValue) {
+    const normalized = normalizeModelOption(modelValue).toLowerCase();
+    if (!normalized || normalized.includes("/"))
+        return null;
+    const match = normalized.match(/^(?:(?:chatgpt|gpt)[\s._-]*)?5[._-]6(?:[\s._-]+(.+))?$/);
+    if (!match)
+        return null;
+    return {
+        variant: (match[1] ?? "").replace(/[^a-z0-9]+/g, " ").trim(),
+    };
+}
+export function isGpt56BrowserLabel(modelValue) {
+    return parseBrowserGpt56Label(modelValue) !== null;
+}
 export function inferModelFromLabel(modelValue) {
     const normalized = normalizeModelOption(modelValue).toLowerCase();
     if (!normalized) {
@@ -298,6 +312,16 @@ export function inferModelFromLabel(modelValue) {
     if (normalized.includes("classic")) {
         return "gpt-5-pro";
     }
+    // Browser label family currently exposed by ChatGPT as "GPT-5.6 Sol".
+    const gpt56Label = parseBrowserGpt56Label(normalized);
+    if (gpt56Label) {
+        const { variant } = gpt56Label;
+        if (!variant)
+            return "gpt-5.6";
+        if (variant === "sol")
+            return "gpt-5.6-sol";
+        throw new InvalidArgumentError(`Unknown GPT-5.6 browser variant "${variant}". Use gpt-5.6 or gpt-5.6-sol.`);
+    }
     if (normalized.includes("thinking") && normalized.includes("heavy")) {
         return "gpt-5.5";
     }

package/dist/src/cli/runOptions.js

@@ -25,7 +25,12 @@ export function resolveRunOptionsFromConfig({ prompt, files = [], model, models,
         .filter(Boolean);
     const cliModelArg = normalizeModelOption(model ?? userConfig?.model) || DEFAULT_MODEL;
     const apiModel = resolveApiModel(cliModelArg);
-    const browserModel = normalizeChatGptModelForBrowser(inferModelFromLabel(cliModelArg));
+    // Browser label inference is intentionally engine-scoped: API model ids such as
+    // gpt-5.6-luna must remain provider values even though browser mode rejects
+    // unrecognized GPT-5.6 picker variants.
+    const browserModel = resolvedEngine === "browser"
+        ? normalizeChatGptModelForBrowser(inferModelFromLabel(cliModelArg))
+        : apiModel;
     const isCodex = apiModel.startsWith("gpt-5.1-codex");
     const isClaude = apiModel.startsWith("claude");
     const isGrok = apiModel.startsWith("grok");

package/dist/src/cli/sessionDisplay.js

@@ -43,19 +43,42 @@ function formatBytes(bytes) {
 function isDeepResearchBrowserSession(metadata) {
     return metadata.mode === "browser" && metadata.browser?.config?.researchMode === "deep";
 }
-function isDeepResearchPlaceholderCapture(metadata, logText) {
-    const answer = trimBeforeFirstAnswer(logText)
-        .replace(/^Answer:\s*/i, "")
+const DEEP_RESEARCH_TOOL_CALL_MARKERS = [
+    "called tool",
+    "used tool",
+    "użyto narzędzia",
+    "narzędzie wywołane",
+];
+function isDeepResearchToolCallPlaceholder(answerText, outputTokens) {
+    const lines = answerText
         .toLowerCase()
-        .replace(/\s+/g, " ")
-        .trim();
-    const isToolOnly = answer === "called tool" ||
-        answer === "used tool" ||
-        answer === "użyto narzędzia" ||
-        answer === "narzędzie wywołane";
+        .split(/\r?\n/)
+        .map((line) => line.replace(/\s+/g, " ").trim())
+        .filter(Boolean);
+    if (!lines[0] || !DEEP_RESEARCH_TOOL_CALL_MARKERS.includes(lines[0])) {
+        return false;
+    }
+    if (lines.length === 1) {
+        return outputTokens == null || outputTokens <= 8;
+    }
+    const wrapper = lines.slice(1).join(" ");
+    const structuralSignals = [
+        wrapper.includes("deep research app"),
+        /\bcall tool\b/.test(wrapper),
+        /\brequest\s*\{/.test(wrapper),
+        /\bresponse\s*\{/.test(wrapper),
+        /\bsession[_ ]id\b/.test(wrapper),
+    ].filter(Boolean).length;
+    return wrapper.includes("deep research app") && structuralSignals >= 2;
+}
+export function isDeepResearchPlaceholderCapture(metadata, logText) {
+    if (/\[reattach\][^\n]*\nAnswer:/i.test(logText)) {
+        return false;
+    }
+    const answer = trimBeforeFirstAnswer(logText).replace(/^Answer:\s*/i, "");
     const modelUsage = metadata.models?.find((run) => run.model === metadata.model)?.usage;
     const outputTokens = metadata.usage?.outputTokens ?? modelUsage?.outputTokens;
-    return isToolOnly && (outputTokens == null || outputTokens <= 8);
+    return isDeepResearchToolCallPlaceholder(answer, outputTokens);
 }
 async function writeReattachAnswer(sessionId, result, replaceExistingLog) {
     const body = result.answerMarkdown || result.answerText;
@@ -566,10 +589,11 @@ export function trimBeforeFirstAnswer(logText) {
     if (index === -1) {
         return logText;
     }
-    const fromFirstAnswer = logText.slice(index);
-    if (/^Answer:\s*(called tool|used tool|użyto narzędzia|narzędzie wywołane)\s*\n\[reattach\]/i.test(fromFirstAnswer)) {
-        const laterIndex = logText.lastIndexOf(marker);
-        if (laterIndex > index) {
+    const laterIndex = logText.lastIndexOf(marker);
+    const reattachIndex = logText.indexOf("[reattach]", index + marker.length);
+    if (laterIndex > index && reattachIndex > index && reattachIndex < laterIndex) {
+        const firstCapture = logText.slice(index + marker.length, reattachIndex);
+        if (isDeepResearchToolCallPlaceholder(firstCapture)) {
             return logText.slice(laterIndex);
         }
     }

package/dist/src/oracle/config.js

@@ -26,7 +26,32 @@ const countTokensAnthropic = (input) => {
     countTokensAnthropicImpl ??= require("@anthropic-ai/tokenizer").countTokens;
     return countTokensAnthropicImpl(stringifyTokenizerInput(input));
 };
+// GPT-5.6 applies higher rates to requests above 272K input tokens. Keep the
+// supported limit at the base-rate boundary until cost estimation supports tiers.
+const GPT_5_6_BASE_RATE_INPUT_LIMIT = 272_000;
 export const MODEL_CONFIGS = {
+    "gpt-5.6": {
+        model: "gpt-5.6",
+        provider: "openai",
+        tokenizer: countTokensGpt5,
+        inputLimit: GPT_5_6_BASE_RATE_INPUT_LIMIT,
+        pricing: {
+            inputPerToken: 5 / 1_000_000,
+            outputPerToken: 30 / 1_000_000,
+        },
+        reasoning: { effort: "xhigh" },
+    },
+    "gpt-5.6-sol": {
+        model: "gpt-5.6-sol",
+        provider: "openai",
+        tokenizer: countTokensGpt5,
+        inputLimit: GPT_5_6_BASE_RATE_INPUT_LIMIT,
+        pricing: {
+            inputPerToken: 5 / 1_000_000,
+            outputPerToken: 30 / 1_000_000,
+        },
+        reasoning: { effort: "xhigh" },
+    },
     "gpt-5.5-pro": {
         model: "gpt-5.5-pro",
         provider: "openai",

package/dist/src/oracle/geminiModels.js

@@ -3,6 +3,8 @@ const MODEL_ID_MAP = {
     "gemini-3.1-pro": "gemini-3.1-pro-preview",
     "gemini-3.5-flash": "gemini-3.5-flash",
     "gemini-3-pro": "gemini-3-pro-preview",
+    "gpt-5.6": "gpt-5.6",
+    "gpt-5.6-sol": "gpt-5.6-sol",
     "gpt-5.5": "gpt-5.5",
     "gpt-5.5-pro": "gpt-5.5-pro",
     "gpt-5.4": "gpt-5.4",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steipete/oracle",
-  "version": "0.15.2",
-  "description": "CLI wrapper around OpenAI Responses API with GPT-5.5 Pro, GPT-5.5, GPT-5.4, GPT-5.2, GPT-5.1, and GPT-5.1 Codex high reasoning modes.",
+  "version": "0.16.0",
+  "description": "CLI wrapper around OpenAI Responses API with GPT-5.6 Sol, GPT-5.6, GPT-5.5 Pro, GPT-5.5, GPT-5.4, GPT-5.2, GPT-5.1, and GPT-5.1 Codex high reasoning modes.",
   "keywords": [],
   "homepage": "https://askoracle.sh",
   "bugs": {
@@ -32,12 +32,12 @@
     "docs:list": "tsx scripts/docs-list.ts",
     "docs:check": "node --no-deprecation --import tsx bin/oracle-cli.ts docs check",
     "docs:site": "node scripts/build-docs-site.mjs",
-    "build": "tsgo -p tsconfig.build.json && pnpm run build:vendor",
+    "build": "tsc -p tsconfig.build.json && pnpm run build:vendor",
     "build:vendor": "node -e \"const fs=require('fs'); const path=require('path'); const vendorRoot=path.join('dist','vendor'); fs.rmSync(vendorRoot,{recursive:true,force:true}); const vendors=[['oracle-notifier']]; vendors.forEach(([name])=>{const src=path.join('vendor',name); const dest=path.join(vendorRoot,name); fs.mkdirSync(dest,{recursive:true}); if(fs.existsSync(src)){fs.cpSync(src,dest,{recursive:true,force:true});}});\"",
     "start": "pnpm run build && node ./dist/scripts/run-cli.js",
     "oracle": "pnpm start",
     "check": "pnpm run format:check && pnpm run lint",
-    "typecheck": "tsgo --noEmit",
+    "typecheck": "tsc --noEmit",
     "format": "oxfmt --write .",
     "format:check": "oxfmt --check .",
     "format:diff": "oxfmt --write . && git --no-pager diff",
@@ -86,17 +86,16 @@
     "@anthropic-ai/tokenizer": "^0.0.4",
     "@types/chrome-remote-interface": "^0.34.0",
     "@types/inquirer": "^9.0.10",
-    "@types/node": "^26.1.0",
-    "@typescript/native-preview": "7.0.0-dev.20260706.1",
+    "@types/node": "^26.1.1",
     "@vitest/coverage-v8": "4.1.10",
-    "devtools-protocol": "0.0.1656784",
+    "devtools-protocol": "0.0.1658499",
     "es-toolkit": "^1.49.0",
     "esbuild": "^0.28.1",
-    "oxfmt": "0.57.0",
-    "oxlint": "^1.72.0",
+    "oxfmt": "0.58.0",
+    "oxlint": "^1.73.0",
     "puppeteer-core": "^25.3.0",
     "tsx": "^4.23.0",
-    "typescript": "^6.0.3",
+    "typescript": "^7.0.2",
     "vitest": "^4.1.10"
   },
   "devEngines": {