@youdie006/prodex 0.16.26 → 0.16.28

package/dist/chatgpt-browser.js

@@ -229,8 +229,21 @@ export function hasFreshChatGptAnswer(previousAssistantMessageCount, state) {
 // changed ChatGPT UI (moved/renamed composer or send control). Distinguish that
 // from a genuinely clean-but-slow submit and point the user at an update/report
 // instead of a misleading "raise --timeout-ms".
+// Render a millisecond duration as a human-readable span for timeout guidance:
+// 45000 -> "45s", 90000 -> "1m 30s", 1200000 -> "20 min". Messages keep the raw
+// ms alongside ("20 min (1200000ms)") so the send_timeout blocker can still
+// parse a budget to double.
+export function formatDurationMs(ms) {
+    const totalSeconds = Math.max(0, Math.round(ms / 1000));
+    if (totalSeconds < 60)
+        return `${totalSeconds}s`;
+    const minutes = Math.floor(totalSeconds / 60);
+    const seconds = totalSeconds % 60;
+    return seconds ? `${minutes}m ${seconds}s` : `${minutes} min`;
+}
 export function acceptanceTimeoutError(ctx) {
     const uiLikelyChanged = ctx.composerStillHasText || !ctx.submitButtonFound;
+    const took = `${formatDurationMs(ctx.timeoutMs)} (${ctx.timeoutMs}ms)`;
     if (uiLikelyChanged) {
         const detail = [
             ctx.composerStillHasText ? "the composer still holds the prompt" : undefined,
@@ -238,12 +251,13 @@ export function acceptanceTimeoutError(ctx) {
         ]
             .filter(Boolean)
             .join(" and ");
-        return new Error(`Timed out after ${ctx.timeoutMs}ms and ChatGPT never registered the prompt (${detail}). ` +
+        return new Error(`Timed out after ${took} and ChatGPT never registered the prompt (${detail}). ` +
             "The ChatGPT web UI may have changed, so prodex could not submit. Update prodex " +
             "(npm i -g @youdie006/prodex@latest); if it persists, report it at " +
             "https://github.com/youdie006/prodex/issues. You can also paste the prompt manually in the visible browser.");
     }
-    return new Error(`Timed out after ${ctx.timeoutMs}ms waiting for ChatGPT to accept the prompt. Raise --timeout-ms and retry (Pro extended already uses a higher default).`);
+    return new Error(`Timed out after ${took} waiting for ChatGPT to accept the prompt. ` +
+        "Pro reasoning can run many minutes. Raise --timeout-ms and retry.");
 }
 export function hasPartialChatGptAnswer(previousAssistantMessageCount, state) {
     return state.assistantMessageCount > previousAssistantMessageCount && isUsableChatGptAnswer(state.answer);
@@ -1415,7 +1429,7 @@ export async function sendChatGptPrompt(options) {
     finally {
         cdp.close();
     }
-    emitProgress("sent", `timeout ${Math.round(timeoutMs / 1000)}s`);
+    emitProgress("sent", `budget ${formatDurationMs(timeoutMs)}`);
     const started = Date.now();
     const acceptDeadline = computePromptAcceptanceDeadline(timeoutMs, started);
     let accepted = false;
@@ -1520,11 +1534,12 @@ export async function sendChatGptPrompt(options) {
             answer: completed.answer.trim(),
             modelHints: completed.modelHints,
             warnings: [
-                `answer_incomplete: ChatGPT was still generating after ${timeoutMs}ms, so the answer below may be truncated. Raise --timeout-ms and retry for the full response.`
+                `answer_incomplete: ChatGPT was still generating after ${formatDurationMs(timeoutMs)} (${timeoutMs}ms), so the answer below may be truncated. Raise --timeout-ms and retry for the full response.`
             ]
         };
     }
-    throw new Error(`Timed out after ${timeoutMs}ms waiting for ChatGPT to respond. Raise --timeout-ms and retry (Pro extended already uses a higher default).`);
+    throw new Error(`Timed out after ${formatDurationMs(timeoutMs)} (${timeoutMs}ms) waiting for ChatGPT to respond. ` +
+        "Pro reasoning can run many minutes. Raise --timeout-ms and retry.");
 }
 export function modelMenuOptionsExpression() {
     return `(() => {

package/dist/cli-pro.js

@@ -1,7 +1,7 @@
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { buildDryRunBundle } from "./bundle.js";
-import { DEFAULT_CDP_PORT, resolveCdpPort, chatGptVisibilityBlocker, defaultChatGptProfileDir, getChatGptBrowserStatus, listChatGptModelOptions, listChatGptSidebarProjects, normalizeChatGptTargetUrl, openChatGptBrowser, parseProMode, parseReasoningEffort, readLastBrowserLoginLaunch, recordBrowserLoginLaunch, sendChatGptPrompt } from "./chatgpt-browser.js";
+import { DEFAULT_CDP_PORT, resolveCdpPort, chatGptVisibilityBlocker, defaultChatGptProfileDir, formatDurationMs, getChatGptBrowserStatus, listChatGptModelOptions, listChatGptSidebarProjects, normalizeChatGptTargetUrl, openChatGptBrowser, parseProMode, parseReasoningEffort, readLastBrowserLoginLaunch, recordBrowserLoginLaunch, sendChatGptPrompt } from "./chatgpt-browser.js";
 import { ASK_PRO_BOOLEAN_FLAGS, ASK_PRO_PREVIEW_VALUE_FLAGS, ASK_PRO_VALUE_FLAGS, assertHelpRequestArgs, assertNoExtraArgs, assertOnlyOptions, findHelpFlagIndexBeforePromptDelimiter, formatCliCommand, hasAskProDryRunMode, hasAskProMode, hasAskProSendMode, isHelpSubcommand, parseAskProArgs, printHelpIfRequested, readFlag, readPortFlag, readPositionalsWithOptions, readPositiveIntegerFlag, readRepeatedFlag, resolveCwdFlag, resolveOptionalFileFlag, unknownSubcommandError } from "./cli-args.js";
 import { printProBrowserHelp, printProHelp } from "./cli-help.js";
 import { listRawResultsForInspection, listTasksForInspection } from "./cli-ledger.js";
@@ -520,11 +520,11 @@ export function createBrowserSendProgressPrinter(write, heartbeatMs = 10_000) {
             if (lastWaitingElapsedMs !== undefined && event.elapsedMs - lastWaitingElapsedMs < heartbeatMs)
                 return;
             lastWaitingElapsedMs = event.elapsedMs;
-            write(`progress: waiting ${Math.round(event.elapsedMs / 1000)}s${event.detail ? ` (${event.detail})` : ""}`);
+            write(`progress: waiting ${formatDurationMs(event.elapsedMs)}${event.detail ? ` (${event.detail})` : ""}`);
             return;
         }
         if (event.phase === "answered") {
-            write(`progress: answer received after ${Math.round(event.elapsedMs / 1000)}s${event.detail ? ` (${event.detail})` : ""}`);
+            write(`progress: answer received after ${formatDurationMs(event.elapsedMs)}${event.detail ? ` (${event.detail})` : ""}`);
             return;
         }
         write(`progress: ${PROGRESS_PHASE_LABELS[event.phase]}${event.detail ? ` (${event.detail})` : ""}`);
@@ -1077,7 +1077,9 @@ export function browserSendBlockerFromError(error) {
             next_step: "Update prodex (npm i -g @youdie006/prodex@latest); if it persists, report it at https://github.com/youdie006/prodex/issues or paste the prompt manually in the visible browser."
         };
     }
-    const timedOut = message.match(/^Timed out after (\d+)ms/);
+    // Match the raw ms whether the message uses the old "after 90000ms" form or
+    // the newer human-readable "after 20 min (1200000ms)" form.
+    const timedOut = message.match(/Timed out after [\s\S]*?(\d+)\s*ms/);
     if (timedOut) {
         // Suggest a concrete doubled budget so the user can paste a rerun command
         // instead of guessing what "raise --timeout-ms" means in milliseconds.
@@ -1087,7 +1089,7 @@ export function browserSendBlockerFromError(error) {
             code: "send_timeout",
             message,
             retryable: true,
-            next_step: `Rerun with a bigger budget: \`prodex pro browser ask --timeout-ms ${suggestedMs} "<same prompt>"\`.`
+            next_step: `Rerun with a bigger budget (${formatDurationMs(suggestedMs)}): \`prodex pro browser ask --timeout-ms ${suggestedMs} "<same prompt>"\`.`
         };
     }
     return {

package/dist/config.js

@@ -129,16 +129,54 @@ export async function loadLocalConfig(cwd) {
     assertServerUrlMatchesConfig(config);
     return config;
 }
+// Global browser-selection defaults from the environment, used when a repo has
+// no per-repo default for a field. The MCP server (pro_consult) frequently runs
+// as `prodex mcp` with no --cwd, so it reads whatever directory the agent
+// launched in - a per-repo default set elsewhere is then missed. Setting e.g.
+// PRODEX_DEFAULT_PROJECT=Codex PRODEX_DEFAULT_MODEL=Pro pins a default that
+// applies from ANY cwd so consults stop landing in the general chat.
+export function envBrowserDefaults() {
+    const model = process.env.PRODEX_DEFAULT_MODEL?.trim() || undefined;
+    const project = process.env.PRODEX_DEFAULT_PROJECT?.trim() || undefined;
+    const raw = {};
+    if (model)
+        raw.model = model;
+    if (project)
+        raw.project = project;
+    const proMode = process.env.PRODEX_DEFAULT_PRO_MODE?.trim();
+    if (proMode)
+        raw.pro_mode = proMode;
+    const effort = process.env.PRODEX_DEFAULT_EFFORT?.trim();
+    if (effort)
+        raw.effort = effort;
+    if (Object.keys(raw).length === 0)
+        return undefined;
+    const parsed = BrowserDefaultsSchema.safeParse(raw);
+    if (parsed.success)
+        return parsed.data;
+    // A bad enum in pro_mode/effort must not drop a valid model/project.
+    const freeText = BrowserDefaultsSchema.safeParse({
+        ...(model ? { model } : {}),
+        ...(project ? { project } : {})
+    });
+    return (model || project) && freeText.success ? freeText.data : undefined;
+}
 // Read persisted browser-selection defaults without failing when the local
 // config is absent or unrelated to this cwd (defaults are optional convenience).
+// Per-repo config wins field-by-field; PRODEX_DEFAULT_* env vars are the global
+// fallback so a pinned default project/model applies from any cwd.
 export async function loadBrowserDefaults(cwd) {
+    const env = envBrowserDefaults();
+    let repo;
     try {
-        const config = await loadLocalConfig(cwd);
-        return config.browser_defaults;
+        repo = (await loadLocalConfig(cwd)).browser_defaults;
     }
     catch {
-        return undefined;
+        repo = undefined;
     }
+    if (!repo && !env)
+        return undefined;
+    return { ...(env ?? {}), ...(repo ?? {}) };
 }
 export function getTokenExpiryStatus(config, now = new Date()) {
     if (!config.token_expires_at) {

package/dist/mcp.js

@@ -138,7 +138,7 @@ export function createServer(cwd = process.cwd(), options = {}) {
     const browserConsult = options.browserConsult;
     if (browserConsult) {
         server.registerTool("pro_consult", {
-            description: "Ask the user's logged-in ChatGPT (Pro) in the visible browser and wait for the full answer. This drives a real browser send: it can take minutes (Pro extended reasoning), is human-paced, and records a durable receipt under .bridge/. Requires a running `prodex pro browser login` session. Returns task_id, thread URL, and the answer text.",
+            description: "Ask the user's logged-in ChatGPT (Pro) in the visible browser and wait for the full answer. This drives a real browser send: it can take minutes (Pro extended reasoning), is human-paced, and records a durable receipt under .bridge/. Requires a running `prodex pro browser login` session. By DEFAULT the consult continues in the currently-open thread, so consecutive follow-ups on the same topic stay in one conversation (keeps context, avoids sidebar clutter). Pass new_chat:true ONLY to start a fresh thread for a genuinely new topic. `project` and `model` come from saved defaults (per-repo config, or PRODEX_DEFAULT_PROJECT / PRODEX_DEFAULT_MODEL env vars) when omitted - do NOT pass them per-call unless deliberately overriding. Returns task_id, thread URL, and the answer text.",
             inputSchema: {
                 prompt: McpBridgeTextSchema.min(1),
                 model: McpShortTextSchema.optional(),
@@ -147,7 +147,10 @@ export function createServer(cwd = process.cwd(), options = {}) {
                 project: McpShortTextSchema.optional(),
                 timeout_ms: z.number().int().positive().max(3_600_000).optional(),
                 files: z.array(McpShortTextSchema).max(20).optional(),
-                new_chat: z.boolean().optional()
+                new_chat: z
+                    .boolean()
+                    .optional()
+                    .describe("Start a fresh thread. Omit to continue the current thread (preferred for follow-ups).")
             }
         }, async (input, extra) => {
             // Bridge send progress to MCP progress notifications, but only when

package/package.json

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