@oxecli/oxe 1.0.86 → 1.0.87

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, } 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, } from "./ui.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const require = createRequire(import.meta.url);
 const packageInfo = require("../package.json");
@@ -64,7 +64,7 @@ export class CLI {
             process.stdout.write(`${labelLine}\n${lines.join("\n")}\n`);
             if (diff) {
                 const diffLines = diff.split("\n").map((ln) => plainLen(ln) > lineMax ? truncateStyled(ln, lineMax) + "…\x1b[0m" : ln);
-                process.stdout.write(diffLines.join("\n") + "\n\n");
+                process.stdout.write(diffLines.join("\n") + "\n");
             }
             return;
         }
@@ -91,6 +91,7 @@ export class CLI {
             process.stdout.write("\n");
     }
     async showHelp() {
+        dockTearDown();
         const rows = COMMAND_HELP.map(([cmd, desc]) => {
             const styled = cmd.replace(/(<[^>]+>)/g, "\x1b[36m$1\x1b[0m");
             return {
@@ -104,7 +105,7 @@ export class CLI {
             titleAlign: "left",
             colGap: 3,
         });
-        process.stdout.write("\n" + panel + "\n");
+        process.stdout.write(panel + "\n");
         if (process.stdin.isTTY) {
             enableRawStdin();
             try {
@@ -117,7 +118,7 @@ export class CLI {
                 disableRawStdin();
             }
             const n = panel.split("\n").length;
-            process.stdout.write(`\x1b[${n + 1}A\r\x1b[J`);
+            process.stdout.write(`\x1b[${n}A\r\x1b[J`);
         }
     }
     async awaitRawCloseKey() {
@@ -309,7 +310,6 @@ export class CLI {
     async pickConversation() {
         const recs = listSessions();
         if (!recs.length) {
-            process.stdout.write("\n");
             renderPanel("No saved conversations yet. Type a prompt to start one.", "Conversations");
             return null;
         }
@@ -318,10 +318,11 @@ export class CLI {
             return null;
         }
         enableRawStdin();
+        dockTearDown();
         let selected = 0;
         let lastRows = 0;
         const draw = () => {
-            const frame = "\n" + this.renderPickerPanel(recs, selected);
+            const frame = this.renderPickerPanel(recs, selected);
             const n = frame.split("\n").length;
             if (lastRows > 0)
                 process.stdout.write(`\x1b[${lastRows - 1}A\r\x1b[J`);
@@ -359,13 +360,11 @@ export class CLI {
     async resumeConversation(engine, num) {
         const sid = parseInt(num, 10);
         if (Number.isNaN(sid)) {
-            process.stdout.write("\n");
             renderPanel(`Invalid conversation number: ${num}`, "Error", "", true, "31");
             return;
         }
         const rec = loadSession(sid);
         if (!rec) {
-            process.stdout.write("\n");
             renderPanel(`Conversation ${sid} not found.`, "Error", "", true, "31");
             return;
         }
@@ -376,10 +375,11 @@ export class CLI {
         this.sessionId = sid;
         engine.reasoningEffort = String(rec["reasoning_effort"] ?? default_reasoning_effort);
         clearScreen();
+        dockSetInactive();
         this.renderHeader();
         process.stdout.write("\n");
         process.stdout.write(`\x1b[90mResumed:\x1b[0m \x1b[1m${truncateLabel(rec["label"])}\x1b[0m\n`);
-        process.stdout.write(`\x1b[90m(${this.inputItems.length} items · ${estimateTokens(this.inputItems).toLocaleString()} tokens)\x1b[0m\n\n`);
+        process.stdout.write(`\x1b[90m(${this.inputItems.length} items · ${estimateTokens(this.inputItems).toLocaleString()} tokens)\x1b[0m\n`);
         renderPanel("Conversation history restored", "Restored");
         process.stdout.write("\n");
         if (this.story.length)
@@ -421,6 +421,7 @@ export class CLI {
                     this.story = [];
                     this.sessionId = null;
                     clearScreen();
+                    dockSetInactive();
                     this.renderHeader();
                     continue;
                 }
@@ -442,15 +443,14 @@ export class CLI {
                     const effort = parts[1]?.toLowerCase() ?? "";
                     if (["none", "low", "high"].includes(effort)) {
                         engine.reasoningEffort = effort;
-                        process.stdout.write(`\n\x1b[32m✓\x1b[0m \x1b[90mReasoning effort set to \x1b[1;36m${effort}\x1b[0m\x1b[90m.\x1b[0m\n`);
+                        dockAppendContent(`\x1b[32m✓\x1b[0m \x1b[90mReasoning effort set to \x1b[1;36m${effort}\x1b[0m\x1b[90m.\x1b[0m\n`);
                     }
                     else {
-                        process.stdout.write("\n");
                         renderPanel("Usage: /effort none|low|high", "Error", "", true, "31");
                     }
                     continue;
                 }
-                process.stdout.write(`\n\x1b[1;36m❯\x1b[0m ${userDisplayText(input, spans)}\n\n`);
+                dockAppendContent(`\x1b[1;36m❯\x1b[0m ${userDisplayText(input, spans)}\n`);
                 queryStarted = true;
                 await engine.executeQuery(input, this.inputItems, this.story, spans);
                 queryStarted = false;
@@ -466,7 +466,7 @@ export class CLI {
                 if (err?.message === "interrupt") {
                     const wasActive = queryStarted || engine.inQuery;
                     if (wasActive && !engine.queryHasOutput && !engine.queryCalledTool) {
-                        process.stdout.write(aiMarkdown("What else can I help you with?") + "\n");
+                        dockAppendContent(aiMarkdown("What else can I help you with?") + "\n");
                     }
                     engine.inQuery = false;
                     stripOrphanCalls(this.inputItems);
@@ -488,8 +488,7 @@ export class CLI {
                         break;
                     }
                     this.interruptPending = true;
-                    process.stdout.write("\n");
-                    process.stdout.write("\x1b[90mInterrupted agent. Press Ctrl+C again to exit, or type a new prompt.\x1b[0m\n");
+                    dockAppendContent("\x1b[90mInterrupted agent. Press Ctrl+C again to exit, or type a new prompt.\x1b[0m\n");
                     continue;
                 }
                 throw err;

package/dist/engine.js

@@ -2,7 +2,7 @@ import OpenAI from "openai";
 import { max_output_tokens, max_empty_retries, max_agent_steps, max_context_tokens, context_overhead_margin, compact_keep_recent_turns, max_summary_source_chars, max_read_file_stored_chars, } from "./config.js";
 import { getSystemPrompt } from "./system.js";
 import { buildTools, truncateToolOutput, toolReadFile, toolWriteFile, toolEditFile, toolBash, toolGlob, toolGrep, toolLoadSkill, } from "./tools.js";
-import { mutedMarkdown, aiMarkdown, tickDuration, displayRows, safeCommitPoint, printAiChunk, toolCallLabel, formatToolResult, renderPanel, Spinner, hideCursor, } from "./ui.js";
+import { mutedMarkdown, aiMarkdown, tickDuration, safeCommitPoint, printAiChunk, toolCallLabel, formatToolResult, renderPanel, Spinner, hideCursor, dockAppendContent, dockReplaceTransient, dockTransientStart, } from "./ui.js";
 import { reportUsage } from "./api.js";
 import { stripOrphanCalls, persistCompactionSummary, toolOutputFailed, } from "./sessions.js";
 import { takePendingDiffOutput } from "./tools.js";
@@ -43,8 +43,6 @@ export class InferenceEngine {
     reasoningEffort;
     keyData;
     client;
-    workActive = false;
-    workRows = 0;
     inQuery = false;
     activeAbort = null;
     interrupted = false;
@@ -146,22 +144,6 @@ export class InferenceEngine {
     incompleteReason(response) {
         return response?.incomplete_details?.reason ?? null;
     }
-    overwriteWorkLine(text) {
-        for (let i = 0; i < this.workRows; i++) {
-            process.stdout.write("\x1b[1A\x1b[2K");
-        }
-        process.stdout.write(mutedMarkdown(text) + "\n\n");
-        this.workRows = displayRows(mutedMarkdown(text)) + 1;
-    }
-    clearWorkLine() {
-        if (!this.workActive || this.workRows < 1)
-            return;
-        for (let i = 0; i < this.workRows; i++) {
-            process.stdout.write("\x1b[1A\x1b[2K");
-        }
-        this.workActive = false;
-        this.workRows = 0;
-    }
     async streamOnce(inputItems, stats, story, previousResponseId) {
         let content = "";
         let committedLen = 0;
@@ -169,6 +151,7 @@ export class InferenceEngine {
         let sawReasoning = false;
         let status = null;
         let thinkingStart = null;
+        dockTransientStart();
         const workStatus = new Spinner();
         const workingStarted = Date.now();
         workStatus.startWithRender(() => `Working ${tickDuration((Date.now() - workingStarted) / 1000)}`);
@@ -187,14 +170,7 @@ export class InferenceEngine {
             const elapsed = (Date.now() - workingStarted) / 1000;
             const t = tickDuration(elapsed);
             story.push({ type: "worked", text: `Worked for ${t}` });
-            if (this.workActive) {
-                this.overwriteWorkLine(`Worked for ${t}`);
-            }
-            else {
-                process.stdout.write(mutedMarkdown(`Worked for ${t}`) + "\n\n");
-                this.workActive = true;
-                this.workRows = displayRows(mutedMarkdown(`Worked for ${t}`)) + 1;
-            }
+            dockReplaceTransient(mutedMarkdown(`Worked for ${t}`) + "\n");
         };
         const finishThinking = (report) => {
             if (thinkingStart === null)
@@ -208,8 +184,7 @@ export class InferenceEngine {
             if (report) {
                 const t = tickDuration(elapsed);
                 story.push({ type: "thought", text: `Thought for ${t}` });
-                process.stdout.write(mutedMarkdown(`Thought for ${t}`) + "\n\n");
-                this.workActive = false;
+                dockReplaceTransient(mutedMarkdown(`Thought for ${t}`) + "\n");
             }
             thinkingStart = null;
         };
@@ -248,6 +223,7 @@ export class InferenceEngine {
                     etype === "response.reasoning.summary.delta") {
                     sawReasoning = true;
                     silenceWorking();
+                    dockTransientStart();
                     if (thinkingStart === null) {
                         thinkingStart = Date.now();
                         status = new Spinner();
@@ -288,9 +264,7 @@ export class InferenceEngine {
             workStatus.stop();
             const stillThinking = thinkingStart !== null;
             finishThinking(stillThinking);
-            if (this.interrupted && !this.queryHasOutput)
-                this.clearWorkLine();
-            else
+            if (!this.interrupted || this.queryHasOutput)
                 reportWorking();
             if (content.slice(committedLen))
                 printAiChunk(content.slice(committedLen));
@@ -398,6 +372,7 @@ export class InferenceEngine {
         if (!this.contextOverBudget(conversation))
             return [conversation, false];
         const started = Date.now();
+        dockTransientStart();
         const comp = new Spinner();
         comp.start(`Compacting conversation ${tickDuration(0)}`);
         const compTimer = setInterval(() => {
@@ -416,14 +391,11 @@ export class InferenceEngine {
         persistCompactionSummary(inputItems, compacted[0]);
         const text = `Compacted conversation in ${tickDuration((Date.now() - started) / 1000)}`;
         story.push({ type: "compacted", text });
-        this.workActive = false;
-        process.stdout.write(mutedMarkdown(text) + "\n\n");
+        dockReplaceTransient(mutedMarkdown(text) + "\n");
         return [compacted, true];
     }
     async executeQuery(userPrompt, inputItems, story, pasteSpans) {
         this.inQuery = true;
-        this.workActive = false;
-        this.workRows = 0;
         this.interrupted = false;
         this.queryHasOutput = false;
         this.queryCalledTool = false;
@@ -553,36 +525,24 @@ export class InferenceEngine {
                         continue;
                     }
                     dropRetryPrompts(conversation, inputItems, retryPrompts);
-                    process.stdout.write(aiMarkdown(emptyMessage) + "\n");
-                    process.stdout.write("\n" + summary() + "\n");
-                    this.workActive = false;
-                    this.workRows = 0;
+                    dockAppendContent(aiMarkdown(emptyMessage) + "\n");
+                    dockAppendContent(summary() + "\n");
                     return;
                 }
                 if (!calls.length) {
-                    // Exactly one blank row between the message and the footer summary.
-                    const trailing = (text.match(/\n+$/) ?? [""])[0].length;
-                    process.stdout.write("\n".repeat(Math.max(0, 2 - trailing)) + summary() + "\n");
                     story.push({ type: "footer", text: footerText() });
                     attachFooter(conversation);
                     attachFooter(inputItems);
-                    this.workActive = false;
-                    this.workRows = 0;
+                    dockAppendContent(summary() + "\n");
                     return;
                 }
-                if (text.trim()) {
-                    // Ensure exactly one blank row between the assistant message and the
-                    // first tool call, no matter how many newlines the message ended with.
-                    const trailing = (text.match(/\n+$/) ?? [""])[0].length;
-                    process.stdout.write("\n".repeat(Math.max(0, 2 - trailing)));
-                }
                 for (const c of calls) {
-                    this.workActive = false;
                     this.queryCalledTool = true;
                     const started = toolCallLabel(c.name, c.arguments);
                     // Print the tool label the instant the command starts, then show a
                     // "╰─ Working..." dots line that swaps to the real result in place.
-                    process.stdout.write(`${started}\n`);
+                    dockAppendContent(`${started}\n`);
+                    dockTransientStart();
                     const toolSpinner = new Spinner();
                     toolSpinner.startDots("\x1b[90m╰─\x1b[0m Working");
                     const rawResult = await this.runTool(c.name, c.arguments);
@@ -602,12 +562,13 @@ export class InferenceEngine {
                     });
                     // Swap the "╰─ Working..." line for the real result. If the tool
                     // produced a diff it renders directly below the action line with no
-                    // gap; otherwise a blank line separates the action from what follows.
-                    toolSpinner.replaceWith(action);
-                    if (diff)
-                        process.stdout.write(diff + "\n\n");
-                    else
-                        process.stdout.write("\n");
+                    // gap; otherwise the dock gap separates the action from what follows.
+                    toolSpinner.stop();
+                    dockReplaceTransient(action + "\n");
+                    if (diff) {
+                        dockTransientStart();
+                        dockReplaceTransient(diff + "\n");
+                    }
                     const truncatedResult = c.name === "read_file"
                         ? truncateToolOutput(rawResult, max_read_file_stored_chars)
                         : truncateToolOutput(rawResult);
@@ -634,10 +595,6 @@ export class InferenceEngine {
             stripOrphanCalls(inputItems);
         }
         catch (err) {
-            if (this.interrupted) {
-                this.workActive = false;
-                this.workRows = 0;
-            }
             if (this.interrupted)
                 throw new Error("interrupt");
             if (err?.message === "interrupt" || err?.message === "eof") {

package/dist/ui.js

@@ -411,7 +411,7 @@ function panelString(content, title = "", subtitle = "", expand = true, borderSt
     return out.join("\n");
 }
 export function renderPanel(content, title = "", subtitle = "", expand = true, borderStyle = "90", titleAlign = "center") {
-    process.stdout.write(panelString(content, title, subtitle, expand, borderStyle, titleAlign) + "\n");
+    dockAppendContent(panelString(content, title, subtitle, expand, borderStyle, titleAlign) + "\n");
 }
 // ---------------------------------------------------------------------------
 // Table Panel Rendering
@@ -462,7 +462,7 @@ export function tickDuration(seconds) {
 export function printAiChunk(chunk) {
     if (!chunk)
         return;
-    process.stdout.write(markdownToAnsi(chunk));
+    dockAppendContent(markdownToAnsi(chunk));
 }
 const FENCE_MARKER_RE = /`{3,}/g;
 export function safeCommitPoint(text) {
@@ -497,6 +497,134 @@ export function displayRows(text) {
     return rows;
 }
 // ---------------------------------------------------------------------------
+// Persistent Prompt Dock
+// ---------------------------------------------------------------------------
+// The prompt box stays on screen at all times (docked). The cursor is parked
+// at the box's TOP row; incoming content is written there and the box is
+// re-rendered below it, so the box is pushed down by content while exactly
+// one blank row is preserved between the latest content and the box.
+//
+// dockRel: how many rows the cursor sits above boxTop. 0 = parked at boxTop,
+// 1 = one row up (the gap row), where transient spinners render.
+// dockGap: true when a blank row already exists above the current row (after
+// the box is torn down), so askBottomPrompt does not add a second one.
+let docked = false;
+let dockRel = 0;
+let dockBoxRows = 0;
+let dockGap = false;
+let dockFrameLines = [];
+export function dockIsDocked() {
+    return docked;
+}
+export function dockHasGap() {
+    return dockGap;
+}
+export function dockSetFrame(frame, totalRows) {
+    dockFrameLines = frame.split("\n");
+    dockBoxRows = totalRows;
+}
+export function dockSetInactive() {
+    docked = false;
+    dockRel = 0;
+    dockBoxRows = 0;
+    dockGap = false;
+    dockFrameLines = [];
+}
+export function dockEnterDocked() {
+    docked = true;
+    dockRel = 0;
+    dockGap = false;
+}
+/** Erase the docked box and leave the cursor at boxTop with the gap above it,
+ *  so a pager/replay can write there and a later prompt re-docks cleanly. */
+export function dockTearDown() {
+    const wasDocked = docked;
+    dockEraseBox();
+    if (wasDocked) {
+        dockGap = true;
+        dockBoxRows = 0;
+        dockFrameLines = [];
+    }
+}
+/** Park the cursor on the gap row (above the box) for a transient spinner. */
+export function dockTransientStart() {
+    if (!docked || dockBoxRows < 1)
+        return;
+    if (dockRel === 0) {
+        process.stdout.write("\x1b[1A\r");
+        dockRel = 1;
+    }
+}
+function dockEraseBox() {
+    if (!docked || dockBoxRows < 1)
+        return;
+    process.stdout.write(`\x1b[${dockBoxRows - 1 + dockRel}B`);
+    for (let i = 0; i < dockBoxRows; i++) {
+        process.stdout.write("\r\x1b[K");
+        if (i < dockBoxRows - 1)
+            process.stdout.write("\x1b[1A");
+    }
+    docked = false;
+    dockRel = 0;
+    dockGap = true;
+}
+function dockEraseBoxKeep() {
+    if (!docked || dockBoxRows < 1)
+        return;
+    process.stdout.write(`\x1b[${dockBoxRows - 1 + dockRel}B`);
+    for (let i = 0; i < dockBoxRows; i++) {
+        process.stdout.write("\r\x1b[K");
+        if (i < dockBoxRows - 1)
+            process.stdout.write("\x1b[1A");
+    }
+    process.stdout.write(`\x1b[${dockRel}A`);
+    docked = false;
+    dockRel = 0;
+    dockGap = true;
+}
+/** Write exactly one blank row then the box frame below the current row, and
+ *  park the cursor at the box top. */
+function dockRenderBox() {
+    if (dockBoxRows < 1)
+        return;
+    process.stdout.write("\n\n" + dockFrameLines.join("\n"));
+    process.stdout.write(`\x1b[${dockBoxRows - 1}A\r`);
+    dockRel = 0;
+    docked = true;
+    dockGap = false;
+}
+/** Commit content at the box top, pushing the box down, preserving exactly one
+ *  blank row between the content and the box. */
+export function dockAppendContent(text) {
+    if (!text)
+        return;
+    if (!docked) {
+        process.stdout.write(text);
+        return;
+    }
+    dockEraseBox();
+    process.stdout.write(text);
+    const tb = displayRows(text) - displayRows(text.replace(/\n+$/, ""));
+    if (tb > 0)
+        process.stdout.write(`\x1b[${tb}A`);
+    dockRenderBox();
+}
+/** Replace a transient spinner row (the gap row) with content, then re-dock. */
+export function dockReplaceTransient(text) {
+    if (!text)
+        return;
+    if (!docked) {
+        process.stdout.write(text);
+        return;
+    }
+    dockEraseBoxKeep();
+    process.stdout.write(text);
+    const tb = displayRows(text) - displayRows(text.replace(/\n+$/, ""));
+    if (tb > 0)
+        process.stdout.write(`\x1b[${tb}A`);
+    dockRenderBox();
+}
+// ---------------------------------------------------------------------------
 // Cursor & Spinner
 // ---------------------------------------------------------------------------
 let cursorHidden = false;
@@ -1060,7 +1188,15 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             process.stdin.setRawMode(false);
             if (pasteBurstTimer)
                 clearTimeout(pasteBurstTimer);
-            clearBox();
+            if (isErr) {
+                clearBox();
+                dockSetInactive();
+            }
+            else {
+                process.stdout.write(`\x1b[${lastCursorRow}A\r`);
+                dockSetFrame((prevFrameLines ?? []).join("\n"), lastTotalRows);
+                dockEnterDocked();
+            }
             process.stdin.removeListener("keypress", onKeypress);
             process.stdin.pause();
             showCursor();
@@ -1073,7 +1209,12 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
             const { frame, cursorRow, cursorCol, totalRows } = renderBufferWithCursor(buffer, pasteSpans, prefix, label, cursor, hints);
             const newLines = frame.split("\n");
             if (isFirst) {
-                process.stdout.write("\n");
+                if (dockIsDocked()) {
+                    dockEraseBox();
+                }
+                else if (!dockHasGap()) {
+                    process.stdout.write("\n");
+                }
                 for (let i = 0; i < newLines.length; i++) {
                     process.stdout.write(newLines[i]);
                     if (i < newLines.length - 1)
@@ -1082,6 +1223,8 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 prevFrameLines = newLines;
                 lastCursorRow = cursorRow;
                 lastTotalRows = totalRows;
+                dockSetFrame(frame, totalRows);
+                dockEnterDocked();
                 const up = totalRows - 1 - cursorRow;
                 process.stdout.write(`\x1b[${up}A\r\x1b[${cursorCol}C`);
             }
@@ -1105,6 +1248,7 @@ export function askBottomPrompt(label = "You", prefix = "❯", history = [], hin
                 prevFrameLines = newLines;
                 lastCursorRow = cursorRow;
                 lastTotalRows = totalRows;
+                dockSetFrame(frame, totalRows);
             }
         };
         const shiftSpansAfterInsert = (pos, delta) => {

package/package.json

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