@oxecli/oxe 1.0.92 → 1.0.95

package/dist/engine.js

@@ -49,6 +49,10 @@ export class InferenceEngine {
     queryHasOutput = false;
     queryCalledTool = false;
     temperature;
+    /** True once a "Worked for …" line has been committed during the current
+     *  query, so subsequent tool iterations don't pile up duplicate working
+     *  blocks. The total worked time is summarized in the final footer. */
+    workedCommitted = false;
     storedResponseIds = [];
     constructor(config) {
         this.modelName = config["model_name"];
@@ -151,10 +155,18 @@ export class InferenceEngine {
         let sawReasoning = false;
         let status = null;
         let thinkingStart = null;
-        dockTransientStart();
+        // Only the first API pass in a query shows the "Working…" spinner and a
+        // committed "Worked for …" block. Subsequent tool iterations run silently
+        // (the tool labels/results already give feedback) so duplicate working
+        // blocks never stack; the total worked time lands in the final footer.
+        const showWorkSpinner = !this.workedCommitted;
+        if (showWorkSpinner)
+            dockTransientStart();
         const workStatus = new Spinner();
         const workingStarted = Date.now();
-        workStatus.startWithRender(() => `Working ${tickDuration((Date.now() - workingStarted) / 1000)}`);
+        if (showWorkSpinner) {
+            workStatus.startWithRender(() => `Working ${tickDuration((Date.now() - workingStarted) / 1000)}`);
+        }
         let workingReported = false;
         let response = null;
         let etype = null;
@@ -169,6 +181,9 @@ export class InferenceEngine {
             workingReported = true;
             const elapsed = (Date.now() - workingStarted) / 1000;
             const t = tickDuration(elapsed);
+            if (!showWorkSpinner)
+                return;
+            this.workedCommitted = true;
             story.push({ type: "worked", text: `Worked for ${t}` });
             dockReplaceTransient(mutedMarkdown(`Worked for ${t}`) + "\n");
         };
@@ -399,6 +414,7 @@ export class InferenceEngine {
         this.interrupted = false;
         this.queryHasOutput = false;
         this.queryCalledTool = false;
+        this.workedCommitted = false;
         this.activeAbort = new AbortController();
         hideCursor();
         inputItems.push({

package/dist/ui.js

@@ -603,21 +603,39 @@ export function dockTearDown() {
         dockFrameLines = [];
     }
 }
-/** Park a transient spinner two rows above the box (dockRel=2), keeping boxTop-1
- *  as the single blank gap. "flush" parks the spinner directly under the
- *  preceding content (label, spinner, blank, box); "blank" gives it its own
- *  blank row above (echo, blank, spinner, blank, box). Idempotent while parked. */
+/** Park a transient spinner row above the box. "flush" parks it directly under
+ *  the preceding content (so a tool result is adjacent to its label); "blank"
+ *  gives it its own blank row above. The single blank gap between content and
+ *  box is always preserved. Idempotent while parked.
+ *
+ *  This dock uses an erase-and-redraw model (never insert-lines), so it stays
+ *  stable when the box sits near the bottom of a real terminal, where
+ *  inserting lines would otherwise scroll the box off-screen. */
 export function dockTransientStart(mode = "blank") {
     if (!docked || dockBoxRows < 1)
         return;
     if (dockTransient)
         return;
-    const insert = mode === "flush" ? 1 : 2;
-    process.stdout.write(`\x1b[${insert}L`);
-    if (mode === "flush")
-        process.stdout.write("\x1b[1A");
-    process.stdout.write("\r");
-    dockRel = 2;
+    dockEraseBox();
+    if (mode === "flush") {
+        // Park on the gap row directly under the preceding content (adjacent).
+        process.stdout.write("\x1b[1A\r");
+        process.stdout.write("\n");
+        process.stdout.write(dockFrameLines.join("\n"));
+        process.stdout.write(`\x1b[${dockBoxRows - 1}A`);
+        process.stdout.write("\x1b[1A\r");
+        dockRel = 1;
+    }
+    else {
+        // Park on a fresh spinner row that keeps a blank above and below it.
+        process.stdout.write("\n\n");
+        process.stdout.write(dockFrameLines.join("\n"));
+        process.stdout.write(`\x1b[${dockBoxRows - 1}A`);
+        process.stdout.write("\x1b[2A\r");
+        dockRel = 2;
+    }
+    docked = true;
+    dockGap = false;
     dockTransient = true;
 }
 /** Erase the box and any transient rows above it, leaving the cursor at boxTop
@@ -642,9 +660,37 @@ function dockEraseBox() {
     dockGap = true;
     dockTransient = false;
 }
-/** Commit content at the box top: insert `rows+1` lines to push the box down
- *  (no erase/redraw), write the body, leave exactly one blank row between the
- *  content and the box, and park the cursor at the new boxTop. */
+/** Erase the box and transient rows, leaving the cursor on the transient row
+ *  (so dockReplaceTransient can write new content in its place). */
+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;
+    dockTransient = false;
+}
+/** Write one blank gap 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;
+    dockTransient = 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;
@@ -652,18 +698,15 @@ export function dockAppendContent(text) {
         process.stdout.write(text);
         return;
     }
-    const body = text.replace(/\n+$/, "");
-    if (!body)
-        return;
-    const rows = displayRows(body);
-    process.stdout.write(`\x1b[${rows + 1}L`);
-    process.stdout.write(body + "\n\r");
-    process.stdout.write("\x1b[1B\r");
+    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 (dockRel=2, two rows above the box) with
- *  real (possibly multi-row) content: erase the spinner line, push the box
- *  down by `rows-1` if the content is taller than the transient row, write the
- *  content, and park the cursor at the boxTop with one blank row above it. */
+/** Replace a transient spinner row with real (possibly multi-row) content, then
+ *  re-dock, keeping exactly one blank row between content and box. */
 export function dockReplaceTransient(text) {
     if (!text)
         return;
@@ -675,18 +718,12 @@ export function dockReplaceTransient(text) {
         dockAppendContent(text);
         return;
     }
-    const body = text.replace(/\n+$/, "");
-    if (!body)
-        return;
-    const rows = displayRows(body);
-    const push = rows + 1 - dockRel;
-    process.stdout.write("\r\x1b[K");
-    if (push > 0)
-        process.stdout.write(`\x1b[${push}L`);
-    process.stdout.write(body);
-    process.stdout.write("\x1b[2B\r");
-    dockRel = 0;
-    dockTransient = false;
+    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

package/package.json

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