@youdie006/prodex 0.27.1 → 0.27.3

package/dist/tui-run.js

@@ -7,7 +7,7 @@
  * what keeps the interactive path from drifting away from the documented flags.
  */
 import readline from "node:readline";
-import { consultArgsFromChoices, moveCursor, renderContextPanel, renderProgressBar, renderSelectList, toggleSelection } from "./tui.js";
+import { consultArgsFromChoices, moveCursor, progressLabel, renderContextPanel, renderProgressBar, renderSelectList, toggleSelection } from "./tui.js";
 const ESC = "";
 const CLEAR = `${ESC}[2J${ESC}[H`;
 // The alternate screen buffer: the terminal comes back exactly as it was, so a
@@ -17,14 +17,54 @@ const ALT_SCREEN_OFF = `${ESC}[?1049l`;
 const CLEAR_LINE = `${ESC}[2K\r`;
 const HIDE_CURSOR = `${ESC}[?25l`;
 const SHOW_CURSOR = `${ESC}[?25h`;
-function readKey(io) {
-    return new Promise((resolve) => {
-        const onKey = (_str, key) => {
-            io.input.off("keypress", onKey);
-            resolve(key ?? {});
-        };
-        io.input.on("keypress", onKey);
-    });
+/**
+ * Keys are queued by one long-lived listener rather than a listener attached
+ * per read.
+ *
+ * Attaching on demand drops every key pressed while nothing is waiting - during
+ * a redraw, or across the seconds it takes to read the project list out of the
+ * browser. Measured by using it: the first key after the prompt vanished, so
+ * "4" (no project) was swallowed and the next key landed on the wrong row.
+ */
+class KeyQueue {
+    input;
+    pending = [];
+    waiting;
+    constructor(input) {
+        this.input = input;
+        this.input.on("keypress", this.onKey);
+    }
+    onKey = (_str, key) => {
+        const value = key ?? {};
+        if (this.waiting) {
+            const resolve = this.waiting;
+            this.waiting = undefined;
+            resolve(value);
+            return;
+        }
+        this.pending.push(value);
+    };
+    next() {
+        const buffered = this.pending.shift();
+        if (buffered)
+            return Promise.resolve(buffered);
+        return new Promise((resolve) => {
+            this.waiting = resolve;
+        });
+    }
+    /** Drop keys typed before a screen existed to receive them. */
+    drain() {
+        this.pending.length = 0;
+    }
+    dispose() {
+        this.input.off("keypress", this.onKey);
+    }
+}
+let keys;
+function readKey(_io) {
+    if (!keys)
+        throw new Error("The key reader is not running.");
+    return keys.next();
 }
 function isCancel(key) {
     return (key.ctrl === true && key.name === "c") || key.name === "escape" || key.name === "q";
@@ -118,6 +158,7 @@ async function askLine(io, question) {
     io.input.setRawMode?.(true);
     readline.emitKeypressEvents(io.input);
     io.input.resume();
+    keys?.drain();
     return answer.trim();
 }
 const TOOL_CHOICES = [
@@ -134,24 +175,22 @@ export async function runInteractiveConsult(io, deps) {
     readline.emitKeypressEvents(io.input);
     io.input.setRawMode?.(true);
     io.input.resume();
+    keys = new KeyQueue(io.input);
     io.write(ALT_SCREEN_ON + HIDE_CURSOR);
     let header = "";
     try {
         io.write(CLEAR);
-        // Show what the send will use before asking anything: choosing a project or
-        // a tool without knowing the model, or whether the browser is even up, is
-        // choosing blind - and a browser failure after four questions wastes all four.
-        if (deps.describeContext) {
-            try {
-                const rows = await deps.describeContext();
-                if (rows.length > 0)
-                    header = `${renderContextPanel(rows, { color: colorEnabled(), width: terminalWidth() })}\n\n`;
-            }
-            catch {
-                // Context is a courtesy; never let it block the consult.
-            }
-        }
-        const prompt = await askLine(io, `${header}Ask ChatGPT Pro\n\n  prompt: `);
+        // Gather the context WHILE the prompt is being typed. Reading the browser
+        // state takes a second or two, and doing it first left the screen blank for
+        // that long - anything typed into that gap was swallowed, prompt included.
+        const contextPromise = deps.describeContext?.().catch(() => []);
+        const prompt = await askLine(io, "Ask ChatGPT Pro\n\n  prompt: ");
+        // The panel still leads every question that follows, which is where it
+        // earns its place: choosing a project and tools without knowing the browser
+        // is down wastes every answer given before the failure.
+        const rows = (await contextPromise) ?? [];
+        if (rows.length > 0)
+            header = `${renderContextPanel(rows, { color: colorEnabled(), width: terminalWidth() })}\n\n`;
         if (prompt.length === 0) {
             io.write("Nothing to ask.\n");
             return 1;
@@ -233,7 +272,7 @@ export async function runInteractiveConsult(io, deps) {
         }, 250);
         try {
             const code = await deps.runConsult(args, (line) => {
-                label = line.replace(/^progress:\s*/, "").slice(0, 60);
+                label = progressLabel(line).slice(0, 60);
             });
             clearInterval(timer);
             io.write(CLEAR_LINE);
@@ -246,6 +285,8 @@ export async function runInteractiveConsult(io, deps) {
         }
     }
     finally {
+        keys?.dispose();
+        keys = undefined;
         io.write(ALT_SCREEN_OFF + SHOW_CURSOR);
         io.input.setRawMode?.(false);
         io.input.pause();

package/dist/tui.js

@@ -115,6 +115,25 @@ function formatElapsed(ms) {
     const rest = seconds % 60;
     return rest === 0 ? `${minutes}m` : `${minutes}m ${rest}s`;
 }
+/**
+ * Turn a `progress:` line from the send into the label beside the bar.
+ *
+ * The bar already carries the elapsed clock, so a label that opens with
+ * "waiting 2m 57s" prints the same number twice and pushes the part worth
+ * reading off to the right. Keep the detail, drop the duplicate.
+ */
+export function progressLabel(line) {
+    const text = line.replace(/^progress:\s*/, "").trim();
+    const waiting = /^waiting\s+[0-9]+[a-z]*(?:\s+[0-9]+[a-z]*)*\s*(.*)$/i.exec(text);
+    if (!waiting)
+        return text;
+    const detail = waiting[1].trim();
+    if (detail.length === 0)
+        return "waiting";
+    // The send wraps its detail in parentheses; the bar reads better without them.
+    const unwrapped = /^\((.*)\)$/.exec(detail);
+    return (unwrapped ? unwrapped[1] : detail).trim();
+}
 const SPINNER = ["|", "/", "-", "\\"];
 /**
  * A Pro consult can run for many minutes with nothing on screen. The bar fills

package/package.json

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