pi-oracle 0.7.7 → 0.7.9

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

@@ -30,12 +30,14 @@ import {
   effortSelectionVisible,
   snapshotCanSafelySkipModelConfiguration,
   snapshotHasModelConfigurationUi,
+  snapshotHasModelOpener,
   snapshotHasUsableComposerControls,
   snapshotStronglyMatchesRequestedModel,
   snapshotWeaklyMatchesRequestedModel,
   autoSwitchToThinkingSelectionVisible,
+  stripChatGptResponseChrome,
 } from "./chatgpt-ui-helpers.mjs";
-import { assistantSnapshotSlice, nextStableValueState, resolveStableConversationUrlCandidate, stripUrlQueryAndHash } from "./chatgpt-flow-helpers.mjs";
+import { assistantSnapshotSlice, nextStableValueState, providerSendAccepted, resolveStableConversationUrlCandidate, stripUrlQueryAndHash } from "./chatgpt-flow-helpers.mjs";
 import { assertNotKnownBrowserUserDataPath, scrubSweetCookieSafeStoragePasswordEnv, sweetCookieSafeStoragePasswordScrubbedEnv } from "../shared/browser-profile-helpers.mjs";
 import { createLease, listLeaseMetadata, readLeaseMetadata, releaseLease, withLock } from "./state-locks.mjs";
 
@@ -83,11 +85,15 @@ const POST_SEND_SETTLE_MS = 15_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";
+const CHROME_DEVTOOLS_READY_TIMEOUT_MS = 15_000;
 const CP_BIN = process.env.PI_ORACLE_CP_PATH?.trim() || "cp";
 scrubSweetCookieSafeStoragePasswordEnv();
 
+let cpSupportsApfsCloneFlag;
 let currentJob;
 let browserStarted = false;
+let browserProcess;
+let browserProcessError;
 let cleaningUpBrowser = false;
 let cleaningUpRuntime = false;
 let shuttingDown = false;
@@ -277,6 +283,14 @@ function spawnCommand(command, args, options = {}) {
   });
 }
 
+async function cpSupportsApfsClone() {
+  if (process.platform !== "darwin") return false;
+  if (cpSupportsApfsCloneFlag !== undefined) return cpSupportsApfsCloneFlag;
+  const probe = await spawnCommand(CP_BIN, ["-c"], { allowFailure: true, timeoutMs: 5_000 });
+  cpSupportsApfsCloneFlag = !/invalid option\s+--\s+['"]?c/i.test(`${probe.stderr}\n${probe.stdout}`);
+  return cpSupportsApfsCloneFlag;
+}
+
 function parseConversationId(chatUrl) {
   if (!chatUrl) return undefined;
   try {
@@ -321,7 +335,7 @@ async function cloneSeedProfileToRuntime(job) {
   await withLock(ORACLE_STATE_DIR, "auth", "global", { jobId: job.id, processPid: process.pid, action: "cloneSeedProfile" }, async () => {
     await rm(job.runtimeProfileDir, { recursive: true, force: true }).catch(() => undefined);
     await ensurePrivateDir(dirname(job.runtimeProfileDir));
-    if (job.config.browser.cloneStrategy === "apfs-clone" && process.platform === "darwin") {
+    if (job.config.browser.cloneStrategy === "apfs-clone" && await cpSupportsApfsClone()) {
       try {
         await spawnCommand(CP_BIN, ["-cR", seedDir, job.runtimeProfileDir], { timeoutMs: PROFILE_CLONE_TIMEOUT_MS });
       } catch (error) {
@@ -344,16 +358,24 @@ async function cleanupRuntime(job) {
   cleaningUpRuntime = true;
   const warnings = [];
   try {
+    let browserClosed = true;
     await closeBrowser(job).catch(async (error) => {
+      browserClosed = false;
       const message = `Browser close warning during cleanup: ${error instanceof Error ? error.message : String(error)}`;
       warnings.push(message);
       await log(message).catch(() => undefined);
     });
-    try {
-      assertSafeRuntimeProfilePath(job.runtimeProfileDir, "runtime profile", job.config);
-      await rm(job.runtimeProfileDir, { recursive: true, force: true });
-    } catch (error) {
-      const message = `Runtime profile cleanup warning: ${error instanceof Error ? error.message : String(error)}`;
+    if (browserClosed) {
+      try {
+        assertSafeRuntimeProfilePath(job.runtimeProfileDir, "runtime profile", job.config);
+        await rm(job.runtimeProfileDir, { recursive: true, force: true });
+      } catch (error) {
+        const message = `Runtime profile cleanup warning: ${error instanceof Error ? error.message : String(error)}`;
+        warnings.push(message);
+        await log(message).catch(() => undefined);
+      }
+    } else {
+      const message = `Runtime profile cleanup skipped because isolated browser close did not complete: ${job.runtimeProfileDir}`;
       warnings.push(message);
       await log(message).catch(() => undefined);
     }
@@ -531,6 +553,39 @@ function browserBaseArgs(job, options = {}) {
   return args;
 }
 
+function waitForChildClose(child, timeoutMs) {
+  if (!child || child.exitCode !== null || child.signalCode !== null) return Promise.resolve(true);
+  return new Promise((resolve) => {
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (settled) return;
+      settled = true;
+      resolve(false);
+    }, timeoutMs);
+    timer.unref?.();
+    child.once("close", () => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      resolve(true);
+    });
+  });
+}
+
+async function terminateBrowserProcess() {
+  if (!browserProcess) return;
+  const child = browserProcess;
+  browserProcess = undefined;
+  browserProcessError = undefined;
+  if (child.exitCode !== null || child.signalCode !== null) return;
+  killProcessTree(child);
+  if (await waitForChildClose(child, 2_000)) return;
+  killProcess(child);
+  if (!(await waitForChildClose(child, 2_000))) {
+    throw new Error(`Timed out terminating isolated Chrome process ${child.pid ?? "(unknown pid)"}`);
+  }
+}
+
 async function closeBrowser(job) {
   if (cleaningUpBrowser) return;
   cleaningUpBrowser = true;
@@ -543,15 +598,107 @@ async function closeBrowser(job) {
       throw new Error(result.stderr || result.stdout || `agent-browser close exited with code ${result.code}`);
     }
   } finally {
+    await terminateBrowserProcess();
     browserStarted = false;
     cleaningUpBrowser = false;
   }
 }
 
+function assertSafeBrowserLaunchArg(arg) {
+  const value = String(arg).trim().toLowerCase();
+  const managedFlags = [
+    "--user-data-dir",
+    "--remote-debugging-port",
+    "--remote-debugging-pipe",
+    "--remote-debugging-address",
+    "--remote-allow-origins",
+  ];
+  const flag = managedFlags.find((candidate) => value === candidate || value.startsWith(`${candidate}=`) || value.startsWith(`${candidate} `));
+  if (flag) {
+    throw new Error(`browser.args cannot override oracle-managed Chrome launch isolation flag ${flag}`);
+  }
+}
+
+function safeBrowserLaunchArgs(job) {
+  if (!Array.isArray(job.config.browser.args)) return [];
+  for (const arg of job.config.browser.args) assertSafeBrowserLaunchArg(arg);
+  return job.config.browser.args;
+}
+
+function chromeLaunchArgs(job, url) {
+  const args = [
+    "--remote-debugging-port=0",
+    "--remote-allow-origins=*",
+    "--no-first-run",
+    "--no-default-browser-check",
+    "--disable-background-networking",
+    "--disable-backgrounding-occluded-windows",
+    "--disable-component-update",
+    "--disable-default-apps",
+    "--disable-hang-monitor",
+    "--disable-popup-blocking",
+    "--disable-prompt-on-repost",
+    "--disable-sync",
+    "--disable-features=Translate",
+    "--enable-features=NetworkService,NetworkServiceInProcess",
+    "--metrics-recording-only",
+    "--password-store=basic",
+    "--use-mock-keychain",
+    "--enable-unsafe-swiftshader",
+    "--window-size=1280,720",
+    `--user-data-dir=${job.runtimeProfileDir}`,
+  ];
+  if (job.config.browser.runMode !== "headed") args.push("--headless=new", "--hide-scrollbars");
+  if (job.config.browser.userAgent) args.push(`--user-agent=${job.config.browser.userAgent}`);
+  args.push(...safeBrowserLaunchArgs(job));
+  args.push(url);
+  return args;
+}
+
+async function waitForDevToolsEndpoint(job) {
+  const path = join(job.runtimeProfileDir, "DevToolsActivePort");
+  const startedAt = Date.now();
+  while (Date.now() - startedAt < CHROME_DEVTOOLS_READY_TIMEOUT_MS) {
+    if (browserProcessError) {
+      throw new Error(`Chrome failed before DevTools became available: ${browserProcessError instanceof Error ? browserProcessError.message : String(browserProcessError)}`);
+    }
+    if (browserProcess?.exitCode !== null && browserProcess?.exitCode !== undefined) {
+      throw new Error(`Chrome exited before DevTools became available (exit code ${browserProcess.exitCode}).`);
+    }
+    if (existsSync(path)) {
+      const lines = (await readFile(path, "utf8")).trim().split(/\r?\n/);
+      const port = lines[0]?.trim();
+      const browserPath = lines[1]?.trim();
+      if (/^\d+$/.test(port)) {
+        return browserPath ? `ws://127.0.0.1:${port}${browserPath}` : `http://127.0.0.1:${port}`;
+      }
+    }
+    await sleep(100);
+  }
+  throw new Error(`Timed out waiting for Chrome DevTools endpoint at ${path}.`);
+}
+
 async function launchBrowser(job, url) {
   await closeBrowser(job);
-  const mode = job.config.browser.runMode;
-  await spawnCommand(AGENT_BROWSER_BIN, [...browserBaseArgs(job, { withLaunchOptions: true, mode }), "open", url]);
+  const executablePath = job.config.browser.executablePath;
+  if (!executablePath) throw new Error("Oracle requires browser.executablePath when launching isolated browser runtimes without owning the global agent-browser daemon.");
+  const args = chromeLaunchArgs(job, url);
+  await log(`Launching isolated Chrome directly for agent-browser attach: ${JSON.stringify([executablePath, ...args])}`);
+  browserProcessError = undefined;
+  browserProcess = spawn(executablePath, args, {
+    env: sweetCookieSafeStoragePasswordScrubbedEnv(),
+    stdio: "ignore",
+    detached: false,
+    shell: false,
+  });
+  browserProcess.on("error", (error) => {
+    browserProcessError = error;
+    log(`Chrome process error: ${error instanceof Error ? error.message : String(error)}`).catch(() => undefined);
+  });
+  const endpoint = await waitForDevToolsEndpoint(job);
+  await log(`Connecting agent-browser session ${job.runtimeSessionName} to isolated Chrome DevTools endpoint`);
+  await spawnCommand(AGENT_BROWSER_BIN, [...browserBaseArgs(job), "connect", endpoint]);
+  await spawnCommand(AGENT_BROWSER_BIN, [...browserBaseArgs(job), "open", url]);
   browserStarted = true;
 }
 
@@ -774,8 +921,8 @@ function snapshotHasCompactIntelligenceMenuControls(snapshot) {
   return Boolean(findEntry(snapshot, (candidate) => {
     if (candidate.disabled) return false;
     const label = normalizeSnapshotLabel(candidate.label);
-    return (candidate.kind === "menu" && /Intelligence.*Instant.*Medium.*High.*Pro/i.test(label))
-      || (candidate.kind === "menuitemradio" && /^(?:Instant\s+5s|Medium\s+5\s*[–-]\s*30s|High\s+15\s*[–-]\s*60s|Pro\s+5\+\s*min)$/i.test(label));
+    return (candidate.kind === "menu" && /(?:Intelligence.*Instant.*Medium.*High.*Pro|^(?:Instant|Medium|High|Extra High|Pro Extended)$)/i.test(label))
+      || (candidate.kind === "menuitemradio" && /^(?:Instant(?:\s+5s)?|Medium(?:\s+5\s*[–-]\s*30s)?|High(?:\s+15\s*[–-]\s*60s)?|Extra High|Pro\s+5\+\s*min|Pro Standard|Pro Extended)$/i.test(label));
   }));
 }
 
@@ -783,9 +930,10 @@ function matchesRequestedModelControl(candidate, selection, options = {}) {
   if (!["button", "radio", "menuitemradio"].includes(candidate.kind || "") || typeof candidate.label !== "string" || candidate.disabled) return false;
   if (candidate.kind === "button") {
     if (/\bexpanded=true\b/.test(String(candidate.line || ""))) return false;
-    if (options.ignoreCompactTierButtons && /^(?:Instant|Medium|High|Pro)$/i.test(candidate.label)) return false;
-    if (options.ignoreCompactOnlyButtons && /^(?:Medium|High)$/i.test(candidate.label)) return false;
+    if (options.ignoreCompactTierButtons && /^(?:Instant|Medium|High|Extra High|Pro|Pro Extended)$/i.test(candidate.label)) return false;
+    if (options.ignoreCompactOnlyButtons && /^(?:Medium|High|Extra High)$/i.test(candidate.label)) return false;
   }
+  if (selection.modelFamily === "pro" && /^Pro(?:\s+Extended)?$/i.test(candidate.label)) return true;
   return matchesRequestedModelControlLabel(candidate.label, selection);
 }
 
@@ -859,7 +1007,41 @@ async function maybeClickLabeledEntry(job, label, options = {}) {
 }
 
 async function openEffortDropdown(job) {
-  const snapshot = await snapshotText(job);
+  let snapshot = await snapshotText(job);
+  if (job.selection?.modelFamily === "pro") {
+    let proEffortEntry = findEntry(
+      snapshot,
+      (candidate) => candidate.kind === "menuitem" && candidate.label === "Pro effort options" && !candidate.disabled,
+    );
+    if (!proEffortEntry) {
+      const opener = findEntry(snapshot, matchesModelConfigurationOpener);
+      if (opener) {
+        await clickRef(job, opener.ref);
+        await agentBrowser(job, "wait", "500");
+        snapshot = await snapshotText(job);
+        proEffortEntry = findEntry(
+          snapshot,
+          (candidate) => candidate.kind === "menuitem" && candidate.label === "Pro effort options" && !candidate.disabled,
+        );
+      }
+    }
+    if (proEffortEntry) {
+      try {
+        await clickRef(job, proEffortEntry.ref);
+        return true;
+      } catch {
+        // Fall through to DOM click. ChatGPT's tiny trailing Pro effort icon can
+        // be covered at the accessibility click point by the parent Pro row.
+      }
+    }
+    const clicked = await evalPage(job, toJsonScript(`
+      const el = document.querySelector('[aria-label="Pro effort options"], [data-composer-intelligence-pro-effort-action]');
+      if (!el) return false;
+      el.click();
+      return true;
+    `));
+    if (clicked) return true;
+  }
   const effortLabels = new Set(["Light", "Standard", "Extended", "Heavy"]);
   const entry = findEntry(
     snapshot,
@@ -1157,46 +1339,128 @@ async function waitForSendReady(job) {
   throw new Error(`Timed out waiting for ${labelsForJob(job).send} to become enabled`);
 }
 
-async function clickSend(job) {
-  const entry = await waitForSendReady(job);
-  if (isGrokJob(job)) {
-    const result = await evalPage(job, toJsonScript(`
-      const button = document.querySelector('button[aria-label="Submit"]');
-      if (!button || button.disabled) return { ok: false };
-      button.click();
-      return { ok: true };
-    `));
-    if (result?.ok) return;
+async function activateSendButton(job) {
+  const result = await evalPage(job, toJsonScript(`
+    const labels = ${JSON.stringify(labelsForJob(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;
+    });
+    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 result;
+}
+
+async function sendAcceptanceState(job, baselineAssistantCount) {
+  const [urlResult, snapshot, messages] = await Promise.all([
+    currentUrl(job).then((url) => ({ url, ok: true })).catch(() => ({ url: "", ok: false })),
+    snapshotText(job).catch(() => ""),
+    assistantMessages(job).catch(() => []),
+  ]);
+  return {
+    url: urlResult.url,
+    urlKnown: urlResult.ok,
+    assistantCount: Math.max(baselineAssistantCount, messages.length),
+    stopStreaming: isGrokJob(job) ? snapshot.includes(GROK_LABELS.stop) : snapshot.includes("Stop streaming"),
+  };
+}
+
+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`);
+  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}`);
+}
+
+async function waitForSendAccepted(job, beforeSend, options = {}) {
+  const timeoutAt = Date.now() + (options.timeoutMs || 15_000);
+  while (Date.now() < timeoutAt) {
+    await heartbeat();
+    const afterSend = await sendAcceptanceState(job, beforeSend.assistantCount || 0);
+    if (providerSendAccepted(beforeSend, afterSend)) return true;
+    await sleep(500);
   }
-  await clickRef(job, entry.ref);
+  return false;
+}
+
+async function dismissProFeedbackModal(job, snapshot) {
+  const entries = parseSnapshotEntries(snapshot);
+  const hasProFeedback = entries.some((entry) => entry.kind === "heading" && entry.label === "Pro feedback" && !entry.disabled);
+  if (!hasProFeedback) return false;
+  const close = entries.find((entry) => entry.kind === "button" && entry.label === CHATGPT_LABELS.close && !entry.disabled);
+  if (close) {
+    await clickRef(job, close.ref).catch(() => undefined);
+    await agentBrowser(job, "wait", "500");
+    if (!(await pageText(job).catch(() => "")).includes("Pro feedback")) return true;
+  }
+  await agentBrowser(job, "press", "Escape").catch(() => undefined);
+  await agentBrowser(job, "wait", "500");
+  if (!(await pageText(job).catch(() => "")).includes("Pro feedback")) return true;
+
+  const dismissed = await evalPage(job, toJsonScript(`
+    const dialogText = document.body.innerText || '';
+    if (!/Pro feedback/.test(dialogText)) return false;
+    const button = Array.from(document.querySelectorAll('button'))
+      .find((candidate) => (candidate.getAttribute('aria-label') || candidate.textContent || '').trim() === 'Close');
+    if (!button) return false;
+    button.click();
+    return true;
+  `));
+  if (dismissed) await agentBrowser(job, "wait", "500");
+  return Boolean(dismissed);
 }
 
 async function openModelConfiguration(job) {
-  const initialSnapshot = await snapshotText(job);
-  if (snapshotHasModelConfigurationUi(initialSnapshot)) return initialSnapshot;
+  const timeoutAt = Date.now() + 15_000;
+  let lastSnapshot = "";
 
-  for (const predicate of [matchesModelConfigurationOpener]) {
-    const snapshot = await snapshotText(job);
-    const entry = findEntry(snapshot, predicate);
-    if (!entry) continue;
-    await clickRef(job, entry.ref);
-    await agentBrowser(job, "wait", "800");
-    const after = await snapshotText(job);
-    if (snapshotHasModelConfigurationUi(after)) return after;
-    if (canUseOpenModelMenuForSelection(after, job.selection)) return after;
+  while (Date.now() < timeoutAt) {
+    const initialSnapshot = await snapshotText(job);
+    lastSnapshot = initialSnapshot;
+    if (snapshotHasModelConfigurationUi(initialSnapshot)) return initialSnapshot;
+    if (await dismissProFeedbackModal(job, initialSnapshot)) continue;
+
+    for (const predicate of [matchesModelConfigurationOpener]) {
+      const snapshot = await snapshotText(job);
+      lastSnapshot = snapshot;
+      const entry = findEntry(snapshot, predicate);
+      if (!entry) continue;
+      await clickRef(job, entry.ref);
+      await agentBrowser(job, "wait", "800");
+      const after = await snapshotText(job);
+      lastSnapshot = after;
+      if (snapshotHasModelConfigurationUi(after)) return after;
+      if (canUseOpenModelMenuForSelection(after, job.selection)) return after;
+
+      const configureEntry = findEntry(
+        after,
+        (candidate) => candidate.kind === "menuitem" && candidate.label === CHATGPT_LABELS.configure && !candidate.disabled,
+      );
 
-    const configureEntry = findEntry(
-      after,
-      (candidate) => candidate.kind === "menuitem" && candidate.label === CHATGPT_LABELS.configure && !candidate.disabled,
-    );
+      if (configureEntry) {
+        await clickRef(job, configureEntry.ref);
+        await agentBrowser(job, "wait", "1200");
+        const postConfigure = await snapshotText(job);
+        lastSnapshot = postConfigure;
+        if (snapshotHasModelConfigurationUi(postConfigure)) return postConfigure;
+        if (canUseOpenModelMenuForSelection(postConfigure, job.selection)) return postConfigure;
+      }
+    }
 
-    if (configureEntry) {
-      await clickRef(job, configureEntry.ref);
-      await agentBrowser(job, "wait", "1200");
-      const postConfigure = await snapshotText(job);
-      if (snapshotHasModelConfigurationUi(postConfigure)) return postConfigure;
-      if (canUseOpenModelMenuForSelection(postConfigure, job.selection)) return postConfigure;
+    if (composerControlsVisible(lastSnapshot, job) && !snapshotHasModelOpener(lastSnapshot)) {
+      await agentBrowser(job, "wait", "1000");
+      continue;
     }
+    await agentBrowser(job, "wait", "500");
   }
 
   throw new Error("Could not open model configuration UI");
@@ -1303,7 +1567,11 @@ async function configureModel(job) {
         throw new Error(`Could not open effort dropdown for requested effort: ${effortLabel}`);
       }
       await agentBrowser(job, "wait", "300");
-      await clickLabeledEntry(job, effortLabel, { kind: "option" });
+      if (job.selection.modelFamily === "pro" && await maybeClickLabeledEntry(job, `Pro ${effortLabel}`, { kind: "menuitemradio" })) {
+        // Current ChatGPT exposes Pro effort choices as nested menu radio items.
+      } else {
+        await clickLabeledEntry(job, effortLabel, { kind: "option" });
+      }
       await agentBrowser(job, "wait", "400");
       const effortSnapshot = await snapshotText(job);
       verificationSnapshot = effortSnapshot;
@@ -2000,15 +2268,8 @@ async function downloadArtifacts(job, responseIndex, responseText = "") {
     }
   }
 
-  const capturedArtifactLabels = new Set(artifacts.map((artifact) => artifact.displayName).filter(Boolean));
-  const capturedArtifactKeys = new Set([...capturedArtifactLabels].map((label) => String(label).replace(/\s+/g, "")));
-  const missedArtifactLabels = suspiciousLabels.filter((label) => !capturedArtifactLabels.has(label) && !capturedArtifactKeys.has(String(label).replace(/\s+/g, "")));
-  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);
+  if (suspiciousLabels.length > 0) {
+    await log(`Ignoring plain-text artifact-like labels without downloadable controls: ${suspiciousLabels.join(", ")}`);
   }
 
   return artifacts;
@@ -2079,8 +2340,8 @@ async function run() {
     await setComposerText(currentJob, await readFile(currentJob.promptPath, "utf8"));
     const baselineAssistantCount = (await assistantMessages(currentJob)).length;
     await log(`Assistant response count before send: ${baselineAssistantCount}`);
-    await clickSend(currentJob);
-    await log(`Waiting ${POST_SEND_SETTLE_MS}ms after send to avoid streaming interruption`);
+    await clickSend(currentJob, baselineAssistantCount);
+    await log(`Send accepted; waiting ${POST_SEND_SETTLE_MS}ms after send to avoid streaming interruption`);
     await sleep(POST_SEND_SETTLE_MS);
 
     const observedChatUrl = isGrokJob(currentJob)
@@ -2118,14 +2379,15 @@ async function run() {
       message: "Extracting the completed response body.",
       patch: { heartbeatAt: new Date().toISOString() },
     }));
-    await secureWriteText(currentJob.responsePath, `${completion.responseText.trim()}\n`);
+    const responseText = isGrokJob(currentJob) ? completion.responseText.trim() : stripChatGptResponseChrome(completion.responseText);
+    await secureWriteText(currentJob.responsePath, `${responseText}\n`);
     currentJob = await mutateJob((job) => transitionOracleJobPhase(job, "downloading_artifacts", {
       at: new Date().toISOString(),
       source: "oracle:worker",
       message: "Downloading any response artifacts.",
       patch: { heartbeatAt: new Date().toISOString() },
     }));
-    const artifacts = await downloadArtifacts(currentJob, completion.responseIndex, completion.responseText);
+    const artifacts = await downloadArtifacts(currentJob, completion.responseIndex, responseText);
     const artifactFailureCount = artifacts.filter((artifact) => artifact.unconfirmed || artifact.error).length;
     const finalPhase = artifactFailureCount > 0 ? "complete_with_artifact_errors" : "complete";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-oracle",
-  "version": "0.7.7",
+  "version": "0.7.9",
   "description": "ChatGPT and Grok web-oracle extension for pi with isolated browser auth, async jobs, and project-context archives.",
   "private": false,
   "license": "MIT",
@@ -41,9 +41,6 @@
   "pi": {
     "extensions": [
       "./extensions/oracle/index.ts"
-    ],
-    "prompts": [
-      "./prompts"
     ]
   },
   "scripts": {
@@ -83,8 +80,8 @@
     "protobufjs": "7.6.1"
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "^0.79.0",
-    "@earendil-works/pi-coding-agent": "^0.79.0",
+    "@earendil-works/pi-ai": "0.79.1",
+    "@earendil-works/pi-coding-agent": "0.79.1",
     "@types/node": "^22.19.19",
     "esbuild": "^0.28.0",
     "tsx": "^4.22.3",

package/prompts/oracle-followup.md

@@ -10,7 +10,7 @@ Required workflow:
 2. If the request does not include both a prior oracle job id and a follow-up request, stop and report: `Usage: /oracle-followup <job-id> <request>. Find the job id in the earlier oracle response or via /oracle-status.`
 3. Same-thread follow-ups cannot switch providers. If the user asks to move a ChatGPT thread to Grok or a Grok thread to ChatGPT, stop and tell them to start a new `/oracle` job instead.
 4. Call `oracle_preflight` immediately with the parsed `followUpJobId` so readiness checks use the prior job's provider.
-5. If `oracle_preflight` reports `ready: false`, stop before any expensive prep. Do not read files, search the codebase, or prepare archive inputs first. If the blocker is an auth seed or stale-auth issue that `oracle_auth` can repair, call `oracle_auth` once for the provider reported by preflight, rerun `oracle_preflight` with the same `followUpJobId`, and continue only if it becomes `ready: true`. Otherwise stop immediately and report the blocking issue plus the suggested next step.
+5. If `oracle_preflight` reports `ready: false`, stop before any expensive prep. Do not read files, search the codebase, prepare archive inputs, or call `oracle_auth` automatically. Report the blocking issue plus the suggested next step.
 6. Treat the parsed job id as `followUpJobId` for `oracle_submit`.
 7. Understand whether the follow-up request is explicitly narrow or genuinely broad.
 8. Gather enough repo context to choose archive inputs and write a strong oracle prompt. Bias toward context-rich submissions when they fit within the provider archive ceiling: 250 MB for ChatGPT, 200 MiB for Grok.
@@ -31,7 +31,7 @@ Oracle provider/model (`oracle_submit`):
 
 Rules:
 - Use `oracle_preflight` before any expensive `/oracle-followup` preparation so missing persisted-session or local auth/config blockers fail fast.
-- If the immediately preceding oracle run for this follow-up failed because ChatGPT/Grok login is required, the worker said to rerun `/oracle-auth`, or stale auth clearly blocked execution, call `oracle_auth` once and then retry the follow-up submission once. For Grok, pass `provider: "grok"` to `oracle_auth`. Do not loop auth refreshes.
+- If the immediately preceding oracle run for this follow-up failed because ChatGPT/Grok login is required, the worker said to rerun `/oracle-auth`, or stale auth clearly blocked execution, stop and tell the user to run `/oracle-auth` (or `/oracle-auth grok` for Grok). Do not call `oracle_auth` automatically from `/oracle-followup`.
 - This prompt exists so normal users can continue the same provider thread without manually constructing `followUpJobId` tool calls.
 - Always include an archive. Do not submit without context files.
 - By default, prefer context-rich archives up to the provider ceiling because more relevant context is usually better than less. The ceiling is 250 MB for ChatGPT and 200 MiB for Grok. For broad or unclear follow-up requests, include the whole repository by passing `.`. Default archive exclusions apply automatically, including common bulky outputs and obvious credentials/private data like `.env` files, key material, credential dotfiles, local database files, and nested `secrets/` directories anywhere in the repo.

package/prompts/oracle.md

@@ -5,20 +5,28 @@ You are preparing an /oracle job.
 
 Do not answer the user's request directly yet.
 
+Hard requirements:
+- Do not plan instead of submitting. The point of `/oracle` is dispatch.
+- Do not claim preflight, auth, archive prep, or submission happened unless the matching tool call actually happened in this turn.
+- If the user explicitly says ChatGPT Instant or Instant, use provider `chatgpt` and preset `instant`; never switch that request to Grok.
+- If a required tool call is unavailable or fails, stop and report that exact blocker instead of fabricating progress.
+- After a successful or queued `oracle_submit`, your final answer must be only a terse dispatch summary with the job id and response path. Do not ask questions, offer to watch/poll/read, list next steps, or continue working.
+
 Required workflow:
-1. Call `oracle_preflight` immediately. If the user says to use Grok, pass `provider: "grok"` to `oracle_preflight`.
-2. If `oracle_preflight` reports `ready: false`, stop before any expensive prep. Do not read files, search the codebase, or prepare archive inputs first. If the blocker is an auth seed or stale-auth issue that `oracle_auth` can repair, call `oracle_auth` once with the same provider, rerun `oracle_preflight` with the same provider, and continue only if it becomes `ready: true`. Otherwise stop immediately and report the blocking issue plus the suggested next step.
+1. Call `oracle_preflight` immediately. If the user says to use Grok, pass `provider: "grok"` to `oracle_preflight`. If the user says to use ChatGPT, pass `provider: "chatgpt"`. If the user says to use ChatGPT Instant, pass `provider: "chatgpt"` and later call `oracle_submit` with `preset: "instant"`.
+2. If `oracle_preflight` reports `ready: false`, stop before any expensive prep. Do not read files, search the codebase, prepare archive inputs, or call `oracle_auth` automatically. Report the blocking issue plus the suggested next step.
 3. Understand the request and decide whether it is explicitly narrow or genuinely broad.
 4. Gather enough repo context to choose archive inputs and write a strong oracle prompt. Bias toward context-rich submissions when they fit within the provider archive ceiling: 250 MB for ChatGPT, 200 MiB for Grok.
 5. If the user scope is explicit and narrow, start from the directly relevant area but still include nearby files, tests, docs, configs, and adjacent modules when they may improve answer quality. Keep the archive tightly minimal only when the user explicitly asks for that, privacy/sensitivity requires it, or size pressure forces it.
 6. If the request is broad, architectural, release-oriented, or otherwise repo-wide, gather broader context and usually archive `.`.
 7. Choose archive inputs for the oracle job.
 8. Craft a concise but complete oracle prompt for the selected web provider.
-9. Call `oracle_submit` with the prompt and exact archive inputs.
-10. Stop immediately after dispatching the oracle job.
+9. Call `oracle_submit` with the prompt and exact archive inputs. Do not ask for confirmation before this submit step unless `oracle_preflight` or `oracle_submit` returns a blocker that requires user action.
+10. Stop immediately after dispatching the oracle job. “Stop” means no follow-up questions, no offers to poll/watch/read, and no extra next-step list.
 
 Oracle provider/model (`oracle_submit`):
 - If the user says to use Grok (for example “Use the oracle to Grok about ...”), pass **`provider: "grok"`**. Grok currently supports only **`mode: "heavy"`**; omit `mode` unless the user explicitly says Heavy.
+- If the user says ChatGPT, pass **`provider: "chatgpt"`**. Never route a ChatGPT request to Grok.
 - Otherwise omit **`provider`** to use the configured default provider, or pass **`provider: "chatgpt"`** only when needed for clarity.
 - To choose a specific ChatGPT model, pass **`preset`** with one of the allowed ids from the canonical preset registry.
 - Matching human-readable preset labels and common hyphen/space variants are also accepted and normalized automatically, but prefer canonical ids when readily available.
@@ -28,7 +36,7 @@ Oracle provider/model (`oracle_submit`):
 
 Rules:
 - Use `oracle_preflight` before any expensive `/oracle` preparation so missing persisted-session or local auth/config blockers fail fast.
-- If the immediately preceding oracle run for this request failed because ChatGPT/Grok login is required, the worker said to rerun `/oracle-auth`, or stale auth clearly blocked execution, call `oracle_auth` once and then retry the oracle submission once. For Grok, pass `provider: "grok"` to `oracle_auth`. Do not loop auth refreshes.
+- If ChatGPT/Grok login is required, the worker said to rerun `/oracle-auth`, or stale auth clearly blocked execution, stop and tell the user to run `/oracle-auth` (or `/oracle-auth grok` for Grok). Do not call `oracle_auth` automatically from `/oracle`.
 - Always include an archive. Do not submit without context files.
 - By default, prefer context-rich archives up to the provider ceiling because more relevant context is usually better than less. The ceiling is 250 MB for ChatGPT and 200 MiB for Grok. For broad or unclear requests, include the whole repository by passing `.`. Default archive exclusions apply automatically, including common bulky outputs and obvious credentials/private data like `.env` files, key material, credential dotfiles, local database files, and nested `secrets/` directories anywhere in the repo.
 - Only limit file selection if the user explicitly requests a tight archive, if privacy/sensitivity requires it, or if the archive would otherwise exceed the size limit after exclusions/pruning.

package/scripts/oracle-real-smoke.mjs

@@ -397,7 +397,9 @@ async function run(mode = "packed") {
     const agent1 = join(runDir, "agent1");
     const sessions1 = join(runDir, "sessions1");
     const jobs1 = join(runDir, "jobs1");
-    mkdirSync(join(agent1, "extensions", "oracle-auth-seed-profile"), { recursive: true });
+    const authSeed1 = join(agent1, "extensions", "oracle-auth-seed-profile");
+    mkdirSync(authSeed1, { recursive: true });
+    writeFileSync(join(authSeed1, ".oracle-seed-generation"), "real-smoke-fake-worker\n");
     mkdirSync(sessions1, { recursive: true });
     mkdirSync(jobs1, { recursive: true });
 
@@ -444,7 +446,9 @@ async function run(mode = "packed") {
       const sessions2 = join(runDir, "sessions2");
       const jobs2 = join(runDir, "jobs2");
       const outside = join(tmpRoot, "outside");
-      mkdirSync(join(agent2, "extensions", "oracle-auth-seed-profile"), { recursive: true });
+      const authSeed2 = join(agent2, "extensions", "oracle-auth-seed-profile");
+      mkdirSync(authSeed2, { recursive: true });
+      writeFileSync(join(authSeed2, ".oracle-seed-generation"), "real-smoke-fake-worker\n");
       mkdirSync(sessions2, { recursive: true });
       mkdirSync(jobs2, { recursive: true });
       mkdirSync(outside, { recursive: true });