surf-cli 2.15.2 → 2.16.1

package/native/chatgpt-client-selection.cjs

@@ -50,12 +50,16 @@ function modelCandidateMatches(item, targetModel) {
 }
 
 function effortCandidateMatches(item, targetEffort) {
-  const variants = new Set(
-    [item?.label, item?.testId]
-      .flatMap((value) => normalizedWords(value))
-      .filter((word) => CHATGPT_EFFORT_CHOICES.includes(word)),
+  const labelVariants = new Set(
+    normalizedWords(item?.label).filter((word) => CHATGPT_EFFORT_CHOICES.includes(word)),
   );
-  return variants.size === 1 && variants.has(targetEffort);
+  if (labelVariants.size > 0) {
+    return labelVariants.size === 1 && labelVariants.has(targetEffort);
+  }
+  const testIdVariants = new Set(
+    normalizedWords(item?.testId).filter((word) => CHATGPT_EFFORT_CHOICES.includes(word)),
+  );
+  return testIdVariants.size === 1 && testIdVariants.has(targetEffort);
 }
 
 function uniqueMatch(items, matches) {

package/native/chatgpt-client-ui.cjs

@@ -191,14 +191,33 @@ async function readPicker(cdp, kind, click = false) {
     `(() => {
       ${buildClickDispatcher()}
       const kind = ${JSON.stringify(kind)};
+      const effortChoices = new Set(${JSON.stringify(CHATGPT_EFFORT_CHOICES)});
+      const effortOwnerLabels = new Set([...effortChoices, 'thinking']);
+      const normalize = (value) => String(value || '').toLowerCase().replace(/[^a-z0-9]+/g, ' ').trim();
+      const labelFor = (node) => {
+        const labelledBy = String(node.getAttribute?.('aria-labelledby') || '')
+          .split(/\s+/)
+          .map((id) => document.getElementById(id)?.textContent || '')
+          .join(' ');
+        const text = (node.innerText || node.textContent || '').replace(/\s+/g, ' ').trim();
+        const aria = (node.getAttribute?.('aria-label') || '').replace(/\s+/g, ' ').trim();
+        const title = (node.getAttribute?.('title') || '').replace(/\s+/g, ' ').trim();
+        return [text, aria, labelledBy, title].filter(Boolean).join(' | ');
+      };
       let nodes = Array.from(document.querySelectorAll(${JSON.stringify(selector)})).filter((node) => {
-        const value = ((node.getAttribute?.('aria-label') || '') + ' ' + (node.textContent || '')).toLowerCase();
-        if (kind !== 'model') return value.includes('thinking') || value.includes('pro');
+        const value = normalize(labelFor(node));
+        if (kind !== 'model') {
+          const words = value.split(/\s+/).filter(Boolean);
+          const hasEffort = words.some((word) => effortOwnerLabels.has(word));
+          const looksLikeModel = node.getAttribute?.('data-testid') === 'model-switcher-dropdown-button' ||
+            value.includes('current model') || value.includes('gpt') || value.includes('instant');
+          return hasEffort && !looksLikeModel;
+        }
         return value.includes('gpt') || value.includes('thinking') || value.includes('instant');
       });
       if (kind === 'model' && nodes.length === 0) {
         nodes = Array.from(document.querySelectorAll(${JSON.stringify(selector)})).filter((node) => {
-          const value = ((node.getAttribute?.('aria-label') || '') + ' ' + (node.textContent || '')).toLowerCase();
+          const value = normalize(labelFor(node));
           return value.includes('pro');
         });
       }
@@ -208,13 +227,19 @@ async function readPicker(cdp, kind, click = false) {
         );
       }
       const items = nodes.map((node) => {
-        const text = (node.textContent || '').replace(/\\s+/g, ' ').trim();
+        const text = (node.innerText || node.textContent || '').replace(/\\s+/g, ' ').trim();
         const aria = (node.getAttribute?.('aria-label') || '').replace(/\\s+/g, ' ').trim();
+        const labelledBy = String(node.getAttribute?.('aria-labelledby') || '')
+          .split(/\\s+/)
+          .map((id) => document.getElementById(id)?.textContent || '')
+          .join(' ')
+          .replace(/\\s+/g, ' ')
+          .trim();
         const title = (node.getAttribute?.('title') || '').replace(/\\s+/g, ' ').trim();
         return {
           role: node.getAttribute?.('role') || (node.tagName === 'BUTTON' ? 'button' : null),
-          label: [text, aria, title].filter(Boolean).join(' | ').slice(0, 240),
-          displayLabel: (text || aria || title).slice(0, 80),
+          label: [text, aria, labelledBy, title].filter(Boolean).join(' | ').slice(0, 240),
+          displayLabel: (text || aria || labelledBy || title).slice(0, 80),
           testId: node.getAttribute?.('data-testid') || null,
         };
       });
@@ -370,6 +395,10 @@ async function selectEffort(cdp, desiredEffort, timeoutMs = 8000, signal) {
   throwIfAborted(signal);
   const normalizedEffort = normalizeChatGPTEffortChoice(desiredEffort);
   if (!normalizedEffort) throw verificationError("effort", desiredEffort, [], true);
+  const current = await readPicker(cdp, "effort");
+  const currentVerified = verifyChatGPTEffortSelection(current?.items, normalizedEffort);
+  if (currentVerified) return currentVerified.displayLabel || currentVerified.label;
+
   const picker = await readPicker(cdp, "effort", true);
   if (picker?.items?.length !== 1) throw verificationError("effort", desiredEffort);
   await delay(300, signal);
@@ -407,6 +436,13 @@ async function typePrompt(cdp, inputCdp, prompt, signal) {
         const node = document.querySelector(selector);
         if (!node) continue;
         dispatchClickSequence(node);
+        if ('value' in node) {
+          node.value = '';
+          node.dispatchEvent(new InputEvent('input', { bubbles: true, inputType: 'deleteContentBackward' }));
+        } else {
+          node.textContent = '';
+          node.dispatchEvent(new InputEvent('input', { bubbles: true, inputType: 'deleteContentBackward' }));
+        }
         if (typeof node.focus === 'function') node.focus();
         const doc = node.ownerDocument;
         const selection = doc?.getSelection?.();

package/native/chatgpt-client.cjs

@@ -152,10 +152,6 @@ async function dispatch(options) {
       modelVerified = await selectModel(cdp, model, 8000, signal);
       log(`Verified model: ${modelVerified}`);
     }
-    if (effort) {
-      effortVerified = await selectEffort(cdp, effort, 8000, signal);
-      log(`Verified effort: ${effortVerified}`);
-    }
     if (file) {
       if (!uploadFile) {
         throw new Error(
@@ -177,6 +173,10 @@ async function dispatch(options) {
     }
     await typePrompt(cdp, inputCdp, prompt, signal);
     log("Prompt typed");
+    if (effort) {
+      effortVerified = await selectEffort(cdp, effort, 8000, signal);
+      log(`Verified effort: ${effortVerified}`);
+    }
     const baseline = normalizeResponseSnapshot(await readChatGPTResponseSnapshot(cdp));
     if (beforeSubmit) await raceAbort(beforeSubmit, signal);
     await clickSend(cdp, inputCdp, signal);

package/native/oracle-host.cjs

@@ -71,7 +71,9 @@ function createOracleHost({ queueAiRequest, requestCallExtension, buildProviderU
       model,
       effortRequested: args.effort ?? null,
       follow: args.follow ?? null,
+      requestId: args.requestId ?? null,
     });
+    if (created.requestDeduped) return oracleJobs.getJob(created.id);
     let createdTabId = null;
 
     try {
@@ -109,6 +111,8 @@ function createOracleHost({ queueAiRequest, requestCallExtension, buildProviderU
             oracleJobs.appendTurn(parent.id, {
               prompt: args.prompt,
               dispatchedAt: dispatchedJob.dispatchedAt,
+              childJobId: created.id,
+              requestId: args.requestId ?? null,
             });
           }
         },
@@ -259,6 +263,8 @@ function createOracleHost({ queueAiRequest, requestCallExtension, buildProviderU
         oracleJobs.markTurnCaptured(captured.follow, {
           dispatchedAt: captured.dispatchedAt,
           capturedAt: captured.capturedAt,
+          childJobId: captured.id,
+          requestId: captured.requestId ?? null,
         });
       }
       if (captured.tabId) {

package/native/oracle-jobs.cjs

@@ -39,6 +39,32 @@ function promptDigest(prompt) {
   return `sha256:${crypto.createHash("sha256").update(prompt).digest("hex")}`;
 }
 
+function stableJson(value) {
+  if (Array.isArray(value)) return `[${value.map(stableJson).join(",")}]`;
+  if (value && typeof value === "object") {
+    return `{${Object.keys(value).sort().map((key) => `${JSON.stringify(key)}:${stableJson(value[key])}`).join(",")}}`;
+  }
+  return JSON.stringify(value) ?? "null";
+}
+
+function requestFingerprint({ prompt, contextManifest, model, effortRequested, follow }) {
+  return promptDigest(stableJson({
+    promptDigest: promptDigest(prompt),
+    contextManifest: contextManifest ?? {},
+    model: model ?? null,
+    effortRequested: effortRequested ?? null,
+    follow: follow ?? null,
+  }));
+}
+
+function normalizedRequestId(requestId) {
+  if (requestId === null || requestId === undefined) return null;
+  if (typeof requestId !== "string" || !requestId.trim() || requestId.trim() !== requestId || requestId.length > 256 || requestId.includes("\0")) {
+    throw codedError("invalid_request", "oracle requestId must be a non-empty trimmed string");
+  }
+  return requestId;
+}
+
 function hydrateJobMetadata(job, root = getPrivateStateRoot()) {
   const prompt = job.promptDigest ? null : readPrivateFile(path.join(jobDirectory(job.id, root), "request.md"), {
     root,
@@ -66,10 +92,27 @@ function readJobs(root = getPrivateStateRoot()) {
     .map((job) => hydrateJobMetadata(job, root));
 }
 
-function createJob({ prompt, contextManifest = {}, model = null, effortRequested = null, follow = null }) {
+function createJob({ prompt, contextManifest = {}, model = null, effortRequested = null, follow = null, requestId = null }) {
   const root = getPrivateStateRoot();
   const base = oracleRoot(root);
   ensurePrivateDir(base, root);
+  const safeRequestId = normalizedRequestId(requestId);
+  const fingerprint = safeRequestId
+    ? requestFingerprint({ prompt, contextManifest, model, effortRequested, follow })
+    : null;
+  if (safeRequestId) {
+    const existing = readJobs(root).find((job) => job.requestId === safeRequestId);
+    if (existing) {
+      if (existing.requestFingerprint !== fingerprint) {
+        throw codedError(
+          "idempotency_conflict",
+          `oracle requestId ${safeRequestId} was already used for a different request`,
+          { jobId: existing.id },
+        );
+      }
+      return { ...existing, requestDeduped: true };
+    }
+  }
   const inFlight = readJobs(root).find((job) => !TERMINAL_STATES.has(job.state));
   if (inFlight) {
     throw codedError(
@@ -108,6 +151,7 @@ function createJob({ prompt, contextManifest = {}, model = null, effortRequested
       effortRequested,
       effortVerified: null,
       promptDigest: promptDigest(prompt),
+      ...(safeRequestId ? { requestId: safeRequestId, requestFingerprint: fingerprint } : {}),
       createdAt: now.toISOString(),
       dispatchedAt: null,
       awaitingAt: null,
@@ -215,10 +259,14 @@ function updateTabId(id, tabId) {
 
 function appendTurn(id, turn) {
   const job = getJob(id);
+  const duplicate = job.turns.find((existing) => (turn.childJobId && existing.childJobId === turn.childJobId) || (turn.requestId && existing.requestId === turn.requestId));
+  if (duplicate) return job;
   const storedTurn = {
     prompt: turn.prompt,
     dispatchedAt: turn.dispatchedAt ?? null,
     capturedAt: turn.capturedAt ?? null,
+    ...(turn.childJobId ? { childJobId: turn.childJobId } : {}),
+    ...(turn.requestId ? { requestId: turn.requestId } : {}),
   };
   const root = getPrivateStateRoot();
   const directory = jobDirectory(id, root);
@@ -229,9 +277,9 @@ function appendTurn(id, turn) {
   return updated;
 }
 
-function markTurnCaptured(id, { dispatchedAt, capturedAt }) {
+function markTurnCaptured(id, { dispatchedAt, capturedAt, childJobId, requestId }) {
   const job = getJob(id);
-  const turnIndex = job.turns.findIndex((turn) => turn.dispatchedAt === dispatchedAt);
+  const turnIndex = job.turns.findIndex((turn) => (childJobId && turn.childJobId === childJobId) || (requestId && turn.requestId === requestId) || turn.dispatchedAt === dispatchedAt);
   if (turnIndex === -1) {
     throw codedError(
       "invalid_transition",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "surf-cli",
-  "version": "2.15.2",
+  "version": "2.16.1",
   "description": "CLI for AI agents to control Chrome. Zero config, agent-agnostic, battle-tested.",
   "keywords": [
     "chrome",
@@ -71,7 +71,7 @@
     "@vitest/coverage-v8": "^4.1.9",
     "@vitest/ui": "^4.1.9",
     "pi-subagents": "^0.52.0",
-    "puppeteer": "25.6.0",
+    "puppeteer": "25.8.0",
     "typebox": "^1.3.11",
     "typescript": "^7.0.2",
     "vite": "^8.1.4",

package/pi-extension/surf.ts

@@ -43,15 +43,10 @@ type ToolResult = { content: Array<{ type: "text" | "image"; text?: string; data
 type OracleJob = {
   id: string;
   state: string;
-  conversationUrl?: string | null;
-  model?: string | null;
-  modelRequested?: string | null;
-  modelVerified?: string | null;
-  effortRequested?: string | null;
-  effortVerified?: string | null;
-  promptDigest?: string | null;
+  conversationUrl: string | null;
+  follow: string | null;
   response?: string;
-  error?: { code?: string; message?: string } | null;
+  error: { code?: string; message?: string } | null;
 };
 
 type BackgroundWorkProvider = {
@@ -75,6 +70,7 @@ type OracleExternalJob = {
   id: string;
   state: string;
   conversationUrl: string | null;
+  follow?: string;
   resultText?: string;
   failure?: { code: string; message: string };
 };
@@ -97,6 +93,7 @@ type OracleExternalJobProvider = {
   status(id: string): Promise<PiExternalJobHandle>;
   result(id: string): Promise<PiExternalJobResult>;
   reattach(id: string): Promise<PiExternalJobHandle>;
+  followUp?(input: Record<string, unknown>): Promise<PiExternalJobHandle>;
 };
 
 type RegisterExternalJobProvider = (provider: OracleExternalJobProvider) => () => void;
@@ -257,11 +254,40 @@ export async function resolveExternalJobProviderRegister(
   return registerGlobalExternalJobProvider;
 }
 
+function optionalOracleString(value: unknown, field: string): string | undefined {
+  if (value === undefined || value === null) return undefined;
+  if (typeof value !== "string") throw new Error(`Surf oracle response included an invalid ${field}`);
+  return value;
+}
+
+function oracleFailure(value: unknown): OracleJob["error"] {
+  if (value === undefined || value === null) return null;
+  if (typeof value !== "object" || Array.isArray(value)) {
+    throw new Error("Surf oracle response included invalid failure details");
+  }
+  const details = value as Record<string, unknown>;
+  const code = optionalOracleString(details.code, "failure code");
+  const message = optionalOracleString(details.message, "failure message");
+  return { ...(code === undefined ? {} : { code }), ...(message === undefined ? {} : { message }) };
+}
+
 function asOracleJob(value: unknown): OracleJob {
   if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("Surf oracle response did not include job metadata");
-  const job = value as Partial<OracleJob>;
-  if (typeof job.id !== "string" || typeof job.state !== "string") throw new Error("Surf oracle response did not include job id and state");
-  return job as OracleJob;
+  const job = value as Record<string, unknown>;
+  if (typeof job.id !== "string" || !job.id || job.id.trim() !== job.id || typeof job.state !== "string") {
+    throw new Error("Surf oracle response did not include a valid job id and state");
+  }
+  const conversationUrl = optionalOracleString(job.conversationUrl, "conversation URL");
+  const follow = optionalOracleString(job.follow, "follow job id");
+  const response = optionalOracleString(job.response, "result text");
+  return {
+    id: job.id,
+    state: job.state,
+    conversationUrl: conversationUrl ?? null,
+    follow: follow ?? null,
+    error: oracleFailure(job.error),
+    ...(response === undefined ? {} : { response }),
+  };
 }
 
 function oracleExternalJob(job: OracleJob): OracleExternalJob {
@@ -273,6 +299,7 @@ function oracleExternalJob(job: OracleJob): OracleExternalJob {
     id: job.id,
     state: job.state,
     conversationUrl: job.conversationUrl ?? null,
+    ...(typeof job.follow === "string" ? { follow: job.follow } : {}),
     ...(resultText === undefined ? {} : { resultText }),
     ...(failure ? { failure } : {}),
   };
@@ -333,6 +360,7 @@ async function requestOracleJob(request: typeof requestSurf, tool: string, args:
 }
 
 function emitFailedOracleJob(error: unknown, emitTerminal: EmitOracleJob) {
+  if (error && typeof error === "object" && "code" in error && error.code === "SURF_REQUEST_ABORTED") return;
   if (!error || typeof error !== "object" || !("jobId" in error) || typeof error.jobId !== "string") return;
   emitTerminal({ id: error.jobId, state: "failed" });
 }
@@ -347,8 +375,41 @@ function oracleOption(input: Record<string, unknown>, key: "model" | "effort"):
   return typeof direct === "string" ? direct : undefined;
 }
 
+function optionalString(input: Record<string, unknown>, key: string): string | undefined {
+  const value = input[key];
+  return typeof value === "string" && value.trim() ? value : undefined;
+}
+
+function parentProviderJobId(input: Record<string, unknown>): string {
+  const id = optionalString(input, "parentProviderJobId") ?? optionalString(input, "providerJobId");
+  if (!id) throw new Error("parentProviderJobId required");
+  return id;
+}
+
+function assertFollowJob(job: OracleExternalJob, parentId: string) {
+  if (job.id === parentId) throw new Error(`Surf oracle follow-up reused parent job '${parentId}'`);
+  if (job.follow !== parentId) throw new Error(`Surf oracle follow-up job '${job.id}' is not linked to parent '${parentId}'`);
+}
+
+const ORACLE_STATUS_HARVEST_TIMEOUT_SECONDS = 5;
+
+async function requestOracleJobStatus(request: typeof requestSurf, id: string) {
+  try {
+    return await requestOracleJob(request, "oracle.result", {
+      id,
+      timeout: ORACLE_STATUS_HARVEST_TIMEOUT_SECONDS,
+    });
+  } catch (error) {
+    if (!error || typeof error !== "object") throw error;
+    if ("code" in error && error.code === "SURF_REQUEST_ABORTED") throw error;
+    if ("jobId" in error && error.jobId === id) {
+      return requestOracleJob(request, "oracle.status", { id });
+    }
+    throw error;
+  }
+}
+
 export function createOracleExternalJobProvider(
-  sessionId: string,
   jobIds: Set<string>,
   request: typeof requestSurf = requestSurf,
   rememberJob: RememberOracleJob = (jobId) => {
@@ -356,8 +417,9 @@ export function createOracleExternalJobProvider(
     return true;
   },
   emitTerminal: EmitOracleJob = () => false,
+  options: { followUp?: boolean } = {},
 ): OracleExternalJobProvider {
-  return {
+  const provider: OracleExternalJobProvider = {
     name: "surf-oracle",
     async start(input) {
       const prompt = typeof input.prompt === "string" ? input.prompt : "";
@@ -373,7 +435,9 @@ export function createOracleExternalJobProvider(
       return piExternalJobHandle(job);
     },
     async status(id) {
-      return piExternalJobHandle(await requestOracleJob(request, "oracle.status", { id }));
+      const job = await requestOracleJobStatus(request, id);
+      emitTerminal({ id: job.id, state: job.state });
+      return piExternalJobHandle(job);
     },
     result(id) {
       return requestOracleJob(request, "oracle.result", { id })
@@ -387,7 +451,7 @@ export function createOracleExternalJobProvider(
         });
     },
     reattach(id) {
-      return requestOracleJob(request, "oracle.result", { id })
+      return requestOracleJobStatus(request, id)
         .then((job) => {
           rememberJob(job.id);
           emitTerminal({ id: job.id, state: job.state });
@@ -399,6 +463,27 @@ export function createOracleExternalJobProvider(
         });
     },
   };
+  if (options.followUp) {
+    provider.followUp = async (input) => {
+      const prompt = typeof input.prompt === "string" ? input.prompt : "";
+      if (!prompt.trim()) throw new Error("prompt required");
+      const parentId = parentProviderJobId(input);
+      const model = oracleOption(input, "model");
+      const effort = oracleOption(input, "effort");
+      const requestId = optionalString(input, "requestId");
+      const job = await requestOracleJob(request, "oracle.ask", {
+        prompt,
+        follow: parentId,
+        ...(model !== undefined ? { model } : {}),
+        ...(effort !== undefined ? { effort } : {}),
+        ...(requestId !== undefined ? { requestId } : {}),
+      });
+      assertFollowJob(job, parentId);
+      rememberJob(job.id);
+      return piExternalJobHandle(job);
+    };
+  }
+  return provider;
 }
 
 export function registerOptionalBackgroundProvider(sessionId: string, jobIds: Set<string>, listJobs: () => Array<{ id: string; state: string }>, register: RegisterBackgroundWorkProvider) {
@@ -412,14 +497,21 @@ export function registerOptionalBackgroundProvider(sessionId: string, jobIds: Se
 }
 
 export function registerOptionalExternalJobProvider(
-  sessionId: string,
   jobIds: Set<string>,
   register: RegisterExternalJobProvider,
   request: typeof requestSurf = requestSurf,
   rememberJob?: RememberOracleJob,
   emitTerminal?: EmitOracleJob,
 ) {
-  return register(createOracleExternalJobProvider(sessionId, jobIds, request, rememberJob, emitTerminal));
+  const provider = createOracleExternalJobProvider(jobIds, request, rememberJob, emitTerminal, { followUp: true });
+  try {
+    return register(provider);
+  } catch (error) {
+    if (String(error instanceof Error ? error.message : error).includes("followUp")) {
+      return register(createOracleExternalJobProvider(jobIds, request, rememberJob, emitTerminal));
+    }
+    throw error;
+  }
 }
 
 export function rememberOracleJobForSession(jobIds: Set<string>, jobId: unknown, requestGeneration: number, currentGeneration: number, sessionActive: boolean): boolean {
@@ -533,7 +625,7 @@ export default function surfExtension(pi: Pi) {
       const rememberForGeneration = (jobId: string) => rememberOracleJobForSession(oracleJobIds, jobId, generation, sessionGeneration, sessionActive);
       const emitFinished = (job: Pick<OracleExternalJob, "id" | "state">) => emitOracleFinished(pi, job);
       dispose = registerOptionalBackgroundProvider(sessionId, oracleJobIds, jobs.listJobs, registerGlobalBackgroundProvider);
-      disposeExternal = registerOptionalExternalJobProvider(sessionId, oracleJobIds, registerGlobalExternalJobProvider, requestSurf, rememberForGeneration, emitFinished);
+      disposeExternal = registerOptionalExternalJobProvider(oracleJobIds, registerGlobalExternalJobProvider, requestSurf, rememberForGeneration, emitFinished);
       sessionActive = true;
       void resolveBackgroundWorkRegister().then((register) => {
         try {
@@ -552,7 +644,7 @@ export default function surfExtension(pi: Pi) {
       void resolveExternalJobProviderRegister().then((register) => {
         try {
           if (register === registerGlobalExternalJobProvider || generation !== sessionGeneration) return;
-          const nextDispose = registerOptionalExternalJobProvider(sessionId, oracleJobIds, register, requestSurf, rememberForGeneration, emitFinished);
+          const nextDispose = registerOptionalExternalJobProvider(oracleJobIds, register, requestSurf, rememberForGeneration, emitFinished);
           if (generation !== sessionGeneration) {
             nextDispose();
             return;