@oxecli/oxe 1.0.81 → 1.0.83

package/LICENSE

@@ -12,10 +12,16 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
+Redistribution or publication of the Software, in original or modified form,
+must retain this copyright notice and must not be presented, published, or
+distributed under a different author's name or claimed as the redistributor's
+own original work. Attribution to the original author ("Oxe") must be
+preserved in any public release, fork, or derivative distribution.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/dist/cli.js

@@ -376,7 +376,7 @@ export class CLI {
                 const budget = max_context_tokens - context_overhead_margin;
                 const pct = Math.max(0, Math.min(100, Math.round(((budget - used) / budget) * 100)));
                 const [input, spans] = await askBottomPrompt("You", "❯", this.promptHistory, {
-                    left: "\x1b[90mPress \x1b[1;36mesc\x1b[0m\x1b[90m to interrupt\x1b[0m",
+                    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`,
                 });
                 if (!input.trim())
@@ -445,7 +445,7 @@ export class CLI {
                 }
                 if (err?.message === "interrupt") {
                     const wasActive = queryStarted || engine.inQuery;
-                    if (wasActive && !engine.queryHasOutput) {
+                    if (wasActive && !engine.queryHasOutput && !engine.queryCalledTool) {
                         process.stdout.write(aiMarkdown("What else can I help you with?") + "\n");
                     }
                     engine.inQuery = false;

package/dist/engine.js

@@ -49,6 +49,7 @@ export class InferenceEngine {
     activeAbort = null;
     interrupted = false;
     queryHasOutput = false;
+    queryCalledTool = false;
     temperature;
     storedResponseIds = [];
     constructor(config) {
@@ -425,6 +426,7 @@ export class InferenceEngine {
         this.workRows = 0;
         this.interrupted = false;
         this.queryHasOutput = false;
+        this.queryCalledTool = false;
         this.activeAbort = new AbortController();
         hideCursor();
         inputItems.push({
@@ -576,6 +578,7 @@ export class InferenceEngine {
                 }
                 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.
@@ -595,12 +598,12 @@ export class InferenceEngine {
                         text: action,
                         status: failed ? "failed" : "ok",
                     });
-                    // Swap the "⎿  Working..." line for the real result, then a blank line.
+                    // 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);
-                    process.stdout.write(`\n`);
-                    // Any diff the tool produced is flushed only now, after the spinner
-                    // has stopped, so the box renders cleanly below the action line.
-                    flushPendingDiffOutput();
+                    if (!flushPendingDiffOutput())
+                        process.stdout.write("\n");
                     const truncatedResult = c.name === "read_file"
                         ? truncateToolOutput(rawResult, max_read_file_stored_chars)
                         : truncateToolOutput(rawResult);

package/dist/tools.js

@@ -36,9 +36,10 @@ function truncateDiffLine(line) {
 const pendingDiffOutput = [];
 export function flushPendingDiffOutput() {
     if (!pendingDiffOutput.length)
-        return;
+        return false;
     process.stdout.write(pendingDiffOutput.join("\n") + "\n\n");
     pendingDiffOutput.length = 0;
+    return true;
 }
 function displayDiff(pathName, oldContent, newContent) {
     if (oldContent.length + newContent.length > max_diff_source_chars) {
@@ -137,12 +138,15 @@ function displayDiff(pathName, oldContent, newContent) {
             const bg = isAdd ? "\x1b[48;2;2;40;0m" : "\x1b[48;2;61;1;0m";
             const fg = isAdd ? "\x1b[38;2;80;200;80m" : "\x1b[38;2;220;90;90m";
             const sign = isAdd ? "+" : "-";
-            // Changed content renders normal white with syntax highlighting;
-            // re-apply the white base after each token reset.
+            // The row background spans the full line width (number, sign, content,
+            // and trailing fill) so the row reads as one colored strip. Changed
+            // content renders normal white with syntax highlighting; re-apply the
+            // background + white base after each token reset so both hold across
+            // the whole body.
             const raw = highlightCodeLine(v.body);
-            const body = truncateStyled(raw.replace(/\x1b\[0m/g, "\x1b[0m\x1b[97m"), bodyMax);
+            const body = truncateStyled(raw.replace(/\x1b\[0m/g, `\x1b[0m${bg}\x1b[97m`), bodyMax);
             const fill = Math.max(0, termW - numW - 4 - plainLen(body));
-            pendingDiffOutput.push(`${bg}${fg}${numStr} ${sign}  \x1b[0m\x1b[97m${body}${" ".repeat(fill)}\x1b[0m`);
+            pendingDiffOutput.push(`${bg}${fg}${numStr} ${sign}  \x1b[0m${bg}\x1b[97m${body}${bg}\x1b[97m${" ".repeat(fill)}\x1b[0m`);
         }
         else {
             const raw = v.kind === "\\" ? v.body : highlightCodeLine(v.body);
@@ -403,7 +407,7 @@ export function toolWriteFile(pathName, content) {
     catch (err) {
         return `Error: ${err}`;
     }
-    return `Wrote ${content.length.toLocaleString()} characters to ${pathName}`;
+    return `Wrote ${content.length.toLocaleString()} chars`;
 }
 // ---------------------------------------------------------------------------
 // edit_file

package/dist/ui.js

@@ -571,7 +571,7 @@ export class Spinner {
         }, 300);
     }
     writeDots(initial) {
-        const dots = `\x1b[1;36m${DOT_FRAMES[this.dotsFrame]}\x1b[0m`;
+        const dots = DOT_FRAMES[this.dotsFrame];
         if (initial) {
             process.stdout.write("\r" + this.dotsText + dots + "\r");
         }

package/package.json

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