@steipete/oracle 0.9.0 → 0.10.0

package/dist/src/browser/actions/attachments.js

@@ -1,14 +1,14 @@
-import path from 'node:path';
-import { CONVERSATION_TURN_SELECTOR, INPUT_SELECTORS, SEND_BUTTON_SELECTORS, UPLOAD_STATUS_SELECTORS } from '../constants.js';
-import { delay } from '../utils.js';
-import { logDomFailure } from '../domDebug.js';
-import { transferAttachmentViaDataTransfer } from './attachmentDataTransfer.js';
+import path from "node:path";
+import { CONVERSATION_TURN_SELECTOR, INPUT_SELECTORS, SEND_BUTTON_SELECTORS, UPLOAD_STATUS_SELECTORS, } from "../constants.js";
+import { delay } from "../utils.js";
+import { logDomFailure } from "../domDebug.js";
+import { transferAttachmentViaDataTransfer } from "./attachmentDataTransfer.js";
 export async function uploadAttachmentFile(deps, attachment, logger, options) {
     const { runtime, dom, input } = deps;
     if (!dom) {
-        throw new Error('DOM domain unavailable while uploading attachments.');
+        throw new Error("DOM domain unavailable while uploading attachments.");
     }
-    const expectedCount = typeof options?.expectedCount === 'number' && Number.isFinite(options.expectedCount)
+    const expectedCount = typeof options?.expectedCount === "number" && Number.isFinite(options.expectedCount)
         ? Math.max(0, Math.floor(options.expectedCount))
         : 0;
     const readAttachmentSignals = async (name) => {
@@ -266,17 +266,17 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
         return {
             ui: Boolean(value?.ui),
             input: Boolean(value?.input),
-            inputCount: typeof value?.inputCount === 'number' ? value?.inputCount : 0,
-            chipCount: typeof value?.chipCount === 'number' ? value?.chipCount : 0,
-            chipSignature: typeof value?.chipSignature === 'string' ? value?.chipSignature : '',
+            inputCount: typeof value?.inputCount === "number" ? value?.inputCount : 0,
+            chipCount: typeof value?.chipCount === "number" ? value?.chipCount : 0,
+            chipSignature: typeof value?.chipSignature === "string" ? value?.chipSignature : "",
             uploading: Boolean(value?.uploading),
-            fileCount: typeof value?.fileCount === 'number' ? value?.fileCount : 0,
+            fileCount: typeof value?.fileCount === "number" ? value?.fileCount : 0,
         };
     };
     // New ChatGPT UI hides the real file input behind a composer "+" menu; click it pre-emptively.
     // Learned: synthetic `.click()` is sometimes ignored (isTrusted checks). Prefer a CDP mouse click when possible.
     const clickPlusTrusted = async () => {
-        if (!input || typeof input.dispatchMouseEvent !== 'function')
+        if (!input || typeof input.dispatchMouseEvent !== "function")
             return false;
         const locate = await runtime
             .evaluate({
@@ -304,13 +304,13 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
         })
             .then((res) => res?.result?.value)
             .catch(() => undefined);
-        if (!locate?.ok || typeof locate.x !== 'number' || typeof locate.y !== 'number')
+        if (!locate?.ok || typeof locate.x !== "number" || typeof locate.y !== "number")
             return false;
         const x = locate.x;
         const y = locate.y;
-        await input.dispatchMouseEvent({ type: 'mouseMoved', x, y });
-        await input.dispatchMouseEvent({ type: 'mousePressed', x, y, button: 'left', clickCount: 1 });
-        await input.dispatchMouseEvent({ type: 'mouseReleased', x, y, button: 'left', clickCount: 1 });
+        await input.dispatchMouseEvent({ type: "mouseMoved", x, y });
+        await input.dispatchMouseEvent({ type: "mousePressed", x, y, button: "left", clickCount: 1 });
+        await input.dispatchMouseEvent({ type: "mouseReleased", x, y, button: "left", clickCount: 1 });
         return true;
     };
     const clickedTrusted = await clickPlusTrusted().catch(() => false);
@@ -338,13 +338,13 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
         })).catch(() => undefined);
     }
     await delay(350);
-    const normalizeForMatch = (value) => String(value || '')
+    const normalizeForMatch = (value) => String(value || "")
         .toLowerCase()
-        .replace(/\s+/g, ' ')
+        .replace(/\s+/g, " ")
         .trim();
     const expectedName = path.basename(attachment.path);
     const expectedNameLower = normalizeForMatch(expectedName);
-    const expectedNameNoExt = expectedNameLower.replace(/\.[a-z0-9]{1,10}$/i, '');
+    const expectedNameNoExt = expectedNameLower.replace(/\.[a-z0-9]{1,10}$/i, "");
     const matchesExpectedName = (value) => {
         const normalized = normalizeForMatch(value);
         if (!normalized)
@@ -367,16 +367,17 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
     const isExpectedSatisfied = (signals) => {
         if (expectedCount <= 0)
             return false;
-        const fileCount = typeof signals.fileCount === 'number' ? signals.fileCount : 0;
-        const chipCount = typeof signals.chipCount === 'number' ? signals.chipCount : 0;
+        const fileCount = typeof signals.fileCount === "number" ? signals.fileCount : 0;
+        const chipCount = typeof signals.chipCount === "number" ? signals.chipCount : 0;
         if (fileCount >= expectedCount)
             return true;
         return Boolean(signals.ui && chipCount >= expectedCount);
     };
     const initialInputSatisfied = expectedCount > 0 ? initialSignals.inputCount >= expectedCount : Boolean(initialSignals.input);
-    if (expectedCount > 0 && (initialSignals.fileCount >= expectedCount || initialSignals.inputCount >= expectedCount)) {
+    if (expectedCount > 0 &&
+        (initialSignals.fileCount >= expectedCount || initialSignals.inputCount >= expectedCount)) {
         const satisfiedCount = Math.max(initialSignals.fileCount, initialSignals.inputCount);
-        logger(`Attachment already present: composer shows ${satisfiedCount} file${satisfiedCount === 1 ? '' : 's'}`);
+        logger(`Attachment already present: composer shows ${satisfiedCount} file${satisfiedCount === 1 ? "" : "s"}`);
         return true;
     }
     if (initialInputSatisfied || initialSignals.input) {
@@ -611,33 +612,38 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
     });
     const candidateValue = candidateSetup?.result?.value;
     const candidateOrder = Array.isArray(candidateValue?.order) ? candidateValue.order : [];
-    const baselineChipCount = typeof candidateValue?.baselineChipCount === 'number' ? candidateValue.baselineChipCount : 0;
-    const baselineChips = Array.isArray(candidateValue?.baselineChips) ? candidateValue.baselineChips : [];
+    const baselineChipCount = typeof candidateValue?.baselineChipCount === "number" ? candidateValue.baselineChipCount : 0;
+    const baselineChips = Array.isArray(candidateValue?.baselineChips)
+        ? candidateValue.baselineChips
+        : [];
     const baselineUploading = Boolean(candidateValue?.baselineUploading);
-    const baselineFileCount = typeof candidateValue?.baselineFileCount === 'number' ? candidateValue.baselineFileCount : 0;
-    const baselineInputCount = typeof candidateValue?.baselineInputCount === 'number' ? candidateValue.baselineInputCount : 0;
+    const baselineFileCount = typeof candidateValue?.baselineFileCount === "number" ? candidateValue.baselineFileCount : 0;
+    const baselineInputCount = typeof candidateValue?.baselineInputCount === "number" ? candidateValue.baselineInputCount : 0;
     const serializeChips = (chips) => chips
         .map((chip) => [chip.text, chip.aria, chip.title, chip.testid]
-        .map((value) => String(value || '').toLowerCase().replace(/\s+/g, ' ').trim())
-        .join('|'))
-        .join('||');
+        .map((value) => String(value || "")
+        .toLowerCase()
+        .replace(/\s+/g, " ")
+        .trim())
+        .join("|"))
+        .join("||");
     const baselineChipSignature = serializeChips(baselineChips);
     if (!candidateValue?.ok || candidateOrder.length === 0) {
-        await logDomFailure(runtime, logger, 'file-input-missing');
-        throw new Error('Unable to locate ChatGPT file attachment input.');
+        await logDomFailure(runtime, logger, "file-input-missing");
+        throw new Error("Unable to locate ChatGPT file attachment input.");
     }
     const hasChipDelta = (signals) => {
-        const chipCount = typeof signals.chipCount === 'number' ? signals.chipCount : 0;
-        const chipSignature = typeof signals.chipSignature === 'string' ? signals.chipSignature : '';
+        const chipCount = typeof signals.chipCount === "number" ? signals.chipCount : 0;
+        const chipSignature = typeof signals.chipSignature === "string" ? signals.chipSignature : "";
         if (chipCount > baselineChipCount)
             return true;
         if (baselineChipSignature && chipSignature && chipSignature !== baselineChipSignature)
             return true;
         return false;
     };
-    const hasInputDelta = (signals) => (typeof signals.inputCount === 'number' ? signals.inputCount : 0) > baselineInputCount;
+    const hasInputDelta = (signals) => (typeof signals.inputCount === "number" ? signals.inputCount : 0) > baselineInputCount;
     const hasUploadDelta = (signals) => Boolean(signals.uploading && !baselineUploading);
-    const hasFileCountDelta = (signals) => (typeof signals.fileCount === 'number' ? signals.fileCount : 0) > baselineFileCount;
+    const hasFileCountDelta = (signals) => (typeof signals.fileCount === "number" ? signals.fileCount : 0) > baselineFileCount;
     const waitForAttachmentUiSignal = async (timeoutMs) => {
         const deadline = Date.now() + timeoutMs;
         let sawInputSignal = false;
@@ -652,7 +658,14 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
             if (inputDelta) {
                 sawInputSignal = true;
             }
-            latest = { signals, chipDelta, inputDelta: sawInputSignal, uploadDelta, fileCountDelta, expectedSatisfied };
+            latest = {
+                signals,
+                chipDelta,
+                inputDelta: sawInputSignal,
+                uploadDelta,
+                fileCountDelta,
+                expectedSatisfied,
+            };
             if (signals.ui || chipDelta || uploadDelta || fileCountDelta || expectedSatisfied) {
                 return latest;
             }
@@ -673,9 +686,9 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
   })()`;
     const parseInputSnapshot = (value) => {
         const snapshot = value;
-        const names = Array.isArray(snapshot?.names) ? snapshot?.names ?? [] : [];
-        const valueText = typeof snapshot?.value === 'string' ? snapshot.value : '';
-        const count = typeof snapshot?.count === 'number' ? snapshot.count : names.length;
+        const names = Array.isArray(snapshot?.names) ? (snapshot?.names ?? []) : [];
+        const valueText = typeof snapshot?.value === "string" ? snapshot.value : "";
+        const count = typeof snapshot?.count === "number" ? snapshot.count : names.length;
         return {
             names,
             value: valueText,
@@ -804,7 +817,7 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
   })()`;
     let confirmedAttachment = false;
     let lastInputNames = [];
-    let lastInputValue = '';
+    let lastInputValue = "";
     let finalSnapshot = null;
     const resolveInputNameCandidates = () => {
         const snapshot = finalSnapshot;
@@ -851,7 +864,7 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
                         chipCount: Number(snapshot.chipCount ?? 0),
                         chips: Array.isArray(snapshot.chips) ? snapshot.chips : [],
                         inputNames: Array.isArray(snapshot.inputNames) ? snapshot.inputNames : [],
-                        composerText: typeof snapshot.composerText === 'string' ? snapshot.composerText : '',
+                        composerText: typeof snapshot.composerText === "string" ? snapshot.composerText : "",
                         uploading: Boolean(snapshot.uploading),
                     };
                 }
@@ -871,15 +884,20 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
                     Boolean(signalResult?.inputDelta) ||
                     inputHasFile;
                 const uiDirect = Boolean(signalResult?.signals?.ui) || expectedSatisfied;
-                const uiDelta = Boolean(signalResult?.chipDelta) || Boolean(signalResult?.uploadDelta) || Boolean(signalResult?.fileCountDelta);
+                const uiDelta = Boolean(signalResult?.chipDelta) ||
+                    Boolean(signalResult?.uploadDelta) ||
+                    Boolean(signalResult?.fileCountDelta);
                 if (uiDirect || (uiDelta && inputEvidence)) {
-                    return { status: 'ui' };
+                    return { status: "ui" };
                 }
                 const postSignals = await readAttachmentSignals(expectedName);
                 if (postSignals.ui ||
                     isExpectedSatisfied(postSignals) ||
-                    ((hasChipDelta(postSignals) || hasUploadDelta(postSignals) || hasFileCountDelta(postSignals)) && inputEvidence)) {
-                    return { status: 'ui' };
+                    ((hasChipDelta(postSignals) ||
+                        hasUploadDelta(postSignals) ||
+                        hasFileCountDelta(postSignals)) &&
+                        inputEvidence)) {
+                    return { status: "ui" };
                 }
                 const inputSignal = immediateInputMatch ||
                     postInputSignals.touched ||
@@ -889,15 +907,15 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
                     postSignals.input ||
                     hasInputDelta(postSignals);
                 if (inputSignal) {
-                    return { status: 'input' };
+                    return { status: "input" };
                 }
-                return { status: 'none' };
+                return { status: "none" };
             };
             const runInputAttempt = async (mode) => {
                 let immediateInputSnapshot = await readInputSnapshot(idx);
                 let hasExpectedFile = snapshotMatchesExpected(immediateInputSnapshot);
                 if (!hasExpectedFile) {
-                    if (mode === 'set') {
+                    if (mode === "set") {
                         await dom.setFileInputFiles({ nodeId: resultNode.nodeId, files: [attachment.path] });
                     }
                     else {
@@ -941,35 +959,37 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
                 })
                     .catch(() => undefined);
             };
-            let result = await runInputAttempt('set');
-            if (result.evaluation.status === 'ui') {
+            let result = await runInputAttempt("set");
+            if (result.evaluation.status === "ui") {
                 confirmedAttachment = true;
                 break;
             }
-            if (result.evaluation.status === 'input') {
+            if (result.evaluation.status === "input") {
                 await dispatchInputEvents();
                 await delay(150);
                 const forcedState = await gatherSignals(1_500);
                 const forcedEvaluation = await evaluateSignals(forcedState.signalResult, forcedState.postInputSignals, result.immediateInputMatch);
-                if (forcedEvaluation.status === 'ui') {
+                if (forcedEvaluation.status === "ui") {
                     confirmedAttachment = true;
                     break;
                 }
-                if (forcedEvaluation.status === 'input') {
-                    logger('Attachment input set; proceeding without UI confirmation.');
+                if (forcedEvaluation.status === "input") {
+                    logger("Attachment input set; proceeding without UI confirmation.");
                     inputConfirmed = true;
                     break;
                 }
-                logger('Attachment input set; retrying with data transfer to trigger ChatGPT upload.');
-                await dom.setFileInputFiles({ nodeId: resultNode.nodeId, files: [] }).catch(() => undefined);
+                logger("Attachment input set; retrying with data transfer to trigger ChatGPT upload.");
+                await dom
+                    .setFileInputFiles({ nodeId: resultNode.nodeId, files: [] })
+                    .catch(() => undefined);
                 await delay(150);
-                result = await runInputAttempt('transfer');
-                if (result.evaluation.status === 'ui') {
+                result = await runInputAttempt("transfer");
+                if (result.evaluation.status === "ui") {
                     confirmedAttachment = true;
                     break;
                 }
-                if (result.evaluation.status === 'input') {
-                    logger('Attachment input set; proceeding without UI confirmation.');
+                if (result.evaluation.status === "input") {
+                    logger("Attachment input set; proceeding without UI confirmation.");
                     inputConfirmed = true;
                     break;
                 }
@@ -984,23 +1004,25 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
                 break;
             }
             if (lateSignals.input || hasInputDelta(lateSignals)) {
-                logger('Attachment input set; proceeding without UI confirmation.');
+                logger("Attachment input set; proceeding without UI confirmation.");
                 inputConfirmed = true;
                 break;
             }
-            logger('Attachment not acknowledged after file input set; retrying with data transfer.');
-            result = await runInputAttempt('transfer');
-            if (result.evaluation.status === 'ui') {
+            logger("Attachment not acknowledged after file input set; retrying with data transfer.");
+            result = await runInputAttempt("transfer");
+            if (result.evaluation.status === "ui") {
                 confirmedAttachment = true;
                 break;
             }
-            if (result.evaluation.status === 'input') {
-                logger('Attachment input set; proceeding without UI confirmation.');
+            if (result.evaluation.status === "input") {
+                logger("Attachment input set; proceeding without UI confirmation.");
                 inputConfirmed = true;
                 break;
             }
             if (orderIndex < candidateOrder.length - 1) {
-                await dom.setFileInputFiles({ nodeId: resultNode.nodeId, files: [] }).catch(() => undefined);
+                await dom
+                    .setFileInputFiles({ nodeId: resultNode.nodeId, files: [] })
+                    .catch(() => undefined);
                 await delay(150);
             }
         }
@@ -1010,7 +1032,9 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
         const inputHasFile = inputNameCandidates.some((name) => matchesExpectedName(name)) ||
             (lastInputValue && matchesExpectedName(lastInputValue));
         await waitForAttachmentVisible(runtime, expectedName, attachmentUiTimeoutMs, logger);
-        logger(inputHasFile ? 'Attachment queued (UI anchored, file input confirmed)' : 'Attachment queued (UI anchored)');
+        logger(inputHasFile
+            ? "Attachment queued (UI anchored, file input confirmed)"
+            : "Attachment queued (UI anchored)");
         return true;
     }
     const inputNameCandidates = resolveInputNameCandidates();
@@ -1018,15 +1042,17 @@ export async function uploadAttachmentFile(deps, attachment, logger, options) {
         (lastInputValue && matchesExpectedName(lastInputValue));
     if (await waitForAttachmentAnchored(runtime, expectedName, attachmentUiTimeoutMs)) {
         await waitForAttachmentVisible(runtime, expectedName, attachmentUiTimeoutMs, logger);
-        logger(inputHasFile ? 'Attachment queued (UI anchored, file input confirmed)' : 'Attachment queued (UI anchored)');
+        logger(inputHasFile
+            ? "Attachment queued (UI anchored, file input confirmed)"
+            : "Attachment queued (UI anchored)");
         return true;
     }
     if (inputConfirmed || inputHasFile) {
-        logger('Attachment input accepted the file but UI did not acknowledge it; continuing with input confirmation only.');
+        logger("Attachment input accepted the file but UI did not acknowledge it; continuing with input confirmation only.");
         return true;
     }
-    await logDomFailure(runtime, logger, 'file-upload-missing');
-    throw new Error('Attachment did not register with the ChatGPT composer in time.');
+    await logDomFailure(runtime, logger, "file-upload-missing");
+    throw new Error("Attachment did not register with the ChatGPT composer in time.");
 }
 export async function clearComposerAttachments(Runtime, timeoutMs, logger) {
     const deadline = Date.now() + Math.max(0, timeoutMs);
@@ -1131,8 +1157,8 @@ export async function clearComposerAttachments(Runtime, timeoutMs, logger) {
         if (value?.hadAttachments) {
             sawAttachments = true;
         }
-        const chipCount = typeof value?.chipCount === 'number' ? value.chipCount : 0;
-        const inputCount = typeof value?.inputCount === 'number' ? value.inputCount : 0;
+        const chipCount = typeof value?.chipCount === "number" ? value.chipCount : 0;
+        const inputCount = typeof value?.inputCount === "number" ? value.inputCount : 0;
         lastState = { chipCount, inputCount };
         if (chipCount === 0 && inputCount === 0) {
             return;
@@ -1141,7 +1167,7 @@ export async function clearComposerAttachments(Runtime, timeoutMs, logger) {
     }
     if (sawAttachments) {
         logger?.(`Attachment cleanup timed out; still saw ${lastState?.chipCount ?? 0} chips and ${lastState?.inputCount ?? 0} inputs.`);
-        throw new Error('Existing attachments still present in composer; aborting to avoid duplicate uploads.');
+        throw new Error("Existing attachments still present in composer; aborting to avoid duplicate uploads.");
     }
 }
 export async function waitForAttachmentCompletion(Runtime, timeoutMs, expectedNames = [], logger) {
@@ -1363,13 +1389,12 @@ export async function waitForAttachmentCompletion(Runtime, timeoutMs, expectedNa
         const { result } = response;
         const value = result?.value;
         if (!value && logger?.verbose) {
-            const exception = response
-                ?.exceptionDetails;
+            const exception = response?.exceptionDetails;
             if (exception) {
                 const details = [exception.text, exception.exception?.description]
                     .filter((part) => Boolean(part))
-                    .join(' - ');
-                logger(`Attachment wait eval failed: ${details || 'unknown error'}`);
+                    .join(" - ");
+                logger(`Attachment wait eval failed: ${details || "unknown error"}`);
             }
         }
         if (value) {
@@ -1388,24 +1413,24 @@ export async function waitForAttachmentCompletion(Runtime, timeoutMs, expectedNa
                 }
             }
             const attachedNames = (value.attachedNames ?? [])
-                .map((name) => name.toLowerCase().replace(/\s+/g, ' ').trim())
+                .map((name) => name.toLowerCase().replace(/\s+/g, " ").trim())
                 .filter(Boolean);
             const inputNames = (value.inputNames ?? [])
-                .map((name) => name.toLowerCase().replace(/\s+/g, ' ').trim())
+                .map((name) => name.toLowerCase().replace(/\s+/g, " ").trim())
                 .filter(Boolean);
-            const fileCount = typeof value.fileCount === 'number' ? value.fileCount : 0;
+            const fileCount = typeof value.fileCount === "number" ? value.fileCount : 0;
             const fileCountSatisfied = expectedNormalized.length > 0 && fileCount >= expectedNormalized.length;
             const matchesExpected = (expected) => {
-                const baseName = expected.split('/').pop()?.split('\\').pop() ?? expected;
-                const normalizedExpected = baseName.toLowerCase().replace(/\s+/g, ' ').trim();
-                const expectedNoExt = normalizedExpected.replace(/\.[a-z0-9]{1,10}$/i, '');
+                const baseName = expected.split("/").pop()?.split("\\").pop() ?? expected;
+                const normalizedExpected = baseName.toLowerCase().replace(/\s+/g, " ").trim();
+                const expectedNoExt = normalizedExpected.replace(/\.[a-z0-9]{1,10}$/i, "");
                 return attachedNames.some((raw) => {
                     if (raw.includes(normalizedExpected))
                         return true;
                     if (expectedNoExt.length >= 6 && raw.includes(expectedNoExt))
                         return true;
-                    if (raw.includes('…') || raw.includes('...')) {
-                        const marker = raw.includes('…') ? '…' : '...';
+                    if (raw.includes("…") || raw.includes("...")) {
+                        const marker = raw.includes("…") ? "…" : "...";
                         const [prefixRaw, suffixRaw] = raw.split(marker);
                         const prefix = prefixRaw.trim();
                         const suffix = suffixRaw.trim();
@@ -1424,12 +1449,12 @@ export async function waitForAttachmentCompletion(Runtime, timeoutMs, expectedNa
                     attachmentMatchSince = Date.now();
                 }
                 const stable = Date.now() - attachmentMatchSince > stableThresholdMs;
-                if (stable && value.state === 'ready') {
+                if (stable && value.state === "ready") {
                     return;
                 }
                 // Don't treat disabled button as complete - wait for it to become 'ready'.
                 // The spinner detection is unreliable, so a disabled button likely means upload is in progress.
-                if (value.state === 'missing' && (value.filesAttached || fileCountSatisfied)) {
+                if (value.state === "missing" && (value.filesAttached || fileCountSatisfied)) {
                     return;
                 }
                 // If files are attached but button isn't ready yet, give it more time but don't fail immediately.
@@ -1444,13 +1469,14 @@ export async function waitForAttachmentCompletion(Runtime, timeoutMs, expectedNa
             // Fallback: if the file input has the expected names, allow progress once that condition is stable.
             // Some ChatGPT surfaces only render the filename after sending the message.
             const inputMissing = expectedNormalized.filter((expected) => {
-                const baseName = expected.split('/').pop()?.split('\\').pop() ?? expected;
-                const normalizedExpected = baseName.toLowerCase().replace(/\s+/g, ' ').trim();
-                const expectedNoExt = normalizedExpected.replace(/\.[a-z0-9]{1,10}$/i, '');
-                return !inputNames.some((raw) => raw.includes(normalizedExpected) || (expectedNoExt.length >= 6 && raw.includes(expectedNoExt)));
+                const baseName = expected.split("/").pop()?.split("\\").pop() ?? expected;
+                const normalizedExpected = baseName.toLowerCase().replace(/\s+/g, " ").trim();
+                const expectedNoExt = normalizedExpected.replace(/\.[a-z0-9]{1,10}$/i, "");
+                return !inputNames.some((raw) => raw.includes(normalizedExpected) ||
+                    (expectedNoExt.length >= 6 && raw.includes(expectedNoExt)));
             });
             // Don't include 'disabled' - a disabled button likely means upload is still in progress.
-            const inputStateOk = value.state === 'ready' || value.state === 'missing';
+            const inputStateOk = value.state === "ready" || value.state === "missing";
             const inputSeenNow = inputMissing.length === 0 || fileCountSatisfied;
             const inputEvidenceOk = Boolean(value.filesAttached) || Boolean(value.uploading) || fileCountSatisfied;
             const stableThresholdMs = value.uploading ? 3000 : 1500;
@@ -1460,7 +1486,10 @@ export async function waitForAttachmentCompletion(Runtime, timeoutMs, expectedNa
                 }
                 sawInputMatch = true;
             }
-            if (inputMatchSince !== null && inputStateOk && inputEvidenceOk && Date.now() - inputMatchSince > stableThresholdMs) {
+            if (inputMatchSince !== null &&
+                inputStateOk &&
+                inputEvidenceOk &&
+                Date.now() - inputMatchSince > stableThresholdMs) {
                 return;
             }
             if (!inputSeenNow && !sawInputMatch) {
@@ -1469,28 +1498,113 @@ export async function waitForAttachmentCompletion(Runtime, timeoutMs, expectedNa
         }
         await delay(250);
     }
-    logger?.('Attachment upload timed out while waiting for ChatGPT composer to become ready.');
-    await logDomFailure(Runtime, logger ?? (() => { }), 'file-upload-timeout');
-    throw new Error('Attachments did not finish uploading before timeout.');
+    logger?.("Attachment upload timed out while waiting for ChatGPT composer to become ready.");
+    await logDomFailure(Runtime, logger ?? (() => { }), "file-upload-timeout");
+    throw new Error("Attachments did not finish uploading before timeout.");
 }
-export async function waitForUserTurnAttachments(Runtime, expectedNames, timeoutMs, logger) {
+export async function waitForUserTurnAttachments(Runtime, expectedNames, timeoutMs, logger, options) {
     if (!expectedNames || expectedNames.length === 0) {
         return true;
     }
     const expectedNormalized = expectedNames.map((name) => name.toLowerCase());
+    const minTurnIndex = typeof options?.minTurnIndex === "number" && Number.isFinite(options.minTurnIndex)
+        ? Math.max(0, Math.floor(options.minTurnIndex))
+        : null;
+    const expectedPromptPrefix = options?.expectedPrompt
+        ? options.expectedPrompt.toLowerCase().replace(/\s+/g, " ").trim().slice(0, 80)
+        : "";
+    const expectedConversationId = typeof options?.expectedConversationId === "string" &&
+        options.expectedConversationId.trim().length > 0
+        ? options.expectedConversationId.trim()
+        : null;
+    const expression = buildUserTurnAttachmentExpression({
+        minTurnIndex,
+        expectedPromptPrefix,
+        expectedConversationId,
+    });
+    const deadline = Date.now() + timeoutMs;
+    let sawAttachmentUi = false;
+    while (Date.now() < deadline) {
+        const { result } = await Runtime.evaluate({ expression, returnByValue: true });
+        const value = result?.value;
+        if (!value?.ok) {
+            if (value?.conversationMismatch && logger?.verbose) {
+                logger("User-turn attachment verification ignored mismatched conversation.");
+            }
+            await delay(200);
+            continue;
+        }
+        if (value.hasAttachmentUi) {
+            sawAttachmentUi = true;
+        }
+        const haystack = [value.text ?? "", ...(value.attrs ?? [])].join("\n");
+        const fileCount = typeof value.fileCount === "number" ? value.fileCount : 0;
+        const attachmentUiCount = typeof value.attachmentUiCount === "number" ? value.attachmentUiCount : 0;
+        const promptMatches = expectedPromptPrefix ? value.promptMatches !== false : true;
+        const fileCountSatisfied = fileCount >= expectedNormalized.length && expectedNormalized.length > 0;
+        const attachmentUiSatisfied = attachmentUiCount >= expectedNormalized.length && expectedNormalized.length > 0;
+        const missing = expectedNormalized.filter((expected) => {
+            const baseName = expected.split("/").pop()?.split("\\").pop() ?? expected;
+            const normalizedExpected = baseName.toLowerCase().replace(/\s+/g, " ").trim();
+            const expectedNoExt = normalizedExpected.replace(/\.[a-z0-9]{1,10}$/i, "");
+            if (haystack.includes(normalizedExpected))
+                return false;
+            if (expectedNoExt.length >= 6 && haystack.includes(expectedNoExt))
+                return false;
+            return true;
+        });
+        if (promptMatches && (missing.length === 0 || fileCountSatisfied || attachmentUiSatisfied)) {
+            return true;
+        }
+        await delay(250);
+    }
+    if (!sawAttachmentUi) {
+        logger?.("Sent user message did not expose attachment UI; skipping attachment verification.");
+        return false;
+    }
+    logger?.("Sent user message did not show expected attachment names in time.");
+    await logDomFailure(Runtime, logger ?? (() => { }), "attachment-missing-user-turn");
+    throw new Error("Attachment was not present on the sent user message.");
+}
+function buildUserTurnAttachmentExpression(options) {
     const conversationSelectorLiteral = JSON.stringify(CONVERSATION_TURN_SELECTOR);
-    const expression = `(() => {
+    const minTurnLiteral = options.minTurnIndex === null ? "null" : String(options.minTurnIndex);
+    const expectedPromptLiteral = JSON.stringify(options.expectedPromptPrefix);
+    const expectedConversationLiteral = options.expectedConversationId
+        ? JSON.stringify(options.expectedConversationId)
+        : "null";
+    return `(() => {
     const CONVERSATION_SELECTOR = ${conversationSelectorLiteral};
+    const MIN_TURN_INDEX = ${minTurnLiteral};
+    const EXPECTED_PROMPT_PREFIX = ${expectedPromptLiteral};
+    const EXPECTED_CONVERSATION_ID = ${expectedConversationLiteral};
+    const currentHref = typeof location === 'object' && location.href ? location.href : '';
+    const currentConversationId = currentHref.match(/\\/c\\/([a-zA-Z0-9-]+)/)?.[1] ?? null;
+    if (
+      EXPECTED_CONVERSATION_ID &&
+      currentConversationId &&
+      currentConversationId !== EXPECTED_CONVERSATION_ID
+    ) {
+      return { ok: false, conversationMismatch: true };
+    }
     const turns = Array.from(document.querySelectorAll(CONVERSATION_SELECTOR));
-    const userTurns = turns.filter((node) => {
+    const userTurns = turns.map((node, index) => ({ node, index })).filter(({ node }) => {
       const attr = (node.getAttribute('data-message-author-role') || node.getAttribute('data-turn') || node.dataset?.turn || '').toLowerCase();
       if (attr === 'user') return true;
       return Boolean(node.querySelector('[data-message-author-role="user"]'));
     });
-    const lastUser = userTurns[userTurns.length - 1];
+    const eligibleTurns =
+      MIN_TURN_INDEX === null ? userTurns : userTurns.filter(({ index }) => index >= MIN_TURN_INDEX);
+    const lastUser = eligibleTurns[eligibleTurns.length - 1];
     if (!lastUser) return { ok: false };
-    const text = (lastUser.innerText || '').toLowerCase();
-    const attrs = Array.from(lastUser.querySelectorAll('[aria-label],[title]')).map((el) => {
+    const text = (lastUser.node.innerText || '').toLowerCase().replace(/\\s+/g, ' ').trim();
+    const textPrefix = text.slice(0, Math.min(text.length, EXPECTED_PROMPT_PREFIX.length));
+    const promptMatches =
+      !EXPECTED_PROMPT_PREFIX ||
+      (text.length > 0 &&
+        (text.includes(EXPECTED_PROMPT_PREFIX) ||
+          (textPrefix.length > 0 && EXPECTED_PROMPT_PREFIX.includes(textPrefix))));
+    const attrs = Array.from(lastUser.node.querySelectorAll('[aria-label],[title]')).map((el) => {
       const aria = el.getAttribute('aria-label') || '';
       const title = el.getAttribute('title') || '';
       return (aria + ' ' + title).trim().toLowerCase();
@@ -1504,11 +1618,11 @@ export async function waitForUserTurnAttachments(Runtime, expectedNames, timeout
       '[title*="file"]',
       '[title*="attachment"]',
     ];
-    const attachmentUiCount = lastUser.querySelectorAll(attachmentSelectors.join(',')).length;
+    const attachmentUiCount = lastUser.node.querySelectorAll(attachmentSelectors.join(',')).length;
     const hasAttachmentUi =
       attachmentUiCount > 0 || attrs.some((attr) => attr.includes('file') || attr.includes('attachment'));
     const countRegex = /(?:^|\\b)(\\d+)\\s+(?:files?|attachments?)\\b/;
-    const fileCountNodes = Array.from(lastUser.querySelectorAll('button,span,div,[aria-label],[title]'));
+    const fileCountNodes = Array.from(lastUser.node.querySelectorAll('button,span,div,[aria-label],[title]'));
     let fileCount = 0;
     for (const node of fileCountNodes) {
       if (!(node instanceof HTMLElement)) continue;
@@ -1541,47 +1655,29 @@ export async function waitForUserTurnAttachments(Runtime, expectedNames, timeout
         }
       }
     }
-    return { ok: true, text, attrs, fileCount, hasAttachmentUi, attachmentUiCount };
+    return {
+      ok: true,
+      text,
+      attrs,
+      fileCount,
+      hasAttachmentUi,
+      attachmentUiCount,
+      promptMatches,
+      turnIndex: lastUser.index,
+    };
   })()`;
-    const deadline = Date.now() + timeoutMs;
-    let sawAttachmentUi = false;
-    while (Date.now() < deadline) {
-        const { result } = await Runtime.evaluate({ expression, returnByValue: true });
-        const value = result?.value;
-        if (!value?.ok) {
-            await delay(200);
-            continue;
-        }
-        if (value.hasAttachmentUi) {
-            sawAttachmentUi = true;
-        }
-        const haystack = [value.text ?? '', ...(value.attrs ?? [])].join('\n');
-        const fileCount = typeof value.fileCount === 'number' ? value.fileCount : 0;
-        const attachmentUiCount = typeof value.attachmentUiCount === 'number' ? value.attachmentUiCount : 0;
-        const fileCountSatisfied = fileCount >= expectedNormalized.length && expectedNormalized.length > 0;
-        const attachmentUiSatisfied = attachmentUiCount >= expectedNormalized.length && expectedNormalized.length > 0;
-        const missing = expectedNormalized.filter((expected) => {
-            const baseName = expected.split('/').pop()?.split('\\').pop() ?? expected;
-            const normalizedExpected = baseName.toLowerCase().replace(/\s+/g, ' ').trim();
-            const expectedNoExt = normalizedExpected.replace(/\.[a-z0-9]{1,10}$/i, '');
-            if (haystack.includes(normalizedExpected))
-                return false;
-            if (expectedNoExt.length >= 6 && haystack.includes(expectedNoExt))
-                return false;
-            return true;
-        });
-        if (missing.length === 0 || fileCountSatisfied || attachmentUiSatisfied) {
-            return true;
-        }
-        await delay(250);
-    }
-    if (!sawAttachmentUi) {
-        logger?.('Sent user message did not expose attachment UI; skipping attachment verification.');
-        return false;
-    }
-    logger?.('Sent user message did not show expected attachment names in time.');
-    await logDomFailure(Runtime, logger ?? (() => { }), 'attachment-missing-user-turn');
-    throw new Error('Attachment was not present on the sent user message.');
+}
+export function buildUserTurnAttachmentExpressionForTest(options) {
+    return buildUserTurnAttachmentExpression({
+        minTurnIndex: typeof options?.minTurnIndex === "number" && Number.isFinite(options.minTurnIndex)
+            ? Math.max(0, Math.floor(options.minTurnIndex))
+            : null,
+        expectedPromptPrefix: options?.expectedPromptPrefix ?? "",
+        expectedConversationId: typeof options?.expectedConversationId === "string" &&
+            options.expectedConversationId.trim().length > 0
+            ? options.expectedConversationId.trim()
+            : null,
+    });
 }
 export async function waitForAttachmentVisible(Runtime, expectedName, timeoutMs, logger) {
     // Attachments can take a few seconds to render in the composer (headless/remote Chrome is slower),
@@ -1763,9 +1859,9 @@ export async function waitForAttachmentVisible(Runtime, expectedName, timeoutMs,
         }
         await delay(200);
     }
-    logger?.('Attachment not visible in composer; giving up.');
-    await logDomFailure(Runtime, logger ?? (() => { }), 'attachment-visible');
-    throw new Error('Attachment did not appear in ChatGPT composer.');
+    logger?.("Attachment not visible in composer; giving up.");
+    await logDomFailure(Runtime, logger ?? (() => { }), "attachment-visible");
+    throw new Error("Attachment did not appear in ChatGPT composer.");
 }
 async function waitForAttachmentAnchored(Runtime, expectedName, timeoutMs) {
     const deadline = Date.now() + timeoutMs;