pi-oracle 0.7.21 → 0.7.23

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

@@ -26,7 +26,7 @@ import {
   CHATGPT_COMPOSER_LABELS,
   deriveAssistantCompletionSignature,
   matchesCompactIntelligenceControlLabel,
-  matchesCompactIntelligenceOpenerLabel,
+  matchesModelConfigurationOpener,
   matchesModelFamilyLabel,
   matchesRequestedModelControlLabel,
   requestedEffortLabel,
@@ -58,7 +58,7 @@ const jobPath = `${jobDir}/job.json`;
 const CHATGPT_LABELS = {
   composer: "Chat with ChatGPT",
   addFiles: "Add files and more",
-  send: "Send prompt",
+  send: ["Send prompt", "Send"],
   close: "Close",
   autoSwitchToThinking: "Auto-switch to Thinking",
   configure: "Configure...",
@@ -66,7 +66,7 @@ const CHATGPT_LABELS = {
 const GROK_LABELS = {
   composer: "Ask Grok anything",
   addFiles: "Attach",
-  send: "Submit",
+  send: ["Submit"],
   modelSelect: "Model select",
   stop: "Stop model response",
 };
@@ -916,18 +916,6 @@ function matchesRequestedModelControl(candidate, selection, options = {}) {
   return matchesRequestedModelControlLabel(candidate.label, selection);
 }
 
-function matchesModelConfigurationOpener(candidate) {
-  if (candidate.kind !== "button" || typeof candidate.label !== "string" || candidate.disabled) return false;
-  const label = String(candidate.label || "");
-  return candidate.label === "Model"
-    || candidate.label === "Model selector"
-    || matchesCompactIntelligenceOpenerLabel(label)
-    || /^(?:Light|Standard|Extended|Heavy)(?:, click to remove)?$/i.test(label)
-    || ["instant", "thinking", "pro"].some((family) => matchesModelFamilyLabel(label, /** @type {import("./chatgpt-ui-helpers.d.mts").OracleUiModelFamily} */ (family)))
-    || /^(?:(?:Light|Standard|Extended|Heavy) )?Thinking(?:, click to remove)?$/i.test(label)
-    || /^(?:(?:Light|Standard|Extended|Heavy) )?Pro(?:, click to remove)?$/i.test(label);
-}
-
 function canUseOpenModelMenuForSelection(snapshot, selection) {
   if (selection.modelFamily !== "instant" || selection.autoSwitchToThinking === true) return false;
   return Boolean(findEntry(
@@ -1312,7 +1300,7 @@ async function waitForUploadConfirmed(job, fileLabel, baselineCount) {
     const labels = labelsForJob(job);
     const sendEntry = findEntry(
       snapshot,
-      (candidate) => candidate.kind === "button" && candidate.label === labels.send && !candidate.disabled,
+      (candidate) => candidate.kind === "button" && labels.send.includes(candidate.label || "") && !candidate.disabled,
     );
     const fileCount = isGrokJob(job) && snapshot.includes(fileLabel)
       ? baselineCount + 1
@@ -1346,12 +1334,12 @@ async function waitForSendReady(job) {
     const labels = labelsForJob(job);
     const entry = findEntry(
       snapshot,
-      (candidate) => candidate.kind === "button" && candidate.label === labels.send && !candidate.disabled,
+      (candidate) => candidate.kind === "button" && labels.send.includes(candidate.label || "") && !candidate.disabled,
     );
     if (entry) return entry;
     await sleep(1000);
   }
-  throw new Error(`Timed out waiting for ${labelsForJob(job).send} to become enabled`);
+  throw new Error(`Timed out waiting for ${labelsForJob(job).send.join(" or ")} to become enabled`);
 }
 
 async function activateSendButton(job) {
@@ -1360,12 +1348,12 @@ async function activateSendButton(job) {
     const buttons = Array.from(document.querySelectorAll('button'));
     const button = buttons.find((candidate) => {
       const label = (candidate.getAttribute('aria-label') || candidate.textContent || '').trim();
-      return label === labels.send;
+      return labels.send.includes(label);
     });
     if (!button) return { ok: false, reason: 'send button not found' };
     if (button.disabled || button.getAttribute('aria-disabled') === 'true') return { ok: false, reason: 'send button disabled' };
     button.click();
-    return { ok: true };
+    return { ok: true, label: (button.getAttribute('aria-label') || button.textContent || '').trim() };
   `));
   return result;
 }
@@ -1380,7 +1368,7 @@ async function sendAcceptanceState(job, baselineAssistantCount) {
     url: urlResult.url,
     urlKnown: urlResult.ok,
     assistantCount: Math.max(baselineAssistantCount, messages.length),
-    stopStreaming: isGrokJob(job) ? snapshot.includes(GROK_LABELS.stop) : snapshot.includes("Stop streaming"),
+    stopStreaming: isGrokJob(job) ? snapshot.includes(GROK_LABELS.stop) : snapshot.includes("Stop streaming") || snapshot.includes('button "Stop"'),
     transientErrorText: detectProviderVisibleBlockerText(snapshot) || "",
   };
 }
@@ -1389,12 +1377,13 @@ async function clickSend(job, baselineAssistantCount) {
   await waitForSendReady(job);
   const beforeSend = await sendAcceptanceState(job, baselineAssistantCount);
   const activation = await activateSendButton(job);
-  if (!activation?.ok) throw new Error(`Could not activate ${labelsForJob(job).send}: ${activation?.reason || "DOM activation failed"}`);
-  await log(`Activated ${labelsForJob(job).send}; waiting for provider acceptance evidence`);
+  const sendLabel = activation?.label || labelsForJob(job).send.join(" or ");
+  if (!activation?.ok) throw new Error(`Could not activate ${sendLabel}: ${activation?.reason || "DOM activation failed"}`);
+  await log(`Activated ${sendLabel}; waiting for provider acceptance evidence`);
   if (await waitForSendAccepted(job, beforeSend, { timeoutMs: 20_000 })) return;
 
   await captureDiagnostics(job, "send-not-accepted");
-  throw new Error(`${isGrokJob(job) ? "Grok" : "ChatGPT"} message did not leave the composer after activating ${labelsForJob(job).send}`);
+  throw new Error(`${isGrokJob(job) ? "Grok" : "ChatGPT"} message did not leave the composer after activating ${sendLabel}`);
 }
 
 async function waitForSendAccepted(job, beforeSend, options = {}) {
@@ -1534,7 +1523,7 @@ async function waitForModelConfigurationToSettle(job, options = {}) {
   throw new Error(`Could not verify requested model settings after configuration for ${job.selection.modelFamily}`);
 }
 
-async function configurePowerSlider(job) {
+async function configurePowerSlider(job, powerRef) {
   // The current picker retains the compact tier semantics, but exposes keyboard
   // interaction on a Power menuitem rather than accessible tier radio buttons.
   const tiers = ["Instant", "Medium", "High", "Extra High", "Pro"];
@@ -1543,10 +1532,10 @@ async function configurePowerSlider(job) {
     : job.selection.effort === "heavy" ? "Extra High"
     : job.selection.effort === "extended" ? "High" : "Medium";
   const target = tiers.indexOf(requested);
-  const selector = '[data-testid="composer-intelligence-picker-content"] [role="menuitem"][aria-label="Power"]';
-  await agentBrowser(job, "focus", selector);
+  const selector = '[role="menuitem"][aria-label="Power"]';
   const timeoutAt = Date.now() + MODEL_CONFIGURATION_SETTLE_TIMEOUT_MS;
   let moves = 0;
+  let focused = false;
   while (Date.now() < timeoutAt && moves < tiers.length) {
     const state = await evalPage(job, toJsonScript(`
       const control = document.querySelector(${JSON.stringify(selector)});
@@ -1566,6 +1555,10 @@ async function configurePowerSlider(job) {
     if (state.min !== "0" || state.max !== "4" || typeof state.value !== "string" || !Number.isInteger(value) || value < 0 || value > 4) {
       throw new Error("ChatGPT Power slider has an unrecognized range; refusing to guess model settings");
     }
+    if (!focused) {
+      await agentBrowser(job, "focus", powerRef);
+      focused = true;
+    }
     if (value === target) {
       if (!state.description.startsWith(`${requested}, ${target + 1} of ${tiers.length}.`)) {
         throw new Error(`Could not verify ChatGPT Power tier: ${requested}`);
@@ -1592,8 +1585,9 @@ async function configureModel(job) {
 
   await log(`Configuring model family=${job.selection.modelFamily} effort=${job.selection?.effort || "(none)"}`);
   let familySnapshot = await openModelConfiguration(job);
-  if (findEntry(familySnapshot, (entry) => entry.kind === "menuitem" && entry.label === "Power" && !entry.disabled)) {
-    await configurePowerSlider(job);
+  const powerEntry = findEntry(familySnapshot, (entry) => entry.kind === "menuitem" && entry.label === "Power" && !entry.disabled);
+  if (powerEntry) {
+    await configurePowerSlider(job, powerEntry.ref);
     return;
   }
   let verificationSnapshot = familySnapshot;
@@ -1776,7 +1770,7 @@ async function assistantMessages(job) {
     job,
     toJsonScript(`
       const headings = Array.from(document.querySelectorAll('h1,h2,h3,h4,h5,h6,[role="heading"]'))
-        .filter((el) => (el.textContent || '').trim() === 'ChatGPT said:');
+        .filter((el) => el.getAttribute('data-conversation-role') === 'assistant' || (el.textContent || '').trim() === 'ChatGPT said:');
       const renderText = (node) => {
         if (!node) return '';
         const clone = node.cloneNode(true);
@@ -1802,7 +1796,10 @@ async function assistantMessages(job) {
           .trim();
         return text;
       };
-      const headingMessages = headings.map((heading) => ({ text: renderText(heading.nextElementSibling) }));
+      const headingMessages = headings.map((heading) => ({
+        text: renderText(heading.nextElementSibling),
+        turnComplete: heading.closest('[data-talvt-turn-state]')?.getAttribute('data-talvt-turn-state') === 'complete',
+      }));
       const messageNodes = Array.from(document.querySelectorAll('[data-testid="assistant-message"], [data-message-author-role="assistant"]'));
       const nodeMessages = messageNodes.map((node) => ({ text: renderText(node) }));
       return {
@@ -1812,7 +1809,10 @@ async function assistantMessages(job) {
   );
 
   if (!Array.isArray(result?.messages)) return [];
-  return result.messages.map((message) => ({ text: typeof message?.text === "string" ? message.text : "" }));
+  return result.messages.map((message) => ({
+    text: typeof message?.text === "string" ? message.text : "",
+    turnComplete: message?.turnComplete === true,
+  }));
 }
 
 async function grokAssistantMessages(job) {
@@ -1881,7 +1881,7 @@ async function waitForChatCompletion(job, baselineAssistantCount) {
   while (Date.now() < timeoutAt) {
     await heartbeat();
     const [snapshot, body] = await Promise.all([snapshotText(job), pageText(job).catch(() => "")]);
-    const hasStopStreaming = isGrokJob(job) ? snapshot.includes(GROK_LABELS.stop) : snapshot.includes("Stop streaming");
+    const hasStopStreaming = isGrokJob(job) ? snapshot.includes(GROK_LABELS.stop) : snapshot.includes("Stop streaming") || snapshot.includes('button "Stop"');
     const hasRetryButton = snapshot.includes('button "Retry"');
     const copyResponseCount = isGrokJob(job) ? (snapshot.match(/button "Copy"/g) || []).length : (snapshot.match(/Copy response/g) || []).length;
     throwIfProviderTransientError(job, snapshot, "waiting for response completion");
@@ -1889,7 +1889,7 @@ async function waitForChatCompletion(job, baselineAssistantCount) {
     const messages = await assistantMessages(job);
     const targetMessage = messages[baselineAssistantCount];
     const targetText = targetMessage?.text || "";
-    const hasTargetCopyResponse = copyResponseCount > baselineAssistantCount;
+    const hasTargetCopyResponse = copyResponseCount > baselineAssistantCount || targetMessage?.turnComplete === true;
 
     if (!hasStopStreaming && hasRetryButton && responseFailureText) {
       if (!retriedAfterFailure) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-oracle",
-  "version": "0.7.21",
+  "version": "0.7.23",
   "description": "ChatGPT and Grok web-oracle extension for pi with isolated browser auth, async jobs, and project-context archives.",
   "private": false,
   "license": "MIT",
@@ -38,6 +38,7 @@
     "scripts/platform-smoke",
     "scripts/oracle-real-smoke.mjs",
     "scripts/oracle-auth.test.mjs",
+    "scripts/oracle-cookie-import.test.mjs",
     "scripts/oracle-model.test.mjs",
     "scripts/oracle-chatgpt-preset-proof.mjs"
   ],
@@ -50,10 +51,10 @@
     ]
   },
   "scripts": {
-    "check:oracle-extension": "node --check extensions/oracle/shared/browser-profile-helpers.mjs && node --check extensions/oracle/shared/process-helpers.mjs && node --check extensions/oracle/shared/state-path-helpers.mjs && node --check extensions/oracle/shared/time-helpers.mjs && node --check extensions/oracle/shared/state-coordination-helpers.mjs && node --check extensions/oracle/shared/job-coordination-helpers.mjs && node --check extensions/oracle/shared/job-lifecycle-helpers.mjs && node --check extensions/oracle/shared/job-observability-helpers.mjs && node --check extensions/oracle/worker/run-job.mjs && node --check extensions/oracle/worker/state-locks.mjs && node --check extensions/oracle/worker/artifact-heuristics.mjs && node --check extensions/oracle/worker/chatgpt-ui-helpers.mjs && node --check extensions/oracle/worker/chatgpt-flow-helpers.mjs && node --check extensions/oracle/worker/auth-flow-helpers.mjs && node --check extensions/oracle/worker/auth-cookie-policy.mjs && node --check extensions/oracle/worker/chromium-cookie-source.mjs && node --check extensions/oracle/worker/auth-bootstrap.mjs && esbuild extensions/oracle/index.ts --bundle --platform=node --format=esm --external:@earendil-works/pi-ai --external:@earendil-works/pi-coding-agent --external:typebox --outfile=/tmp/pi-oracle-extension-check.js",
+    "check:oracle-extension": "node --check extensions/oracle/shared/browser-profile-helpers.mjs && node --check extensions/oracle/shared/process-helpers.mjs && node --check extensions/oracle/shared/state-path-helpers.mjs && node --check extensions/oracle/shared/time-helpers.mjs && node --check extensions/oracle/shared/state-coordination-helpers.mjs && node --check extensions/oracle/shared/job-coordination-helpers.mjs && node --check extensions/oracle/shared/job-lifecycle-helpers.mjs && node --check extensions/oracle/shared/job-observability-helpers.mjs && node --check extensions/oracle/worker/run-job.mjs && node --check extensions/oracle/worker/state-locks.mjs && node --check extensions/oracle/worker/artifact-heuristics.mjs && node --check extensions/oracle/worker/chatgpt-ui-helpers.mjs && node --check extensions/oracle/worker/chatgpt-flow-helpers.mjs && node --check extensions/oracle/worker/auth-flow-helpers.mjs && node --check extensions/oracle/worker/auth-cookie-policy.mjs && node --check extensions/oracle/worker/chromium-cookie-source.mjs && node --check extensions/oracle/worker/linux-chromium-cookie-source.mjs && node --check extensions/oracle/worker/auth-bootstrap.mjs && esbuild extensions/oracle/index.ts --bundle --platform=node --format=esm --external:@earendil-works/pi-ai --external:@earendil-works/pi-coding-agent --external:typebox --outfile=/tmp/pi-oracle-extension-check.js",
     "typecheck": "tsc --noEmit -p tsconfig.json",
     "typecheck:worker-helpers": "tsc --noEmit -p tsconfig.worker-helpers.json",
-    "sanity:oracle": "node --test scripts/oracle-auth.test.mjs scripts/oracle-model.test.mjs && node scripts/oracle-sanity-runner.mjs",
+    "sanity:oracle": "node --test scripts/oracle-auth.test.mjs scripts/oracle-cookie-import.test.mjs scripts/oracle-model.test.mjs && node scripts/oracle-sanity-runner.mjs",
     "pack:check": "npm pack --dry-run",
     "verify:oracle": "npm run check:oracle-extension && npm run check:platform-smoke && npm run check:oracle-real-smoke && npm run check:oracle-release-proof && npm run typecheck && npm run typecheck:worker-helpers && npm run sanity:oracle && npm run pack:check",
     "test": "npm run verify:oracle",
@@ -74,7 +75,7 @@
     "release:proof:chatgpt-presets": "node scripts/oracle-chatgpt-preset-proof.mjs check",
     "smoke:real:packed": "node scripts/oracle-real-smoke.mjs run --mode packed",
     "smoke:real:source": "node scripts/oracle-real-smoke.mjs run --mode source",
-    "sanity:oracle:platform": "node --test scripts/oracle-auth.test.mjs scripts/oracle-model.test.mjs && node scripts/oracle-sanity-runner.mjs --mode platform",
+    "sanity:oracle:platform": "node --test scripts/oracle-auth.test.mjs scripts/oracle-cookie-import.test.mjs scripts/oracle-model.test.mjs && node scripts/oracle-sanity-runner.mjs --mode platform",
     "verify:oracle:platform": "npm run check:oracle-extension && npm run check:platform-smoke && npm run check:oracle-real-smoke && npm run check:oracle-release-proof && npm run sanity:oracle:platform && npm run pack:check"
   },
   "dependencies": {
@@ -86,17 +87,17 @@
     "typebox": "*"
   },
   "overrides": {
-    "basic-ftp": "6.0.1",
-    "protobufjs": "7.6.1"
+    "basic-ftp": "6.2.3",
+    "protobufjs": "7.6.6"
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "0.86.1",
-    "@earendil-works/pi-coding-agent": "0.86.1",
+    "@earendil-works/pi-ai": "1.0.0",
+    "@earendil-works/pi-coding-agent": "1.0.0",
     "@types/node": "^22.19.19",
     "esbuild": "^0.28.0",
     "tsx": "^4.22.3",
-    "typebox": "^1.1.39",
-    "typescript": "^6.0.3"
+    "typebox": "1.3.34",
+    "typescript": "^7.0.0"
   },
   "engines": {
     "node": ">=22.19.0"
@@ -106,7 +107,7 @@
     "linux",
     "win32"
   ],
-  "packageManager": "npm@11.16.0",
+  "packageManager": "npm@11.21.0",
   "peerDependenciesMeta": {
     "@earendil-works/pi-ai": {
       "optional": true

package/platform-smoke.config.mjs

@@ -6,33 +6,12 @@ export default {
   artifactRoot: ".artifacts/platform-smoke",
   requiredTargets: ["macos", "ubuntu", "windows-native"],
   requiredSuites: ["platform-build", "real-extension"],
-  workflows: {
-    everyday: {
-      description: "Fast local validation for normal iteration.",
-      commands: ["npm run verify:oracle"],
-    },
-    platformSensitive: {
-      description: "Doctor plus focused platform target/suite runs for platform-sensitive changes.",
-      commands: [
-        "npm run smoke:platform:doctor",
-        "node scripts/platform-smoke.mjs run --target <target> --suite <suite>",
-      ],
-    },
-    platformMatrix: {
-      description: "Doctor-first packed-install macOS/Ubuntu/Windows platform proof.",
-      commands: ["npm run smoke:platform:all"],
-    },
-    release: {
-      description: "Full release gate: local verification, fresh ChatGPT preset proof, plus the doctor-first platform matrix.",
-      commands: ["npm run release:check"],
-    },
-  },
   requiredCrabbox: {
     source: "https://github.com/openclaw/crabbox",
     minVersion: "0.26.0",
   },
   ubuntuContainerImage: "pi-oracle-platform-smoke:node24",
-  ubuntuContainerBaseImage: "cimg/node:24.16",
+  ubuntuContainerBaseImage: "cimg/node:24.21",
   windowsParallels: {
     sourceVm: "pi-extension-windows-template",
     snapshot: "crabbox-ready",

package/scripts/oracle-auth.test.mjs

@@ -46,6 +46,41 @@ function pollingHarness(overrides = {}) {
   return { poll, logs, get captures() { return captures; } };
 }
 
+test("auth launch waits for a closing daemon only on the known pre-launch socket failure", async () => {
+  const socketFailure = "Could not configure browser: Failed to connect: No such file or directory (os error 2)";
+  for (const [failures, message, succeeds] of [
+    [1, socketFailure, true],
+    [Infinity, socketFailure, false],
+    [1, "Chrome exited before startup", false],
+  ]) {
+    let now = 0;
+    let launches = 0;
+    const launch = vm.runInNewContext(`(${functionSource(bootstrap, "launchTargetBrowser")})`, {
+      Date: { now: () => now }, Math, Error, JSON,
+      AGENT_BROWSER_BIN: "agent-browser", AGENT_BROWSER_COMMAND_TIMEOUT_MS: 500,
+      closeTargetBrowser: async () => {},
+      targetBrowserBaseArgs: () => ["--session", "fixture-auth", "--profile", "/fixture/seed"],
+      log: async () => {},
+      sleep: async (ms) => { now += ms; },
+      spawnCommand: async (_command, args, options) => {
+        assert.equal(args.at(-1), "about:blank");
+        assert(options.timeoutMs > 0 && options.timeoutMs <= 500);
+        return ++launches <= failures
+          ? { code: 1, stdout: "", stderr: message }
+          : { code: 0, stdout: "Browser opened", stderr: "" };
+      },
+    });
+    if (succeeds) {
+      await launch();
+      assert.equal(launches, 2);
+    } else {
+      await assert.rejects(launch(), (error) => error.message === message);
+      if (message === socketFailure) assert(now <= 500 && launches > 1, "persistent socket failure must stop at the launch deadline");
+      else assert.equal(launches, 1, "other launch failures must not be retried");
+    }
+  }
+});
+
 test("auth polling retries a complete observation after each navigation-interrupted read", async () => {
   for (const read of ["getUrl", "snapshotText", "pageText", "loginProbe"]) {
     let calls = 0;

package/scripts/oracle-chatgpt-preset-proof.mjs

@@ -6,6 +6,7 @@
 
 import { execFileSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
+import { createRequire } from "node:module";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -60,8 +61,25 @@ function currentGitHead() {
   return git(["rev-parse", "HEAD"]);
 }
 
-function currentGitHeadCommittedAt() {
-  return git(["show", "-s", "--format=%cI", "HEAD"]);
+function gitCommitCommittedAt(ref = "HEAD") {
+  return git(["show", "-s", "--format=%cI", ref]);
+}
+
+function isRuntimeIdenticalAncestor(candidateHead, currentHead) {
+  if (typeof candidateHead !== "string" || !/^[0-9a-f]{40}$/i.test(candidateHead)) return false;
+  if (candidateHead === currentHead) return true;
+  try {
+    execFileSync("git", ["merge-base", "--is-ancestor", candidateHead, currentHead], { cwd: REPO_ROOT, stdio: "ignore" });
+    execFileSync("git", ["diff", "--exit-code", candidateHead, currentHead, "--", "extensions", "prompts"], { cwd: REPO_ROOT, stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function packageMetadataAtCommit(ref) {
+  const pkg = JSON.parse(git(["show", `${ref}:package.json`]));
+  return { name: pkg.name, version: pkg.version };
 }
 
 function currentGitStatus() {
@@ -69,18 +87,24 @@ function currentGitStatus() {
 }
 
 function canonicalPresets() {
-  const configSource = readFileSync(resolve(REPO_ROOT, "extensions/oracle/lib/config.ts"), "utf8");
-  const registryMatch = configSource.match(/export const ORACLE_SUBMIT_PRESETS = \{([\s\S]*?)\n\} as const;/);
-  if (!registryMatch) throw new Error("Could not locate ORACLE_SUBMIT_PRESETS registry in extensions/oracle/lib/config.ts");
-  const entries = [...registryMatch[1].matchAll(
-    /^\s{2}([a-z0-9_]+):\s*\{\s*label:\s*"[^"]+",\s*modelFamily:\s*"([a-z]+)"\s+as const(?:,\s*effort:\s*"([a-z]+)"\s+as const)?,\s*autoSwitchToThinking:\s*(true|false)\s*\}/gm,
-  )];
-  if (entries.length === 0) throw new Error("Could not parse ORACLE_SUBMIT_PRESETS registry entries");
-  return Object.fromEntries(entries.map((match) => [match[1], {
-    modelFamily: match[2],
-    effort: match[3],
-    autoSwitchToThinking: match[4] === "true",
-  }]));
+  // Derive the canonical registry by importing the real config module so a
+  // formatting change in config.ts can never silently drop a preset from the
+  // release proof's required set.
+  const tsx = createRequire(import.meta.url).resolve("tsx");
+  const stdout = execFileSync(process.execPath, [
+    "--import", tsx,
+    "--input-type=module",
+    "--eval",
+    "const mod = await import('./extensions/oracle/lib/config.ts');" +
+    "const presets = Object.fromEntries(Object.entries(mod.ORACLE_SUBMIT_PRESETS).map(([id, preset]) => [id, {" +
+    "modelFamily: preset.modelFamily, effort: preset.effort, autoSwitchToThinking: preset.autoSwitchToThinking }]));" +
+    "process.stdout.write(JSON.stringify(presets));",
+  ], { cwd: REPO_ROOT, encoding: "utf8" });
+  const presets = JSON.parse(stdout);
+  if (!presets || typeof presets !== "object" || Object.keys(presets).length === 0) {
+    throw new Error("ORACLE_SUBMIT_PRESETS registry resolved to no presets");
+  }
+  return presets;
 }
 
 function canonicalPresetIds() {
@@ -223,8 +247,6 @@ function validateProof(proof, path) {
   const errors = [];
   const { name, version } = packageMetadata();
   const gitHead = currentGitHead();
-  const gitHeadCommittedAt = currentGitHeadCommittedAt();
-  const gitHeadCommittedAtMs = Date.parse(gitHeadCommittedAt);
   const gitStatus = currentGitStatus();
   const presetRegistry = canonicalPresets();
   const requiredPresets = Object.keys(presetRegistry);
@@ -239,10 +261,17 @@ function validateProof(proof, path) {
     return errors;
   }
 
+  const proofGitHead = typeof proof.gitHead === "string" ? proof.gitHead : "";
+  const validProofHead = isRuntimeIdenticalAncestor(proofGitHead, gitHead);
+  const expectedProofHead = validProofHead ? proofGitHead : gitHead;
+  const expectedVersion = validProofHead ? packageMetadataAtCommit(expectedProofHead).version : version;
+  const gitHeadCommittedAt = gitCommitCommittedAt(expectedProofHead);
+  const gitHeadCommittedAtMs = Date.parse(gitHeadCommittedAt);
+
   if (proof.schemaVersion !== 1) errors.push("schemaVersion must be 1");
   if (proof.packageName !== name) errors.push(`packageName must be ${name}`);
-  if (proof.packageVersion !== version) errors.push(`packageVersion must match package.json version ${version}`);
-  if (proof.gitHead !== gitHead) errors.push(`gitHead must match current HEAD ${gitHead}`);
+  if (proof.packageVersion !== expectedVersion) errors.push(`packageVersion must match package.json version ${expectedVersion}`);
+  if (!validProofHead) errors.push(`gitHead must match current HEAD ${gitHead} or a runtime-identical ancestor commit`);
   if (proof.provider !== "chatgpt") errors.push('provider must be "chatgpt"');
   if (proof.extensionUnderTest !== "loaded-extension") errors.push('extensionUnderTest must be "loaded-extension"');
 
@@ -255,7 +284,7 @@ function validateProof(proof, path) {
     const maxAgeMs = maxAgeHours() * 60 * 60 * 1000;
     if (ageMs < 0) errors.push("validatedAt must not be in the future");
     if (ageMs > maxAgeMs) errors.push(`validatedAt is older than ${maxAgeHours()} hours`);
-    if (proofValidatedAtMs <= gitHeadCommittedAtMs) errors.push("validatedAt must be after current git HEAD commit time");
+    if (proofValidatedAtMs <= gitHeadCommittedAtMs) errors.push("validatedAt must be after proven git commit time");
   }
 
   const jobs = proof.jobs;
@@ -270,8 +299,8 @@ function validateProof(proof, path) {
       canonicalPreset: presetRegistry[preset],
       proofJob: jobs[preset],
       packageName: name,
-      packageVersion: version,
-      gitHead,
+      packageVersion: expectedVersion,
+      gitHead: expectedProofHead,
       gitHeadCommittedAtMs,
       proofValidatedAtMs,
       errors,