@youdie006/prodex 0.16.12 → 0.16.14

package/dist/browser-send-lock.js

@@ -0,0 +1,79 @@
+import { mkdir, open, readFile, rm } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+// One visible-browser send at a time per machine: the dedicated Chrome is a
+// single shared tab, and two concurrent prodex clients interleave composer
+// input and navigation, silently cross-contaminating each other's threads
+// (measured live: one client's token prompt landed inside the other client's
+// consult thread, and a 15-minute consult never actually posted).
+function lockPath() {
+    const override = process.env.PRODEX_SEND_LOCK_FILE;
+    if (override)
+        return override;
+    return path.join(os.homedir(), ".local", "share", "prodex", "browser-send.lock");
+}
+function holderIsAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+async function readHolderPid(file) {
+    try {
+        const parsed = JSON.parse(await readFile(file, "utf8"));
+        return typeof parsed.pid === "number" ? parsed.pid : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+async function tryAcquire(file) {
+    await mkdir(path.dirname(file), { recursive: true, mode: 0o700 });
+    try {
+        const handle = await open(file, "wx", 0o600);
+        await handle.writeFile(`${JSON.stringify({ pid: process.pid, started_at: new Date().toISOString() })}\n`);
+        await handle.close();
+        return true;
+    }
+    catch (error) {
+        if (error.code !== "EEXIST")
+            throw error;
+        return false;
+    }
+}
+/**
+ * Serialize visible-browser sends across processes. Waits up to waitMs for a
+ * live holder to finish (0 = fail fast); a lock whose holder process is dead
+ * is reaped immediately.
+ */
+export async function withBrowserSendLock(waitMs, onWait, fn) {
+    const file = lockPath();
+    const deadline = Date.now() + Math.max(0, waitMs);
+    let waited = false;
+    for (;;) {
+        if (await tryAcquire(file))
+            break;
+        const holder = await readHolderPid(file);
+        if (holder === undefined || !holderIsAlive(holder)) {
+            await rm(file, { force: true }).catch(() => undefined);
+            continue;
+        }
+        if (Date.now() >= deadline) {
+            throw new Error(`Another prodex browser send is in progress (pid ${holder}). Wait for it to finish, or pass --busy-wait-ms to queue behind it.`);
+        }
+        if (!waited) {
+            waited = true;
+            onWait(`another prodex send holds the browser (pid ${holder}); waiting`);
+        }
+        await new Promise((resolve) => setTimeout(resolve, 2_000));
+    }
+    try {
+        return await fn();
+    }
+    finally {
+        await rm(file, { force: true }).catch(() => undefined);
+    }
+}

package/dist/chatgpt-browser.js

@@ -933,7 +933,26 @@ async function selectModelReasoning(cdp, options) {
         throw new Error(button.reason ?? "Could not open the ChatGPT model selector");
     }
     try {
-        await verifiedClickAt(cdp, button.x, button.y, "model selector");
+        // The hover-verified click can be transiently refused right after a page
+        // transition (measured live: the just-closed create-project modal's
+        // overlay still covered the selector for a beat, and one refusal aborted
+        // the whole send). Retry briefly with FRESH coordinates; a persistent
+        // cover still fails with the refusal message.
+        const clickDeadline = Date.now() + 5_000;
+        for (;;) {
+            try {
+                await verifiedClickAt(cdp, button.x, button.y, "model selector");
+                break;
+            }
+            catch (error) {
+                if (Date.now() >= clickDeadline || !/Refusing to click/.test(error instanceof Error ? error.message : String(error)))
+                    throw error;
+                await sleep(700);
+                const fresh = await cdp.evaluate(modelButtonRectExpression());
+                if (fresh.ok && fresh.x !== undefined && fresh.y !== undefined)
+                    button = fresh;
+            }
+        }
         const opened = await waitForExpressionTrue(cdp, menuOpenExpression(), MENU_OPEN_TIMEOUT_MS);
         if (!opened)
             throw new Error("ChatGPT model menu did not open after clicking the selector");
@@ -1205,7 +1224,24 @@ export async function sendChatGptPrompt(options) {
     if (normalizedTargetUrl)
         assertChatGptTargetUrlMatches(status.url, normalizedTargetUrl);
     assertVisibleChatGptTab(status.visibilityState, status.url, normalizedTargetUrl);
-    const busyBlocker = chatGptBusyBlocker(status.generating);
+    let busyBlocker = chatGptBusyBlocker(status.generating);
+    if (busyBlocker && (options.busyWaitMs ?? 0) > 0) {
+        // Queue behind the in-flight response instead of failing: shared-tab
+        // contention (another agent or the user mid-generation) is a when, not an
+        // if. Bounded, and a mid-wait page blocker (usage limit etc.) still throws.
+        const busyDeadline = Date.now() + (options.busyWaitMs ?? 0);
+        emitProgress("waiting", "tab busy with another response; waiting");
+        while (busyBlocker && Date.now() < busyDeadline) {
+            await sleep(3_000);
+            status = await evaluateOnPage(page, statusExpression());
+            const midBlocker = detectChatGptPageBlocker(status);
+            if (midBlocker)
+                throw new ChatGptBrowserBlockerError(midBlocker);
+            busyBlocker = chatGptBusyBlocker(status.generating);
+            if (busyBlocker)
+                emitProgress("waiting", "tab busy with another response; waiting");
+        }
+    }
     if (busyBlocker) {
         throw new ChatGptBrowserBlockerError(busyBlocker);
     }

package/dist/cli-args.js

@@ -253,6 +253,7 @@ export const ASK_PRO_VALUE_FLAGS = new Set([
     "--file",
     "--port",
     "--timeout-ms",
+    "--busy-wait-ms",
     "--target-url",
     "--source-cli",
     ...ASK_PRO_SELECTION_VALUE_FLAGS

package/dist/cli-help.js

@@ -25,7 +25,7 @@ Ask / consult commands:
   prodex pro browser smoke [--source-cli /absolute/path/to/dist/cli.js] [--cwd /absolute/path/to/repo] [--port 9333] [--timeout-ms 90000]
   prodex pro browser models [--source-cli /absolute/path/to/dist/cli.js] [--port 9333] [--timeout-ms 15000]  # read-only list of model menu options
   prodex pro browser projects [--source-cli /absolute/path/to/dist/cli.js] [--port 9333] [--timeout-ms 15000]  # read-only list of sidebar project names (for --project)
-  prodex pro browser ask [--source-cli /absolute/path/to/dist/cli.js] [--cwd /absolute/path/to/repo] [--port 9333] [--timeout-ms 90000] [--target-url url --confirm-target] [--new-chat] [--stdin] [--json] [--auto-login|--no-auto-login] [--file path] [--model Pro] [--pro-mode 기본|확장] [--effort 즉시|중간|높음|"매우 높음"] [--project "name" | --project-new "name"] "prompt"  # explicit visible-browser send
+  prodex pro browser ask [--source-cli /absolute/path/to/dist/cli.js] [--cwd /absolute/path/to/repo] [--port 9333] [--timeout-ms 90000] [--busy-wait-ms 600000] [--target-url url --confirm-target] [--new-chat] [--stdin] [--json] [--auto-login|--no-auto-login] [--file path] [--model Pro] [--pro-mode 기본|확장] [--effort 즉시|중간|높음|"매우 높음"] [--project "name" | --project-new "name"] "prompt"  # explicit visible-browser send
   prodex pro latest [--source-cli /absolute/path/to/dist/cli.js] [--cwd /absolute/path/to/repo]
   prodex pro list [--source-cli /absolute/path/to/dist/cli.js] [--cwd /absolute/path/to/repo]
   prodex pro show <task-id|latest> [--source-cli /absolute/path/to/dist/cli.js] [--cwd /absolute/path/to/repo]
@@ -251,8 +251,8 @@ export function printProBrowserHelp(stdout, sourceCli) {
         : "prodex pro browser smoke [--source-cli /absolute/path/to/dist/cli.js] [--cwd /absolute/path/to/repo] [--port 9333] [--timeout-ms 90000]";
     const selectionUsage = '[--model Pro] [--pro-mode 기본|확장] [--effort 즉시|중간|높음|"매우 높음"] [--project "name" | --project-new "name"]';
     const askUsage = sourceCli
-        ? `${cli} pro browser ask${sourceCliOption} [--cwd /absolute/path/to/repo] [--port 9333] [--timeout-ms 90000] [--target-url url --confirm-target] [--new-chat] [--stdin] [--json] [--auto-login|--no-auto-login] [--file path] ${selectionUsage} "prompt"`
-        : `prodex pro browser ask [--source-cli /absolute/path/to/dist/cli.js] [--cwd /absolute/path/to/repo] [--port 9333] [--timeout-ms 90000] [--target-url url --confirm-target] [--new-chat] [--stdin] [--json] [--auto-login|--no-auto-login] [--file path] ${selectionUsage} "prompt"`;
+        ? `${cli} pro browser ask${sourceCliOption} [--cwd /absolute/path/to/repo] [--port 9333] [--timeout-ms 90000] [--busy-wait-ms 600000] [--target-url url --confirm-target] [--new-chat] [--stdin] [--json] [--auto-login|--no-auto-login] [--file path] ${selectionUsage} "prompt"`
+        : `prodex pro browser ask [--source-cli /absolute/path/to/dist/cli.js] [--cwd /absolute/path/to/repo] [--port 9333] [--timeout-ms 90000] [--busy-wait-ms 600000] [--target-url url --confirm-target] [--new-chat] [--stdin] [--json] [--auto-login|--no-auto-login] [--file path] ${selectionUsage} "prompt"`;
     const modelsUsage = sourceCli
         ? `${cli} pro browser models${sourceCliOption} [--port 9333] [--timeout-ms 15000]`
         : "prodex pro browser models [--source-cli /absolute/path/to/dist/cli.js] [--port 9333] [--timeout-ms 15000]";

package/dist/cli-pro.js

@@ -8,6 +8,7 @@ import { listRawResultsForInspection, listTasksForInspection } from "./cli-ledge
 import { formatBrowserDefaults, redactServerUrl } from "./cli-server.js";
 import { errorMessage, firstLine, formatBlockedConsultRecordedMessage, formatProLatestCommand, formatBrowserCheckCommand, formatBrowserLoginCommand, formatBrowserSmokeCommand, formatBrowserTargetAskCommand, formatInitCommand, formatSetupCommand, isMissingFileError, computeSendPacingWaitMs, isUntrustedResultError, resolveMinSendIntervalMs, sourceAwareBrowserBlocker, sourceAwareBrowserNextStep, sourceAwareResultError, sourceAwareResultMessage, sourceAwareSetupMessage } from "./cli-shared.js";
 import { getTokenExpiryStatus, loadBrowserDefaults, loadLocalConfig } from "./config.js";
+import { withBrowserSendLock } from "./browser-send-lock.js";
 import { BridgeStore, MAX_FETCHABLE_RESULT_ARTIFACT_BYTES } from "./store.js";
 export async function runChatgptCommand(rest, io) {
     const [subcommand, ...chatgptArgs] = rest;
@@ -80,12 +81,12 @@ export async function runChatgptCommand(rest, io) {
         };
         let result;
         try {
-            result = await sendChatGptPrompt({
+            result = await withBrowserSendLock(0, (detail) => io.stderr(`progress: ${detail}`), () => sendChatGptPrompt({
                 port,
                 prompt: smokePrompt,
                 timeoutMs,
                 onProgress: createBrowserSendProgressPrinter(io.stderr)
-            });
+            }));
         }
         catch (error) {
             const blocker = sourceAwareBrowserBlocker(browserSendBlockerFromError(error), sourceCli, commandOptions);
@@ -145,6 +146,7 @@ export async function runProCommand(rest, io, runCliFn) {
         const straySendFlag = [
             "--port",
             "--timeout-ms",
+            "--busy-wait-ms",
             "--target-url",
             "--confirm-target",
             "--project",
@@ -594,6 +596,7 @@ export async function runAskProCommand(rest, io) {
         ...(selectionEffort ? { effort: selectionEffort } : {})
     };
     const browserPort = hasSendMode ? resolveCdpPort(readPortFlag(parsedAskPro.optionArgs, "--port")) : undefined;
+    const busyWaitMs = readPositiveIntegerFlag(parsedAskPro.optionArgs, "--busy-wait-ms");
     // Pro extended can legitimately think for minutes, so its default timeout is
     // higher; an explicit --timeout-ms always wins.
     const defaultBrowserTimeoutMs = selectionProMode === "확장" ? 300_000 : 90_000;
@@ -653,19 +656,20 @@ export async function runAskProCommand(rest, io) {
             }
             throw new Error(formatBlockedConsultRecordedMessage(blocker.message, task.id, sourceCli, { cwd: targetCwd }));
         }
-        const sendOnce = () => sendChatGptPrompt({
+        const sendOnce = () => withBrowserSendLock(busyWaitMs ?? 0, (detail) => io.stderr(`progress: ${detail}`), () => sendChatGptPrompt({
             port: browserPort,
             prompt: bundle.text,
             targetUrl: normalizedTargetUrl,
             timeoutMs: browserTimeoutMs,
             ...(newChat ? { newChat: true } : {}),
+            ...(busyWaitMs !== undefined ? { busyWaitMs } : {}),
             project: selectionProject,
             projectNew: selectionProjectNew,
             model: selectionModel,
             proMode: selectionProMode,
             effort: selectionEffort,
             onProgress: createBrowserSendProgressPrinter(io.stderr)
-        });
+        }));
         // One-command recovery: interactive terminals (or explicit --auto-login)
         // launch the dedicated browser and retry once when no browser runs.
         // Scripts and agents keep the plain blocker unless they opt in.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youdie006/prodex",
-  "version": "0.16.12",
+  "version": "0.16.14",
   "description": "Local receipt bus for coordinating Codex execution with ChatGPT Pro/Projects consultation.",
   "author": "youdie006",
   "license": "MIT",