@oxecli/oxe 1.0.89 → 1.0.91

package/dist/cli.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url";
 import { loadOrPrompt, default_reasoning_effort, max_action_chars, max_resume_history_items, runtimeOsSummary, max_context_tokens, context_overhead_margin, } from "./config.js";
 import { InferenceEngine, estimateTokens } from "./engine.js";
 import { saveSession, loadSession, listSessions, nextSessionId, conversationLabel, COMMAND_HELP, stripOrphanCalls, toolOutputFailed, } from "./sessions.js";
-import { clearScreen, enableAnsi, askBottomPrompt, userDisplayText, aiMarkdown, mutedMarkdown, messageText, toolCallLabel, formatToolResult, truncateEllipsis, stripAnsi, plainLen, truncateStyled, terminalWidth, TOOL_RESULT_MAX_LINES, MAX_COMMAND_DISPLAY_CHARS, renderPanel, renderTableString, enableRawStdin, disableRawStdin, waitRawKey, dockAppendContent, dockSetInactive, dockTearDown, } from "./ui.js";
+import { clearScreen, enableAnsi, askBottomPrompt, userDisplayText, aiMarkdown, mutedMarkdown, messageText, toolCallLabel, formatToolResult, truncateEllipsis, stripAnsi, plainLen, truncateStyled, terminalWidth, TOOL_RESULT_MAX_LINES, MAX_COMMAND_DISPLAY_CHARS, renderPanel, renderTableString, enableRawStdin, disableRawStdin, waitRawKey, dockAppendContent, dockSetInactive, dockTearDown, startDraftCapture, } from "./ui.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const require = createRequire(import.meta.url);
 const packageInfo = require("../package.json");
@@ -396,50 +396,14 @@ export class CLI {
                 const used = estimateTokens(this.inputItems);
                 const budget = max_context_tokens - context_overhead_margin;
                 const pct = Math.max(0, Math.min(100, Math.round(((budget - used) / budget) * 100)));
-                // Queries run through onSubmit so the prompt box stays focused and
-                // editable while the AI streams its reply and tool calls above it.
-                // Commands (slash inputs) settle back to this loop for handling.
-                const onSubmit = async (input, spans) => {
-                    this.interruptPending = false;
-                    this.promptHistory.push(input);
-                    this.lastPrompt = input;
-                    dockAppendContent(`\x1b[1;36m❯\x1b[0m ${userDisplayText(input, spans)}\n`);
-                    queryStarted = true;
-                    try {
-                        await engine.executeQuery(input, this.inputItems, this.story, spans);
-                    }
-                    catch (qerr) {
-                        if (qerr?.message === "interrupt") {
-                            if (!engine.queryHasOutput && !engine.queryCalledTool) {
-                                dockAppendContent(aiMarkdown("What else can I help you with?") + "\n");
-                            }
-                            engine.inQuery = false;
-                            stripOrphanCalls(this.inputItems);
-                            if (this.inputItems.length &&
-                                this.inputItems[this.inputItems.length - 1]["role"] === "user") {
-                                this.inputItems.pop();
-                            }
-                            if (this.story.length &&
-                                this.story[this.story.length - 1]["type"] === "user") {
-                                this.story.pop();
-                            }
-                            this.interruptPending = true;
-                            dockAppendContent("\x1b[90mInterrupted agent. Press Ctrl+C again to exit, or type a new prompt.\x1b[0m\n");
-                        }
-                        else if (qerr?.message !== "eof") {
-                            throw qerr;
-                        }
-                    }
-                    finally {
-                        queryStarted = false;
-                    }
-                    this.saveSession(engine);
-                };
-                const onInterrupt = () => engine.interrupt();
+                // Queries run the proven settle-on-Enter flow: the prompt settles and
+                // the query streams above it (robust dock streaming). While the query
+                // runs, typed keys are captured into a draft; the draft (or the sent
+                // prompt) is restored into the next prompt box so input is never lost.
                 const [input, spans] = await askBottomPrompt("You", "❯", this.promptHistory, {
                     left: "\x1b[90mPress \x1b[1;36mCtrl+C\x1b[0m\x1b[90m to interrupt\x1b[0m",
                     right: `\x1b[1;36m${pct}%\x1b[0m \x1b[90muntil auto-compact\x1b[0m`,
-                }, this.lastPrompt, onSubmit, onInterrupt);
+                }, this.lastPrompt);
                 if (!input.trim())
                     continue;
                 this.interruptPending = false;
@@ -461,6 +425,7 @@ export class CLI {
                     this.inputItems = [];
                     this.story = [];
                     this.sessionId = null;
+                    this.lastPrompt = "";
                     clearScreen();
                     dockSetInactive();
                     this.renderHeader();
@@ -491,6 +456,20 @@ export class CLI {
                     }
                     continue;
                 }
+                dockAppendContent(`\x1b[1;36m❯\x1b[0m ${userDisplayText(input, spans)}\n`);
+                this.lastPrompt = input;
+                queryStarted = true;
+                const stopCapture = startDraftCapture(() => engine.interrupt());
+                try {
+                    await engine.executeQuery(input, this.inputItems, this.story, spans);
+                }
+                finally {
+                    const captured = stopCapture();
+                    if (captured.trim())
+                        this.lastPrompt = captured;
+                    queryStarted = false;
+                }
+                this.saveSession(engine);
             }
             catch (err) {
                 if (err?.message === "eof") {

package/dist/ui.js

@@ -38,6 +38,52 @@ export function waitRawKey() {
         process.stdin.on("keypress", onKeypress);
     });
 }
+/**
+ * Capture typed input while a query runs (the prompt box is torn down during
+ * streaming). Keystrokes are accumulated into a draft that the next prompt box
+ * is pre-filled with, so nothing the user types while the AI is busy is lost.
+ * Returns a stop() function returning the captured draft (may be empty).
+ */
+export function startDraftCapture(onInterrupt) {
+    let draft = "";
+    let active = true;
+    const onKey = (str, key) => {
+        if (!active)
+            return;
+        if (key && key.ctrl && key.name === "c") {
+            onInterrupt();
+            return;
+        }
+        if (key && key.ctrl && (key.name === "d" || key.name === "z"))
+            return;
+        if (key && key.name === "backspace") {
+            draft = draft.slice(0, -1);
+            return;
+        }
+        if (key && (key.name === "return" || key.name === "enter"))
+            return;
+        if (str && !key?.ctrl && !key?.meta) {
+            draft += str.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+        }
+    };
+    readline.emitKeypressEvents(process.stdin);
+    if (process.stdin.isTTY)
+        process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.on("keypress", onKey);
+    return () => {
+        active = false;
+        process.stdin.removeListener("keypress", onKey);
+        try {
+            process.stdin.setRawMode(false);
+        }
+        catch {
+            /* ignore */
+        }
+        process.stdin.pause();
+        return draft;
+    };
+}
 // ---------------------------------------------------------------------------
 // Terminal helpers
 // ---------------------------------------------------------------------------
@@ -1163,7 +1209,7 @@ function isEnterKey(str, key) {
         seq === "\x1bOM" // application keypad
     );
 }
-export function askBottomPrompt(label = "You", prefix = "❯", history = [], hints, initialBuffer = "", onSubmit, onInterrupt) {
+export function askBottomPrompt(label = "You", prefix = "❯", history = [], hints, initialBuffer = "") {
     return new Promise((resolve, reject) => {
         const isTTY = process.stdin.isTTY;
         if (!isTTY) {
@@ -1192,7 +1238,6 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
         readline.emitKeypressEvents(process.stdin);
         if (process.stdin.isTTY) {
             process.stdin.setRawMode(true);
-            // Bracketed paste so multi-line pastes arrive inside \x1b[200~…\x1b[201~.
             process.stdout.write("\x1b[?2004h");
         }
         process.stdin.resume();
@@ -1201,11 +1246,9 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
         let lastCursorRow = 0;
         let lastTotalRows = 0;
         let prevFrameLines = null;
-        // True while an onSubmit query is running. While it runs the box stays
-        // focused and editable; Enter won't re-submit and Ctrl+C interrupts it.
-        let submitting = false;
         const clearBox = () => {
-            process.stdout.write(`\x1b[${lastCursorRow}A`);
+            if (lastCursorRow > 0)
+                process.stdout.write(`\x1b[${lastCursorRow}A`);
             for (let i = 0; i < lastTotalRows; i++) {
                 process.stdout.write("\r\x1b[K");
                 if (i < lastTotalRows - 1)
@@ -1228,7 +1271,9 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 dockSetInactive();
             }
             else {
-                process.stdout.write(`\x1b[${lastCursorRow}A\r`);
+                if (lastCursorRow > 0)
+                    process.stdout.write(`\x1b[${lastCursorRow}A`);
+                process.stdout.write("\r");
                 dockSetFrame((prevFrameLines ?? []).join("\n"), lastTotalRows);
                 dockEnterDocked();
             }
@@ -1256,14 +1301,12 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                         process.stdout.write("\n");
                 }
                 prevFrameLines = newLines;
-                lastCursorRow = 0;
+                lastCursorRow = cursorRow;
                 lastTotalRows = totalRows;
                 dockSetFrame(frame, totalRows);
                 dockEnterDocked();
-                // Park the cursor at the box top so concurrent dock content (AI
-                // streaming, tool results) inserts above the box rather than into it.
-                const up = totalRows - 1;
-                process.stdout.write(`\x1b[${up}A\r`);
+                const up = totalRows - 1 - cursorRow;
+                process.stdout.write(`\x1b[${up}A\r\x1b[${cursorCol}C`);
             }
             else {
                 process.stdout.write(`\x1b[${lastCursorRow}A\r`);
@@ -1277,11 +1320,13 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                         process.stdout.write("\n");
                 }
                 const atLine = maxLen - 1;
-                // Return the cursor to the box top so concurrent dock content keeps
-                // inserting above the box.
-                process.stdout.write(`\x1b[${atLine}A\r`);
+                if (atLine > cursorRow)
+                    process.stdout.write(`\x1b[${atLine - cursorRow}A`);
+                else if (atLine < cursorRow)
+                    process.stdout.write(`\x1b[${cursorRow - atLine}B`);
+                process.stdout.write(`\r\x1b[${cursorCol}C`);
                 prevFrameLines = newLines;
-                lastCursorRow = 0;
+                lastCursorRow = cursorRow;
                 lastTotalRows = totalRows;
                 dockSetFrame(frame, totalRows);
             }
@@ -1314,8 +1359,6 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             }
             cursor += text.length;
         };
-        // A paste span is treated as a single atomic "block" only when it collapses
-        // to a marker (large pastes). Small inline pastes behave like normal text.
         const spanCollapsed = (span) => {
             return shouldCollapsePaste(buffer.slice(span[0], span[1]));
         };
@@ -1492,11 +1535,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             if (!bracketedPaste && (sequence === start || value === start)) {
                 bracketedPaste = true;
                 bracketedPasteBuffer = "";
-                const inline = value === start
-                    ? ""
-                    : value.startsWith(start)
-                        ? value.slice(start.length)
-                        : "";
+                const inline = value === start ? "" : value.startsWith(start) ? value.slice(start.length) : "";
                 if (inline)
                     bracketedPasteBuffer = inline;
                 if (inline.includes(end)) {
@@ -1516,9 +1555,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             if (!bracketedPaste)
                 return false;
             if (sequence === end || value === end) {
-                const pasted = bracketedPasteBuffer
-                    .replace(/\r\n/g, "\n")
-                    .replace(/\r/g, "\n");
+                const pasted = bracketedPasteBuffer.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
                 bracketedPaste = false;
                 bracketedPasteBuffer = "";
                 if (pasted)
@@ -1526,15 +1563,12 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 repaint();
                 return true;
             }
-            const chunk = value ||
-                (sequence && !sequence.startsWith("\x1b[") ? sequence : "");
+            const chunk = value || (sequence && !sequence.startsWith("\x1b[") ? sequence : "");
             if (chunk) {
                 const endAt = chunk.indexOf(end);
                 if (endAt >= 0) {
                     bracketedPasteBuffer += chunk.slice(0, endAt);
-                    const pasted = bracketedPasteBuffer
-                        .replace(/\r\n/g, "\n")
-                        .replace(/\r/g, "\n");
+                    const pasted = bracketedPasteBuffer.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
                     bracketedPaste = false;
                     bracketedPasteBuffer = "";
                     if (pasted)
@@ -1566,12 +1600,6 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 pasteBurstTimer = null;
             }
             if (key && key.ctrl && key.name === "c") {
-                // While a query is running, Ctrl+C interrupts the query instead of
-                // leaving the prompt (the box stays focused for editing).
-                if (submitting && onInterrupt) {
-                    onInterrupt();
-                    return;
-                }
                 settle(new Error("interrupt"), true);
                 return;
             }
@@ -1612,31 +1640,9 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 return;
             }
             if (isEnterKey(str, key)) {
-                const trimmed = buffer.trim();
-                if (!trimmed)
-                    return;
-                // While a query is running the box stays focused and editable; Enter is
-                // ignored (even for commands) so the query finishes cleanly first.
-                if (submitting)
-                    return;
-                // With an onSubmit handler, ordinary prompts are submitted in place so
-                // the box stays focused and editable while the query streams above it.
-                // Slash commands (and any prompt when no handler is wired) settle so the
-                // caller's existing command loop handles them.
-                if (onSubmit && !trimmed.startsWith("/")) {
-                    submitting = true;
-                    const submitted = buffer;
-                    const submittedSpans = pasteSpans.slice();
-                    Promise.resolve()
-                        .then(() => onSubmit(submitted, submittedSpans))
-                        .then(() => {
-                        submitting = false;
-                    }, () => {
-                        submitting = false;
-                    });
-                    return;
+                if (buffer.trim()) {
+                    settle([buffer, pasteSpans], false);
                 }
-                settle([buffer, pasteSpans], false);
                 return;
             }
             if (key && key.name === "backspace") {
@@ -1689,9 +1695,6 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 repaint();
                 return;
             }
-            // Ctrl+J sends a bare LF (0x0a). Node reports it as name "enter" or
-            // "linefeed". It is not a real Enter (a real Enter arrives as CR / name
-            // "return"), so ignore it rather than submitting or inserting a newline.
             if (key && (key.name === "enter" || key.name === "linefeed")) {
                 return;
             }
@@ -1707,9 +1710,6 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
         repaint(true);
     });
 }
-// ---------------------------------------------------------------------------
-// User Display & Message Text Helpers
-// ---------------------------------------------------------------------------
 export function userDisplayText(payload, pasteSpans) {
     if (pasteSpans && pasteSpans.length) {
         const segs = splitBlocks(payload, pasteSpans);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxecli/oxe",
-  "version": "1.0.89",
+  "version": "1.0.91",
   "publishConfig": {
     "access": "public"
   },