pi-oracle 0.1.8 → 0.1.10

package/extensions/oracle/lib/jobs.ts

@@ -30,6 +30,9 @@ export const ORACLE_STALE_HEARTBEAT_MS = 3 * 60 * 1000;
 export const ORACLE_NOTIFICATION_CLAIM_TTL_MS = 60_000;
 const ORACLE_COMPLETE_JOB_RETENTION_MS = 14 * 24 * 60 * 60 * 1000;
 const ORACLE_FAILED_JOB_RETENTION_MS = 30 * 24 * 60 * 60 * 1000;
+export const DEFAULT_ORACLE_JOBS_DIR = "/tmp";
+export const ORACLE_JOBS_DIR_ENV = "PI_ORACLE_JOBS_DIR";
+const ORACLE_JOBS_DIR = process.env[ORACLE_JOBS_DIR_ENV]?.trim() || DEFAULT_ORACLE_JOBS_DIR;
 
 export function isActiveOracleJob(job: Pick<OracleJob, "status">): boolean {
   return ACTIVE_ORACLE_JOB_STATUSES.includes(job.status);
@@ -148,20 +151,24 @@ export function getSessionFile(ctx: ExtensionContext): string | undefined {
   return manager.getSessionFile?.();
 }
 
+export function getOracleJobsDir(): string {
+  return ORACLE_JOBS_DIR;
+}
+
 export function getJobDir(id: string): string {
-  return join("/tmp", `oracle-${id}`);
+  return join(ORACLE_JOBS_DIR, `oracle-${id}`);
 }
 
 export function listOracleJobDirs(): string[] {
-  if (!existsSync("/tmp")) return [];
-  return readdirSync("/tmp")
+  if (!existsSync(ORACLE_JOBS_DIR)) return [];
+  return readdirSync(ORACLE_JOBS_DIR)
     .filter((name) => name.startsWith("oracle-"))
-    .map((name) => join("/tmp", name))
+    .map((name) => join(ORACLE_JOBS_DIR, name))
     .filter((path) => existsSync(join(path, "job.json")));
 }
 
 export function readJob(jobDirOrId: string): OracleJob | undefined {
-  const jobDir = jobDirOrId.startsWith("/tmp/oracle-") ? jobDirOrId : getJobDir(jobDirOrId);
+  const jobDir = existsSync(join(jobDirOrId, "job.json")) ? jobDirOrId : getJobDir(jobDirOrId);
   const jobPath = join(jobDir, "job.json");
   if (!existsSync(jobPath)) return undefined;
   try {
@@ -528,6 +535,10 @@ export async function createJob(
   await chmod(promptPath, 0o600).catch(() => undefined);
 
   const now = new Date().toISOString();
+  const normalizedEffort = input.modelFamily === "instant" ? undefined : (input.effort ?? config.defaults.effort);
+  const normalizedAutoSwitchToThinking = input.modelFamily === "instant"
+    ? (input.autoSwitchToThinking ?? config.defaults.autoSwitchToThinking)
+    : false;
   const job: OracleJob = {
     id,
     status: "submitted",
@@ -541,8 +552,8 @@ export async function createJob(
     originSessionFile,
     requestSource: input.requestSource,
     chatModelFamily: input.modelFamily,
-    effort: input.effort,
-    autoSwitchToThinking: input.autoSwitchToThinking,
+    effort: normalizedEffort,
+    autoSwitchToThinking: normalizedAutoSwitchToThinking,
     followUpToJobId: input.followUpToJobId,
     chatUrl: input.followUpToJobId ? input.chatUrl : undefined,
     conversationId,

package/extensions/oracle/lib/locks.ts

@@ -4,7 +4,9 @@ import { mkdirSync, readdirSync, readFileSync } from "node:fs";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 
-const ORACLE_STATE_DIR = "/tmp/pi-oracle-state";
+export const DEFAULT_ORACLE_STATE_DIR = "/tmp/pi-oracle-state";
+export const ORACLE_STATE_DIR_ENV = "PI_ORACLE_STATE_DIR";
+const ORACLE_STATE_DIR = process.env[ORACLE_STATE_DIR_ENV]?.trim() || DEFAULT_ORACLE_STATE_DIR;
 const LOCKS_DIR = join(ORACLE_STATE_DIR, "locks");
 const LEASES_DIR = join(ORACLE_STATE_DIR, "leases");
 const DEFAULT_WAIT_MS = 30_000;

package/extensions/oracle/lib/runtime.ts

@@ -7,6 +7,11 @@ import type { OracleConfig } from "./config.js";
 import { createLease, listLeaseMetadata, readLeaseMetadata, releaseLease, withAuthLock } from "./locks.js";
 
 const SEED_GENERATION_FILE = ".oracle-seed-generation";
+const DEFAULT_ORACLE_JOBS_DIR = "/tmp";
+const ORACLE_JOBS_DIR = process.env.PI_ORACLE_JOBS_DIR?.trim() || DEFAULT_ORACLE_JOBS_DIR;
+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";
 
 export interface OracleRuntimeLeaseMetadata {
   jobId: string;
@@ -80,7 +85,7 @@ export async function writeSeedGeneration(config: OracleConfig, value = new Date
 }
 
 function activeJobExists(jobId: string): boolean {
-  const path = join("/tmp", `oracle-${jobId}`, "job.json");
+  const path = join(ORACLE_JOBS_DIR, `oracle-${jobId}`, "job.json");
   if (!existsSync(path)) return false;
   try {
     const job = JSON.parse(readFileSync(path, "utf8")) as { status?: string };
@@ -181,7 +186,7 @@ export interface OracleCleanupReport {
 
 async function closeRuntimeBrowserSession(runtimeSessionName: string): Promise<string | undefined> {
   return new Promise<string | undefined>((resolve) => {
-    const child = spawn("agent-browser", ["--session", runtimeSessionName, "close"], { stdio: "ignore" });
+    const child = spawn(AGENT_BROWSER_BIN, ["--session", runtimeSessionName, "close"], { stdio: "ignore" });
     let settled = false;
     let timeout: NodeJS.Timeout | undefined;
     let timedOut = false;

package/extensions/oracle/worker/artifact-heuristics.mjs

@@ -0,0 +1,76 @@
+export const FILE_LABEL_PATTERN_SOURCE = String.raw`(?:^|[^\w])[^\n]*\.[A-Za-z0-9]{1,12}(?:$|[^\w])`;
+const FILE_LABEL_PATTERN = new RegExp(FILE_LABEL_PATTERN_SOURCE);
+export const GENERIC_ARTIFACT_LABELS = ["ATTACHED", "DONE"];
+const GENERIC_ARTIFACT_LABEL_SET = new Set(GENERIC_ARTIFACT_LABELS);
+
+export function parseSnapshotEntries(snapshot) {
+  return String(snapshot || "")
+    .split("\n")
+    .map((line, lineIndex) => {
+      const refMatch = line.match(/\bref=(e\d+)\b/);
+      if (!refMatch) return undefined;
+      const kindMatch = line.match(/^\s*-\s*([^\s]+)/);
+      const quotedMatch = line.match(/"([^"]*)"/);
+      const valueMatch = line.match(/:\s*(.+)$/);
+      return {
+        line,
+        lineIndex,
+        ref: `@${refMatch[1]}`,
+        kind: kindMatch ? kindMatch[1] : undefined,
+        label: quotedMatch ? quotedMatch[1] : undefined,
+        value: valueMatch ? valueMatch[1].trim() : undefined,
+        disabled: /\bdisabled\b/.test(line),
+      };
+    })
+    .filter(Boolean);
+}
+
+function normalizeText(value) {
+  return String(value || "").replace(/\s+/g, " ").trim();
+}
+
+export function isLikelyArtifactLabel(label) {
+  const normalized = normalizeText(label);
+  if (!normalized) return false;
+  if (GENERIC_ARTIFACT_LABEL_SET.has(normalized.toUpperCase())) return true;
+  return FILE_LABEL_PATTERN.test(normalized);
+}
+
+export function isStructuralArtifactCandidate(candidate) {
+  const label = normalizeText(candidate?.label);
+  if (!isLikelyArtifactLabel(label)) return false;
+
+  const listItemText = normalizeText(candidate?.listItemText);
+  const listItemFileButtonCount = Number(candidate?.listItemFileButtonCount || 0);
+  const paragraphFileButtonCount = Number(candidate?.paragraphFileButtonCount || 0);
+  const paragraphOtherTextLength = Number(candidate?.paragraphOtherTextLength ?? Number.POSITIVE_INFINITY);
+  const focusableFileButtonCount = Number(candidate?.focusableFileButtonCount || 0);
+  const focusableOtherTextLength = Number(candidate?.focusableOtherTextLength ?? Number.POSITIVE_INFINITY);
+
+  if (listItemText === label && listItemFileButtonCount === 1) {
+    return true;
+  }
+
+  if (paragraphFileButtonCount === 1 && paragraphOtherTextLength <= 32) {
+    return true;
+  }
+
+  if (focusableFileButtonCount >= 1 && focusableOtherTextLength <= 64) {
+    return true;
+  }
+
+  return false;
+}
+
+export function filterStructuralArtifactCandidates(candidates) {
+  const seen = new Set();
+  const filtered = [];
+  for (const candidate of candidates || []) {
+    const label = normalizeText(candidate?.label);
+    if (!label || seen.has(label)) continue;
+    if (!isStructuralArtifactCandidate(candidate)) continue;
+    seen.add(label);
+    filtered.push({ label });
+  }
+  return filtered;
+}

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

@@ -33,9 +33,13 @@ const SNAPSHOT_PATH = "/tmp/oracle-auth.snapshot.txt";
 const BODY_PATH = "/tmp/oracle-auth.body.txt";
 const SCREENSHOT_PATH = "/tmp/oracle-auth.png";
 const REAL_CHROME_USER_DATA_DIR = resolve(homedir(), "Library", "Application Support", "Google", "Chrome");
-const ORACLE_STATE_DIR = "/tmp/pi-oracle-state";
+const DEFAULT_ORACLE_STATE_DIR = "/tmp/pi-oracle-state";
+const ORACLE_STATE_DIR = process.env.PI_ORACLE_STATE_DIR?.trim() || DEFAULT_ORACLE_STATE_DIR;
 const LOCKS_DIR = join(ORACLE_STATE_DIR, "locks");
 const STALE_STAGING_PROFILE_MAX_AGE_MS = 24 * 60 * 60 * 1000;
+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";
 
 let runtimeProfileDir = config.browser.authSeedProfileDir;
 
@@ -165,7 +169,7 @@ function targetBrowserBaseArgs(options = {}) {
 
 async function closeTargetBrowser() {
   await log(`Closing target browser session ${authSessionName()} if present`);
-  const result = await spawnCommand("agent-browser", [...targetBrowserBaseArgs(), "close"], { allowFailure: true });
+  const result = await spawnCommand(AGENT_BROWSER_BIN, [...targetBrowserBaseArgs(), "close"], { allowFailure: true });
   await log(`close result: code=${result.code} stdout=${JSON.stringify(result.stdout)} stderr=${JSON.stringify(result.stderr)}`);
 }
 
@@ -182,7 +186,7 @@ async function ensureNotSymlink(path, label) {
 }
 
 async function isAuthBrowserConnected() {
-  const result = await spawnCommand("agent-browser", [...targetBrowserBaseArgs(), "--json", "stream", "status"], { allowFailure: true });
+  const result = await spawnCommand(AGENT_BROWSER_BIN, [...targetBrowserBaseArgs(), "--json", "stream", "status"], { allowFailure: true });
   try {
     const parsed = JSON.parse(result.stdout || "{}");
     return parsed?.data?.connected === true;
@@ -274,7 +278,7 @@ async function launchTargetBrowser() {
   await closeTargetBrowser();
   const args = [...targetBrowserBaseArgs({ withLaunchOptions: true, mode: "headed" }), "open", "about:blank"];
   await log(`Launching isolated browser: agent-browser ${JSON.stringify(args)}`);
-  const result = await spawnCommand("agent-browser", args, { allowFailure: true });
+  const result = await spawnCommand(AGENT_BROWSER_BIN, args, { allowFailure: true });
   await log(`launch result: code=${result.code} stdout=${JSON.stringify(result.stdout)} stderr=${JSON.stringify(result.stderr)}`);
   if (result.code !== 0) {
     throw new Error(result.stderr || result.stdout || "Failed to launch isolated oracle browser");
@@ -282,7 +286,7 @@ async function launchTargetBrowser() {
 }
 
 async function streamStatus() {
-  const result = await spawnCommand("agent-browser", [...targetBrowserBaseArgs(), "--json", "stream", "status"], { allowFailure: true });
+  const result = await spawnCommand(AGENT_BROWSER_BIN, [...targetBrowserBaseArgs(), "--json", "stream", "status"], { allowFailure: true });
   await log(`stream status: code=${result.code} stdout=${JSON.stringify(result.stdout)} stderr=${JSON.stringify(result.stderr)}`);
   try {
     const parsed = JSON.parse(result.stdout || "{}");
@@ -311,7 +315,7 @@ async function targetCommand(...args) {
     options = args.pop();
   }
   await ensureBrowserConnected();
-  const result = await spawnCommand("agent-browser", [...targetBrowserBaseArgs(), ...args], options);
+  const result = await spawnCommand(AGENT_BROWSER_BIN, [...targetBrowserBaseArgs(), ...args], options);
   const label = options?.logLabel || `agent-browser ${args.join(" ")}`;
   await log(`${label}: code=${result.code} stdout=${JSON.stringify(result.stdout)} stderr=${JSON.stringify(result.stderr)}`);
   return result;

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

@@ -3,6 +3,7 @@ import { existsSync } from "node:fs";
 import { appendFile, chmod, mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, join } from "node:path";
 import { spawn } from "node:child_process";
+import { FILE_LABEL_PATTERN_SOURCE, filterStructuralArtifactCandidates, GENERIC_ARTIFACT_LABELS, parseSnapshotEntries } from "./artifact-heuristics.mjs";
 
 const jobId = process.argv[2];
 if (!jobId) {
@@ -10,7 +11,9 @@ if (!jobId) {
   process.exit(1);
 }
 
-const jobDir = `/tmp/oracle-${jobId}`;
+const DEFAULT_ORACLE_JOBS_DIR = "/tmp";
+const ORACLE_JOBS_DIR = process.env.PI_ORACLE_JOBS_DIR?.trim() || DEFAULT_ORACLE_JOBS_DIR;
+const jobDir = join(ORACLE_JOBS_DIR, `oracle-${jobId}`);
 const jobPath = `${jobDir}/job.json`;
 const CHATGPT_LABELS = {
   composer: "Chat with ChatGPT",
@@ -26,7 +29,8 @@ const MODEL_FAMILY_PREFIX = {
   pro: "Pro ",
 };
 
-const ORACLE_STATE_DIR = "/tmp/pi-oracle-state";
+const DEFAULT_ORACLE_STATE_DIR = "/tmp/pi-oracle-state";
+const ORACLE_STATE_DIR = process.env.PI_ORACLE_STATE_DIR?.trim() || DEFAULT_ORACLE_STATE_DIR;
 const LOCKS_DIR = join(ORACLE_STATE_DIR, "locks");
 const LEASES_DIR = join(ORACLE_STATE_DIR, "leases");
 const SEED_GENERATION_FILE = ".oracle-seed-generation";
@@ -37,6 +41,12 @@ const ARTIFACT_DOWNLOAD_HEARTBEAT_MS = 10_000;
 const ARTIFACT_DOWNLOAD_TIMEOUT_MS = 90_000;
 const ARTIFACT_DOWNLOAD_MAX_ATTEMPTS = 2;
 const AGENT_BROWSER_CLOSE_TIMEOUT_MS = 10_000;
+const MODEL_CONFIGURATION_SETTLE_TIMEOUT_MS = 20_000;
+const MODEL_CONFIGURATION_SETTLE_POLL_MS = 250;
+const MODEL_CONFIGURATION_CLOSE_RETRY_MS = 1_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";
 
 let currentJob;
 let browserStarted = false;
@@ -321,7 +331,7 @@ async function closeBrowser(job) {
   if (cleaningUpBrowser) return;
   cleaningUpBrowser = true;
   try {
-    const result = await spawnCommand("agent-browser", [...browserBaseArgs(job), "close"], {
+    const result = await spawnCommand(AGENT_BROWSER_BIN, [...browserBaseArgs(job), "close"], {
       allowFailure: true,
       timeoutMs: AGENT_BROWSER_CLOSE_TIMEOUT_MS,
     });
@@ -337,12 +347,12 @@ async function closeBrowser(job) {
 async function launchBrowser(job, url) {
   await closeBrowser(job);
   const mode = job.config.browser.runMode;
-  await spawnCommand("agent-browser", [...browserBaseArgs(job, { withLaunchOptions: true, mode }), "open", url]);
+  await spawnCommand(AGENT_BROWSER_BIN, [...browserBaseArgs(job, { withLaunchOptions: true, mode }), "open", url]);
   browserStarted = true;
 }
 
 async function streamStatus(job) {
-  const { stdout } = await spawnCommand("agent-browser", [...browserBaseArgs(job), "--json", "stream", "status"], { allowFailure: true });
+  const { stdout } = await spawnCommand(AGENT_BROWSER_BIN, [...browserBaseArgs(job), "--json", "stream", "status"], { allowFailure: true });
   try {
     const parsed = JSON.parse(stdout || "{}");
     return parsed?.data || {};
@@ -374,7 +384,7 @@ async function agentBrowser(job, ...args) {
     options = args.pop();
   }
   await ensureBrowserConnected(job);
-  return spawnCommand("agent-browser", [...browserBaseArgs(job), ...args], options);
+  return spawnCommand(AGENT_BROWSER_BIN, [...browserBaseArgs(job), ...args], options);
 }
 
 function parseEvalResult(stdout) {
@@ -536,27 +546,6 @@ function buildLoginProbeScript(timeoutMs) {
   `);
 }
 
-function parseSnapshotEntries(snapshot) {
-  return snapshot
-    .split("\n")
-    .map((line) => {
-      const refMatch = line.match(/\bref=(e\d+)\b/);
-      if (!refMatch) return undefined;
-      const kindMatch = line.match(/^\s*-\s*([^\s]+)/);
-      const quotedMatch = line.match(/"([^"]*)"/);
-      const valueMatch = line.match(/:\s*(.+)$/);
-      return {
-        line,
-        ref: `@${refMatch[1]}`,
-        kind: kindMatch ? kindMatch[1] : undefined,
-        label: quotedMatch ? quotedMatch[1] : undefined,
-        value: valueMatch ? valueMatch[1].trim() : undefined,
-        disabled: /\bdisabled\b/.test(line),
-      };
-    })
-    .filter(Boolean);
-}
-
 function findEntry(snapshot, predicate) {
   return parseSnapshotEntries(snapshot).find(predicate);
 }
@@ -569,14 +558,21 @@ function findLastEntry(snapshot, predicate) {
   return undefined;
 }
 
-function matchesModelFamilyButton(candidate, family) {
-  return candidate.kind === "button" && typeof candidate.label === "string" && candidate.label.startsWith(MODEL_FAMILY_PREFIX[family]) && !candidate.disabled;
-}
-
 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.effort ? titleCase(job.effort) : undefined;
 }
@@ -609,9 +605,9 @@ function snapshotHasModelConfigurationUi(snapshot) {
     entries
       .filter((entry) => entry.kind === "button" && typeof entry.label === "string")
       .flatMap((entry) =>
-        Object.entries(MODEL_FAMILY_PREFIX)
-          .filter(([, prefix]) => entry.label.startsWith(prefix))
-          .map(([family]) => family),
+        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);
@@ -624,18 +620,35 @@ function snapshotHasModelConfigurationUi(snapshot) {
 function snapshotStronglyMatchesRequestedModel(snapshot, job) {
   const entries = parseSnapshotEntries(snapshot);
   const familyMatched = entries.some((entry) => matchesModelFamilyButton(entry, job.chatModelFamily));
+  const effortLabel = requestedEffortLabel(job);
   if (job.chatModelFamily === "thinking") {
-    return familyMatched || effortSelectionVisible(snapshot, requestedEffortLabel(job));
+    return familyMatched || effortSelectionVisible(snapshot, effortLabel);
   }
   if (job.chatModelFamily === "pro") {
-    return familyMatched;
+    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(
+    (entry) => entry.kind === "textbox" && entry.label === CHATGPT_LABELS.composer && !entry.disabled,
+  );
+  const hasAddFiles = entries.some(
+    (entry) => entry.kind === "button" && entry.label === CHATGPT_LABELS.addFiles && !entry.disabled,
+  );
+  return hasComposer && hasAddFiles;
+}
+
 function snapshotWeaklyMatchesRequestedModel(snapshot, job) {
   if (job.chatModelFamily === "thinking") {
-    return effortSelectionVisible(snapshot, requestedEffortLabel(job));
+    return effortSelectionVisible(snapshot, requestedEffortLabel(job)) || thinkingSelectionVisible(snapshot);
   }
   if (job.chatModelFamily === "pro") {
     return !thinkingChipVisible(snapshot);
@@ -829,6 +842,17 @@ function detectUploadErrorText(text) {
   return patterns.find((pattern) => text.toLowerCase().includes(pattern.toLowerCase()));
 }
 
+function detectResponseFailureText(text) {
+  const patterns = [
+    "Message delivery timed out",
+    "A network error occurred",
+    "An error occurred while connecting to the websocket",
+    "There was an error generating a response",
+    "Something went wrong while generating the response",
+  ];
+  return patterns.find((pattern) => text.toLowerCase().includes(pattern.toLowerCase()));
+}
+
 function composerSnapshotSlice(snapshot) {
   const lines = snapshot.split("\n");
   let composerIndex = -1;
@@ -941,6 +965,54 @@ async function openModelConfiguration(job) {
   throw new Error("Could not open model configuration UI");
 }
 
+async function waitForModelConfigurationToSettle(job, options = {}) {
+  const deadline = Date.now() + MODEL_CONFIGURATION_SETTLE_TIMEOUT_MS;
+  let lastCloseAttemptAt = 0;
+  let fallbackLogged = false;
+  let lastSnapshot = "";
+
+  while (Date.now() < deadline) {
+    const snapshot = await snapshotText(job);
+    lastSnapshot = snapshot;
+    const configurationUiVisible = snapshotHasModelConfigurationUi(snapshot);
+
+    if (!configurationUiVisible) {
+      if (snapshotWeaklyMatchesRequestedModel(snapshot, job)) return;
+      if (options.stronglyVerified) {
+        if (!fallbackLogged) {
+          fallbackLogged = true;
+          await log(`Model configuration closed after strong in-dialog verification for family=${job.chatModelFamily} effort=${job.effort || "(none)"}`);
+        }
+        return;
+      }
+    }
+
+    if (!configurationUiVisible && composerControlsVisible(snapshot) && options.stronglyVerified) {
+      if (!fallbackLogged) {
+        fallbackLogged = true;
+        await log(`Composer became usable after strong in-dialog verification for family=${job.chatModelFamily} effort=${job.effort || "(none)"}`);
+      }
+      return;
+    }
+
+    if (Date.now() - lastCloseAttemptAt >= MODEL_CONFIGURATION_CLOSE_RETRY_MS) {
+      lastCloseAttemptAt = Date.now();
+      if (!(await maybeClickLabeledEntry(job, CHATGPT_LABELS.close, { kind: "button" }))) {
+        await agentBrowser(job, "press", "Escape").catch(() => undefined);
+      }
+    }
+
+    await sleep(MODEL_CONFIGURATION_SETTLE_POLL_MS);
+  }
+
+  if (options.stronglyVerified && lastSnapshot && !snapshotHasModelConfigurationUi(lastSnapshot)) {
+    await log(`Model configuration closed only after settle-timeout for family=${job.chatModelFamily} effort=${job.effort || "(none)"}`);
+    return;
+  }
+
+  throw new Error(`Could not verify requested model settings after configuration for ${job.chatModelFamily}`);
+}
+
 async function configureModel(job) {
   const initialSnapshot = await snapshotText(job);
   if (snapshotStronglyMatchesRequestedModel(initialSnapshot, job)) {
@@ -950,6 +1022,7 @@ async function configureModel(job) {
 
   await log(`Configuring model family=${job.chatModelFamily} effort=${job.effort || "(none)"}`);
   let familySnapshot = await openModelConfiguration(job);
+  let verificationSnapshot = familySnapshot;
 
   let familyEntry = findEntry(familySnapshot, (candidate) => matchesModelFamilyButton(candidate, job.chatModelFamily));
   if (!familyEntry && snapshotStronglyMatchesRequestedModel(familySnapshot, job)) {
@@ -963,6 +1036,7 @@ async function configureModel(job) {
     await clickRef(job, familyEntry.ref);
     await agentBrowser(job, "wait", "800");
     familySnapshot = await snapshotText(job);
+    verificationSnapshot = familySnapshot;
   }
 
   if (job.chatModelFamily === "thinking" || job.chatModelFamily === "pro") {
@@ -976,6 +1050,7 @@ async function configureModel(job) {
       await clickLabeledEntry(job, effortLabel, { kind: "option" });
       await agentBrowser(job, "wait", "400");
       const effortSnapshot = await snapshotText(job);
+      verificationSnapshot = effortSnapshot;
       const selectedEffort = findEntry(
         effortSnapshot,
         (candidate) => candidate.kind === "combobox" && candidate.value === effortLabel && !candidate.disabled,
@@ -988,17 +1063,18 @@ async function configureModel(job) {
 
   if (job.chatModelFamily === "instant" && job.autoSwitchToThinking) {
     await maybeClickLabeledEntry(job, CHATGPT_LABELS.autoSwitchToThinking);
+    verificationSnapshot = await snapshotText(job);
   }
 
-  if (!(await maybeClickLabeledEntry(job, CHATGPT_LABELS.close, { kind: "button" }))) {
-    await agentBrowser(job, "press", "Escape").catch(() => undefined);
+  const stronglyVerified = snapshotStronglyMatchesRequestedModel(verificationSnapshot, job);
+  if (!stronglyVerified) {
+    throw new Error(`Could not verify requested model settings in configuration UI for ${job.chatModelFamily}`);
   }
-  await agentBrowser(job, "wait", "500");
 
-  const postCloseSnapshot = await snapshotText(job);
-  if (!snapshotWeaklyMatchesRequestedModel(postCloseSnapshot, job)) {
-    throw new Error(`Could not verify requested model settings after configuration for ${job.chatModelFamily}`);
+  if (!(await maybeClickLabeledEntry(job, CHATGPT_LABELS.close, { kind: "button" }))) {
+    await agentBrowser(job, "press", "Escape").catch(() => undefined);
   }
+  await waitForModelConfigurationToSettle(job, { stronglyVerified });
 }
 
 async function uploadArchive(job) {
@@ -1120,17 +1196,39 @@ async function waitForChatCompletion(job, baselineAssistantCount) {
   const timeoutAt = Date.now() + job.config.worker.completionTimeoutMs;
   let lastText = "";
   let stableCount = 0;
+  let retriedAfterFailure = false;
 
   while (Date.now() < timeoutAt) {
     await heartbeat();
-    const snapshot = await snapshotText(job);
+    const [snapshot, body] = await Promise.all([snapshotText(job), pageText(job).catch(() => "")]);
     const hasStopStreaming = snapshot.includes("Stop streaming");
+    const hasRetryButton = snapshot.includes('button "Retry"');
     const copyResponseCount = (snapshot.match(/Copy response/g) || []).length;
+    const responseFailureText = detectResponseFailureText(`${snapshot}\n${body}`);
     const messages = await assistantMessages(job);
     const targetMessage = messages[baselineAssistantCount];
     const targetText = targetMessage?.text || "";
     const hasTargetCopyResponse = copyResponseCount > baselineAssistantCount;
 
+    if (!hasStopStreaming && hasRetryButton && responseFailureText) {
+      if (!retriedAfterFailure) {
+        const retryEntry = findEntry(
+          snapshot,
+          (candidate) => candidate.kind === "button" && candidate.label === "Retry" && !candidate.disabled,
+        );
+        if (retryEntry) {
+          retriedAfterFailure = true;
+          lastText = "";
+          stableCount = 0;
+          await log(`Response delivery failed (${responseFailureText}); clicking Retry once`);
+          await clickRef(job, retryEntry.ref);
+          await agentBrowser(job, "wait", "1000").catch(() => undefined);
+          continue;
+        }
+      }
+      throw new Error(`ChatGPT response failed: ${responseFailureText}`);
+    }
+
     if (!hasStopStreaming && hasTargetCopyResponse && targetText) {
       if (targetText === lastText) stableCount += 1;
       else stableCount = 1;
@@ -1156,14 +1254,6 @@ async function detectType(path) {
   return result.stdout || "unknown";
 }
 
-function isLikelyArtifactLabel(label) {
-  const normalized = String(label || "").trim();
-  if (!normalized) return false;
-  const upper = normalized.toUpperCase();
-  if (upper === "ATTACHED" || upper === "DONE") return true;
-  return /(?:^|[^\w])[^\n]*\.[A-Za-z0-9]{1,12}(?:$|[^\w])/.test(normalized);
-}
-
 function preferredArtifactName(label, index) {
   const normalized = String(label || "").trim();
   const fileNameMatch = normalized.match(/([A-Za-z0-9._-]+\.[A-Za-z0-9]{1,12})(?!.*[A-Za-z0-9._-]+\.[A-Za-z0-9]{1,12})/);
@@ -1171,57 +1261,82 @@ function preferredArtifactName(label, index) {
   return `artifact-${String(index + 1).padStart(2, "0")}`;
 }
 
-function artifactCandidatesFromEntries(entries) {
-  const excluded = new Set([
-    "Copy response",
-    "Good response",
-    "Bad response",
-    "Share",
-    "Switch model",
-    "More actions",
-    CHATGPT_LABELS.addFiles,
-    "Start dictation",
-    "Start Voice",
-    "Model selector",
-    "Open conversation options",
-    "Scroll to bottom",
-    CHATGPT_LABELS.close,
-  ]);
-
-  const seen = new Set();
-  const candidates = [];
-  for (const entry of entries) {
-    if (!entry.label) continue;
-    if (excluded.has(entry.label)) continue;
-    if (entry.label.startsWith("Thought for ")) continue;
-    if (entry.kind !== "button" && entry.kind !== "link") continue;
-    if (!isLikelyArtifactLabel(entry.label)) continue;
-    if (seen.has(entry.label)) continue;
-    seen.add(entry.label);
-    candidates.push({ label: entry.label });
-  }
-  return candidates;
-}
-
-async function collectArtifactCandidates(job, responseIndex) {
+async function collectArtifactCandidates(job, responseIndex, responseText = "") {
   const snapshot = await snapshotText(job);
   const targetSlice = assistantSnapshotSlice(snapshot, responseIndex);
   if (!targetSlice) return { snapshot, targetSlice, candidates: [] };
+
+  const structural = await evalPage(
+    job,
+    toJsonScript(`
+      const normalize = (value) => String(value || '').replace(/\s+/g, ' ').trim();
+      const genericArtifactLabels = new Set(${JSON.stringify(GENERIC_ARTIFACT_LABELS)});
+      const fileLabelPattern = new RegExp(${JSON.stringify(FILE_LABEL_PATTERN_SOURCE)});
+      const isFileLabel = (value) => {
+        const normalized = normalize(value);
+        if (!normalized) return false;
+        if (genericArtifactLabels.has(normalized.toUpperCase())) return true;
+        return fileLabelPattern.test(normalized);
+      };
+      const headings = Array.from(document.querySelectorAll('h1,h2,h3,h4,h5,h6,[role="heading"]'))
+        .filter((el) => normalize(el.textContent) === 'ChatGPT said:');
+      const host = headings[${responseIndex}]?.nextElementSibling;
+      if (!host) return { candidates: [] };
+
+      const fileButtons = (node) => node
+        ? Array.from(node.querySelectorAll('button, a')).map((candidate) => normalize(candidate.textContent)).filter(isFileLabel)
+        : [];
+      const otherTextLength = (text, labels) => {
+        let remaining = normalize(text);
+        for (const label of labels || []) {
+          remaining = normalize(remaining.replaceAll(label, ' '));
+        }
+        remaining = normalize(remaining.replaceAll('Coding Citation', ' '));
+        return remaining.length;
+      };
+      const focusableFor = (node) => node?.closest('[tabindex]');
+
+      const candidates = Array.from(host.querySelectorAll('button, a'))
+        .map((button) => {
+          const label = normalize(button.textContent);
+          if (!isFileLabel(label)) return null;
+          const paragraph = button.closest('p');
+          const listItem = button.closest('li');
+          const focusable = focusableFor(button);
+          const paragraphFileLabels = fileButtons(paragraph);
+          const focusableFileLabels = fileButtons(focusable);
+          return {
+            label,
+            paragraphText: normalize(paragraph?.textContent),
+            listItemText: normalize(listItem?.textContent),
+            paragraphFileButtonCount: paragraphFileLabels.length,
+            paragraphOtherTextLength: otherTextLength(paragraph?.textContent, paragraphFileLabels),
+            listItemFileButtonCount: fileButtons(listItem).length,
+            focusableFileButtonCount: focusableFileLabels.length,
+            focusableOtherTextLength: otherTextLength(focusable?.textContent, focusableFileLabels),
+          };
+        })
+        .filter(Boolean);
+
+      return { candidates };
+    `),
+  );
+
   return {
     snapshot,
     targetSlice,
-    candidates: artifactCandidatesFromEntries(parseSnapshotEntries(targetSlice)),
+    candidates: filterStructuralArtifactCandidates(structural?.candidates || []),
   };
 }
 
-async function waitForStableArtifactCandidates(job, responseIndex) {
+async function waitForStableArtifactCandidates(job, responseIndex, responseText = "") {
   const deadline = Date.now() + ARTIFACT_CANDIDATE_STABILITY_TIMEOUT_MS;
   let lastSignature;
   let stablePolls = 0;
   let latest = { snapshot: "", targetSlice: undefined, candidates: [] };
 
   while (Date.now() < deadline) {
-    latest = await collectArtifactCandidates(job, responseIndex);
+    latest = await collectArtifactCandidates(job, responseIndex, responseText);
     const signature = latest.candidates.map((candidate) => candidate.label).join("\n");
     if (signature === lastSignature) stablePolls += 1;
     else {
@@ -1236,12 +1351,12 @@ async function waitForStableArtifactCandidates(job, responseIndex) {
   return latest;
 }
 
-async function reopenConversationForArtifacts(job, responseIndex, reason) {
+async function reopenConversationForArtifacts(job, responseIndex, responseText, reason) {
   const targetUrl = job.chatUrl || stripQuery(await currentUrl(job));
   await log(`Reopening conversation before artifact capture (${reason}): ${targetUrl}`);
   await agentBrowser(job, "open", targetUrl);
   await agentBrowser(job, "wait", "1500");
-  return waitForStableArtifactCandidates(job, responseIndex);
+  return waitForStableArtifactCandidates(job, responseIndex, responseText);
 }
 
 async function withHeartbeatWhile(task, intervalMs = ARTIFACT_DOWNLOAD_HEARTBEAT_MS) {
@@ -1273,14 +1388,14 @@ async function flushArtifactsState(artifacts) {
   }));
 }
 
-async function downloadArtifacts(job, responseIndex) {
+async function downloadArtifacts(job, responseIndex, responseText = "") {
   if (!job.config.artifacts.capture) {
     await secureWriteText(`${jobDir}/artifacts.json`, "[]\n");
     await mutateJob((current) => ({ ...current, artifactPaths: [] }));
     return [];
   }
 
-  const { targetSlice, candidates } = await reopenConversationForArtifacts(job, responseIndex, "initial");
+  const { targetSlice, candidates } = await reopenConversationForArtifacts(job, responseIndex, responseText, "initial");
   if (!targetSlice) {
     await log(`No assistant response found in snapshot for response index ${responseIndex}`);
     await secureWriteText(`${jobDir}/artifacts.json`, "[]\n");
@@ -1342,7 +1457,7 @@ async function downloadArtifacts(job, responseIndex) {
         if (attempt >= ARTIFACT_DOWNLOAD_MAX_ATTEMPTS) {
           artifacts.push({ displayName: candidate.label, unconfirmed: true, error: message });
         } else {
-          await reopenConversationForArtifacts(job, responseIndex, `retry ${attempt + 1} for ${candidate.label}`);
+          await reopenConversationForArtifacts(job, responseIndex, responseText, `retry ${attempt + 1} for ${candidate.label}`);
           await sleep(1_000);
         }
       } finally {
@@ -1407,7 +1522,7 @@ async function run() {
     currentJob = await mutateJob((job) => ({ ...job, ...phasePatch("extracting_response", { heartbeatAt: new Date().toISOString() }) }));
     await secureWriteText(currentJob.responsePath, `${completion.responseText.trim()}\n`);
     currentJob = await mutateJob((job) => ({ ...job, ...phasePatch("downloading_artifacts", { heartbeatAt: new Date().toISOString() }) }));
-    const artifacts = await downloadArtifacts(currentJob, completion.responseIndex);
+    const artifacts = await downloadArtifacts(currentJob, completion.responseIndex, completion.responseText);
     const artifactFailureCount = artifacts.filter((artifact) => artifact.unconfirmed || artifact.error).length;
 
     await heartbeat(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-oracle",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "ChatGPT web-oracle extension for pi with isolated browser auth, async jobs, and project-context archives.",
   "private": false,
   "license": "MIT",
@@ -40,8 +40,8 @@
     ]
   },
   "scripts": {
-    "check:oracle-extension": "node --check extensions/oracle/worker/run-job.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",
-    "sanity:oracle": "tsx scripts/oracle-sanity.ts",
+    "check:oracle-extension": "node --check extensions/oracle/worker/run-job.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",
+    "sanity:oracle": "node scripts/oracle-sanity-runner.mjs",
     "pack:check": "npm pack --dry-run"
   },
   "dependencies": {