@youdie006/prodex 0.16.13 → 0.16.15

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/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);
@@ -580,10 +581,13 @@ export async function runAskProCommand(rest, io) {
     // from the confirmed tab).
     const selectionModel = explicitModel ?? browserDefaults?.model;
     const selectionProjectNew = explicitProjectNew;
-    // A persisted default project is suppressed under --new-chat (the point
-    // is a fresh root chat); an explicit --project still wins.
+    // A persisted default project APPLIES under --new-chat: since 0.16.11 a
+    // fresh chat inside the project is exactly what "--new-chat + project"
+    // produces, and the whole point of pinning a default project is that
+    // consults stop landing in the general chat list. Only --target-url
+    // (pinned tab) and --project-new suppress it.
     const selectionProject = explicitProject ??
-        (normalizedTargetUrl || selectionProjectNew !== undefined || newChat ? undefined : browserDefaults?.project);
+        (normalizedTargetUrl || selectionProjectNew !== undefined ? undefined : browserDefaults?.project);
     const reasoningAxisChosen = explicitProMode !== undefined || explicitEffort !== undefined;
     const selectionProMode = explicitProMode ?? (reasoningAxisChosen ? undefined : browserDefaults?.pro_mode);
     const selectionEffort = explicitEffort ?? (reasoningAxisChosen ? undefined : browserDefaults?.effort);
@@ -655,7 +659,7 @@ 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,
@@ -668,7 +672,7 @@ export async function runAskProCommand(rest, io) {
             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.13",
+  "version": "0.16.15",
   "description": "Local receipt bus for coordinating Codex execution with ChatGPT Pro/Projects consultation.",
   "author": "youdie006",
   "license": "MIT",