pi-oracle 0.7.4 → 0.7.5

package/extensions/oracle/worker/chatgpt-ui-helpers.mjs

@@ -29,11 +29,15 @@ const AUTO_SWITCH_LABEL = "Auto-switch to Thinking";
 const THINKING_EFFORT_COMBOBOX_LABEL = "Thinking effort";
 const PRO_THINKING_EFFORT_COMBOBOX_LABEL = "Pro thinking effort";
 const EFFORT_LABELS = new Set(["Light", "Standard", "Extended", "Heavy"]);
+const COMPACT_INTELLIGENCE_MENU_PATTERN = /Intelligence.*Instant.*Medium.*High.*Pro/i;
+const COMPACT_INTELLIGENCE_CONTROL_PATTERN = /^(?:Instant(?:\s+5s)?|Medium(?:\s+5\s*[–-]\s*30s)?|High(?:\s+15\s*[–-]\s*60s)?|Pro(?:\s+5\+\s*min)?)$/i;
+const COMPACT_INTELLIGENCE_OPENER_PATTERN = /^(?:Instant|Medium|High|Pro)$/i;
 const BARE_EFFORT_PATTERN = /^(light|standard|extended|heavy)(?:, click to remove)?$/i;
 const INSTANT_CHIP_PATTERN = /^instant(?:, click to remove)?$/i;
 const THINKING_CHIP_PATTERN = /^(?:(light|standard|extended|heavy)\s+)?thinking(?:, click to remove)?$/i;
 const PRO_CHIP_PATTERN = /^(?:(light|standard|extended|heavy)\s+)?pro(?:, click to remove)?$/i;
 const MODEL_FAMILY_CONTROL_KINDS = new Set(["button", "radio", "menuitemradio"]);
+const COMPACT_INTELLIGENCE_CONTROL_KINDS = new Set(["menuitemradio"]);
 
 /**
  * @param {string | undefined} url
@@ -151,9 +155,134 @@ function parseComposerChipSelection(label) {
   return undefined;
 }
 
+function parseCompactIntelligenceSelection(label) {
+  if (/click to remove/i.test(String(label || ""))) return undefined;
+  const normalized = normalizeChipLabel(label);
+  if (!COMPACT_INTELLIGENCE_CONTROL_PATTERN.test(normalized)) return undefined;
+
+  if (/^Instant(?:\s+5s)?$/i.test(normalized)) {
+    return {
+      modelFamily: /** @type {OracleUiModelFamily} */ ("instant"),
+      compactTier: "instant",
+    };
+  }
+  if (/^Medium(?:\s+5\s*[–-]\s*30s)?$/i.test(normalized)) {
+    return {
+      modelFamily: /** @type {OracleUiModelFamily} */ ("thinking"),
+      effort: /** @type {import("./chatgpt-ui-helpers.d.mts").OracleUiEffort} */ ("standard"),
+      compactTier: "medium",
+    };
+  }
+  if (/^High(?:\s+15\s*[–-]\s*60s)?$/i.test(normalized)) {
+    return {
+      modelFamily: /** @type {OracleUiModelFamily} */ ("thinking"),
+      effort: /** @type {import("./chatgpt-ui-helpers.d.mts").OracleUiEffort} */ ("extended"),
+      compactTier: "high",
+    };
+  }
+  if (/^Pro(?:\s+5\+\s*min)?$/i.test(normalized)) {
+    return {
+      modelFamily: /** @type {OracleUiModelFamily} */ ("pro"),
+      compactTier: "pro",
+    };
+  }
+
+  return undefined;
+}
+
+function hasRemovableComposerModelChip(entries) {
+  return entries.some(
+    (entry) => entry.kind === "button" && /click to remove/i.test(String(entry.label || "")) && parseComposerChipSelection(entry.label),
+  );
+}
+
+function hasCompactIntelligenceMenuContext(entries) {
+  return entries.some((entry) => !entry.disabled && entry.kind === "menu" && COMPACT_INTELLIGENCE_MENU_PATTERN.test(normalizeText(entry.label)))
+    || entries.some((entry) => !entry.disabled && entry.kind === "menuitemradio" && checkedState(entry) === true && /\d/.test(String(entry.label || "")) && parseCompactIntelligenceSelection(entry.label));
+}
+
+function hasLegacyEffortCombobox(entries) {
+  return entries.some((entry) => {
+    if (entry.disabled || entry.kind !== "combobox") return false;
+    const label = normalizeText(entry.label).toLowerCase();
+    return label === THINKING_EFFORT_COMBOBOX_LABEL.toLowerCase() || label === PRO_THINKING_EFFORT_COMBOBOX_LABEL.toLowerCase();
+  });
+}
+
+function compactSelectionFromEntry(entry, _entries, _options = {}) {
+  if (entry.disabled || !COMPACT_INTELLIGENCE_CONTROL_KINDS.has(entry.kind || "")) return undefined;
+  if (!/\d/.test(String(entry.label || ""))) return undefined;
+  return parseCompactIntelligenceSelection(entry.label);
+}
+
+function compactSelectionMatchesRequested(selection, compactSelection) {
+  if (!compactSelection || compactSelection.modelFamily !== selection.modelFamily) return false;
+
+  if (selection.modelFamily === "instant") {
+    // The compact Intelligence picker has no explicit auto-switch toggle. Treat
+    // Instant 5s as the closest available target for both instant presets.
+    return compactSelection.compactTier === "instant";
+  }
+
+  if (selection.modelFamily === "pro") {
+    // The compact picker exposes one Pro tier instead of separate Pro efforts.
+    return compactSelection.compactTier === "pro";
+  }
+
+  if (selection.modelFamily === "thinking") {
+    const requestedEffort = selection.effort || "standard";
+    if (compactSelection.compactTier === "medium") return requestedEffort === "light" || requestedEffort === "standard";
+    if (compactSelection.compactTier === "high") return requestedEffort === "extended" || requestedEffort === "heavy";
+  }
+
+  return false;
+}
+
+function compactSelectionMatchesRequestedInSnapshot(snapshot, selection, compactSelection, { weak = false } = {}) {
+  if (!compactSelectionMatchesRequested(selection, compactSelection)) return false;
+  if (selection.modelFamily !== "instant") return true;
+
+  const autoSwitchState = autoSwitchToThinkingSelectionVisible(snapshot);
+  if (autoSwitchState === undefined) return true;
+  if (weak) return selection.autoSwitchToThinking ? autoSwitchState !== false : autoSwitchState !== true;
+  return selection.autoSwitchToThinking ? autoSwitchState === true : autoSwitchState !== true;
+}
+
+function detectCompactIntelligenceSelection(entries) {
+  if (hasRemovableComposerModelChip(entries)) return undefined;
+  if (hasLegacyEffortCombobox(entries)) return undefined;
+
+  for (const entry of entries) {
+    if (entry.kind !== "menuitemradio" || checkedState(entry) !== true) continue;
+    const compactSelection = compactSelectionFromEntry(entry, entries, { allowClosedButtons: false });
+    if (compactSelection) return compactSelection;
+  }
+
+  if (hasCompactIntelligenceMenuContext(entries)) return undefined;
+
+  for (const entry of entries) {
+    if (entry.kind !== "button") continue;
+    const compactSelection = compactSelectionFromEntry(entry, entries);
+    if (!compactSelection) continue;
+    return compactSelection;
+  }
+  return undefined;
+}
+
+export function matchesRequestedModelControlLabel(label, selection) {
+  const compactSelection = parseCompactIntelligenceSelection(label);
+  if (compactSelection) return compactSelectionMatchesRequested(selection, compactSelection);
+  return matchesModelFamilyLabel(label, selection.modelFamily);
+}
+
+export function matchesCompactIntelligenceOpenerLabel(label) {
+  return COMPACT_INTELLIGENCE_OPENER_PATTERN.test(normalizeChipLabel(label));
+}
+
 function detectComposerChipSelection(entries) {
   for (const entry of entries) {
     if (entry.disabled || entry.kind !== "button") continue;
+    if (/\bexpanded=true\b/.test(String(entry.line || "")) && !/click to remove/i.test(String(entry.label || ""))) continue;
     const selection = parseComposerChipSelection(entry.label);
     if (selection) return selection;
   }
@@ -168,6 +297,9 @@ function checkedState(entry) {
 }
 
 function detectSelectedModelFamily(entries) {
+  const compactSelection = detectCompactIntelligenceSelection(entries);
+  if (compactSelection) return compactSelection.modelFamily;
+
   for (const entry of entries) {
     if (entry.disabled || !MODEL_FAMILY_CONTROL_KINDS.has(entry.kind || "") || checkedState(entry) !== true) continue;
     for (const family of /** @type {OracleUiModelFamily[]} */ (["instant", "thinking", "pro"])) {
@@ -213,8 +345,15 @@ export function effortSelectionVisible(snapshot, effortLabel) {
   /** @type {SnapshotEntry[]} */
   const entries = parseSnapshotEntries(snapshot);
   const normalizedEffort = effortLabel.toLowerCase();
+  const compactClosedButtonsAllowed = !hasRemovableComposerModelChip(entries) && !hasLegacyEffortCombobox(entries) && !hasCompactIntelligenceMenuContext(entries);
   return entries.some((entry) => {
     if (entry.disabled) return false;
+    const compactSelection = compactSelectionFromEntry(entry, entries, { allowClosedButtons: compactClosedButtonsAllowed });
+    if (compactSelection && entry.kind === "menuitemradio" && checkedState(entry) !== true) return false;
+    if (compactSelection?.modelFamily === "thinking") {
+      return compactSelectionMatchesRequested({ modelFamily: "thinking", effort: /** @type {import("./chatgpt-ui-helpers.d.mts").OracleUiEffort} */ (normalizedEffort), autoSwitchToThinking: false }, compactSelection);
+    }
+    if (compactSelection?.modelFamily === "pro") return true;
     if (entry.kind === "combobox" && normalizeText(entry.value).toLowerCase() === normalizedEffort) return true;
     const chipSelection = entry.kind === "button" ? parseComposerChipSelection(entry.label) : undefined;
     if (chipSelection?.effort === normalizedEffort) return true;
@@ -255,12 +394,18 @@ export function snapshotHasModelConfigurationUi(snapshot) {
           .filter((family) => matchesModelFamilyLabel(entry.label, family)),
       ),
   );
+  const visibleCompactControls = entries.filter(
+    (entry) => !entry.disabled && entry.kind === "menuitemradio" && /\d/.test(String(entry.label || "")) && parseCompactIntelligenceSelection(entry.label),
+  );
+  const hasCompactIntelligenceMenu = entries.some(
+    (entry) => !entry.disabled && entry.kind === "menu" && COMPACT_INTELLIGENCE_MENU_PATTERN.test(normalizeText(entry.label)),
+  );
   const hasCloseButton = entries.some((entry) => entry.kind === "button" && entry.label === "Close" && !entry.disabled);
   const hasIntelligenceHeading = entries.some((entry) => entry.kind === "heading" && normalizeText(entry.label) === "Intelligence" && !entry.disabled);
   const hasEffortCombobox = entries.some(
     (entry) => entry.kind === "combobox" && EFFORT_LABELS.has(entry.value || "") && !entry.disabled,
   );
-  return visibleFamilies.size >= 2 || visibleRadioFamilies.size >= 2 || hasCloseButton || hasIntelligenceHeading || hasEffortCombobox;
+  return visibleFamilies.size >= 2 || visibleRadioFamilies.size >= 2 || visibleCompactControls.length >= 2 || hasCompactIntelligenceMenu || hasCloseButton || hasIntelligenceHeading || hasEffortCombobox;
 }
 
 /**
@@ -287,6 +432,7 @@ export function snapshotHasModelOpener(snapshot) {
     const label = normalizeChipLabel(entry.label);
     return label === "Model"
       || label === "Model selector"
+      || COMPACT_INTELLIGENCE_OPENER_PATTERN.test(label)
       || EFFORT_LABELS.has(label)
       || ["instant", "thinking", "pro"].some((family) => matchesModelFamilyLabel(label, /** @type {OracleUiModelFamily} */ (family)))
       || THINKING_CHIP_PATTERN.test(label)
@@ -325,6 +471,10 @@ export function autoSwitchToThinkingSelectionVisible(snapshot) {
  */
 export function snapshotCanSafelySkipModelConfiguration(snapshot, selection) {
   if (!snapshotStronglyMatchesRequestedModel(snapshot, selection)) return false;
+  const hasBareProPill = selection.modelFamily === "pro" && parseSnapshotEntries(snapshot).some(
+    (entry) => entry.kind === "button" && !entry.disabled && normalizeChipLabel(entry.label) === "Pro",
+  );
+  if (hasBareProPill && !snapshotHasModelConfigurationUi(snapshot)) return false;
   if (selection.modelFamily === "instant" && selection.autoSwitchToThinking) {
     return autoSwitchToThinkingSelectionVisible(snapshot) === true;
   }
@@ -339,6 +489,9 @@ export function snapshotCanSafelySkipModelConfiguration(snapshot, selection) {
 export function snapshotStronglyMatchesRequestedModel(snapshot, selection) {
   /** @type {SnapshotEntry[]} */
   const entries = parseSnapshotEntries(snapshot);
+  const compactSelection = detectCompactIntelligenceSelection(entries);
+  if (compactSelection) return compactSelectionMatchesRequestedInSnapshot(snapshot, selection, compactSelection);
+
   const chipSelection = detectComposerChipSelection(entries);
   if (chipSelection) return selectionMatchesChipSelection(selection, chipSelection);
 
@@ -366,6 +519,9 @@ export function snapshotStronglyMatchesRequestedModel(snapshot, selection) {
 export function snapshotWeaklyMatchesRequestedModel(snapshot, selection) {
   /** @type {SnapshotEntry[]} */
   const entries = parseSnapshotEntries(snapshot);
+  const compactSelection = detectCompactIntelligenceSelection(entries);
+  if (compactSelection) return compactSelectionMatchesRequestedInSnapshot(snapshot, selection, compactSelection, { weak: true });
+
   const chipSelection = detectComposerChipSelection(entries);
   if (chipSelection) return selectionMatchesChipSelection(selection, chipSelection);
 

package/extensions/oracle/worker/chromium-cookie-source.mjs

@@ -4,6 +4,7 @@
 // Usage: auth-bootstrap.mjs uses this when auth.chromiumKeychain is configured alongside auth.chromeCookiePath.
 // Invariants/Assumptions: The configured cookie path points at a Chromium Cookies DB and the configured Keychain item is the browser's safe-storage secret.
 import { spawn } from "node:child_process";
+import { sweetCookieSafeStoragePasswordScrubbedEnv } from "../shared/browser-profile-helpers.mjs";
 import { createDecipheriv, pbkdf2Sync } from "node:crypto";
 import { copyFileSync, existsSync, mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
@@ -16,7 +17,7 @@ const MACOS_CHROMIUM_KEY_ITERATIONS = 1003;
 
 function spawnCapture(command, args, options = {}) {
   return new Promise((resolve) => {
-    const child = spawn(command, args, { stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn(command, args, { env: sweetCookieSafeStoragePasswordScrubbedEnv(), stdio: ["ignore", "pipe", "pipe"], shell: process.platform === "win32" });
     let stdout = "";
     let stderr = "";
     const timeoutMs = options.timeoutMs ?? 5_000;

package/extensions/oracle/worker/run-job.mjs

@@ -5,7 +5,7 @@
 // Invariants/Assumptions: Job state is persisted under worker-held locks, browser/session artifacts live under the configured oracle directories, and cleanup preserves durable recovery semantics.
 import { createHash, randomUUID } from "node:crypto";
 import { existsSync, readdirSync, readFileSync } from "node:fs";
-import { appendFile, chmod, mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
+import { appendFile, chmod, cp as copyDirectory, mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { spawn } from "node:child_process";
@@ -23,7 +23,9 @@ import { extractArtifactLabels, FILE_LABEL_PATTERN_SOURCE, GENERIC_ARTIFACT_LABE
 import {
   buildAllowedChatGptOrigins,
   deriveAssistantCompletionSignature,
+  matchesCompactIntelligenceOpenerLabel,
   matchesModelFamilyLabel,
+  matchesRequestedModelControlLabel,
   requestedEffortLabel,
   effortSelectionVisible,
   snapshotCanSafelySkipModelConfiguration,
@@ -34,6 +36,7 @@ import {
   autoSwitchToThinkingSelectionVisible,
 } from "./chatgpt-ui-helpers.mjs";
 import { assistantSnapshotSlice, nextStableValueState, resolveStableConversationUrlCandidate, stripUrlQueryAndHash } from "./chatgpt-flow-helpers.mjs";
+import { assertNotKnownBrowserUserDataPath, scrubSweetCookieSafeStoragePasswordEnv, sweetCookieSafeStoragePasswordScrubbedEnv } from "../shared/browser-profile-helpers.mjs";
 import { createLease, listLeaseMetadata, readLeaseMetadata, releaseLease, withLock } from "./state-locks.mjs";
 
 const jobId = process.argv[2];
@@ -80,6 +83,8 @@ const POST_SEND_SETTLE_MS = 15_000;
 const AGENT_BROWSER_BIN = [process.env.AGENT_BROWSER_PATH, "/opt/homebrew/bin/agent-browser", "/usr/local/bin/agent-browser"].find(
   (candidate) => typeof candidate === "string" && candidate && existsSync(candidate),
 ) || "agent-browser";
+const CP_BIN = process.env.PI_ORACLE_CP_PATH?.trim() || "cp";
+scrubSweetCookieSafeStoragePasswordEnv();
 
 let currentJob;
 let browserStarted = false;
@@ -209,12 +214,30 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+function killProcessTree(child) {
+  if (process.platform === "win32" && child.pid) {
+    spawn("taskkill", ["/pid", String(child.pid), "/t", "/f"], { stdio: "ignore", windowsHide: true }).on("error", () => undefined);
+    return;
+  }
+  child.kill("SIGTERM");
+}
+
+function killProcess(child) {
+  if (process.platform === "win32" && child.pid) {
+    spawn("taskkill", ["/pid", String(child.pid), "/f"], { stdio: "ignore", windowsHide: true }).on("error", () => undefined);
+    return;
+  }
+  child.kill("SIGKILL");
+}
+
 function spawnCommand(command, args, options = {}) {
   return new Promise((resolve, reject) => {
     const { timeoutMs, ...spawnOptions } = options;
     const child = spawn(command, args, {
       stdio: ["pipe", "pipe", "pipe"],
       ...spawnOptions,
+      env: sweetCookieSafeStoragePasswordScrubbedEnv(spawnOptions.env),
+      shell: spawnOptions.shell ?? process.platform === "win32",
     });
     let stdout = "";
     let stderr = "";
@@ -223,8 +246,8 @@ function spawnCommand(command, args, options = {}) {
     if (typeof timeoutMs === "number" && timeoutMs > 0) {
       killTimer = setTimeout(() => {
         timedOut = true;
-        child.kill("SIGTERM");
-        setTimeout(() => child.kill("SIGKILL"), 2_000).unref?.();
+        killProcessTree(child);
+        setTimeout(() => killProcess(child), 2_000).unref?.();
       }, timeoutMs);
       killTimer.unref?.();
     }
@@ -274,8 +297,20 @@ async function removeChromiumProcessSingletonArtifacts(profileDir) {
   ]);
 }
 
+function assertSafeRuntimeProfilePath(path, label, config = undefined) {
+  try {
+    assertNotKnownBrowserUserDataPath(path, label, {
+      cookieSources: config ? { chromeProfile: config.auth.chromeProfile, chromeCookiePath: config.auth.chromeCookiePath } : undefined,
+    });
+  } catch (error) {
+    throw new Error(`Oracle ${label} path is unsafe: ${path}. ${error instanceof Error ? error.message : String(error)}`);
+  }
+}
+
 async function cloneSeedProfileToRuntime(job) {
   const seedDir = job.config.browser.authSeedProfileDir;
+  assertSafeRuntimeProfilePath(seedDir, "auth seed profile", job.config);
+  assertSafeRuntimeProfilePath(job.runtimeProfileDir, "runtime profile", job.config);
   if (!existsSync(seedDir)) {
     throw new Error(`Oracle auth seed profile not found: ${seedDir}. Run /oracle-auth first.`);
   }
@@ -286,17 +321,17 @@ async function cloneSeedProfileToRuntime(job) {
   await withLock(ORACLE_STATE_DIR, "auth", "global", { jobId: job.id, processPid: process.pid, action: "cloneSeedProfile" }, async () => {
     await rm(job.runtimeProfileDir, { recursive: true, force: true }).catch(() => undefined);
     await ensurePrivateDir(dirname(job.runtimeProfileDir));
-    if (job.config.browser.cloneStrategy === "apfs-clone") {
+    if (job.config.browser.cloneStrategy === "apfs-clone" && process.platform === "darwin") {
       try {
-        await spawnCommand("/bin/cp", ["-cR", seedDir, job.runtimeProfileDir], { timeoutMs: PROFILE_CLONE_TIMEOUT_MS });
+        await spawnCommand(CP_BIN, ["-cR", seedDir, job.runtimeProfileDir], { timeoutMs: PROFILE_CLONE_TIMEOUT_MS });
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         await log(`APFS clone copy failed; falling back to recursive copy: ${message}`);
         await rm(job.runtimeProfileDir, { recursive: true, force: true }).catch(() => undefined);
-        await spawnCommand("/bin/cp", ["-R", seedDir, job.runtimeProfileDir], { timeoutMs: PROFILE_CLONE_TIMEOUT_MS });
+        await spawnCommand(CP_BIN, ["-R", seedDir, job.runtimeProfileDir], { timeoutMs: PROFILE_CLONE_TIMEOUT_MS });
       }
     } else {
-      await spawnCommand("/bin/cp", ["-R", seedDir, job.runtimeProfileDir], { timeoutMs: PROFILE_CLONE_TIMEOUT_MS });
+      await copyDirectory(seedDir, job.runtimeProfileDir, { recursive: true, force: true, verbatimSymlinks: true });
     }
     await removeChromiumProcessSingletonArtifacts(job.runtimeProfileDir);
   }, 10 * 60 * 1000);
@@ -314,27 +349,28 @@ async function cleanupRuntime(job) {
       warnings.push(message);
       await log(message).catch(() => undefined);
     });
-    await rm(job.runtimeProfileDir, { recursive: true, force: true }).catch(async (error) => {
+    try {
+      assertSafeRuntimeProfilePath(job.runtimeProfileDir, "runtime profile", job.config);
+      await rm(job.runtimeProfileDir, { recursive: true, force: true });
+    } catch (error) {
       const message = `Runtime profile cleanup warning: ${error instanceof Error ? error.message : String(error)}`;
       warnings.push(message);
       await log(message).catch(() => undefined);
-    });
-    if (warnings.length === 0) {
-      await releaseLease(ORACLE_STATE_DIR, "conversation", job.conversationId).catch(async (error) => {
-        const message = `Conversation lease cleanup warning: ${error instanceof Error ? error.message : String(error)}`;
-        warnings.push(message);
-        await log(message).catch(() => undefined);
-      });
-      await releaseLease(ORACLE_STATE_DIR, "runtime", job.runtimeId).catch(async (error) => {
-        const message = `Runtime lease cleanup warning: ${error instanceof Error ? error.message : String(error)}`;
-        warnings.push(message);
-        await log(message).catch(() => undefined);
-      });
     }
+    await releaseLease(ORACLE_STATE_DIR, "conversation", job.conversationId).catch(async (error) => {
+      const message = `Conversation lease cleanup warning: ${error instanceof Error ? error.message : String(error)}`;
+      warnings.push(message);
+      await log(message).catch(() => undefined);
+    });
+    await releaseLease(ORACLE_STATE_DIR, "runtime", job.runtimeId).catch(async (error) => {
+      const message = `Runtime lease cleanup warning: ${error instanceof Error ? error.message : String(error)}`;
+      warnings.push(message);
+      await log(message).catch(() => undefined);
+    });
     if (warnings.length === 0) {
       await log(`Cleanup summary: runtime ${job.runtimeId} released with no warnings`).catch(() => undefined);
     } else {
-      await log(`Cleanup summary: runtime ${job.runtimeId} released with ${warnings.length} warning(s)`).catch(() => undefined);
+      await log(`Cleanup summary: runtime ${job.runtimeId} released after ${warnings.length} warning(s)`).catch(() => undefined);
     }
     return warnings;
   } finally {
@@ -723,11 +759,42 @@ function matchesModelFamilyControl(candidate, family) {
   return ["button", "radio", "menuitemradio"].includes(candidate.kind || "") && typeof candidate.label === "string" && matchesModelFamilyLabel(candidate.label, family) && !candidate.disabled;
 }
 
+function normalizeSnapshotLabel(value) {
+  return String(value || "").replace(/\s+/g, " ").trim();
+}
+
+function snapshotHasLegacyEffortCombobox(snapshot) {
+  return Boolean(findEntry(snapshot, (candidate) => {
+    if (candidate.kind !== "combobox" || candidate.disabled) return false;
+    return /^(?:Thinking effort|Pro thinking effort)$/i.test(normalizeSnapshotLabel(candidate.label));
+  }));
+}
+
+function snapshotHasCompactIntelligenceMenuControls(snapshot) {
+  return Boolean(findEntry(snapshot, (candidate) => {
+    if (candidate.disabled) return false;
+    const label = normalizeSnapshotLabel(candidate.label);
+    return (candidate.kind === "menu" && /Intelligence.*Instant.*Medium.*High.*Pro/i.test(label))
+      || (candidate.kind === "menuitemradio" && /^(?:Instant\s+5s|Medium\s+5\s*[–-]\s*30s|High\s+15\s*[–-]\s*60s|Pro\s+5\+\s*min)$/i.test(label));
+  }));
+}
+
+function matchesRequestedModelControl(candidate, selection, options = {}) {
+  if (!["button", "radio", "menuitemradio"].includes(candidate.kind || "") || typeof candidate.label !== "string" || candidate.disabled) return false;
+  if (candidate.kind === "button") {
+    if (/\bexpanded=true\b/.test(String(candidate.line || ""))) return false;
+    if (options.ignoreCompactTierButtons && /^(?:Instant|Medium|High|Pro)$/i.test(candidate.label)) return false;
+    if (options.ignoreCompactOnlyButtons && /^(?:Medium|High)$/i.test(candidate.label)) return false;
+  }
+  return matchesRequestedModelControlLabel(candidate.label, selection);
+}
+
 function matchesModelConfigurationOpener(candidate) {
   if (candidate.kind !== "button" || typeof candidate.label !== "string" || candidate.disabled) return false;
   const label = String(candidate.label || "");
   return candidate.label === "Model"
     || candidate.label === "Model selector"
+    || matchesCompactIntelligenceOpenerLabel(label)
     || /^(?:Light|Standard|Extended|Heavy)(?:, click to remove)?$/i.test(label)
     || ["instant", "thinking", "pro"].some((family) => matchesModelFamilyLabel(label, /** @type {import("./chatgpt-ui-helpers.d.mts").OracleUiModelFamily} */ (family)))
     || /^(?:(?:Light|Standard|Extended|Heavy) )?Thinking(?:, click to remove)?$/i.test(label)
@@ -1196,19 +1263,33 @@ async function configureModel(job) {
   let verificationSnapshot = familySnapshot;
 
   const alreadyConfiguredInUi = snapshotStronglyMatchesRequestedModel(familySnapshot, job.selection);
-  let familyEntry = findEntry(familySnapshot, (candidate) => matchesModelFamilyControl(candidate, job.selection.modelFamily));
+  const legacyEffortComboboxVisible = snapshotHasLegacyEffortCombobox(familySnapshot);
+  const familyAlreadySelectedInUi = !alreadyConfiguredInUi && legacyEffortComboboxVisible && snapshotWeaklyMatchesRequestedModel(familySnapshot, job.selection);
+  const controlOptions = {
+    ignoreCompactTierButtons: snapshotHasCompactIntelligenceMenuControls(familySnapshot),
+    ignoreCompactOnlyButtons: legacyEffortComboboxVisible,
+  };
+  let familyEntry = alreadyConfiguredInUi || familyAlreadySelectedInUi
+    ? undefined
+    : findEntry(familySnapshot, (candidate) => matchesRequestedModelControl(candidate, job.selection, controlOptions));
   if (alreadyConfiguredInUi) {
     await log("Model configuration UI opened with requested settings already selected");
+  } else if (familyAlreadySelectedInUi) {
+    await log("Model family already appears selected; verifying effort-specific settings");
   } else if (!familyEntry) {
     throw new Error(`Could not find model family control for ${job.selection.modelFamily}`);
   }
 
-  if (!alreadyConfiguredInUi && familyEntry) {
+  if (!alreadyConfiguredInUi && !familyAlreadySelectedInUi && familyEntry) {
     await clickRef(job, familyEntry.ref);
     await agentBrowser(job, "wait", "800");
     familySnapshot = await snapshotText(job);
     verificationSnapshot = familySnapshot;
-    familyEntry = findEntry(familySnapshot, (candidate) => matchesModelFamilyControl(candidate, job.selection.modelFamily));
+    const postClickControlOptions = {
+      ignoreCompactTierButtons: snapshotHasCompactIntelligenceMenuControls(familySnapshot),
+      ignoreCompactOnlyButtons: snapshotHasLegacyEffortCombobox(familySnapshot),
+    };
+    familyEntry = findEntry(familySnapshot, (candidate) => matchesRequestedModelControl(candidate, job.selection, postClickControlOptions));
     if (!familyEntry && !snapshotStronglyMatchesRequestedModel(familySnapshot, job.selection)) {
       throw new Error(`Requested model family did not remain selected: ${job.selection.modelFamily}`);
     }
@@ -1240,7 +1321,8 @@ async function configureModel(job) {
   if (job.selection.modelFamily === "instant") {
     const desiredAutoSwitchState = job.selection.autoSwitchToThinking === true;
     const currentAutoSwitchState = autoSwitchToThinkingSelectionVisible(familySnapshot);
-    if (currentAutoSwitchState !== desiredAutoSwitchState && (desiredAutoSwitchState || currentAutoSwitchState === true)) {
+    const compactInstantAlreadyVerified = desiredAutoSwitchState && currentAutoSwitchState === undefined && snapshotStronglyMatchesRequestedModel(familySnapshot, job.selection);
+    if (!compactInstantAlreadyVerified && currentAutoSwitchState !== desiredAutoSwitchState && (desiredAutoSwitchState || currentAutoSwitchState === true)) {
       await clickAutoSwitchToThinkingControl(job);
       await agentBrowser(job, "wait", "400");
       verificationSnapshot = await snapshotText(job);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-oracle",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "ChatGPT and Grok web-oracle extension for pi with isolated browser auth, async jobs, and project-context archives.",
   "private": false,
   "license": "MIT",
@@ -32,7 +32,11 @@
     "docs",
     "README.md",
     "CHANGELOG.md",
-    "LICENSE"
+    "LICENSE",
+    "platform-smoke.config.mjs",
+    "scripts/platform-smoke.mjs",
+    "scripts/platform-smoke",
+    "scripts/oracle-real-smoke.mjs"
   ],
   "pi": {
     "extensions": [
@@ -43,14 +47,29 @@
     ]
   },
   "scripts": {
-    "check:oracle-extension": "node --check extensions/oracle/shared/process-helpers.mjs && node --check extensions/oracle/shared/state-coordination-helpers.mjs && node --check extensions/oracle/shared/job-coordination-helpers.mjs && node --check extensions/oracle/shared/job-lifecycle-helpers.mjs && node --check extensions/oracle/shared/job-observability-helpers.mjs && node --check extensions/oracle/worker/run-job.mjs && node --check extensions/oracle/worker/state-locks.mjs && node --check extensions/oracle/worker/artifact-heuristics.mjs && node --check extensions/oracle/worker/chatgpt-ui-helpers.mjs && node --check extensions/oracle/worker/chatgpt-flow-helpers.mjs && node --check extensions/oracle/worker/auth-flow-helpers.mjs && node --check extensions/oracle/worker/auth-cookie-policy.mjs && node --check extensions/oracle/worker/chromium-cookie-source.mjs && node --check extensions/oracle/worker/auth-bootstrap.mjs && esbuild extensions/oracle/index.ts --bundle --platform=node --format=esm --external:@earendil-works/pi-coding-agent --external:@earendil-works/pi-ai --external:typebox --outfile=/tmp/pi-oracle-extension-check.js",
+    "check:oracle-extension": "node --check extensions/oracle/shared/browser-profile-helpers.mjs && node --check extensions/oracle/shared/process-helpers.mjs && node --check extensions/oracle/shared/state-coordination-helpers.mjs && node --check extensions/oracle/shared/job-coordination-helpers.mjs && node --check extensions/oracle/shared/job-lifecycle-helpers.mjs && node --check extensions/oracle/shared/job-observability-helpers.mjs && node --check extensions/oracle/worker/run-job.mjs && node --check extensions/oracle/worker/state-locks.mjs && node --check extensions/oracle/worker/artifact-heuristics.mjs && node --check extensions/oracle/worker/chatgpt-ui-helpers.mjs && node --check extensions/oracle/worker/chatgpt-flow-helpers.mjs && node --check extensions/oracle/worker/auth-flow-helpers.mjs && node --check extensions/oracle/worker/auth-cookie-policy.mjs && node --check extensions/oracle/worker/chromium-cookie-source.mjs && node --check extensions/oracle/worker/auth-bootstrap.mjs && esbuild extensions/oracle/index.ts --bundle --platform=node --format=esm --external:@earendil-works/pi-coding-agent --external:@earendil-works/pi-ai --external:typebox --outfile=/tmp/pi-oracle-extension-check.js",
     "typecheck": "tsc --noEmit -p tsconfig.json",
     "typecheck:worker-helpers": "tsc --noEmit -p tsconfig.worker-helpers.json",
     "sanity:oracle": "node scripts/oracle-sanity-runner.mjs",
     "pack:check": "npm pack --dry-run",
-    "verify:oracle": "npm run check:oracle-extension && npm run typecheck && npm run typecheck:worker-helpers && npm run sanity:oracle && npm run pack:check",
+    "verify:oracle": "npm run check:oracle-extension && npm run check:platform-smoke && npm run check:oracle-real-smoke && npm run typecheck && npm run typecheck:worker-helpers && npm run sanity:oracle && npm run pack:check",
     "test": "npm run verify:oracle",
-    "prepublishOnly": "npm run verify:oracle"
+    "prepublishOnly": "npm run release:check",
+    "check:platform-smoke": "node --check scripts/platform-smoke.mjs && node --check scripts/platform-smoke/assertions.mjs && node --check scripts/platform-smoke/artifacts.mjs && node --check scripts/platform-smoke/crabbox-runner.mjs && node --check scripts/platform-smoke/doctor.mjs && node --check scripts/platform-smoke/targets.mjs && node scripts/platform-smoke/invariants.mjs",
+    "smoke:platform": "node scripts/platform-smoke.mjs",
+    "smoke:platform:doctor": "node scripts/platform-smoke.mjs doctor",
+    "smoke:platform:ubuntu": "node scripts/platform-smoke.mjs run --target ubuntu",
+    "smoke:platform:all": "npm run smoke:platform:doctor && node scripts/platform-smoke.mjs run --target macos,ubuntu,windows-native",
+    "smoke:platform:macos": "node scripts/platform-smoke.mjs run --target macos",
+    "smoke:platform:windows-native": "node scripts/platform-smoke.mjs run --target windows-native",
+    "smoke:real": "npm run smoke:real:packed",
+    "smoke:real:doctor": "node scripts/oracle-real-smoke.mjs doctor",
+    "release:check": "npm run verify:oracle && npm run smoke:platform:all",
+    "check:oracle-real-smoke": "node --check scripts/oracle-real-smoke.mjs",
+    "smoke:real:packed": "node scripts/oracle-real-smoke.mjs run --mode packed",
+    "smoke:real:source": "node scripts/oracle-real-smoke.mjs run --mode source",
+    "sanity:oracle:platform": "node scripts/oracle-sanity-runner.mjs --mode platform",
+    "verify:oracle:platform": "npm run check:oracle-extension && npm run check:platform-smoke && npm run check:oracle-real-smoke && npm run sanity:oracle:platform && npm run pack:check"
   },
   "dependencies": {
     "@steipete/sweet-cookie": "^0.3.0"
@@ -76,7 +95,9 @@
     "node": ">=22.19.0"
   },
   "os": [
-    "darwin"
+    "darwin",
+    "linux",
+    "win32"
   ],
   "packageManager": "npm@11.16.0",
   "peerDependenciesMeta": {

package/platform-smoke.config.mjs

@@ -0,0 +1,59 @@
+// Platform smoke configuration for pi-oracle.
+// Crabbox is used as the local cross-platform release/readiness gate.
+
+export default {
+  packageName: "pi-oracle",
+  artifactRoot: ".artifacts/platform-smoke",
+  requiredTargets: ["macos", "ubuntu", "windows-native"],
+  requiredSuites: ["platform-build", "real-extension"],
+  workflows: {
+    everyday: {
+      description: "Fast local validation for normal iteration.",
+      commands: ["npm run verify:oracle"],
+    },
+    platformSensitive: {
+      description: "Doctor plus focused platform target/suite runs for platform-sensitive changes.",
+      commands: [
+        "npm run smoke:platform:doctor",
+        "node scripts/platform-smoke.mjs run --target <target> --suite <suite>",
+      ],
+    },
+    release: {
+      description: "Doctor-first packed-install macOS/Ubuntu/Windows release proof.",
+      commands: ["npm run smoke:platform:all"],
+    },
+  },
+  requiredCrabbox: {
+    source: "https://github.com/openclaw/crabbox",
+    minVersion: "0.24.0",
+  },
+  ubuntuContainerImage: "pi-oracle-platform-smoke:node24",
+  ubuntuContainerBaseImage: "cimg/node:24.16",
+  windowsParallels: {
+    sourceVm: "pi-extension-windows-template",
+    snapshot: "crabbox-ready",
+  },
+  nodeValidationMajor: 24,
+  realSmoke: {
+    defaultProvider: "zai",
+    defaultModel: "glm-5.1",
+    authEnvByProvider: {
+      zai: ["ZAI_API_KEY"],
+      openai: ["OPENAI_API_KEY"],
+      anthropic: ["ANTHROPIC_API_KEY", "ANTHROPIC_OAUTH_TOKEN"],
+      google: ["GEMINI_API_KEY"],
+      xai: ["XAI_API_KEY"],
+      groq: ["GROQ_API_KEY"],
+      deepseek: ["DEEPSEEK_API_KEY"],
+      cerebras: ["CEREBRAS_API_KEY"],
+      fireworks: ["FIREWORKS_API_KEY"],
+      together: ["TOGETHER_API_KEY"],
+      openrouter: ["OPENROUTER_API_KEY"],
+      ai_gateway: ["AI_GATEWAY_API_KEY"],
+      mistral: ["MISTRAL_API_KEY"],
+      minimax: ["MINIMAX_API_KEY"],
+      moonshot: ["MOONSHOT_API_KEY"],
+      kimi: ["KIMI_API_KEY"],
+    },
+  },
+};