pi-oracle 0.4.0 → 0.6.0

package/extensions/oracle/shared/job-lifecycle-helpers.d.mts

@@ -104,6 +104,7 @@ export declare function appendOracleJobLifecycleEvent<TJob extends OracleLifecyc
   event: Omit<OracleJobLifecycleEvent, "status" | "phase"> & { status?: OracleJobStatus; phase?: OracleJobPhase },
 ): TJob;
 export declare function getLatestOracleJobLifecycleEvent(job: Pick<OracleLifecycleTrackedJobLike, "lifecycleEvents">): OracleJobLifecycleEvent | undefined;
+export declare function getLatestOracleTerminalLifecycleEvent(job: Pick<OracleLifecycleTrackedJobLike, "lifecycleEvents">): OracleJobLifecycleEvent | undefined;
 export declare function markOracleJobCreated<TJob extends OracleLifecycleTrackedJobLike>(job: TJob, options?: { at?: string; source?: string; message?: string }): TJob;
 export declare function transitionOracleJobPhase<TJob extends OracleLifecycleTrackedJobLike>(
   job: TJob,

package/extensions/oracle/shared/job-lifecycle-helpers.mjs

@@ -111,6 +111,19 @@ export function getLatestOracleJobLifecycleEvent(job) {
   return events.length > 0 ? events[events.length - 1] : undefined;
 }
 
+/**
+ * @param {Pick<OracleLifecycleTrackedJobLike, "lifecycleEvents">} job
+ * @returns {OracleJobLifecycleEvent | undefined}
+ */
+export function getLatestOracleTerminalLifecycleEvent(job) {
+  const events = job.lifecycleEvents || [];
+  for (let index = events.length - 1; index >= 0; index -= 1) {
+    const event = events[index];
+    if (event?.kind === "phase" && TERMINAL_ORACLE_JOB_STATUSES.includes(event.status)) return event;
+  }
+  return undefined;
+}
+
 /**
  * @template {OracleLifecycleTrackedJobLike} TJob
  * @param {TJob} job

package/extensions/oracle/shared/job-observability-helpers.d.mts

@@ -32,6 +32,7 @@ export interface OracleJobSummaryOptions {
   queuePosition?: OracleQueuePositionLike;
   artifactsPath?: string;
   responsePreview?: string;
+  responseAvailable?: boolean;
   includeLatestEvent?: boolean;
   includeWorkerLogPath?: boolean;
 }
@@ -53,7 +54,7 @@ export declare function formatOracleLifecycleEvent(event: OracleJobLifecycleEven
 export declare function formatOracleJobSummary(job: OracleJobSummaryLike, options?: OracleJobSummaryOptions): string;
 export declare function buildOracleWakeupNotificationContent(
   job: OracleJobSummaryLike,
-  options?: { responsePath?: string; artifactsPath?: string },
+  options?: { responsePath?: string; responseAvailable?: boolean; artifactsPath?: string },
 ): string;
 export declare function formatOracleSubmitResponse(job: OracleJobSummaryLike & { promptPath: string; archivePath: string }, options: OracleSubmitResponseOptions): string;
 export declare function buildOracleStatusText(counts: OracleStatusCounts): string;

package/extensions/oracle/shared/job-observability-helpers.mjs

@@ -4,7 +4,7 @@
 // Usage: Imported by commands, tools, poller, and extension startup/status code to keep detached-oracle messaging consistent.
 // Invariants/Assumptions: Job summaries read from durable job state, and lifecycle event trails are bounded and already normalized by shared lifecycle helpers.
 
-import { getLatestOracleJobLifecycleEvent } from "./job-lifecycle-helpers.mjs";
+import { getLatestOracleJobLifecycleEvent, getLatestOracleTerminalLifecycleEvent } from "./job-lifecycle-helpers.mjs";
 
 /** @typedef {import("./job-observability-helpers.d.mts").OracleJobSummaryLike} OracleJobSummaryLike */
 /** @typedef {import("./job-observability-helpers.d.mts").OracleJobSummaryOptions} OracleJobSummaryOptions */
@@ -52,7 +52,22 @@ function formatAutoPrunedArchiveMessage(autoPrunedPrefixes) {
  * @returns {string}
  */
 export function formatOracleJobSummary(job, options = {}) {
-  const latestEvent = options.includeLatestEvent === false ? undefined : formatOracleLifecycleEvent(getLatestOracleJobLifecycleEvent(job));
+  const latestEventRaw = options.includeLatestEvent === false ? undefined : getLatestOracleJobLifecycleEvent(job);
+  const terminalEventRaw = getLatestOracleTerminalLifecycleEvent(job);
+  const latestEvent = formatOracleLifecycleEvent(latestEventRaw);
+  const terminalEvent = formatOracleLifecycleEvent(terminalEventRaw);
+  const sameEvent = Boolean(
+    latestEventRaw && terminalEventRaw &&
+    latestEventRaw.at === terminalEventRaw.at &&
+    latestEventRaw.source === terminalEventRaw.source &&
+    latestEventRaw.kind === terminalEventRaw.kind &&
+    latestEventRaw.message === terminalEventRaw.message,
+  );
+  const responseLine = options.responseAvailable === true
+    ? job.responsePath ? `response: ${job.responsePath}` : undefined
+    : job.responsePath ? "response: unavailable yet" : undefined;
+  const responseFormatLine = options.responseAvailable === true && job.responseFormat ? `response-format: ${job.responseFormat}` : undefined;
+  const latestEventLabel = latestEventRaw?.kind === "wakeup" ? "wakeup-event" : "last-event";
   return [
     `job: ${job.id}`,
     `status: ${job.status}`,
@@ -67,14 +82,15 @@ export function formatOracleJobSummary(job, options = {}) {
     job.followUpToJobId ? `follow-up-to: ${job.followUpToJobId}` : undefined,
     job.chatUrl ? `chat: ${job.chatUrl}` : undefined,
     job.conversationId ? `conversation: ${job.conversationId}` : undefined,
-    job.responsePath ? `response: ${job.responsePath}` : undefined,
-    job.responseFormat ? `response-format: ${job.responseFormat}` : undefined,
+    responseLine,
+    responseFormatLine,
     options.artifactsPath ? `artifacts: ${options.artifactsPath}` : undefined,
     typeof job.artifactFailureCount === "number" ? `artifact-failures: ${job.artifactFailureCount}` : undefined,
     options.includeWorkerLogPath === false ? undefined : job.workerLogPath ? `worker-log: ${job.workerLogPath}` : undefined,
     job.lastCleanupAt ? `last-cleanup: ${job.lastCleanupAt}` : undefined,
     job.cleanupWarnings?.length ? `cleanup-warnings: ${job.cleanupWarnings.join(" | ")}` : undefined,
-    latestEvent ? `last-event: ${latestEvent}` : undefined,
+    terminalEvent ? `terminal-event: ${terminalEvent}` : undefined,
+    latestEvent && !sameEvent ? `${latestEventLabel}: ${latestEvent}` : undefined,
     job.error ? `error: ${job.error}` : undefined,
     options.responsePreview ? "" : undefined,
     options.responsePreview,
@@ -85,19 +101,21 @@ export function formatOracleJobSummary(job, options = {}) {
 
 /**
  * @param {OracleJobSummaryLike} job
- * @param {{ responsePath?: string; artifactsPath?: string }} [options]
+ * @param {{ responsePath?: string; responseAvailable?: boolean; artifactsPath?: string }} [options]
  * @returns {string}
  */
 export function buildOracleWakeupNotificationContent(job, options = {}) {
-  const responsePath = options.responsePath ?? job.responsePath ?? `response unavailable for ${job.id}`;
+  const responseLine = options.responseAvailable === false
+    ? "Response file: unavailable yet"
+    : `Response file: ${options.responsePath ?? job.responsePath ?? `response unavailable for ${job.id}`}`;
   const artifactsPath = options.artifactsPath ?? `artifacts unavailable for ${job.id}`;
   return [
     `Oracle job ${job.id} is ${job.status}.`,
-    `Use oracle_read with jobId ${job.id} to open the response and settle wake-up retries.`,
-    `Response file: ${responsePath}`,
+    `Use /oracle-read ${job.id} to inspect the saved response preview. /oracle-status ${job.id} still shows saved job metadata. Agent callers can use oracle_read({ jobId: "${job.id}" }) if they need tool output in the current turn.`,
+    responseLine,
     `Artifacts: ${artifactsPath}`,
     formatOracleLifecycleEvent(getLatestOracleJobLifecycleEvent(job)) ? `Last event: ${formatOracleLifecycleEvent(getLatestOracleJobLifecycleEvent(job))}` : undefined,
-    job.error ? `Error: ${job.error}` : "After oracle_read, continue from the oracle output.",
+    job.error ? `Error: ${job.error}` : "After opening the saved result, continue from the oracle output.",
   ].filter(Boolean).join("\n");
 }
 

package/extensions/oracle/worker/auth-bootstrap.mjs

@@ -20,7 +20,23 @@ if (!rawConfig) {
   process.exit(1);
 }
 
-const config = JSON.parse(rawConfig);
+const parsedConfigPayload = JSON.parse(rawConfig);
+const config =
+  parsedConfigPayload &&
+    typeof parsedConfigPayload === "object" &&
+    !Array.isArray(parsedConfigPayload) &&
+    Object.hasOwn(parsedConfigPayload, "config")
+    ? parsedConfigPayload.config
+    : parsedConfigPayload;
+const configLoad =
+  parsedConfigPayload &&
+    typeof parsedConfigPayload === "object" &&
+    !Array.isArray(parsedConfigPayload) &&
+    Object.hasOwn(parsedConfigPayload, "configLoad") &&
+    parsedConfigPayload.configLoad &&
+    typeof parsedConfigPayload.configLoad === "object"
+    ? parsedConfigPayload.configLoad
+    : undefined;
 const CHATGPT_LABELS = {
   composer: "Chat with ChatGPT",
   addFiles: "Add files and more",
@@ -65,6 +81,34 @@ function authSessionName() {
   return `${config.browser.sessionPrefix}-auth`;
 }
 
+function effectiveAuthConfigPath() {
+  return typeof configLoad?.effectiveAuthConfigPath === "string" && configLoad.effectiveAuthConfigPath
+    ? configLoad.effectiveAuthConfigPath
+    : join(process.env.PI_CODING_AGENT_DIR?.trim() || join(homedir(), ".pi", "agent"), "extensions", "oracle.json");
+}
+
+function authConfigRemediation() {
+  if (typeof configLoad?.remediation === "string" && configLoad.remediation) return configLoad.remediation;
+  if (typeof configLoad?.projectConfigPath === "string" && configLoad.projectConfigPath && configLoad.projectConfigExists) {
+    return (
+      `Set auth.chromeProfile / auth.chromeCookiePath in ${effectiveAuthConfigPath()}. ` +
+      `Project overrides are also read from ${configLoad.projectConfigPath}, but auth.* is loaded from ${effectiveAuthConfigPath()}.`
+    );
+  }
+  return `Set auth.chromeProfile / auth.chromeCookiePath in ${effectiveAuthConfigPath()}.`;
+}
+
+function authConfigSummary() {
+  if (typeof configLoad?.summary === "string" && configLoad.summary) return configLoad.summary;
+  const agentDirSuffix = typeof configLoad?.agentDir === "string" && configLoad.agentDir ? ` (agent dir: ${configLoad.agentDir})` : "";
+  const createSuffix = configLoad?.agentConfigExists === false ? " [create this file to override auth.*]" : "";
+  const lines = [`Effective oracle auth config: ${effectiveAuthConfigPath()}${agentDirSuffix}${createSuffix}`];
+  if (typeof configLoad?.projectConfigPath === "string" && configLoad.projectConfigPath && configLoad.projectConfigExists) {
+    lines.push(`Project oracle config also loaded: ${configLoad.projectConfigPath} (auth.* still comes from ${effectiveAuthConfigPath()}).`);
+  }
+  return lines.join("\n");
+}
+
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -457,7 +501,7 @@ async function readSourceCookies() {
 
   if (!hasSessionToken) {
     throw new Error(
-      `No ChatGPT session-token cookies were found in ${cookieSourceLabel()}. Make sure ChatGPT is logged into that Chrome profile, or set auth.chromeProfile / auth.chromeCookiePath in ~/.pi/agent/extensions/oracle.json.`,
+      `No ChatGPT session-token cookies were found in ${cookieSourceLabel()}. Make sure ChatGPT is logged into that Chrome profile. ${authConfigRemediation()}`,
     );
   }
 
@@ -731,7 +775,7 @@ async function waitForImportedAuthReady() {
     }
     if (classification.state === "login_required") {
       await captureDiagnostics("login-required");
-      throw new Error(classification.message);
+      throw new Error(`${classification.message} ${authConfigRemediation()}`);
     }
     await sleep(config.auth.pollMs);
   }
@@ -751,6 +795,7 @@ async function run() {
       await log(
         `Config summary: session=${authSessionName()} seedProfileDir=${profilePlan.targetDir} stagingProfileDir=${profilePlan.stagingDir} executable=${config.browser.executablePath || "(default)"} source=${cookieSourceLabel()}`,
       );
+      await log(authConfigSummary());
       const cookies = await readSourceCookies();
       await prepareStagedProfile(profilePlan);
       await launchTargetBrowser();
@@ -783,7 +828,7 @@ async function run() {
 
 run().catch((error) => {
   process.stderr.write(
-    `${error instanceof Error ? error.message : String(error)}\nSee ${LOG_PATH} and diagnostics in ${DIAGNOSTICS_DIR || "(oracle-auth diagnostics dir unavailable)"}\nIf needed, ensure the configured real Chrome profile is already logged into ChatGPT and grant macOS Keychain access when prompted.`,
+    `${error instanceof Error ? error.message : String(error)}\nSee ${LOG_PATH} and diagnostics in ${DIAGNOSTICS_DIR || "(oracle-auth diagnostics dir unavailable)"}\n${authConfigSummary()}\nIf needed, ensure the configured real Chrome profile is already logged into ChatGPT and grant macOS Keychain access when prompted.`,
   );
   process.exit(1);
 });

package/extensions/oracle/worker/auth-flow-helpers.mjs

@@ -69,7 +69,7 @@ export function classifyChatAuthPage(args) {
   const hasAddFiles = args.snapshot.includes(`button "${addFilesLabel}"`);
   const hasModelControl =
     args.snapshot.includes('button "Model selector"') ||
-    /button "(Instant|Thinking|Pro)(?: [^"]*)?"/.test(args.snapshot);
+    /button "(?:Instant|(?:(?:Light|Standard|Extended|Heavy) )?Thinking|(?:(?:Light|Standard|Extended|Heavy) )?Pro)(?:, click to remove)?"/i.test(args.snapshot);
 
   const challengePatterns = [
     /just a moment/i,

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

@@ -26,6 +26,11 @@ const MODEL_FAMILY_PREFIX = {
 };
 
 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 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"]);
 
 /**
  * @param {string | undefined} url
@@ -99,26 +104,101 @@ export function requestedEffortLabel(selection) {
 }
 
 /**
- * @param {string} snapshot
- * @param {string | undefined} effortLabel
- * @returns {boolean}
+ * @param {string | undefined} label
+ * @returns {string}
  */
+function normalizeChipLabel(label) {
+  return normalizeText(label).replace(/, click to remove$/i, "").trim();
+}
+
+function parseComposerChipSelection(label) {
+  const normalized = normalizeChipLabel(label).toLowerCase();
+  if (!normalized) return undefined;
+
+  const thinkingMatch = normalized.match(THINKING_CHIP_PATTERN);
+  if (thinkingMatch) {
+    return {
+      modelFamily: /** @type {OracleUiModelFamily} */ ("thinking"),
+      effort: /** @type {import("./chatgpt-ui-helpers.d.mts").OracleUiEffort} */ ((thinkingMatch[1] || "standard").toLowerCase()),
+    };
+  }
+
+  const proMatch = normalized.match(PRO_CHIP_PATTERN);
+  if (proMatch) {
+    return {
+      modelFamily: /** @type {OracleUiModelFamily} */ ("pro"),
+      effort: /** @type {import("./chatgpt-ui-helpers.d.mts").OracleUiEffort} */ ((proMatch[1] || "standard").toLowerCase()),
+    };
+  }
+
+  return undefined;
+}
+
+function detectComposerChipSelection(entries) {
+  for (const entry of entries) {
+    if (entry.disabled || entry.kind !== "button") continue;
+    const selection = parseComposerChipSelection(entry.label);
+    if (selection) return selection;
+  }
+  return undefined;
+}
+
+function checkedState(entry) {
+  const line = String(entry?.line || "");
+  if (/\bchecked=true\b/.test(line) || /\bselected\b/.test(line)) return true;
+  if (/\bchecked=false\b/.test(line)) return false;
+  return undefined;
+}
+
+function detectSelectedModelFamily(entries) {
+  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"])) {
+      if (matchesModelFamilyLabel(entry.label, family)) return family;
+    }
+  }
+
+  const hasProEffortCombobox = entries.some(
+    (entry) => !entry.disabled && entry.kind === "combobox" && normalizeText(entry.label).toLowerCase() === PRO_THINKING_EFFORT_COMBOBOX_LABEL.toLowerCase(),
+  );
+  if (hasProEffortCombobox) return "pro";
+
+  const hasAutoSwitchControl = entries.some((entry) => {
+    if (entry.disabled || !["button", "switch"].includes(entry.kind || "")) return false;
+    const controlText = normalizeText([entry.label, entry.value, entry.line].filter(Boolean).join(" "));
+    return controlText.toLowerCase().includes(AUTO_SWITCH_LABEL.toLowerCase());
+  });
+  if (hasAutoSwitchControl) return "instant";
+
+  const hasThinkingEffortCombobox = entries.some(
+    (entry) => !entry.disabled && entry.kind === "combobox" && normalizeText(entry.label).toLowerCase() === THINKING_EFFORT_COMBOBOX_LABEL.toLowerCase(),
+  );
+  if (hasThinkingEffortCombobox) return "thinking";
+
+  return undefined;
+}
+
+function selectionMatchesChipSelection(selection, chipSelection) {
+  if (!chipSelection || chipSelection.modelFamily !== selection.modelFamily) return false;
+  if (selection.modelFamily === "thinking" || selection.modelFamily === "pro") {
+    return chipSelection.effort === (selection.effort || "standard");
+  }
+  return selection.autoSwitchToThinking !== true;
+}
+
 export function effortSelectionVisible(snapshot, effortLabel) {
   if (!effortLabel) return true;
   /** @type {SnapshotEntry[]} */
   const entries = parseSnapshotEntries(snapshot);
+  const normalizedEffort = effortLabel.toLowerCase();
   return entries.some((entry) => {
     if (entry.disabled) return false;
-    if (entry.kind === "combobox" && entry.value === effortLabel) 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;
     if (entry.kind !== "button") return false;
-    const label = String(entry.label || "").toLowerCase();
-    const normalizedEffort = effortLabel.toLowerCase();
-    return (
-      label === normalizedEffort ||
-      label === `${normalizedEffort} thinking` ||
-      label === `${normalizedEffort}, click to remove` ||
-      label === `${normalizedEffort} thinking, click to remove`
-    );
+    const label = normalizeChipLabel(entry.label).toLowerCase();
+    return label === normalizedEffort || label === `${normalizedEffort} thinking` || label === `${normalizedEffort} pro`;
   });
 }
 
@@ -166,7 +246,9 @@ export function autoSwitchToThinkingSelectionVisible(snapshot) {
     if (!controlText.toLowerCase().includes(AUTO_SWITCH_LABEL.toLowerCase())) continue;
     foundControl = true;
 
-    if (/\b(?:checked|selected|enabled|on|active)\b/i.test(controlText)) return true;
+    if (/\bchecked=true\b/i.test(String(entry.line || ""))) return true;
+    if (/\bchecked=false\b/i.test(String(entry.line || ""))) return false;
+    if (/\b(?:selected|enabled|on|active)\b/i.test(controlText)) return true;
     if (/\b(?:unchecked|not checked|disabled|off)\b/i.test(controlText)) return false;
     if (typeof entry.label === "string" && /click to remove/i.test(entry.label)) return true;
   }
@@ -181,16 +263,9 @@ export function autoSwitchToThinkingSelectionVisible(snapshot) {
  */
 export function snapshotCanSafelySkipModelConfiguration(snapshot, selection) {
   if (!snapshotStronglyMatchesRequestedModel(snapshot, selection)) return false;
-
-  if (selection.modelFamily === "thinking" || selection.modelFamily === "pro") {
-    const effortLabel = requestedEffortLabel(selection);
-    if (effortLabel && !effortSelectionVisible(snapshot, effortLabel)) return false;
-  }
-
   if (selection.modelFamily === "instant" && selection.autoSwitchToThinking) {
     return autoSwitchToThinkingSelectionVisible(snapshot) === true;
   }
-
   return true;
 }
 
@@ -202,23 +277,19 @@ export function snapshotCanSafelySkipModelConfiguration(snapshot, selection) {
 export function snapshotStronglyMatchesRequestedModel(snapshot, selection) {
   /** @type {SnapshotEntry[]} */
   const entries = parseSnapshotEntries(snapshot);
-  const familyMatched = entries.some((entry) => !entry.disabled && matchesModelFamilyLabel(entry.label, selection.modelFamily));
-  if (!familyMatched) return false;
+  const chipSelection = detectComposerChipSelection(entries);
+  if (chipSelection) return selectionMatchesChipSelection(selection, chipSelection);
 
-  const configurationUiVisible = snapshotHasModelConfigurationUi(snapshot);
-  const effortLabel = requestedEffortLabel(selection);
+  const selectedModelFamily = detectSelectedModelFamily(entries);
+  if (!selectedModelFamily || selectedModelFamily !== selection.modelFamily) return false;
 
   if (selection.modelFamily === "thinking" || selection.modelFamily === "pro") {
-    if (!effortLabel) return true;
-    if (effortSelectionVisible(snapshot, effortLabel)) return true;
-    return !configurationUiVisible;
+    return effortSelectionVisible(snapshot, requestedEffortLabel(selection));
   }
 
   if (selection.modelFamily === "instant") {
     const autoSwitchState = autoSwitchToThinkingSelectionVisible(snapshot);
-    if (selection.autoSwitchToThinking) {
-      return autoSwitchState === true || (!configurationUiVisible && autoSwitchState === undefined);
-    }
+    if (selection.autoSwitchToThinking) return autoSwitchState === true;
     return autoSwitchState !== true;
   }
 
@@ -233,24 +304,18 @@ export function snapshotStronglyMatchesRequestedModel(snapshot, selection) {
 export function snapshotWeaklyMatchesRequestedModel(snapshot, selection) {
   /** @type {SnapshotEntry[]} */
   const entries = parseSnapshotEntries(snapshot);
-  const familyMatched = entries.some((entry) => !entry.disabled && matchesModelFamilyLabel(entry.label, selection.modelFamily));
+  const chipSelection = detectComposerChipSelection(entries);
+  if (chipSelection) return selectionMatchesChipSelection(selection, chipSelection);
 
-  if (selection.modelFamily === "thinking") {
-    return familyMatched || effortSelectionVisible(snapshot, requestedEffortLabel(selection));
-  }
-
-  if (!familyMatched) return false;
-
-  if (selection.modelFamily === "pro") {
-    return !thinkingChipVisible(snapshot);
-  }
+  const selectedModelFamily = detectSelectedModelFamily(entries);
+  if (!selectedModelFamily || selectedModelFamily !== selection.modelFamily) return false;
 
   if (selection.modelFamily === "instant") {
     const autoSwitchState = autoSwitchToThinkingSelectionVisible(snapshot);
     return selection.autoSwitchToThinking ? autoSwitchState !== false : autoSwitchState !== true;
   }
 
-  return false;
+  return true;
 }
 
 /**

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

@@ -679,8 +679,17 @@ function findLastEntry(snapshot, predicate) {
   return undefined;
 }
 
-function matchesModelFamilyButton(candidate, family) {
-  return candidate.kind === "button" && typeof candidate.label === "string" && matchesModelFamilyLabel(candidate.label, family) && !candidate.disabled;
+function matchesModelFamilyControl(candidate, family) {
+  return ["button", "radio", "menuitemradio"].includes(candidate.kind || "") && typeof candidate.label === "string" && matchesModelFamilyLabel(candidate.label, family) && !candidate.disabled;
+}
+
+function matchesModelConfigurationOpener(candidate) {
+  if (candidate.kind !== "button" || typeof candidate.label !== "string" || candidate.disabled) return false;
+  const label = String(candidate.label || "");
+  return candidate.label === "Model selector"
+    || ["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)
+    || /^(?:(?:Light|Standard|Extended|Heavy) )?Pro(?:, click to remove)?$/i.test(label);
 }
 
 function composerControlsVisible(snapshot) {
@@ -698,7 +707,7 @@ async function clickAutoSwitchToThinkingControl(job) {
   const snapshot = await snapshotText(job);
   const entry = findEntry(
     snapshot,
-    (candidate) => candidate.kind === "button" && typeof candidate.label === "string" && candidate.label.startsWith(CHATGPT_LABELS.autoSwitchToThinking) && !candidate.disabled,
+    (candidate) => ["button", "switch"].includes(candidate.kind || "") && typeof candidate.label === "string" && candidate.label.startsWith(CHATGPT_LABELS.autoSwitchToThinking) && !candidate.disabled,
   );
   if (!entry) throw new Error(`Could not find ${CHATGPT_LABELS.autoSwitchToThinking} control`);
   await clickRef(job, entry.ref);
@@ -780,7 +789,7 @@ function classifyChatPage({ job, url, snapshot, body, probe }) {
   const onAuthPath = typeof url === "string" && url.includes("/auth/");
   const hasComposer = snapshot.includes(`textbox "${CHATGPT_LABELS.composer}"`);
   const hasAddFiles = snapshot.includes(`button "${CHATGPT_LABELS.addFiles}"`);
-  const hasModelControl = snapshot.includes('button "Model selector"') || /button "(Instant|Thinking|Pro)(?: [^"]*)?"/.test(snapshot);
+  const hasModelControl = snapshot.includes('button "Model selector"') || /button "(?:Instant|(?:(?:Light|Standard|Extended|Heavy) )?Thinking|(?:(?:Light|Standard|Extended|Heavy) )?Pro)(?:, click to remove)?"/i.test(snapshot);
 
   if (probe?.status === 401 || probe?.status === 403) {
     return { state: "login_required", message: "ChatGPT login is required. Run /oracle-auth." };
@@ -978,15 +987,10 @@ async function clickSend(job) {
 }
 
 async function openModelConfiguration(job) {
-  const openerPredicates = [
-    (candidate) => candidate.kind === "button" && candidate.label === "Model selector" && !candidate.disabled,
-    (candidate) => candidate.kind === "button" && ["Instant", "Thinking", "Pro"].includes(candidate.label || "") && !candidate.disabled,
-  ];
-
   const initialSnapshot = await snapshotText(job);
   if (snapshotHasModelConfigurationUi(initialSnapshot)) return initialSnapshot;
 
-  for (const predicate of openerPredicates) {
+  for (const predicate of [matchesModelConfigurationOpener]) {
     const snapshot = await snapshotText(job);
     const entry = findEntry(snapshot, predicate);
     if (!entry) continue;
@@ -1071,11 +1075,11 @@ async function configureModel(job) {
   let verificationSnapshot = familySnapshot;
 
   const alreadyConfiguredInUi = snapshotStronglyMatchesRequestedModel(familySnapshot, job.selection);
-  let familyEntry = findEntry(familySnapshot, (candidate) => matchesModelFamilyButton(candidate, job.selection.modelFamily));
+  let familyEntry = findEntry(familySnapshot, (candidate) => matchesModelFamilyControl(candidate, job.selection.modelFamily));
   if (alreadyConfiguredInUi) {
     await log("Model configuration UI opened with requested settings already selected");
   } else if (!familyEntry) {
-    throw new Error(`Could not find model family button for ${job.selection.modelFamily}`);
+    throw new Error(`Could not find model family control for ${job.selection.modelFamily}`);
   }
 
   if (!alreadyConfiguredInUi && familyEntry) {
@@ -1083,7 +1087,7 @@ async function configureModel(job) {
     await agentBrowser(job, "wait", "800");
     familySnapshot = await snapshotText(job);
     verificationSnapshot = familySnapshot;
-    familyEntry = findEntry(familySnapshot, (candidate) => matchesModelFamilyButton(candidate, job.selection.modelFamily));
+    familyEntry = findEntry(familySnapshot, (candidate) => matchesModelFamilyControl(candidate, job.selection.modelFamily));
     if (!familyEntry && !snapshotStronglyMatchesRequestedModel(familySnapshot, job.selection)) {
       throw new Error(`Requested model family did not remain selected: ${job.selection.modelFamily}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-oracle",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "ChatGPT web-oracle extension for pi with isolated browser auth, async jobs, and project-context archives.",
   "private": false,
   "license": "MIT",
@@ -52,15 +52,19 @@
     "prepublishOnly": "npm run verify:oracle"
   },
   "dependencies": {
-    "@sinclair/typebox": "^0.34.49",
     "@steipete/sweet-cookie": "^0.2.0"
   },
+  "peerDependencies": {
+    "@mariozechner/pi-coding-agent": "*",
+    "@sinclair/typebox": "*"
+  },
   "overrides": {
     "basic-ftp": "^5.2.2"
   },
   "devDependencies": {
     "@mariozechner/pi-ai": "^0.65.2",
     "@mariozechner/pi-coding-agent": "^0.65.2",
+    "@sinclair/typebox": "^0.34.49",
     "@types/node": "^24.6.0",
     "esbuild": "^0.27.0",
     "tsx": "^4.20.6",

package/prompts/oracle-followup.md

@@ -0,0 +1,48 @@
+---
+description: Continue an earlier oracle job in the same ChatGPT thread
+---
+You are preparing an `/oracle-followup` job.
+
+Do not answer the user's request directly yet.
+
+Required workflow:
+1. Call `oracle_preflight` immediately.
+2. If `oracle_preflight` reports `ready: false`, stop before any expensive prep. Do not read files, search the codebase, or prepare archive inputs first. If the blocker is an auth seed or stale-auth issue that `oracle_auth` can repair, call `oracle_auth` once, rerun `oracle_preflight`, and continue only if it becomes `ready: true`. Otherwise stop immediately and report the blocking issue plus the suggested next step.
+3. Parse the user request as `<job-id> <follow-up request>`.
+4. If the request does not include both a prior oracle job id and a follow-up request, stop and report: `Usage: /oracle-followup <job-id> <request>. Find the job id in the earlier oracle response or via /oracle-status.`
+5. Treat the parsed job id as `followUpJobId` for `oracle_submit`.
+6. Understand whether the follow-up request is explicitly narrow or genuinely broad.
+7. Gather enough repo context to choose archive inputs and write a strong oracle prompt. Bias toward context-rich submissions when they fit within the 250 MB archive ceiling.
+8. If the follow-up request is explicit and narrow, start from the directly relevant area but still include nearby files, tests, docs, configs, and adjacent modules when they may improve answer quality. Keep the archive tightly minimal only when the user explicitly asks for that, privacy/sensitivity requires it, or size pressure forces it.
+9. If the follow-up request is broad, architectural, release-oriented, or otherwise repo-wide, gather broader context and usually archive `.`.
+10. Choose archive inputs for the follow-up oracle job.
+11. Craft a concise but complete follow-up prompt for ChatGPT web.
+12. Call `oracle_submit` with the prompt, exact archive inputs, and the parsed `followUpJobId`.
+13. Stop immediately after dispatching the oracle job.
+
+Oracle model (`oracle_submit`):
+- To choose a specific ChatGPT model, pass **`preset`** with one of the allowed ids from the canonical preset registry.
+- Matching human-readable preset labels and common hyphen/space variants are also accepted and normalized automatically, but prefer canonical ids when readily available.
+- **Or** omit **`preset`** entirely to use the configured default model (from oracle config).
+- **`preset`** is the only model-selection parameter on `oracle_submit`. Do not pass `modelFamily`, `effort`, or `autoSwitchToThinking`.
+- If unsure, omit **`preset`** and use the configured default. Ask the user about model choice only when they explicitly want model control or the choice would materially change the result.
+
+Rules:
+- Use `oracle_preflight` before any expensive `/oracle-followup` preparation so missing persisted-session or local auth/config blockers fail fast.
+- If the immediately preceding oracle run for this follow-up failed because ChatGPT login is required, the worker said to rerun `/oracle-auth`, or stale auth clearly blocked execution, call `oracle_auth` once and then retry the follow-up submission once. Do not loop auth refreshes.
+- This prompt exists so normal users can continue the same ChatGPT thread without manually constructing `followUpJobId` tool calls.
+- Always include an archive. Do not submit without context files.
+- By default, prefer context-rich archives up to the 250 MB ceiling because more relevant context is usually better than less. For broad or unclear follow-up requests, include the whole repository by passing `.`. Default archive exclusions apply automatically, including common bulky outputs and obvious credentials/private data like `.env` files, key material, credential dotfiles, local database files, and nested `secrets/` directories anywhere in the repo.
+- Only limit file selection if the user explicitly requests a tight archive, if privacy/sensitivity requires it, or if the archive would otherwise exceed the size limit after exclusions/pruning.
+- For targeted follow-ups, still include directly related surrounding files, tests, docs, configs, and adjacent modules when they may improve answer quality. Do not default to a one-file archive just because the user mentioned one file, one function, or one stack trace.
+- Do not keep exploring once you already have enough context to submit well.
+- If the request depends on git state or pending changes (for example code review, ship readiness, or release approval), create a tracked diff bundle file inside the repo (for example under `.pi/`) containing `git status` plus `git diff` output, include that file in the archive, and tell the oracle to use it because the `.git` directory is not included in oracle exports.
+- When `files=["."]` and the post-exclusion archive is still too large, submit automatically prunes the largest nested directories matching generic generated-output names like `build/`, `dist/`, `out/`, `coverage/`, and `tmp/` outside obvious source roots like `src/` and `lib/` until the archive fits or no candidate remains. Successful submissions report what was pruned.
+- If a submitted oracle job later fails because upload is rejected, retry with a smaller archive in this order: (1) remove the largest obviously irrelevant/generated content, (2) if still too large, include modified files plus adjacent files plus directly relevant subtrees, (3) if still too large, explain the cut or ask the user.
+- Prefer the configured default (omit **`preset`**) unless the task clearly needs a different model or the user explicitly asked for one; then choose a canonical **`preset`** id.
+- If `oracle_submit` itself fails because the local archive still exceeds the upload limit after default exclusions and automatic generic generated-output-dir pruning, or for any other submit-time error, stop and report the error. Do not retry automatically.
+- If `oracle_submit` returns a queued job instead of an immediately dispatched one, treat that as success and end your turn exactly the same way.
+- After `oracle_submit` returns, end your turn. Do not keep working while the oracle runs.
+
+User request:
+$@