pi-oracle 0.3.3 → 0.3.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.3.4 - 2026-04-11
+
+### Changed
+- oracle archive defaults now exclude nested `secrets/` and `.secrets/` directories anywhere in the repo unless they are explicitly requested
+- package metadata now reflects the current runtime floor and platform support (`node >=22`, `darwin`) and local release automation runs `verify:oracle` through `npm test` / `prepublishOnly`
+
+### Fixed
+- model verification now distinguishes `thinking`, `pro`, `instant`, and `instant_auto_switch` more conservatively instead of accepting mismatched presets on partial UI evidence
+- artifact-only assistant responses can now complete without timing out on missing plain-text bodies
+- `/oracle-auth` diagnostics now write into a unique private temp directory per run instead of fixed `/tmp/oracle-auth.*` paths
+- sanity coverage now exercises shared ChatGPT UI helpers directly, verifies nested secret exclusion, and guards the new auth diagnostics path handling
+
 ## 0.3.3 - 2026-04-11
 
 ### Added

package/README.md

@@ -147,6 +147,7 @@ Project config should only override safe, non-privileged settings.
 ## Requirements
 
 - macOS
+- Node.js 22 or newer
 - Google Chrome installed
 - ChatGPT already signed into a local Chrome profile
 - `pi` 0.65.0 or newer
@@ -211,10 +212,14 @@ npm run check:oracle-extension
 npm run typecheck
 npm run sanity:oracle
 npm run pack:check
+# conventional local gate
+npm test
 # or all at once
 npm run verify:oracle
 ```
 
+`npm publish` is also guarded locally via `prepublishOnly` and will run `npm run verify:oracle` before publishing.
+
 ## Beta caveats
 
 The highest-risk areas to monitor are:

package/docs/ORACLE_DESIGN.md

@@ -585,7 +585,7 @@ Remaining non-blocking hardening work:
 
 Recent proof points:
 - expired-auth drill fail path: `a2460bc1-7d89-4041-b67d-39680d310325`
-- `/oracle-auth` repair evidence: `/tmp/oracle-auth.log`
+- `/oracle-auth` repair evidence: the per-run `/tmp/pi-oracle-auth-*/oracle-auth.log` bundle path printed by `/oracle-auth`
 - expired-auth drill post-repair success: `fa26a2a7-0057-4a21-b3e0-71c1d020facf`
 - successful multi-artifact completion: `b6b3599c-6b91-4315-adfa-8a83aa5eda9b`
 - repo-owned sanity harness: `npm run sanity:oracle`

package/docs/ORACLE_RECOVERY_DRILL.md

@@ -105,10 +105,11 @@ For the failed run:
 - any failure diagnostics under that job dir
 
 For the repair:
-- `/tmp/oracle-auth.log`
-- `/tmp/oracle-auth.url.txt`
-- `/tmp/oracle-auth.snapshot.txt`
-- `/tmp/oracle-auth.body.txt`
+- the per-run `/tmp/pi-oracle-auth-*/` diagnostics directory printed by `/oracle-auth`
+- `oracle-auth.log`
+- `oracle-auth.url.txt`
+- `oracle-auth.snapshot.txt`
+- `oracle-auth.body.txt`
 
 For the successful rerun:
 - `/tmp/oracle-<job-id>/job.json`

package/extensions/oracle/lib/tools.ts

@@ -107,8 +107,10 @@ const DEFAULT_ARCHIVE_EXCLUDED_DIR_NAMES_ANYWHERE = new Set([
   ".pnpm-store",
   ".serverless",
   ".aws-sam",
+  "secrets",
+  ".secrets",
 ]);
-const DEFAULT_ARCHIVE_EXCLUDED_DIR_NAMES_AT_REPO_ROOT = new Set(["coverage", "htmlcov", "tmp", "temp", ".tmp", "dist", "build", "out", "secrets", ".secrets"]);
+const DEFAULT_ARCHIVE_EXCLUDED_DIR_NAMES_AT_REPO_ROOT = new Set(["coverage", "htmlcov", "tmp", "temp", ".tmp", "dist", "build", "out"]);
 const DEFAULT_ARCHIVE_EXCLUDED_FILES = new Set([
   ".coverage",
   ".DS_Store",
@@ -583,7 +585,7 @@ export function registerOracleTools(pi: ExtensionAPI, workerPath: string): void
     promptSnippet: "Dispatch a background ChatGPT web oracle job after gathering repo context.",
     promptGuidelines: [
       "Gather context before calling oracle_submit.",
-      "By default, archive the whole repo 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 root secrets directories.",
+      "By default, archive the whole repo 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 narrow file selection when the user explicitly asks, the task is clearly scoped smaller, or privacy/sensitivity requires it.",
       "For very targeted asks like a single function or stack trace, a smaller archive is preferable.",
       "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.",

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

@@ -1,11 +1,12 @@
 import { withLock } from "./state-locks.mjs";
 import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
-import { appendFile, chmod, lstat, mkdir, readdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
-import { homedir } from "node:os";
+import { appendFile, chmod, lstat, mkdir, mkdtemp, readdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
+import { homedir, tmpdir } from "node:os";
 import { basename, dirname, join, resolve } from "node:path";
 import { getCookies } from "@steipete/sweet-cookie";
 import { ensureAccountCookie, filterImportableAuthCookies } from "./auth-cookie-policy.mjs";
+import { buildAllowedChatGptOrigins } from "./chatgpt-ui-helpers.mjs";
 
 const rawConfig = process.argv[2];
 if (!rawConfig) {
@@ -27,11 +28,12 @@ const CHATGPT_COOKIE_ORIGINS = [
   "https://sentinel.openai.com",
   "https://ws.chatgpt.com",
 ];
-const LOG_PATH = "/tmp/oracle-auth.log";
-const URL_PATH = "/tmp/oracle-auth.url.txt";
-const SNAPSHOT_PATH = "/tmp/oracle-auth.snapshot.txt";
-const BODY_PATH = "/tmp/oracle-auth.body.txt";
-const SCREENSHOT_PATH = "/tmp/oracle-auth.png";
+let DIAGNOSTICS_DIR;
+let LOG_PATH = "(oracle-auth log path unavailable)";
+let URL_PATH = "(oracle-auth url path unavailable)";
+let SNAPSHOT_PATH = "(oracle-auth snapshot path unavailable)";
+let BODY_PATH = "(oracle-auth body path unavailable)";
+let SCREENSHOT_PATH = "(oracle-auth screenshot path unavailable)";
 const REAL_CHROME_USER_DATA_DIR = resolve(homedir(), "Library", "Application Support", "Google", "Chrome");
 const DEFAULT_ORACLE_STATE_DIR = "/tmp/pi-oracle-state";
 const ORACLE_STATE_DIR = process.env.PI_ORACLE_STATE_DIR?.trim() || DEFAULT_ORACLE_STATE_DIR;
@@ -50,12 +52,25 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+async function initDiagnosticsBundle() {
+  if (DIAGNOSTICS_DIR) return;
+  DIAGNOSTICS_DIR = await mkdtemp(join(tmpdir(), "pi-oracle-auth-"));
+  await chmod(DIAGNOSTICS_DIR, 0o700).catch(() => undefined);
+  LOG_PATH = join(DIAGNOSTICS_DIR, "oracle-auth.log");
+  URL_PATH = join(DIAGNOSTICS_DIR, "oracle-auth.url.txt");
+  SNAPSHOT_PATH = join(DIAGNOSTICS_DIR, "oracle-auth.snapshot.txt");
+  BODY_PATH = join(DIAGNOSTICS_DIR, "oracle-auth.body.txt");
+  SCREENSHOT_PATH = join(DIAGNOSTICS_DIR, "oracle-auth.png");
+}
+
 async function initLog() {
+  await initDiagnosticsBundle();
   await writeFile(LOG_PATH, "", { mode: 0o600 });
   await chmod(LOG_PATH, 0o600).catch(() => undefined);
 }
 
 async function log(message) {
+  await initDiagnosticsBundle();
   const line = `[${new Date().toISOString()}] ${message}\n`;
   await appendFile(LOG_PATH, line, { encoding: "utf8", mode: 0o600 });
   await chmod(LOG_PATH, 0o600).catch(() => undefined);
@@ -566,7 +581,7 @@ async function captureDiagnostics(reason) {
 
 function classifyChatPage({ url, snapshot, body, probe }) {
   const text = `${snapshot}\n${body}`;
-  const allowedOrigins = [new URL(config.browser.chatUrl).origin, new URL(config.browser.authUrl).origin, "https://auth.openai.com"];
+  const allowedOrigins = buildAllowedChatGptOrigins(config.browser.chatUrl, config.browser.authUrl);
 
   const challengePatterns = [
     /just a moment/i,
@@ -804,7 +819,7 @@ async function run() {
       await writeFile(join(profilePlan.targetDir, ".oracle-seed-generation"), `${generation}\n`, { encoding: "utf8", mode: 0o600 });
       committedProfile = true;
       process.stdout.write(
-        `${classification.message} Synced ${appliedCount} cookies into ${profilePlan.targetDir}`,
+        `${classification.message} Synced ${appliedCount} cookies into ${profilePlan.targetDir}. Diagnostics: ${DIAGNOSTICS_DIR}`,
       );
     } catch (error) {
       shouldPreserveBrowser = Boolean(error && typeof error === "object" && error.preserveBrowser === true);
@@ -822,7 +837,7 @@ async function run() {
 
 run().catch((error) => {
   process.stderr.write(
-    `${error instanceof Error ? error.message : String(error)}\nSee ${LOG_PATH} and diagnostics in /tmp/oracle-auth.*\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)"}\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/chatgpt-ui-helpers.d.mts

@@ -0,0 +1,33 @@
+export type OracleUiModelFamily = "instant" | "thinking" | "pro";
+export type OracleUiEffort = "light" | "standard" | "extended" | "heavy";
+
+export interface OracleUiSelection {
+  modelFamily: OracleUiModelFamily;
+  effort?: OracleUiEffort;
+  autoSwitchToThinking?: boolean;
+}
+
+export declare const CHATGPT_CANONICAL_APP_ORIGINS: readonly string[];
+
+export declare function buildAllowedChatGptOrigins(chatUrl: string, authUrl?: string): string[];
+export declare function matchesModelFamilyLabel(label: string | undefined, family: OracleUiModelFamily): boolean;
+export declare function requestedEffortLabel(selection: OracleUiSelection): string | undefined;
+export declare function effortSelectionVisible(snapshot: string, effortLabel: string | undefined): boolean;
+export declare function thinkingChipVisible(snapshot: string): boolean;
+export declare function snapshotHasModelConfigurationUi(snapshot: string): boolean;
+export declare function autoSwitchToThinkingSelectionVisible(snapshot: string): boolean | undefined;
+export declare function snapshotCanSafelySkipModelConfiguration(snapshot: string, selection: OracleUiSelection): boolean;
+export declare function snapshotStronglyMatchesRequestedModel(snapshot: string, selection: OracleUiSelection): boolean;
+export declare function snapshotWeaklyMatchesRequestedModel(snapshot: string, selection: OracleUiSelection): boolean;
+export declare function buildAssistantCompletionSignature(args: {
+  responseText: string;
+  artifactLabels?: string[];
+  suspiciousArtifactLabels?: string[];
+}): string | undefined;
+export declare function deriveAssistantCompletionSignature(args: {
+  hasStopStreaming: boolean;
+  hasTargetCopyResponse: boolean;
+  responseText: string;
+  artifactLabels?: string[];
+  suspiciousArtifactLabels?: string[];
+}): string | undefined;

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

@@ -0,0 +1,208 @@
+import { parseSnapshotEntries } from "./artifact-heuristics.mjs";
+
+export const CHATGPT_CANONICAL_APP_ORIGINS = Object.freeze([
+  "https://chatgpt.com",
+  "https://chat.openai.com",
+]);
+
+const MODEL_FAMILY_PREFIX = {
+  instant: "Instant ",
+  thinking: "Thinking ",
+  pro: "Pro ",
+};
+
+const AUTO_SWITCH_LABEL = "Auto-switch to Thinking";
+
+function originFromUrl(url) {
+  if (typeof url !== "string" || !url.trim()) return undefined;
+  try {
+    return new URL(url).origin;
+  } catch {
+    return undefined;
+  }
+}
+
+function uniqueStrings(values) {
+  return [...new Set(values.filter((value) => typeof value === "string" && value))];
+}
+
+function titleCase(value) {
+  return value ? `${value[0].toUpperCase()}${value.slice(1)}` : value;
+}
+
+function normalizeText(value) {
+  return String(value || "").replace(/\s+/g, " ").trim();
+}
+
+export function buildAllowedChatGptOrigins(chatUrl, authUrl) {
+  return uniqueStrings([
+    ...CHATGPT_CANONICAL_APP_ORIGINS,
+    originFromUrl(chatUrl),
+    originFromUrl(authUrl),
+    "https://auth.openai.com",
+  ]);
+}
+
+export function matchesModelFamilyLabel(label, family) {
+  const normalized = String(label || "");
+  const prefix = MODEL_FAMILY_PREFIX[family];
+  const exact = prefix.trim();
+  return normalized === exact || normalized.startsWith(prefix) || normalized.startsWith(`${exact},`);
+}
+
+export function requestedEffortLabel(selection) {
+  return selection?.effort ? titleCase(selection.effort) : undefined;
+}
+
+export function effortSelectionVisible(snapshot, effortLabel) {
+  if (!effortLabel) return true;
+  const entries = parseSnapshotEntries(snapshot);
+  return entries.some((entry) => {
+    if (entry.disabled) return false;
+    if (entry.kind === "combobox" && entry.value === effortLabel) 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`
+    );
+  });
+}
+
+export function thinkingChipVisible(snapshot) {
+  return /button "(?:Light|Standard|Extended|Heavy)(?: thinking)?(?:, click to remove)?"/i.test(snapshot);
+}
+
+export function snapshotHasModelConfigurationUi(snapshot) {
+  const entries = parseSnapshotEntries(snapshot);
+  const visibleFamilies = new Set(
+    entries
+      .filter((entry) => entry.kind === "button" && typeof entry.label === "string")
+      .flatMap((entry) =>
+        Object.keys(MODEL_FAMILY_PREFIX)
+          .filter((family) => matchesModelFamilyLabel(entry.label, family))
+          .map((family) => family),
+      ),
+  );
+  const hasCloseButton = entries.some((entry) => entry.kind === "button" && entry.label === "Close" && !entry.disabled);
+  const hasEffortCombobox = entries.some(
+    (entry) => entry.kind === "combobox" && ["Light", "Standard", "Extended", "Heavy"].includes(entry.value || "") && !entry.disabled,
+  );
+  return visibleFamilies.size >= 2 || hasCloseButton || hasEffortCombobox;
+}
+
+export function autoSwitchToThinkingSelectionVisible(snapshot) {
+  const entries = parseSnapshotEntries(snapshot);
+  let foundControl = false;
+
+  for (const entry of entries) {
+    const controlText = normalizeText([entry.label, entry.value, entry.line].filter(Boolean).join(" "));
+    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 (/\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;
+  }
+
+  return foundControl ? false : undefined;
+}
+
+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;
+}
+
+export function snapshotStronglyMatchesRequestedModel(snapshot, selection) {
+  const entries = parseSnapshotEntries(snapshot);
+  const familyMatched = entries.some((entry) => {
+    return !entry.disabled && matchesModelFamilyLabel(entry.label, selection.modelFamily);
+  });
+  if (!familyMatched) return false;
+
+  const configurationUiVisible = snapshotHasModelConfigurationUi(snapshot);
+  const effortLabel = requestedEffortLabel(selection);
+
+  if (selection.modelFamily === "thinking" || selection.modelFamily === "pro") {
+    if (!effortLabel) return true;
+    if (effortSelectionVisible(snapshot, effortLabel)) return true;
+    return !configurationUiVisible;
+  }
+
+  if (selection.modelFamily === "instant") {
+    const autoSwitchState = autoSwitchToThinkingSelectionVisible(snapshot);
+    if (selection.autoSwitchToThinking) {
+      return autoSwitchState === true || (!configurationUiVisible && autoSwitchState === undefined);
+    }
+    return autoSwitchState !== true;
+  }
+
+  return false;
+}
+
+export function snapshotWeaklyMatchesRequestedModel(snapshot, selection) {
+  const entries = parseSnapshotEntries(snapshot);
+  const familyMatched = entries.some((entry) => {
+    return !entry.disabled && matchesModelFamilyLabel(entry.label, selection.modelFamily);
+  });
+
+  if (selection.modelFamily === "thinking") {
+    return familyMatched || effortSelectionVisible(snapshot, requestedEffortLabel(selection));
+  }
+
+  if (!familyMatched) return false;
+
+  if (selection.modelFamily === "pro") {
+    return !thinkingChipVisible(snapshot);
+  }
+
+  if (selection.modelFamily === "instant") {
+    const autoSwitchState = autoSwitchToThinkingSelectionVisible(snapshot);
+    return selection.autoSwitchToThinking ? autoSwitchState !== false : autoSwitchState !== true;
+  }
+
+  return false;
+}
+
+export function buildAssistantCompletionSignature({ responseText, artifactLabels = [], suspiciousArtifactLabels = [] }) {
+  const normalizedResponse = normalizeText(responseText);
+  if (normalizedResponse) return `text:${normalizedResponse}`;
+
+  const labels = uniqueStrings([...artifactLabels, ...suspiciousArtifactLabels].map((value) => normalizeText(value))).sort((left, right) => left.localeCompare(right));
+  if (labels.length > 0) return `artifacts:${labels.join("|")}`;
+
+  return undefined;
+}
+
+export function deriveAssistantCompletionSignature({
+  hasStopStreaming,
+  hasTargetCopyResponse,
+  responseText,
+  artifactLabels = [],
+  suspiciousArtifactLabels = [],
+}) {
+  if (hasStopStreaming) return undefined;
+
+  if (hasTargetCopyResponse && normalizeText(responseText)) {
+    return buildAssistantCompletionSignature({ responseText });
+  }
+
+  if (!normalizeText(responseText)) {
+    return buildAssistantCompletionSignature({ responseText, artifactLabels, suspiciousArtifactLabels });
+  }
+
+  return undefined;
+}

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

@@ -5,6 +5,18 @@ import { basename, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { spawn, execFileSync } from "node:child_process";
 import { extractArtifactLabels, FILE_LABEL_PATTERN_SOURCE, GENERIC_ARTIFACT_LABELS, parseSnapshotEntries, partitionStructuralArtifactCandidates } from "./artifact-heuristics.mjs";
+import {
+  buildAllowedChatGptOrigins,
+  deriveAssistantCompletionSignature,
+  matchesModelFamilyLabel,
+  requestedEffortLabel,
+  effortSelectionVisible,
+  snapshotCanSafelySkipModelConfiguration,
+  snapshotHasModelConfigurationUi,
+  snapshotStronglyMatchesRequestedModel,
+  snapshotWeaklyMatchesRequestedModel,
+  autoSwitchToThinkingSelectionVisible,
+} from "./chatgpt-ui-helpers.mjs";
 import { createLease, listLeaseMetadata, readLeaseMetadata, releaseLease, withLock } from "./state-locks.mjs";
 
 const jobId = process.argv[2];
@@ -25,12 +37,6 @@ const CHATGPT_LABELS = {
   autoSwitchToThinking: "Auto-switch to Thinking",
   configure: "Configure...",
 };
-const MODEL_FAMILY_PREFIX = {
-  instant: "Instant ",
-  thinking: "Thinking ",
-  pro: "Pro ",
-};
-
 const WORKER_SCRIPT_PATH = fileURLToPath(import.meta.url);
 const DEFAULT_ORACLE_STATE_DIR = "/tmp/pi-oracle-state";
 const ORACLE_STATE_DIR = process.env.PI_ORACLE_STATE_DIR?.trim() || DEFAULT_ORACLE_STATE_DIR;
@@ -791,83 +797,10 @@ function findLastEntry(snapshot, predicate) {
   return undefined;
 }
 
-function titleCase(value) {
-  return value ? `${value[0].toUpperCase()}${value.slice(1)}` : value;
-}
-
-function matchesModelFamilyLabel(label, family) {
-  const normalized = String(label || "");
-  const prefix = MODEL_FAMILY_PREFIX[family];
-  const exact = prefix.trim();
-  return normalized === exact || normalized.startsWith(prefix) || normalized.startsWith(`${exact},`);
-}
-
 function matchesModelFamilyButton(candidate, family) {
   return candidate.kind === "button" && typeof candidate.label === "string" && matchesModelFamilyLabel(candidate.label, family) && !candidate.disabled;
 }
 
-function requestedEffortLabel(job) {
-  return job.selection?.effort ? titleCase(job.selection.effort) : undefined;
-}
-
-function effortSelectionVisible(snapshot, effortLabel) {
-  if (!effortLabel) return true;
-  const entries = parseSnapshotEntries(snapshot);
-  return entries.some((entry) => {
-    if (entry.disabled) return false;
-    if (entry.kind === "combobox" && entry.value === effortLabel) 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`
-    );
-  });
-}
-
-function thinkingChipVisible(snapshot) {
-  return /button "(?:Light|Standard|Extended|Heavy)(?: thinking)?(?:, click to remove)?"/i.test(snapshot);
-}
-
-function snapshotHasModelConfigurationUi(snapshot) {
-  const entries = parseSnapshotEntries(snapshot);
-  const visibleFamilies = new Set(
-    entries
-      .filter((entry) => entry.kind === "button" && typeof entry.label === "string")
-      .flatMap((entry) =>
-        Object.keys(MODEL_FAMILY_PREFIX)
-          .filter((family) => matchesModelFamilyLabel(entry.label, family))
-          .map((family) => family),
-      ),
-  );
-  const hasCloseButton = entries.some((entry) => entry.kind === "button" && entry.label === CHATGPT_LABELS.close && !entry.disabled);
-  const hasEffortCombobox = entries.some(
-    (entry) => entry.kind === "combobox" && ["Light", "Standard", "Extended", "Heavy"].includes(entry.value || "") && !entry.disabled,
-  );
-  return visibleFamilies.size >= 2 || hasCloseButton || hasEffortCombobox;
-}
-
-function snapshotStronglyMatchesRequestedModel(snapshot, job) {
-  const entries = parseSnapshotEntries(snapshot);
-  const familyMatched = entries.some((entry) => matchesModelFamilyButton(entry, job.selection.modelFamily));
-  const effortLabel = requestedEffortLabel(job);
-  if (job.selection.modelFamily === "thinking") {
-    return familyMatched || effortSelectionVisible(snapshot, effortLabel);
-  }
-  if (job.selection.modelFamily === "pro") {
-    return effortLabel ? familyMatched && effortSelectionVisible(snapshot, effortLabel) : familyMatched;
-  }
-  return familyMatched;
-}
-
-function thinkingSelectionVisible(snapshot) {
-  const entries = parseSnapshotEntries(snapshot);
-  return entries.some((entry) => !entry.disabled && entry.kind === "button" && matchesModelFamilyLabel(entry.label, "thinking"));
-}
-
 function composerControlsVisible(snapshot) {
   const entries = parseSnapshotEntries(snapshot);
   const hasComposer = entries.some(
@@ -879,17 +812,15 @@ function composerControlsVisible(snapshot) {
   return hasComposer && hasAddFiles;
 }
 
-function snapshotWeaklyMatchesRequestedModel(snapshot, job) {
-  if (job.selection.modelFamily === "thinking") {
-    return effortSelectionVisible(snapshot, requestedEffortLabel(job)) || thinkingSelectionVisible(snapshot);
-  }
-  if (job.selection.modelFamily === "pro") {
-    return !thinkingChipVisible(snapshot);
-  }
-  if (job.selection.modelFamily === "instant") {
-    return !thinkingChipVisible(snapshot);
-  }
-  return false;
+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,
+  );
+  if (!entry) throw new Error(`Could not find ${CHATGPT_LABELS.autoSwitchToThinking} control`);
+  await clickRef(job, entry.ref);
+  return entry;
 }
 
 async function clickRef(job, ref) {
@@ -962,7 +893,7 @@ function classifyChatPage({ job, url, snapshot, body, probe }) {
     return { state: "transient_outage_error", message: "ChatGPT is showing a transient outage/error page" };
   }
 
-  const allowedOrigins = [new URL(job.config.browser.chatUrl).origin, "https://auth.openai.com"];
+  const allowedOrigins = buildAllowedChatGptOrigins(job.config.browser.chatUrl, job.config.browser.authUrl);
   const onAllowedOrigin = typeof url === "string" && allowedOrigins.some((origin) => url.startsWith(origin));
   const onAuthPath = typeof url === "string" && url.includes("/auth/");
   const hasComposer = snapshot.includes(`textbox "${CHATGPT_LABELS.composer}"`);
@@ -1210,7 +1141,7 @@ async function waitForModelConfigurationToSettle(job, options = {}) {
     const configurationUiVisible = snapshotHasModelConfigurationUi(snapshot);
 
     if (!configurationUiVisible) {
-      if (snapshotWeaklyMatchesRequestedModel(snapshot, job)) return;
+      if (snapshotWeaklyMatchesRequestedModel(snapshot, job.selection)) return;
       if (options.stronglyVerified) {
         if (!fallbackLogged) {
           fallbackLogged = true;
@@ -1248,7 +1179,7 @@ async function waitForModelConfigurationToSettle(job, options = {}) {
 
 async function configureModel(job) {
   const initialSnapshot = await snapshotText(job);
-  if (snapshotStronglyMatchesRequestedModel(initialSnapshot, job)) {
+  if (snapshotCanSafelySkipModelConfiguration(initialSnapshot, job.selection)) {
     await log(`Model already appears configured for family=${job.selection.modelFamily} effort=${job.selection?.effort || "(none)"}; skipping reconfiguration`);
     return;
   }
@@ -1257,23 +1188,27 @@ async function configureModel(job) {
   let familySnapshot = await openModelConfiguration(job);
   let verificationSnapshot = familySnapshot;
 
+  const alreadyConfiguredInUi = snapshotStronglyMatchesRequestedModel(familySnapshot, job.selection);
   let familyEntry = findEntry(familySnapshot, (candidate) => matchesModelFamilyButton(candidate, job.selection.modelFamily));
-  if (!familyEntry && snapshotStronglyMatchesRequestedModel(familySnapshot, job)) {
+  if (alreadyConfiguredInUi) {
     await log("Model configuration UI opened with requested settings already selected");
-  }
-  if (!familyEntry && !snapshotStronglyMatchesRequestedModel(familySnapshot, job)) {
+  } else if (!familyEntry) {
     throw new Error(`Could not find model family button for ${job.selection.modelFamily}`);
   }
 
-  if (familyEntry) {
+  if (!alreadyConfiguredInUi && familyEntry) {
     await clickRef(job, familyEntry.ref);
     await agentBrowser(job, "wait", "800");
     familySnapshot = await snapshotText(job);
     verificationSnapshot = familySnapshot;
+    familyEntry = findEntry(familySnapshot, (candidate) => matchesModelFamilyButton(candidate, job.selection.modelFamily));
+    if (!familyEntry && !snapshotStronglyMatchesRequestedModel(familySnapshot, job.selection)) {
+      throw new Error(`Requested model family did not remain selected: ${job.selection.modelFamily}`);
+    }
   }
 
   if (job.selection.modelFamily === "thinking" || job.selection.modelFamily === "pro") {
-    const effortLabel = requestedEffortLabel(job);
+    const effortLabel = requestedEffortLabel(job.selection);
     if (effortLabel && !effortSelectionVisible(familySnapshot, effortLabel)) {
       const opened = await openEffortDropdown(job);
       if (!opened) {
@@ -1291,15 +1226,22 @@ async function configureModel(job) {
       if (!selectedEffort && !effortSelectionVisible(effortSnapshot, effortLabel)) {
         throw new Error(`Requested effort did not remain selected: ${effortLabel}`);
       }
+      familySnapshot = effortSnapshot;
     }
   }
 
-  if (job.selection.modelFamily === "instant" && job.selection.autoSwitchToThinking) {
-    await maybeClickLabeledEntry(job, CHATGPT_LABELS.autoSwitchToThinking);
-    verificationSnapshot = await snapshotText(job);
+  if (job.selection.modelFamily === "instant") {
+    const desiredAutoSwitchState = job.selection.autoSwitchToThinking === true;
+    const currentAutoSwitchState = autoSwitchToThinkingSelectionVisible(familySnapshot);
+    if (currentAutoSwitchState !== desiredAutoSwitchState && (desiredAutoSwitchState || currentAutoSwitchState === true)) {
+      await clickAutoSwitchToThinkingControl(job);
+      await agentBrowser(job, "wait", "400");
+      verificationSnapshot = await snapshotText(job);
+      familySnapshot = verificationSnapshot;
+    }
   }
 
-  const stronglyVerified = snapshotStronglyMatchesRequestedModel(verificationSnapshot, job);
+  const stronglyVerified = snapshotStronglyMatchesRequestedModel(verificationSnapshot, job.selection);
   if (!stronglyVerified) {
     throw new Error(`Could not verify requested model settings in configuration UI for ${job.selection.modelFamily}`);
   }
@@ -1427,7 +1369,7 @@ async function waitForStableChatUrl(job, previousChatUrl) {
 
 async function waitForChatCompletion(job, baselineAssistantCount) {
   const timeoutAt = Date.now() + job.config.worker.completionTimeoutMs;
-  let lastText = "";
+  let lastCompletionSignature = "";
   let stableCount = 0;
   let retriedAfterFailure = false;
 
@@ -1451,7 +1393,7 @@ async function waitForChatCompletion(job, baselineAssistantCount) {
         );
         if (retryEntry) {
           retriedAfterFailure = true;
-          lastText = "";
+          lastCompletionSignature = "";
           stableCount = 0;
           await log(`Response delivery failed (${responseFailureText}); clicking Retry once`);
           await clickRef(job, retryEntry.ref);
@@ -1462,13 +1404,34 @@ async function waitForChatCompletion(job, baselineAssistantCount) {
       throw new Error(`ChatGPT response failed: ${responseFailureText}`);
     }
 
+    let completionSignature;
     if (!hasStopStreaming && hasTargetCopyResponse && targetText) {
-      if (targetText === lastText) stableCount += 1;
+      completionSignature = deriveAssistantCompletionSignature({
+        hasStopStreaming,
+        hasTargetCopyResponse,
+        responseText: targetText,
+      });
+    } else if (!hasStopStreaming && !targetText) {
+      const artifactSignals = await collectArtifactCandidates(job, baselineAssistantCount, targetText).catch(() => ({ candidates: [], suspiciousLabels: [] }));
+      completionSignature = deriveAssistantCompletionSignature({
+        hasStopStreaming,
+        hasTargetCopyResponse,
+        responseText: targetText,
+        artifactLabels: artifactSignals.candidates.map((candidate) => candidate.label),
+        suspiciousArtifactLabels: artifactSignals.suspiciousLabels,
+      });
+    }
+
+    if (completionSignature) {
+      if (completionSignature === lastCompletionSignature) stableCount += 1;
       else stableCount = 1;
-      lastText = targetText;
+      lastCompletionSignature = completionSignature;
       if (stableCount >= 2) {
         return { responseIndex: baselineAssistantCount, responseText: targetText };
       }
+    } else {
+      lastCompletionSignature = "";
+      stableCount = 0;
     }
 
     await sleep(job.config.worker.pollMs);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-oracle",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "ChatGPT web-oracle extension for pi with isolated browser auth, async jobs, and project-context archives.",
   "private": false,
   "license": "MIT",
@@ -42,16 +42,21 @@
     ]
   },
   "scripts": {
-    "check:oracle-extension": "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/auth-cookie-policy.mjs && node --check extensions/oracle/worker/auth-bootstrap.mjs && esbuild extensions/oracle/index.ts --bundle --platform=node --format=esm --external:@mariozechner/pi-coding-agent --external:@mariozechner/pi-ai --external:@sinclair/typebox --outfile=/tmp/pi-oracle-extension-check.js",
+    "check:oracle-extension": "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/auth-cookie-policy.mjs && node --check extensions/oracle/worker/auth-bootstrap.mjs && esbuild extensions/oracle/index.ts --bundle --platform=node --format=esm --external:@mariozechner/pi-coding-agent --external:@mariozechner/pi-ai --external:@sinclair/typebox --outfile=/tmp/pi-oracle-extension-check.js",
     "typecheck": "tsc --noEmit -p tsconfig.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 sanity:oracle && npm run pack:check"
+    "verify:oracle": "npm run check:oracle-extension && npm run typecheck && npm run sanity:oracle && npm run pack:check",
+    "test": "npm run verify:oracle",
+    "prepublishOnly": "npm run verify:oracle"
   },
   "dependencies": {
     "@sinclair/typebox": "^0.34.49",
     "@steipete/sweet-cookie": "^0.2.0"
   },
+  "overrides": {
+    "basic-ftp": "^5.2.2"
+  },
   "devDependencies": {
     "@mariozechner/pi-ai": "^0.65.2",
     "@mariozechner/pi-coding-agent": "^0.65.2",
@@ -61,6 +66,9 @@
     "typescript": "^5.9.3"
   },
   "engines": {
-    "node": ">=20"
-  }
+    "node": ">=22"
+  },
+  "os": [
+    "darwin"
+  ]
 }

package/prompts/oracle.md

@@ -22,7 +22,7 @@ Oracle model (`oracle_submit`):
 
 Rules:
 - Always include an archive. Do not submit without context files.
-- By default, 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 root `secrets/` directories.
+- By default, 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 it, if the task is clearly scoped to a smaller area, or if privacy/sensitivity requires it.
 - For very targeted asks like reviewing one function or explaining one stack trace, a smaller archive is preferable.
 - 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.