pi-oracle 0.2.1 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 0.3.0 - 2026-04-08
+
+### Changed
+- breaking: `oracle_submit` and oracle config defaults now use preset-only model selection; legacy `modelFamily` / `effort` / `autoSwitchToThinking` submit inputs and default config fields were removed in favor of canonical preset ids
+- oracle jobs now persist a resolved `selection` snapshot and the worker configures ChatGPT from that persisted selection instead of re-deriving model settings from legacy job fields
+- oracle model preset definitions now come from a single canonical registry in `extensions/oracle/lib/config.ts`
+
+### Fixed
+- removed duplicate hand-maintained preset-id examples from agent-facing prompt and design docs so callers are directed to the tool schema / canonical registry instead of stale inline lists
+- oracle sanity coverage now validates the preset-only contract from the registered tool schema and canonical registry instead of brittle prose-only assertions
+- worker model configuration now consistently uses the explicit `configureModel(job)` parameter instead of hidden coupling through the module-global current job
+
+## 0.2.2 - 2026-04-07
+
+### Fixed
+- missed ChatGPT file artifacts now map generic download controls onto nearby filenames and download from live DOM selectors instead of relying only on filename-labeled snapshot refs
+- oracle jobs no longer report a false-clean completion when response-local artifact signals are present but capture fails or remains inconclusive
+- artifact label extraction now collapses paths and mixed response text down to real filenames so suspicious artifact fallback logic does not emit bogus labels
+
+### Added
+- regression coverage for artifact label extraction edge cases and ambiguous download-control artifact detection
+
 ## 0.2.1 - 2026-04-07
 
 ### Fixed

package/README.md

@@ -111,6 +111,7 @@ Config files:
 - project: `.pi/extensions/oracle.json`
 
 Common settings:
+- `defaults.preset`
 - `browser.args`
 - `browser.executablePath`
 - `browser.authSeedProfileDir`

package/docs/ORACLE_DESIGN.md

@@ -133,7 +133,9 @@ The authenticated seed profile remains the source of truth for future oracle run
 
 ### `oracle_submit`
 
-1. validate config and model options
+Agent-facing submissions use **`preset`**; the canonical registry is `ORACLE_SUBMIT_PRESETS` in `extensions/oracle/lib/config.ts`. **`preset` is the only model-selection parameter** on `oracle_submit`. There are no `modelFamily`, `effort`, or `autoSwitchToThinking` fields.
+
+1. resolve the preset (submit-time or config default) into an execution snapshot
 2. resolve optional `followUpJobId` into a prior `chatUrl` and `conversationId`
 3. build the archive first into a temporary path
 4. allocate a unique runtime:
@@ -216,9 +218,7 @@ Browser/auth settings are global-only because they control local privileged brow
 ```json
 {
   "defaults": {
-    "modelFamily": "pro",
-    "effort": "extended",
-    "autoSwitchToThinking": false
+    "preset": "<preset id from ORACLE_SUBMIT_PRESETS>"
   },
   "browser": {
     "sessionPrefix": "oracle",
@@ -317,9 +317,7 @@ Important fields include:
 - `sessionId`
 - `originSessionFile`
 - `requestSource`
-- `chatModelFamily`
-- `effort`
-- `autoSwitchToThinking`
+- `selection`: resolved execution snapshot with `{ preset, modelFamily, effort?, autoSwitchToThinking }`
 - `followUpToJobId`
 - `chatUrl`
 - `conversationId`

package/extensions/oracle/lib/config.ts

@@ -10,13 +10,61 @@ export type OracleModelFamily = (typeof MODEL_FAMILIES)[number];
 export const EFFORTS = ["light", "standard", "extended", "heavy"] as const;
 export type OracleEffort = (typeof EFFORTS)[number];
 
+/**
+ * Canonical preset registry for `oracle_submit` preset selection.
+ * This is the single authored source of truth — all derived lists come from `Object.keys(...)`.
+ */
+export const ORACLE_SUBMIT_PRESETS = {
+  pro_standard: { label: "Pro - Standard", modelFamily: "pro" as const, effort: "standard" as const, autoSwitchToThinking: false },
+  pro_extended: { label: "Pro - Extended", modelFamily: "pro" as const, effort: "extended" as const, autoSwitchToThinking: false },
+  thinking_light: { label: "Thinking - Light", modelFamily: "thinking" as const, effort: "light" as const, autoSwitchToThinking: false },
+  thinking_standard: { label: "Thinking - Standard", modelFamily: "thinking" as const, effort: "standard" as const, autoSwitchToThinking: false },
+  thinking_extended: { label: "Thinking - Extended", modelFamily: "thinking" as const, effort: "extended" as const, autoSwitchToThinking: false },
+  thinking_heavy: { label: "Thinking - Heavy", modelFamily: "thinking" as const, effort: "heavy" as const, autoSwitchToThinking: false },
+  instant: { label: "Instant", modelFamily: "instant" as const, autoSwitchToThinking: false },
+  instant_auto_switch: { label: "Instant - Auto-switch to Thinking Enabled", modelFamily: "instant" as const, autoSwitchToThinking: true },
+} as const;
+
+export type OracleSubmitPresetId = keyof typeof ORACLE_SUBMIT_PRESETS;
+
+export type OracleSubmitPreset = typeof ORACLE_SUBMIT_PRESETS[OracleSubmitPresetId];
+
+export function getOracleSubmitPresetById(id: OracleSubmitPresetId): OracleSubmitPreset {
+  const found = ORACLE_SUBMIT_PRESETS[id];
+  if (!found) {
+    throw new Error(`Unknown oracle_submit preset: ${id}`);
+  }
+  return found;
+}
+
+/** Resolved execution snapshot generated from a preset at submit time. */
+export type OracleResolvedSelection = {
+  preset: OracleSubmitPresetId;
+  modelFamily: OracleModelFamily;
+  effort?: OracleEffort;
+  autoSwitchToThinking: boolean;
+};
+
+/**
+ * Resolve a preset id into the execution snapshot that gets persisted on the job.
+ * @throws if the preset id is unknown.
+ */
+export function resolveOracleSubmitPreset(presetId: OracleSubmitPresetId): OracleResolvedSelection {
+  const def = getOracleSubmitPresetById(presetId);
+  return {
+    preset: presetId,
+    modelFamily: def.modelFamily,
+    effort: def.modelFamily === "instant" ? undefined : def.effort,
+    autoSwitchToThinking: def.modelFamily === "instant" ? def.autoSwitchToThinking : false,
+  };
+}
+
 export const BROWSER_RUN_MODES = ["headless", "headed"] as const;
 export type OracleBrowserRunMode = (typeof BROWSER_RUN_MODES)[number];
 
 export const CLONE_STRATEGIES = ["apfs-clone", "copy"] as const;
 export type OracleCloneStrategy = (typeof CLONE_STRATEGIES)[number];
 
-const PRO_EFFORTS = ["standard", "extended"] as const satisfies readonly OracleEffort[];
 const ALLOWED_CHATGPT_ORIGINS = new Set(["https://chatgpt.com", "https://chat.openai.com"]);
 const PROJECT_OVERRIDE_KEYS = new Set(["defaults", "worker", "poller", "artifacts", "cleanup"]);
 const DEFAULT_MAC_CHROME_EXECUTABLE = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome";
@@ -24,9 +72,7 @@ const DEFAULT_MAC_CHROME_USER_DATA_DIR = join(homedir(), "Library", "Application
 
 export interface OracleConfig {
   defaults: {
-    modelFamily: OracleModelFamily;
-    effort: OracleEffort;
-    autoSwitchToThinking: boolean;
+    preset: OracleSubmitPresetId;
   };
   browser: {
     sessionPrefix: string;
@@ -98,9 +144,7 @@ const detectedChromeProfileName = detectDefaultChromeProfileName();
 
 export const DEFAULT_CONFIG: OracleConfig = {
   defaults: {
-    modelFamily: "pro",
-    effort: "extended",
-    autoSwitchToThinking: false,
+    preset: "pro_extended",
   },
   browser: {
     sessionPrefix: "oracle",
@@ -292,19 +336,13 @@ function normalizeLegacyBrowserConfig(root: Record<string, unknown>): Record<str
   return root;
 }
 
+const PRESET_IDS = Object.keys(ORACLE_SUBMIT_PRESETS) as unknown as readonly OracleSubmitPresetId[];
+
 function validateOracleConfig(value: unknown): OracleConfig {
   const root = normalizeLegacyBrowserConfig(expectObject(value, "root"));
 
   const defaults = expectObject(root.defaults, "defaults");
-  const modelFamily = expectEnum(defaults.modelFamily, "defaults.modelFamily", MODEL_FAMILIES);
-  const effort = expectEnum(defaults.effort, "defaults.effort", EFFORTS);
-  const autoSwitchToThinking = expectBoolean(defaults.autoSwitchToThinking, "defaults.autoSwitchToThinking");
-  if (modelFamily === "pro" && effort !== "standard" && effort !== "extended") {
-    throw new Error(`Invalid oracle config: defaults.effort must be one of ${PRO_EFFORTS.join(", ")} for pro`);
-  }
-  if (modelFamily !== "instant" && autoSwitchToThinking) {
-    throw new Error("Invalid oracle config: defaults.autoSwitchToThinking is only valid for instant");
-  }
+  const preset = expectEnum(defaults.preset, "defaults.preset", PRESET_IDS);
 
   const browser = expectObject(root.browser, "browser");
   const auth = expectObject(root.auth, "auth");
@@ -321,9 +359,7 @@ function validateOracleConfig(value: unknown): OracleConfig {
 
   return {
     defaults: {
-      modelFamily,
-      effort,
-      autoSwitchToThinking,
+      preset,
     },
     browser: {
       sessionPrefix: expectString(browser.sessionPrefix, "browser.sessionPrefix"),

package/extensions/oracle/lib/jobs.ts

@@ -4,7 +4,7 @@ import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { chmod, mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { join, resolve } from "node:path";
 import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
-import type { OracleConfig, OracleEffort, OracleModelFamily } from "./config.js";
+import type { OracleConfig, OracleResolvedSelection } from "./config.js";
 import { withJobLock, withLock } from "./locks.js";
 import { cleanupRuntimeArtifacts, getProjectId, getSessionId, parseConversationId, requirePersistedSessionFile, type OracleCleanupReport } from "./runtime.js";
 
@@ -133,9 +133,7 @@ export interface OracleJob {
   sessionId: string;
   originSessionFile?: string;
   requestSource: "command" | "tool";
-  chatModelFamily: OracleModelFamily;
-  effort?: OracleEffort;
-  autoSwitchToThinking?: boolean;
+  selection: OracleResolvedSelection;
   followUpToJobId?: string;
   chatUrl?: string;
   conversationId?: string;
@@ -185,9 +183,7 @@ export interface OracleJob {
 export interface OracleSubmitInput {
   prompt: string;
   files: string[];
-  modelFamily: OracleModelFamily;
-  effort?: OracleEffort;
-  autoSwitchToThinking?: boolean;
+  selection: OracleResolvedSelection;
   followUpToJobId?: string;
   chatUrl?: string;
   requestSource: "command" | "tool";
@@ -971,10 +967,6 @@ export async function createJob(
 
   const createdAt = options?.createdAt ?? new Date().toISOString();
   const initialState = options?.initialState ?? "submitted";
-  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: initialState,
@@ -988,9 +980,7 @@ export async function createJob(
     sessionId,
     originSessionFile: sessionFile,
     requestSource: input.requestSource,
-    chatModelFamily: input.modelFamily,
-    effort: normalizedEffort,
-    autoSwitchToThinking: normalizedAutoSwitchToThinking,
+    selection: input.selection,
     followUpToJobId: input.followUpToJobId,
     chatUrl: input.followUpToJobId ? input.chatUrl : undefined,
     conversationId,

package/extensions/oracle/lib/tools.ts

@@ -5,7 +5,12 @@ import { basename, join, posix } from "node:path";
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
 import { isLockTimeoutError, withGlobalReconcileLock, withLock } from "./locks.js";
-import { loadOracleConfig, EFFORTS, MODEL_FAMILIES, type OracleEffort, type OracleModelFamily } from "./config.js";
+import {
+  loadOracleConfig,
+  ORACLE_SUBMIT_PRESETS,
+  resolveOracleSubmitPreset,
+  type OracleSubmitPresetId,
+} from "./config.js";
 import {
   appendCleanupWarnings,
   cancelOracleJob,
@@ -53,10 +58,11 @@ const ORACLE_SUBMIT_PARAMS = Type.Object({
     description: "Exact project-relative files/directories to include in the oracle archive.",
     minItems: 1,
   }),
-  modelFamily: Type.Optional(stringEnum(MODEL_FAMILIES, "ChatGPT model family: instant, thinking, or pro.")),
-  effort: Type.Optional(stringEnum(EFFORTS, "Reasoning effort. Use only values supported by the chosen model family.")),
-  autoSwitchToThinking: Type.Optional(
-    Type.Boolean({ description: "Only valid when modelFamily is instant. Omit for thinking and pro." }),
+  preset: Type.Optional(
+    stringEnum(
+      [...Object.keys(ORACLE_SUBMIT_PRESETS)] as const,
+      "ChatGPT model preset. Omit to use the configured default preset.",
+    ),
   ),
   followUpJobId: Type.Optional(Type.String({ description: "Earlier oracle job id whose chat thread should be continued." })),
 });
@@ -69,12 +75,6 @@ const ORACLE_CANCEL_PARAMS = Type.Object({
   jobId: Type.String({ description: "Oracle job id." }),
 });
 
-const VALID_EFFORTS: Record<OracleModelFamily, readonly OracleEffort[]> = {
-  instant: [],
-  thinking: ["light", "standard", "extended", "heavy"],
-  pro: ["standard", "extended"],
-};
-
 const MAX_ARCHIVE_BYTES = 250 * 1024 * 1024;
 const MAX_QUEUED_JOBS_PER_ACTIVE_RUNTIME = 1;
 const MAX_QUEUED_ARCHIVE_BYTES_PER_ACTIVE_RUNTIME = MAX_ARCHIVE_BYTES;
@@ -491,29 +491,6 @@ export function getQueueAdmissionFailure(args: {
   return undefined;
 }
 
-function validateSubmissionOptions(
-  params: { effort?: OracleEffort; autoSwitchToThinking?: boolean },
-  modelFamily: OracleModelFamily,
-  effort: OracleEffort | undefined,
-  autoSwitchToThinking: boolean,
-): void {
-  if (modelFamily === "instant" && params.effort !== undefined) {
-    throw new Error("Instant model family does not support effort selection");
-  }
-
-  if (effort && !VALID_EFFORTS[modelFamily].includes(effort)) {
-    throw new Error(`Invalid effort for ${modelFamily}: ${effort}`);
-  }
-
-  if (modelFamily !== "instant" && params.autoSwitchToThinking === true) {
-    throw new Error("autoSwitchToThinking is only valid for the instant model family");
-  }
-
-  if (modelFamily !== "instant" && autoSwitchToThinking) {
-    throw new Error(`autoSwitchToThinking cannot be enabled for ${modelFamily}`);
-  }
-}
-
 function resolveFollowUp(previousJobId: string | undefined, cwd: string): {
   followUpToJobId?: string;
   chatUrl?: string;
@@ -601,7 +578,8 @@ export function registerOracleTools(pi: ExtensionAPI, workerPath: string): void
     name: "oracle_submit",
     label: "Oracle Submit",
     description:
-      "Dispatch a background ChatGPT web oracle job after gathering context. Always pass a prompt and exact project-relative archive inputs.",
+      "Dispatch a background ChatGPT web oracle job after gathering context. Always pass a prompt and exact project-relative archive inputs. " +
+      "Optional ChatGPT model: set parameter `preset`, or omit it for configured defaults (see `preset` field for allowed ids).",
     promptSnippet: "Dispatch a background ChatGPT web oracle job after gathering repo context.",
     promptGuidelines: [
       "Gather context before calling oracle_submit.",
@@ -613,7 +591,7 @@ export function registerOracleTools(pi: ExtensionAPI, workerPath: string): void
       "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 instead of retrying automatically.",
       "If oracle_submit returns a queued job instead of an immediately dispatched one, treat that as success and stop exactly the same way.",
       "Stop after dispatching oracle_submit; do not continue the task while the oracle job is running.",
-      "Only use autoSwitchToThinking with modelFamily=instant.",
+      "Use `preset` as the only model-selection parameter on oracle_submit. Allowed values come from the tool schema enum. Omit preset to use the configured default.",
     ],
     parameters: ORACLE_SUBMIT_PARAMS,
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
@@ -621,16 +599,9 @@ export function registerOracleTools(pi: ExtensionAPI, workerPath: string): void
       const originSessionFile = requirePersistedSessionFile(getSessionFile(ctx), "submit oracle jobs");
       const projectId = getProjectId(ctx.cwd);
       const sessionId = getSessionId(originSessionFile, projectId);
-      const submittedModelFamily = params.modelFamily as OracleModelFamily | undefined;
-      const submittedEffort = params.effort as OracleEffort | undefined;
-      const modelFamily: OracleModelFamily = submittedModelFamily ?? config.defaults.modelFamily;
-      const requestedEffort: OracleEffort = submittedEffort ?? config.defaults.effort;
-      const effort: OracleEffort | undefined = modelFamily === "instant" ? undefined : requestedEffort;
-      const rawAutoSwitchToThinking = params.autoSwitchToThinking ?? config.defaults.autoSwitchToThinking;
-      const autoSwitchToThinking = modelFamily === "instant" ? rawAutoSwitchToThinking : false;
+      const presetId = (params.preset as OracleSubmitPresetId | undefined) ?? config.defaults.preset;
+      const selection = resolveOracleSubmitPreset(presetId);
       const followUp = resolveFollowUp(params.followUpJobId, ctx.cwd);
-
-      validateSubmissionOptions({ effort: submittedEffort, autoSwitchToThinking: params.autoSwitchToThinking }, modelFamily, effort, autoSwitchToThinking);
       try {
         await withGlobalReconcileLock({ processPid: process.pid, source: "oracle_submit", cwd: ctx.cwd }, async () => {
           await reconcileStaleOracleJobs();
@@ -691,9 +662,7 @@ export function registerOracleTools(pi: ExtensionAPI, workerPath: string): void
               {
                 prompt: params.prompt,
                 files: params.files,
-                modelFamily,
-                effort,
-                autoSwitchToThinking,
+                selection,
                 followUpToJobId: followUp.followUpToJobId,
                 chatUrl: followUp.chatUrl,
                 requestSource: "tool",
@@ -736,9 +705,7 @@ export function registerOracleTools(pi: ExtensionAPI, workerPath: string): void
             {
               prompt: params.prompt,
               files: params.files,
-              modelFamily,
-              effort,
-              autoSwitchToThinking,
+              selection,
               followUpToJobId: followUp.followUpToJobId,
               chatUrl: followUp.chatUrl,
               requestSource: "tool",

package/extensions/oracle/worker/artifact-heuristics.d.mts

@@ -10,20 +10,36 @@ export interface SnapshotEntry {
 
 export interface StructuralArtifactCandidateInput {
   label?: string;
+  selector?: string;
+  controlLabel?: string;
   paragraphText?: string;
   listItemText?: string;
-  paragraphFileButtonCount?: number;
+  paragraphInteractiveCount?: number;
+  paragraphArtifactLabelCount?: number;
   paragraphOtherTextLength?: number;
-  listItemFileButtonCount?: number;
-  focusableFileButtonCount?: number;
+  listItemInteractiveCount?: number;
+  listItemArtifactLabelCount?: number;
+  focusableInteractiveCount?: number;
+  focusableArtifactLabelCount?: number;
   focusableOtherTextLength?: number;
 }
 
 export interface StructuralArtifactCandidate {
   label: string;
+  selector?: string;
+  controlLabel?: string;
+}
+
+export interface StructuralArtifactCandidatePartition {
+  confirmed: StructuralArtifactCandidate[];
+  suspicious: StructuralArtifactCandidate[];
 }
 
 export function parseSnapshotEntries(snapshot: string): SnapshotEntry[];
+export function extractArtifactLabels(value: string): string[];
 export function filterStructuralArtifactCandidates(
   candidates: StructuralArtifactCandidateInput[],
 ): StructuralArtifactCandidate[];
+export function partitionStructuralArtifactCandidates(
+  candidates: StructuralArtifactCandidateInput[],
+): StructuralArtifactCandidatePartition;

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

@@ -1,7 +1,8 @@
-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 FILE_LABEL_PATTERN_SOURCE = String.raw`(?:^|[^A-Za-z0-9._~/-])((?:(?:[A-Za-z]:)?[\\/]|[.~][\\/])?(?:[^\\/\s"'<>|]+[\\/])*[^\\/\s"'<>|]+\.[A-Za-z0-9]{1,12})(?=$|[^A-Za-z0-9._~/-])`;
+const FILE_LABEL_PATTERN = new RegExp(FILE_LABEL_PATTERN_SOURCE, "g");
 export const GENERIC_ARTIFACT_LABELS = ["ATTACHED", "DONE"];
 const GENERIC_ARTIFACT_LABEL_SET = new Set(GENERIC_ARTIFACT_LABELS);
+const GENERIC_DOWNLOAD_CONTROL_PATTERN = /(?:^|\b)(?:download|save)(?:\b|$)/i;
 
 export function parseSnapshotEntries(snapshot) {
   return String(snapshot || "")
@@ -29,11 +30,61 @@ function normalizeText(value) {
   return String(value || "").replace(/\s+/g, " ").trim();
 }
 
+function sanitizeArtifactLabel(value) {
+  const normalized = normalizeText(value).replace(/^[^A-Za-z0-9._~/-]+|[^A-Za-z0-9._~/-]+$/g, "");
+  if (!normalized) return "";
+  const basename = normalized.split(/[\\/]/).filter(Boolean).at(-1) || "";
+  return basename.replace(/^[^A-Za-z0-9._-]+|[^A-Za-z0-9._-]+$/g, "");
+}
+
+export function extractArtifactLabels(value) {
+  const seen = new Set();
+  const labels = [];
+  for (const match of String(value || "").matchAll(FILE_LABEL_PATTERN)) {
+    const normalized = sanitizeArtifactLabel(match[1] || match[0] || "");
+    if (!normalized || seen.has(normalized)) continue;
+    seen.add(normalized);
+    labels.push(normalized);
+  }
+  return labels;
+}
+
 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);
+  return extractArtifactLabels(normalized).length > 0;
+}
+
+function hasGenericDownloadControl(controlLabel) {
+  return GENERIC_DOWNLOAD_CONTROL_PATTERN.test(normalizeText(controlLabel));
+}
+
+function normalizeCandidate(candidate) {
+  const label = normalizeText(candidate?.label);
+  return label ? { ...candidate, label } : undefined;
+}
+
+function hasArtifactSignal(candidate) {
+  const label = normalizeText(candidate?.label);
+  if (!isLikelyArtifactLabel(label)) return false;
+
+  const paragraphInteractiveCount = Number(candidate?.paragraphInteractiveCount || 0);
+  const listItemInteractiveCount = Number(candidate?.listItemInteractiveCount || 0);
+  const focusableInteractiveCount = Number(candidate?.focusableInteractiveCount || 0);
+  const paragraphArtifactLabelCount = Number(candidate?.paragraphArtifactLabelCount || 0);
+  const listItemArtifactLabelCount = Number(candidate?.listItemArtifactLabelCount || 0);
+  const focusableArtifactLabelCount = Number(candidate?.focusableArtifactLabelCount || 0);
+
+  return (
+    hasGenericDownloadControl(candidate?.controlLabel) ||
+    paragraphInteractiveCount > 0 ||
+    listItemInteractiveCount > 0 ||
+    focusableInteractiveCount > 0 ||
+    paragraphArtifactLabelCount > 0 ||
+    listItemArtifactLabelCount > 0 ||
+    focusableArtifactLabelCount > 0
+  );
 }
 
 export function isStructuralArtifactCandidate(candidate) {
@@ -41,36 +92,56 @@ export function isStructuralArtifactCandidate(candidate) {
   if (!isLikelyArtifactLabel(label)) return false;
 
   const listItemText = normalizeText(candidate?.listItemText);
-  const listItemFileButtonCount = Number(candidate?.listItemFileButtonCount || 0);
-  const paragraphFileButtonCount = Number(candidate?.paragraphFileButtonCount || 0);
+  const listItemInteractiveCount = Number(candidate?.listItemInteractiveCount || 0);
+  const listItemArtifactLabelCount = Number(candidate?.listItemArtifactLabelCount || 0);
+  const paragraphInteractiveCount = Number(candidate?.paragraphInteractiveCount || 0);
+  const paragraphArtifactLabelCount = Number(candidate?.paragraphArtifactLabelCount || 0);
   const paragraphOtherTextLength = Number(candidate?.paragraphOtherTextLength ?? Number.POSITIVE_INFINITY);
-  const focusableFileButtonCount = Number(candidate?.focusableFileButtonCount || 0);
+  const focusableInteractiveCount = Number(candidate?.focusableInteractiveCount || 0);
+  const focusableArtifactLabelCount = Number(candidate?.focusableArtifactLabelCount || 0);
   const focusableOtherTextLength = Number(candidate?.focusableOtherTextLength ?? Number.POSITIVE_INFINITY);
 
-  if (listItemText === label && listItemFileButtonCount === 1) {
+  if (listItemText === label && listItemInteractiveCount === 1 && listItemArtifactLabelCount === 1) {
     return true;
   }
 
-  if (paragraphFileButtonCount === 1 && paragraphOtherTextLength <= 32) {
+  if (paragraphArtifactLabelCount === 1 && paragraphInteractiveCount === 1 && paragraphOtherTextLength <= 32) {
     return true;
   }
 
-  if (focusableFileButtonCount >= 1 && focusableOtherTextLength <= 64) {
+  if (focusableArtifactLabelCount >= 1 && focusableInteractiveCount >= 1 && focusableOtherTextLength <= 64) {
     return true;
   }
 
   return false;
 }
 
-export function filterStructuralArtifactCandidates(candidates) {
-  const seen = new Set();
-  const filtered = [];
+export function partitionStructuralArtifactCandidates(candidates) {
+  const confirmedSeen = new Set();
+  const suspiciousSeen = new Set();
+  const confirmed = [];
+  const suspicious = [];
+
   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 });
+    const normalized = normalizeCandidate(candidate);
+    if (!normalized) continue;
+    if (!hasArtifactSignal(normalized)) continue;
+
+    if (isStructuralArtifactCandidate(normalized)) {
+      if (confirmedSeen.has(normalized.label)) continue;
+      confirmedSeen.add(normalized.label);
+      confirmed.push(normalized);
+      continue;
+    }
+
+    if (suspiciousSeen.has(normalized.label)) continue;
+    suspiciousSeen.add(normalized.label);
+    suspicious.push(normalized);
   }
-  return filtered;
+
+  return { confirmed, suspicious: suspicious.filter((candidate) => !confirmedSeen.has(candidate.label)) };
+}
+
+export function filterStructuralArtifactCandidates(candidates) {
+  return partitionStructuralArtifactCandidates(candidates).confirmed;
 }

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

@@ -4,7 +4,7 @@ import { appendFile, chmod, mkdir, readFile, rename, rm, stat, writeFile } from
 import { basename, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { spawn, execFileSync } from "node:child_process";
-import { FILE_LABEL_PATTERN_SOURCE, filterStructuralArtifactCandidates, GENERIC_ARTIFACT_LABELS, parseSnapshotEntries } from "./artifact-heuristics.mjs";
+import { extractArtifactLabels, FILE_LABEL_PATTERN_SOURCE, GENERIC_ARTIFACT_LABELS, parseSnapshotEntries, partitionStructuralArtifactCandidates } from "./artifact-heuristics.mjs";
 import { createLease, listLeaseMetadata, readLeaseMetadata, releaseLease, withLock } from "./state-locks.mjs";
 
 const jobId = process.argv[2];
@@ -807,7 +807,7 @@ function matchesModelFamilyButton(candidate, family) {
 }
 
 function requestedEffortLabel(job) {
-  return job.effort ? titleCase(job.effort) : undefined;
+  return job.selection?.effort ? titleCase(job.selection.effort) : undefined;
 }
 
 function effortSelectionVisible(snapshot, effortLabel) {
@@ -852,12 +852,12 @@ function snapshotHasModelConfigurationUi(snapshot) {
 
 function snapshotStronglyMatchesRequestedModel(snapshot, job) {
   const entries = parseSnapshotEntries(snapshot);
-  const familyMatched = entries.some((entry) => matchesModelFamilyButton(entry, job.chatModelFamily));
+  const familyMatched = entries.some((entry) => matchesModelFamilyButton(entry, job.selection.modelFamily));
   const effortLabel = requestedEffortLabel(job);
-  if (job.chatModelFamily === "thinking") {
+  if (job.selection.modelFamily === "thinking") {
     return familyMatched || effortSelectionVisible(snapshot, effortLabel);
   }
-  if (job.chatModelFamily === "pro") {
+  if (job.selection.modelFamily === "pro") {
     return effortLabel ? familyMatched && effortSelectionVisible(snapshot, effortLabel) : familyMatched;
   }
   return familyMatched;
@@ -880,13 +880,13 @@ function composerControlsVisible(snapshot) {
 }
 
 function snapshotWeaklyMatchesRequestedModel(snapshot, job) {
-  if (job.chatModelFamily === "thinking") {
+  if (job.selection.modelFamily === "thinking") {
     return effortSelectionVisible(snapshot, requestedEffortLabel(job)) || thinkingSelectionVisible(snapshot);
   }
-  if (job.chatModelFamily === "pro") {
+  if (job.selection.modelFamily === "pro") {
     return !thinkingChipVisible(snapshot);
   }
-  if (job.chatModelFamily === "instant") {
+  if (job.selection.modelFamily === "instant") {
     return !thinkingChipVisible(snapshot);
   }
   return false;
@@ -1214,7 +1214,7 @@ async function waitForModelConfigurationToSettle(job, options = {}) {
       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)"}`);
+          await log(`Model configuration closed after strong in-dialog verification for family=${job.selection.modelFamily} effort=${job.selection?.effort || "(none)"}`);
         }
         return;
       }
@@ -1223,7 +1223,7 @@ async function waitForModelConfigurationToSettle(job, options = {}) {
     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)"}`);
+        await log(`Composer became usable after strong in-dialog verification for family=${job.selection.modelFamily} effort=${job.selection?.effort || "(none)"}`);
       }
       return;
     }
@@ -1239,30 +1239,30 @@ async function waitForModelConfigurationToSettle(job, options = {}) {
   }
 
   if (options.stronglyVerified && lastSnapshot && !snapshotHasModelConfigurationUi(lastSnapshot)) {
-    await log(`Model configuration closed only after settle-timeout for family=${job.chatModelFamily} effort=${job.effort || "(none)"}`);
+    await log(`Model configuration closed only after settle-timeout for family=${job.selection.modelFamily} effort=${job.selection?.effort || "(none)"}`);
     return;
   }
 
-  throw new Error(`Could not verify requested model settings after configuration for ${job.chatModelFamily}`);
+  throw new Error(`Could not verify requested model settings after configuration for ${job.selection.modelFamily}`);
 }
 
 async function configureModel(job) {
   const initialSnapshot = await snapshotText(job);
   if (snapshotStronglyMatchesRequestedModel(initialSnapshot, job)) {
-    await log(`Model already appears configured for family=${job.chatModelFamily} effort=${job.effort || "(none)"}; skipping reconfiguration`);
+    await log(`Model already appears configured for family=${job.selection.modelFamily} effort=${job.selection?.effort || "(none)"}; skipping reconfiguration`);
     return;
   }
 
-  await log(`Configuring model family=${job.chatModelFamily} effort=${job.effort || "(none)"}`);
+  await log(`Configuring model family=${job.selection.modelFamily} effort=${job.selection?.effort || "(none)"}`);
   let familySnapshot = await openModelConfiguration(job);
   let verificationSnapshot = familySnapshot;
 
-  let familyEntry = findEntry(familySnapshot, (candidate) => matchesModelFamilyButton(candidate, job.chatModelFamily));
+  let familyEntry = findEntry(familySnapshot, (candidate) => matchesModelFamilyButton(candidate, job.selection.modelFamily));
   if (!familyEntry && snapshotStronglyMatchesRequestedModel(familySnapshot, job)) {
     await log("Model configuration UI opened with requested settings already selected");
   }
   if (!familyEntry && !snapshotStronglyMatchesRequestedModel(familySnapshot, job)) {
-    throw new Error(`Could not find model family button for ${job.chatModelFamily}`);
+    throw new Error(`Could not find model family button for ${job.selection.modelFamily}`);
   }
 
   if (familyEntry) {
@@ -1272,7 +1272,7 @@ async function configureModel(job) {
     verificationSnapshot = familySnapshot;
   }
 
-  if (job.chatModelFamily === "thinking" || job.chatModelFamily === "pro") {
+  if (job.selection.modelFamily === "thinking" || job.selection.modelFamily === "pro") {
     const effortLabel = requestedEffortLabel(job);
     if (effortLabel && !effortSelectionVisible(familySnapshot, effortLabel)) {
       const opened = await openEffortDropdown(job);
@@ -1294,14 +1294,14 @@ async function configureModel(job) {
     }
   }
 
-  if (job.chatModelFamily === "instant" && job.autoSwitchToThinking) {
+  if (job.selection.modelFamily === "instant" && job.selection.autoSwitchToThinking) {
     await maybeClickLabeledEntry(job, CHATGPT_LABELS.autoSwitchToThinking);
     verificationSnapshot = await snapshotText(job);
   }
 
   const stronglyVerified = snapshotStronglyMatchesRequestedModel(verificationSnapshot, job);
   if (!stronglyVerified) {
-    throw new Error(`Could not verify requested model settings in configuration UI for ${job.chatModelFamily}`);
+    throw new Error(`Could not verify requested model settings in configuration UI for ${job.selection.modelFamily}`);
   }
 
   if (!(await maybeClickLabeledEntry(job, CHATGPT_LABELS.close, { kind: "button" }))) {
@@ -1497,28 +1497,52 @@ function preferredArtifactName(label, index) {
 async function collectArtifactCandidates(job, responseIndex, responseText = "") {
   const snapshot = await snapshotText(job);
   const targetSlice = assistantSnapshotSlice(snapshot, responseIndex);
-  if (!targetSlice) return { snapshot, targetSlice, candidates: [] };
+  if (!targetSlice) return { snapshot, targetSlice, candidates: [], suspiciousLabels: [] };
 
   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 fileLabelPattern = new RegExp(${JSON.stringify(FILE_LABEL_PATTERN_SOURCE)}, 'g');
+      const downloadControlPattern = /(?:^|\\b)(?:download|save)(?:\\b|$)/i;
+      const artifactMarkerAttr = 'data-pi-oracle-artifact-candidate';
+      const artifactPrefix = 'pi-oracle-artifact-${jobId}-${responseIndex}-';
+      const sanitize = (value) => normalize(value).replace(/^[^A-Za-z0-9._~/-]+|[^A-Za-z0-9._~/-]+$/g, '');
+      const sanitizeArtifactLabel = (value) => {
+        const normalized = sanitize(value);
+        if (!normalized) return '';
+        const basename = normalized.split(/[\\/]/).filter(Boolean).at(-1) || '';
+        return basename.replace(/^[^A-Za-z0-9._-]+|[^A-Za-z0-9._-]+$/g, '');
+      };
+      const extractArtifactLabels = (value) => {
+        const seen = new Set();
+        const labels = [];
+        for (const match of String(value || '').matchAll(fileLabelPattern)) {
+          const label = sanitizeArtifactLabel(match[1] || match[0] || '');
+          if (!label || seen.has(label)) continue;
+          seen.add(label);
+          labels.push(label);
+        }
+        return labels;
+      };
       const isFileLabel = (value) => {
         const normalized = normalize(value);
         if (!normalized) return false;
         if (genericArtifactLabels.has(normalized.toUpperCase())) return true;
-        return fileLabelPattern.test(normalized);
+        return extractArtifactLabels(normalized).length > 0;
       };
+      const isDownloadControl = (value) => downloadControlPattern.test(normalize(value));
       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 interactiveElements = (node) => node ? Array.from(node.querySelectorAll('button, a')) : [];
+      const interactiveLabels = (node) => interactiveElements(node)
+        .map((candidate) => normalize(candidate.textContent || candidate.getAttribute('aria-label') || candidate.getAttribute('title')))
+        .filter(Boolean);
+      const artifactLabelsForNode = (node) => extractArtifactLabels(node?.textContent || '');
       const otherTextLength = (text, labels) => {
         let remaining = normalize(text);
         for (const label of labels || []) {
@@ -1528,25 +1552,43 @@ async function collectArtifactCandidates(job, responseIndex, responseText = "")
         return remaining.length;
       };
       const focusableFor = (node) => node?.closest('[tabindex]');
+      const uniqueLabel = (...groups) => {
+        for (const group of groups) {
+          const labels = Array.from(new Set((group || []).map(sanitizeArtifactLabel).filter(Boolean)));
+          if (labels.length === 1) return labels[0];
+        }
+        return undefined;
+      };
 
-      const candidates = Array.from(host.querySelectorAll('button, a'))
-        .map((button) => {
-          const label = normalize(button.textContent);
-          if (!isFileLabel(label)) return null;
+      const candidates = interactiveElements(host)
+        .map((button, index) => {
+          const controlLabel = normalize(button.textContent || button.getAttribute('aria-label') || button.getAttribute('title'));
           const paragraph = button.closest('p');
           const listItem = button.closest('li');
           const focusable = focusableFor(button);
-          const paragraphFileLabels = fileButtons(paragraph);
-          const focusableFileLabels = fileButtons(focusable);
+          const ownArtifactLabels = extractArtifactLabels(controlLabel);
+          const paragraphArtifactLabels = artifactLabelsForNode(paragraph);
+          const listItemArtifactLabels = artifactLabelsForNode(listItem);
+          const focusableArtifactLabels = artifactLabelsForNode(focusable);
+          const label = uniqueLabel(ownArtifactLabels, listItemArtifactLabels, paragraphArtifactLabels, focusableArtifactLabels);
+          if (!label && !isFileLabel(controlLabel) && !isDownloadControl(controlLabel)) return null;
+          if (!label) return null;
+          const marker = artifactPrefix + index;
+          button.setAttribute(artifactMarkerAttr, marker);
           return {
             label,
+            selector: '[' + artifactMarkerAttr + '="' + marker + '"]',
+            controlLabel,
             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),
+            paragraphInteractiveCount: interactiveElements(paragraph).length,
+            paragraphArtifactLabelCount: Array.from(new Set(paragraphArtifactLabels)).length,
+            paragraphOtherTextLength: otherTextLength(paragraph?.textContent, [...paragraphArtifactLabels, ...interactiveLabels(paragraph)]),
+            listItemInteractiveCount: interactiveElements(listItem).length,
+            listItemArtifactLabelCount: Array.from(new Set(listItemArtifactLabels)).length,
+            focusableInteractiveCount: interactiveElements(focusable).length,
+            focusableArtifactLabelCount: Array.from(new Set(focusableArtifactLabels)).length,
+            focusableOtherTextLength: otherTextLength(focusable?.textContent, [...focusableArtifactLabels, ...interactiveLabels(focusable)]),
           };
         })
         .filter(Boolean);
@@ -1555,10 +1597,26 @@ async function collectArtifactCandidates(job, responseIndex, responseText = "")
     `),
   );
 
+  const partitioned = partitionStructuralArtifactCandidates(structural?.candidates || []);
+  const snapshotEntries = parseSnapshotEntries(targetSlice);
+  const hasGenericArtifactControl = snapshotEntries.some(
+    (entry) =>
+      (entry.kind === "button" || entry.kind === "link") &&
+      !entry.disabled &&
+      /(?:^|\b)(?:download|save)(?:\b|$)/i.test(`${entry.label || ""} ${entry.value || ""}`),
+  );
+  const suspiciousFromText = hasGenericArtifactControl
+    ? extractArtifactLabels(responseText)
+        .filter((label) => !partitioned.confirmed.some((candidate) => candidate.label === label) && !partitioned.suspicious.some((candidate) => candidate.label === label))
+        .map((label) => ({ label }))
+    : [];
+
   return {
     snapshot,
     targetSlice,
-    candidates: filterStructuralArtifactCandidates(structural?.candidates || []),
+    candidates: partitioned.confirmed,
+    suspiciousLabels: [...partitioned.suspicious.map((candidate) => candidate.label), ...suspiciousFromText.map((candidate) => candidate.label)]
+      .filter((label, index, labels) => labels.indexOf(label) === index),
   };
 }
 
@@ -1566,11 +1624,14 @@ 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: [] };
+  let latest = { snapshot: "", targetSlice: undefined, candidates: [], suspiciousLabels: [] };
 
   while (Date.now() < deadline) {
     latest = await collectArtifactCandidates(job, responseIndex, responseText);
-    const signature = latest.candidates.map((candidate) => candidate.label).join("\n");
+    const signature = JSON.stringify({
+      candidates: latest.candidates.map((candidate) => candidate.label),
+      suspiciousLabels: latest.suspiciousLabels,
+    });
     if (signature === lastSignature) stablePolls += 1;
     else {
       lastSignature = signature;
@@ -1628,7 +1689,7 @@ async function downloadArtifacts(job, responseIndex, responseText = "") {
     return [];
   }
 
-  const { targetSlice, candidates } = await reopenConversationForArtifacts(job, responseIndex, responseText, "initial");
+  let { targetSlice, candidates, suspiciousLabels } = 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");
@@ -1637,33 +1698,32 @@ async function downloadArtifacts(job, responseIndex, responseText = "") {
   }
 
   await log(`Artifact candidates: ${candidates.map((candidate) => candidate.label).join(", ") || "(none)"}`);
+  if (suspiciousLabels.length > 0) {
+    await log(`Suspicious artifact signals: ${suspiciousLabels.join(", ")}`);
+  }
 
   const artifactsDir = `${jobDir}/artifacts`;
   await ensurePrivateDir(artifactsDir);
   const artifacts = [];
   await flushArtifactsState(artifacts);
 
-  for (const [index, candidate] of candidates.entries()) {
+  for (const [index, originalCandidate] of candidates.entries()) {
     let downloaded = false;
+    let activeCandidate = originalCandidate;
     for (let attempt = 1; attempt <= ARTIFACT_DOWNLOAD_MAX_ATTEMPTS && !downloaded; attempt += 1) {
-      const freshSnapshot = await snapshotText(job);
-      const freshSlice = assistantSnapshotSlice(freshSnapshot, responseIndex);
-      if (!freshSlice) break;
-      const freshEntries = parseSnapshotEntries(freshSlice);
-      const entry = freshEntries.find(
-        (artifactEntry) => artifactEntry.label === candidate.label && (artifactEntry.kind === "button" || artifactEntry.kind === "link") && !artifactEntry.disabled,
-      );
-      if (!entry) {
-        await log(`Artifact "${candidate.label}" not found in fresh snapshot, skipping`);
+      if (!activeCandidate?.selector) {
+        await log(`Artifact "${originalCandidate.label}" has no live selector, marking unconfirmed`);
+        artifacts.push({ displayName: originalCandidate.label, unconfirmed: true, error: "Artifact candidate lost its live selector before download." });
+        await flushArtifactsState(artifacts);
         break;
       }
 
-      const destinationPath = join(artifactsDir, preferredArtifactName(candidate.label, index));
+      const destinationPath = join(artifactsDir, preferredArtifactName(originalCandidate.label, index));
       await rm(destinationPath, { force: true }).catch(() => undefined);
       try {
-        await log(`Artifact "${candidate.label}" download attempt ${attempt}/${ARTIFACT_DOWNLOAD_MAX_ATTEMPTS} using ref ${entry.ref}`);
+        await log(`Artifact "${originalCandidate.label}" download attempt ${attempt}/${ARTIFACT_DOWNLOAD_MAX_ATTEMPTS} using selector ${activeCandidate.selector}`);
         await withHeartbeatWhile(() =>
-          agentBrowser(job, "download", entry.ref, destinationPath, {
+          agentBrowser(job, "download", activeCandidate.selector, destinationPath, {
             timeoutMs: ARTIFACT_DOWNLOAD_TIMEOUT_MS,
           }),
         );
@@ -1675,7 +1735,7 @@ async function downloadArtifacts(job, responseIndex, responseText = "") {
           detectType(destinationPath),
         ]);
         artifacts.push({
-          displayName: candidate.label,
+          displayName: originalCandidate.label,
           fileName: basename(destinationPath),
           copiedPath: destinationPath,
           size,
@@ -1686,11 +1746,15 @@ async function downloadArtifacts(job, responseIndex, responseText = "") {
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         await rm(destinationPath, { force: true }).catch(() => undefined);
-        await log(`Artifact "${candidate.label}" download failed on attempt ${attempt}/${ARTIFACT_DOWNLOAD_MAX_ATTEMPTS}: ${message}`);
+        await log(`Artifact "${originalCandidate.label}" download failed on attempt ${attempt}/${ARTIFACT_DOWNLOAD_MAX_ATTEMPTS}: ${message}`);
         if (attempt >= ARTIFACT_DOWNLOAD_MAX_ATTEMPTS) {
-          artifacts.push({ displayName: candidate.label, unconfirmed: true, error: message });
+          artifacts.push({ displayName: originalCandidate.label, unconfirmed: true, error: message });
         } else {
-          await reopenConversationForArtifacts(job, responseIndex, responseText, `retry ${attempt + 1} for ${candidate.label}`);
+          const refreshed = await reopenConversationForArtifacts(job, responseIndex, responseText, `retry ${attempt + 1} for ${originalCandidate.label}`);
+          targetSlice = refreshed.targetSlice;
+          candidates = refreshed.candidates;
+          suspiciousLabels = refreshed.suspiciousLabels;
+          activeCandidate = candidates.find((candidate) => candidate.label === originalCandidate.label);
           await sleep(1_000);
         }
       } finally {
@@ -1699,6 +1763,16 @@ async function downloadArtifacts(job, responseIndex, responseText = "") {
     }
   }
 
+  const capturedArtifactLabels = new Set(artifacts.map((artifact) => artifact.displayName).filter(Boolean));
+  const missedArtifactLabels = suspiciousLabels.filter((label) => !capturedArtifactLabels.has(label));
+  if (missedArtifactLabels.length > 0) {
+    await log(`Marking missed artifact signals as unconfirmed: ${missedArtifactLabels.join(", ")}`);
+    for (const label of missedArtifactLabels) {
+      artifacts.push({ displayName: label, unconfirmed: true, error: "Response-local artifact signal was present, but no downloadable artifact was captured." });
+    }
+    await flushArtifactsState(artifacts);
+  }
+
   return artifacts;
 }
 
@@ -1759,9 +1833,10 @@ async function run() {
     currentJob = await mutateJob((job) => ({ ...job, ...phasePatch("downloading_artifacts", { heartbeatAt: new Date().toISOString() }) }));
     const artifacts = await downloadArtifacts(currentJob, completion.responseIndex, completion.responseText);
     const artifactFailureCount = artifacts.filter((artifact) => artifact.unconfirmed || artifact.error).length;
+    const finalPhase = artifactFailureCount > 0 ? "complete_with_artifact_errors" : "complete";
 
     await heartbeat(
-      phasePatch(artifactFailureCount > 0 ? "complete_with_artifact_errors" : "complete", {
+      phasePatch(finalPhase, {
         status: "complete",
         completedAt: new Date().toISOString(),
         responsePath: currentJob.responsePath,
@@ -1773,7 +1848,7 @@ async function run() {
     );
     const persistedJob = await readJob().catch(() => undefined);
     await log(`Persisted final status after completion write: ${persistedJob?.status || "unknown"}`);
-    await log(`Job ${currentJob.id} complete`);
+    await log(`Job ${currentJob.id} complete (${finalPhase}, artifact failures=${artifactFailureCount})`);
   } catch (error) {
     if (!shuttingDown) {
       const message = error instanceof Error ? error.message : String(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-oracle",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "ChatGPT web-oracle extension for pi with isolated browser auth, async jobs, and project-context archives.",
   "private": false,
   "license": "MIT",

package/prompts/oracle.md

@@ -13,6 +13,12 @@ Required workflow:
 5. Call oracle_submit with the prompt and exact archive inputs.
 6. 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 tool schema enum / canonical preset registry.
+- **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 which preset fits the task, ask the user.
+
 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.
@@ -21,8 +27,7 @@ Rules:
 - 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 model/effort unless the task clearly needs something else.
-- Only use autoSwitchToThinking with the instant model family.
+- Prefer the configured default (omit **`preset`**) unless the task clearly needs a different model; then choose a **`preset`** id from the tool schema enum.
 - 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.