pi-oracle 0.1.8 → 0.1.9

package/extensions/oracle/lib/runtime.ts

@@ -7,6 +7,9 @@ import type { OracleConfig } from "./config.js";
 import { createLease, listLeaseMetadata, readLeaseMetadata, releaseLease, withAuthLock } from "./locks.js";
 
 const SEED_GENERATION_FILE = ".oracle-seed-generation";
+const AGENT_BROWSER_BIN = [process.env.AGENT_BROWSER_PATH, "/opt/homebrew/bin/agent-browser", "/usr/local/bin/agent-browser"].find(
+  (candidate) => typeof candidate === "string" && candidate && existsSync(candidate),
+) || "agent-browser";
 
 export interface OracleRuntimeLeaseMetadata {
   jobId: string;
@@ -181,7 +184,7 @@ export interface OracleCleanupReport {
 
 async function closeRuntimeBrowserSession(runtimeSessionName: string): Promise<string | undefined> {
   return new Promise<string | undefined>((resolve) => {
-    const child = spawn("agent-browser", ["--session", runtimeSessionName, "close"], { stdio: "ignore" });
+    const child = spawn(AGENT_BROWSER_BIN, ["--session", runtimeSessionName, "close"], { stdio: "ignore" });
     let settled = false;
     let timeout: NodeJS.Timeout | undefined;
     let timedOut = false;

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

@@ -36,6 +36,9 @@ const REAL_CHROME_USER_DATA_DIR = resolve(homedir(), "Library", "Application Sup
 const ORACLE_STATE_DIR = "/tmp/pi-oracle-state";
 const LOCKS_DIR = join(ORACLE_STATE_DIR, "locks");
 const STALE_STAGING_PROFILE_MAX_AGE_MS = 24 * 60 * 60 * 1000;
+const AGENT_BROWSER_BIN = [process.env.AGENT_BROWSER_PATH, "/opt/homebrew/bin/agent-browser", "/usr/local/bin/agent-browser"].find(
+  (candidate) => typeof candidate === "string" && candidate && existsSync(candidate),
+) || "agent-browser";
 
 let runtimeProfileDir = config.browser.authSeedProfileDir;
 
@@ -165,7 +168,7 @@ function targetBrowserBaseArgs(options = {}) {
 
 async function closeTargetBrowser() {
   await log(`Closing target browser session ${authSessionName()} if present`);
-  const result = await spawnCommand("agent-browser", [...targetBrowserBaseArgs(), "close"], { allowFailure: true });
+  const result = await spawnCommand(AGENT_BROWSER_BIN, [...targetBrowserBaseArgs(), "close"], { allowFailure: true });
   await log(`close result: code=${result.code} stdout=${JSON.stringify(result.stdout)} stderr=${JSON.stringify(result.stderr)}`);
 }
 
@@ -182,7 +185,7 @@ async function ensureNotSymlink(path, label) {
 }
 
 async function isAuthBrowserConnected() {
-  const result = await spawnCommand("agent-browser", [...targetBrowserBaseArgs(), "--json", "stream", "status"], { allowFailure: true });
+  const result = await spawnCommand(AGENT_BROWSER_BIN, [...targetBrowserBaseArgs(), "--json", "stream", "status"], { allowFailure: true });
   try {
     const parsed = JSON.parse(result.stdout || "{}");
     return parsed?.data?.connected === true;
@@ -274,7 +277,7 @@ async function launchTargetBrowser() {
   await closeTargetBrowser();
   const args = [...targetBrowserBaseArgs({ withLaunchOptions: true, mode: "headed" }), "open", "about:blank"];
   await log(`Launching isolated browser: agent-browser ${JSON.stringify(args)}`);
-  const result = await spawnCommand("agent-browser", args, { allowFailure: true });
+  const result = await spawnCommand(AGENT_BROWSER_BIN, args, { allowFailure: true });
   await log(`launch result: code=${result.code} stdout=${JSON.stringify(result.stdout)} stderr=${JSON.stringify(result.stderr)}`);
   if (result.code !== 0) {
     throw new Error(result.stderr || result.stdout || "Failed to launch isolated oracle browser");
@@ -282,7 +285,7 @@ async function launchTargetBrowser() {
 }
 
 async function streamStatus() {
-  const result = await spawnCommand("agent-browser", [...targetBrowserBaseArgs(), "--json", "stream", "status"], { allowFailure: true });
+  const result = await spawnCommand(AGENT_BROWSER_BIN, [...targetBrowserBaseArgs(), "--json", "stream", "status"], { allowFailure: true });
   await log(`stream status: code=${result.code} stdout=${JSON.stringify(result.stdout)} stderr=${JSON.stringify(result.stderr)}`);
   try {
     const parsed = JSON.parse(result.stdout || "{}");
@@ -311,7 +314,7 @@ async function targetCommand(...args) {
     options = args.pop();
   }
   await ensureBrowserConnected();
-  const result = await spawnCommand("agent-browser", [...targetBrowserBaseArgs(), ...args], options);
+  const result = await spawnCommand(AGENT_BROWSER_BIN, [...targetBrowserBaseArgs(), ...args], options);
   const label = options?.logLabel || `agent-browser ${args.join(" ")}`;
   await log(`${label}: code=${result.code} stdout=${JSON.stringify(result.stdout)} stderr=${JSON.stringify(result.stderr)}`);
   return result;

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

@@ -37,6 +37,9 @@ const ARTIFACT_DOWNLOAD_HEARTBEAT_MS = 10_000;
 const ARTIFACT_DOWNLOAD_TIMEOUT_MS = 90_000;
 const ARTIFACT_DOWNLOAD_MAX_ATTEMPTS = 2;
 const AGENT_BROWSER_CLOSE_TIMEOUT_MS = 10_000;
+const AGENT_BROWSER_BIN = [process.env.AGENT_BROWSER_PATH, "/opt/homebrew/bin/agent-browser", "/usr/local/bin/agent-browser"].find(
+  (candidate) => typeof candidate === "string" && candidate && existsSync(candidate),
+) || "agent-browser";
 
 let currentJob;
 let browserStarted = false;
@@ -321,7 +324,7 @@ async function closeBrowser(job) {
   if (cleaningUpBrowser) return;
   cleaningUpBrowser = true;
   try {
-    const result = await spawnCommand("agent-browser", [...browserBaseArgs(job), "close"], {
+    const result = await spawnCommand(AGENT_BROWSER_BIN, [...browserBaseArgs(job), "close"], {
       allowFailure: true,
       timeoutMs: AGENT_BROWSER_CLOSE_TIMEOUT_MS,
     });
@@ -337,12 +340,12 @@ async function closeBrowser(job) {
 async function launchBrowser(job, url) {
   await closeBrowser(job);
   const mode = job.config.browser.runMode;
-  await spawnCommand("agent-browser", [...browserBaseArgs(job, { withLaunchOptions: true, mode }), "open", url]);
+  await spawnCommand(AGENT_BROWSER_BIN, [...browserBaseArgs(job, { withLaunchOptions: true, mode }), "open", url]);
   browserStarted = true;
 }
 
 async function streamStatus(job) {
-  const { stdout } = await spawnCommand("agent-browser", [...browserBaseArgs(job), "--json", "stream", "status"], { allowFailure: true });
+  const { stdout } = await spawnCommand(AGENT_BROWSER_BIN, [...browserBaseArgs(job), "--json", "stream", "status"], { allowFailure: true });
   try {
     const parsed = JSON.parse(stdout || "{}");
     return parsed?.data || {};
@@ -374,7 +377,7 @@ async function agentBrowser(job, ...args) {
     options = args.pop();
   }
   await ensureBrowserConnected(job);
-  return spawnCommand("agent-browser", [...browserBaseArgs(job), ...args], options);
+  return spawnCommand(AGENT_BROWSER_BIN, [...browserBaseArgs(job), ...args], options);
 }
 
 function parseEvalResult(stdout) {
@@ -829,6 +832,17 @@ function detectUploadErrorText(text) {
   return patterns.find((pattern) => text.toLowerCase().includes(pattern.toLowerCase()));
 }
 
+function detectResponseFailureText(text) {
+  const patterns = [
+    "Message delivery timed out",
+    "A network error occurred",
+    "An error occurred while connecting to the websocket",
+    "There was an error generating a response",
+    "Something went wrong while generating the response",
+  ];
+  return patterns.find((pattern) => text.toLowerCase().includes(pattern.toLowerCase()));
+}
+
 function composerSnapshotSlice(snapshot) {
   const lines = snapshot.split("\n");
   let composerIndex = -1;
@@ -1120,17 +1134,39 @@ async function waitForChatCompletion(job, baselineAssistantCount) {
   const timeoutAt = Date.now() + job.config.worker.completionTimeoutMs;
   let lastText = "";
   let stableCount = 0;
+  let retriedAfterFailure = false;
 
   while (Date.now() < timeoutAt) {
     await heartbeat();
-    const snapshot = await snapshotText(job);
+    const [snapshot, body] = await Promise.all([snapshotText(job), pageText(job).catch(() => "")]);
     const hasStopStreaming = snapshot.includes("Stop streaming");
+    const hasRetryButton = snapshot.includes('button "Retry"');
     const copyResponseCount = (snapshot.match(/Copy response/g) || []).length;
+    const responseFailureText = detectResponseFailureText(`${snapshot}\n${body}`);
     const messages = await assistantMessages(job);
     const targetMessage = messages[baselineAssistantCount];
     const targetText = targetMessage?.text || "";
     const hasTargetCopyResponse = copyResponseCount > baselineAssistantCount;
 
+    if (!hasStopStreaming && hasRetryButton && responseFailureText) {
+      if (!retriedAfterFailure) {
+        const retryEntry = findEntry(
+          snapshot,
+          (candidate) => candidate.kind === "button" && candidate.label === "Retry" && !candidate.disabled,
+        );
+        if (retryEntry) {
+          retriedAfterFailure = true;
+          lastText = "";
+          stableCount = 0;
+          await log(`Response delivery failed (${responseFailureText}); clicking Retry once`);
+          await clickRef(job, retryEntry.ref);
+          await agentBrowser(job, "wait", "1000").catch(() => undefined);
+          continue;
+        }
+      }
+      throw new Error(`ChatGPT response failed: ${responseFailureText}`);
+    }
+
     if (!hasStopStreaming && hasTargetCopyResponse && targetText) {
       if (targetText === lastText) stableCount += 1;
       else stableCount = 1;

package/package.json

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