open-agents-ai 0.103.88 → 0.103.90

package/dist/index.js

@@ -46731,28 +46731,28 @@ var init_status_bar = __esm({
         const pos = this.rowPositions(rows);
         const w = getTermWidth();
         const sep = c2.dim("\u2500".repeat(w));
-        let clearBuf = "";
-        if (prevRows > 0 && (rows !== prevRows || cols !== prevCols)) {
-          const wrapFactor = cols > 0 ? Math.ceil(prevCols / cols) : 1;
-          const extraWrappedRows = Math.max(0, (wrapFactor - 1) * 3);
-          const safetyMargin = extraWrappedRows + 2;
-          const clearFrom = Math.max(1, pos.bufferRow - safetyMargin);
-          clearBuf = "\x1B[1;" + rows + `r\x1B[${clearFrom};1H\x1B[J`;
-        }
         if (this.writeDepth > 0) {
           const inputWrap = this.wrapInput(w);
-          let buf = clearBuf + `\x1B[${this.scrollRegionTop};${pos.scrollEnd}r\x1B[?25l\x1B[?7l\x1B[${pos.bufferRow};1H\x1B[2K${this.buildBufferContent(w)}\x1B[${pos.topSepRow};1H\x1B[2K${sep}`;
+          let buf = `\x1B[${this.scrollRegionTop};${pos.scrollEnd}r\x1B[?25l\x1B[?7l`;
+          for (let row = pos.bufferRow; row <= rows; row++) {
+            buf += `\x1B[${row};1H\x1B[2K`;
+          }
+          buf += `\x1B[${pos.bufferRow};1H${this.buildBufferContent(w)}\x1B[${pos.topSepRow};1H${sep}`;
           for (let i = 0; i < inputWrap.lines.length; i++) {
             const row = pos.inputStartRow + i;
             const prefix = i === 0 ? this.promptText : " ".repeat(this.promptWidth);
-            buf += `\x1B[${row};1H\x1B[2K${prefix}${inputWrap.lines[i]}`;
+            buf += `\x1B[${row};1H${prefix}${inputWrap.lines[i]}`;
           }
-          buf += `\x1B[${pos.bottomSepRow};1H\x1B[2K${sep}\x1B[${pos.metricsRow};1H\x1B[2K${this.buildMetricsLine()}\x1B[?7h\x1B[${pos.scrollEnd};1H`;
+          buf += `\x1B[${pos.bottomSepRow};1H${sep}\x1B[${pos.metricsRow};1H${this.buildMetricsLine()}\x1B[?7h\x1B[${pos.scrollEnd};1H`;
           process.stdout.write(buf);
         } else {
-          if (clearBuf)
-            process.stdout.write(clearBuf);
           this.applyScrollRegion();
+          let clearBuf = "\x1B[?7l";
+          for (let row = pos.bufferRow; row <= rows; row++) {
+            clearBuf += `\x1B[${row};1H\x1B[2K`;
+          }
+          clearBuf += "\x1B[?7h";
+          process.stdout.write(clearBuf);
           this.renderFooterAndPositionInput();
         }
       }
@@ -46843,58 +46843,68 @@ var init_status_bar = __esm({
         const pipe = pastel2(60, " \u2502 ");
         const pipeW = 3;
         const sections = [];
+        const compactOrder = [];
+        let modelSectionIdx = -1;
+        let versionSectionIdx = -1;
         const tokInRaw = m.promptTokens > 0 ? m.promptTokens : Math.max(m.estimatedContextTokens, 0);
-        const tokInPrefix = m.promptTokens > 0 ? "" : "~";
-        const tokInExpanded = pastel2(117, "In: ") + c2.bold(tokInPrefix + tokInRaw.toLocaleString());
-        const tokInCompact = pastel2(117, "I:") + c2.bold(tokInPrefix + _StatusBar.compactNum(tokInRaw));
-        sections.push({
-          expanded: tokInExpanded,
-          compact: tokInCompact,
-          expandedW: 4 + (tokInPrefix + tokInRaw.toLocaleString()).length,
-          compactW: 2 + (tokInPrefix + _StatusBar.compactNum(tokInRaw)).length,
-          empty: false
-        });
         const effectiveOut = this.effectiveCompletionTokens;
         const tokOutRaw = effectiveOut > 0 ? effectiveOut : Math.ceil(m.totalTokens > 0 ? m.totalTokens - m.promptTokens : m.estimatedContextTokens * 0.3);
-        const tokOutPrefix = effectiveOut > 0 ? "" : "~";
-        const tokOutExpanded = pastel2(151, "Out: ") + c2.bold(tokOutPrefix + Math.max(0, tokOutRaw).toLocaleString());
-        const tokOutCompact = pastel2(151, "O:") + c2.bold(tokOutPrefix + _StatusBar.compactNum(Math.max(0, tokOutRaw)));
-        sections.push({
-          expanded: tokOutExpanded,
-          compact: tokOutCompact,
-          expandedW: 5 + (tokOutPrefix + Math.max(0, tokOutRaw).toLocaleString()).length,
-          compactW: 2 + (tokOutPrefix + _StatusBar.compactNum(Math.max(0, tokOutRaw))).length,
-          empty: false
-        });
-        const ctxUsed = m.estimatedContextTokens;
-        const ctxTotal = m.contextWindowSize;
-        let ctxExpanded;
-        let ctxCompact;
-        let ctxExpandedW;
-        let ctxCompactW;
-        if (ctxTotal <= 0) {
-          ctxExpanded = pastel2(153, "Ctx: ") + c2.dim("--");
-          ctxCompact = pastel2(153, "Ctx:") + c2.dim("--");
-          ctxExpandedW = 7;
-          ctxCompactW = 6;
-        } else {
-          const ctxPct = Math.max(0, Math.min(100, Math.round((1 - ctxUsed / ctxTotal) * 100)));
-          const ctxColor = ctxPct > 50 ? c2.green : ctxPct > 20 ? c2.yellow : c2.red;
-          const ctxFullStr = `${ctxUsed.toLocaleString()}/${ctxTotal.toLocaleString()}`;
-          ctxExpanded = pastel2(153, "Ctx: ") + c2.bold(ctxFullStr) + ` ${ctxColor(`${ctxPct}%`)}`;
-          ctxCompact = pastel2(153, "Ctx:") + ctxColor(`${ctxPct}%`);
-          ctxExpandedW = 5 + ctxFullStr.length + 1 + `${ctxPct}%`.length;
-          ctxCompactW = 4 + `${ctxPct}%`.length;
-        }
-        sections.push({ expanded: ctxExpanded, compact: ctxCompact, expandedW: ctxExpandedW, compactW: ctxCompactW, empty: false });
+        const tokOutVal = Math.max(0, tokOutRaw);
+        const tokExpanded = pastel2(117, "\u2191") + c2.bold(tokInRaw.toLocaleString()) + " " + pastel2(151, "\u2193") + c2.bold(tokOutVal.toLocaleString());
+        const tokCompact = pastel2(117, "\u2191") + c2.bold(_StatusBar.compactNum(tokInRaw)) + " " + pastel2(151, "\u2193") + c2.bold(_StatusBar.compactNum(tokOutVal));
+        const tokExpW = 1 + tokInRaw.toLocaleString().length + 1 + 1 + tokOutVal.toLocaleString().length;
+        const tokCompW = 1 + _StatusBar.compactNum(tokInRaw).length + 1 + 1 + _StatusBar.compactNum(tokOutVal).length;
+        sections.push({ expanded: tokExpanded, compact: tokCompact, expandedW: tokExpW, compactW: tokCompW, empty: false });
+        {
+          const ctxUsed = m.estimatedContextTokens;
+          const ctxTotal = m.contextWindowSize;
+          let ctxSuffix = "";
+          let ctxSuffixW = 0;
+          let ctxCompSuffix = "";
+          let ctxCompSuffixW = 0;
+          if (ctxTotal > 0) {
+            const ctxPct = Math.max(0, Math.min(100, Math.round((1 - ctxUsed / ctxTotal) * 100)));
+            const ctxColor = ctxPct > 50 ? c2.green : ctxPct > 20 ? c2.yellow : c2.red;
+            const ctxSizeStr = _StatusBar.compactNum(ctxTotal);
+            ctxSuffix = " " + ctxColor(`${ctxPct}%`) + c2.dim(` ${ctxSizeStr}`);
+            ctxSuffixW = 1 + `${ctxPct}%`.length + 1 + ctxSizeStr.length;
+            ctxCompSuffix = " " + ctxColor(`${ctxPct}%`);
+            ctxCompSuffixW = 1 + `${ctxPct}%`.length;
+          }
+          const capParts = [];
+          if (this._caps.vision)
+            capParts.push("\u{1F441}");
+          if (this._caps.toolUse)
+            capParts.push("\u{1F527}");
+          if (this._caps.thinking)
+            capParts.push("\u{1F9E0}");
+          const capsStr = capParts.length > 0 ? " " + capParts.join(" ") : "";
+          const capsVisW = capParts.length > 0 ? 1 + capParts.length * 2 + (capParts.length - 1) : 0;
+          if (this._modelName) {
+            const paramMatch = this._modelName.match(/(\d+\.?\d*[bBmM])/);
+            const paramStr = paramMatch ? paramMatch[1] : this._modelName.split(":")[0]?.split("/").pop() ?? this._modelName;
+            const modelExpanded = pastel2(146, this._modelName) + (capsStr ? " " + pastel2(183, capParts.join(" ")) : "") + ctxSuffix;
+            const modelCompact = (capParts.length > 0 ? pastel2(183, capParts.join(" ")) : pastel2(146, paramStr)) + ctxCompSuffix;
+            const expW = this._modelName.length + capsVisW + ctxSuffixW;
+            const compW = (capParts.length > 0 ? capParts.length * 2 + (capParts.length - 1) : paramStr.length) + ctxCompSuffixW;
+            modelSectionIdx = sections.length;
+            sections.push({ expanded: modelExpanded, compact: modelCompact, expandedW: expW, compactW: compW, empty: false });
+          } else if (capParts.length > 0) {
+            const capsOnly = pastel2(183, capParts.join(" ")) + ctxCompSuffix;
+            const capsOnlyW = capParts.length * 2 + (capParts.length - 1) + ctxCompSuffixW;
+            sections.push({ expanded: capsOnly, compact: capsOnly, expandedW: capsOnlyW, compactW: capsOnlyW, empty: false });
+          } else if (ctxTotal > 0) {
+            sections.push({ expanded: ctxSuffix.trimStart(), compact: ctxCompSuffix.trimStart(), expandedW: ctxSuffixW - 1, compactW: ctxCompSuffixW - 1, empty: false });
+          }
+        }
         if (this._snr) {
           const snrPct = Math.round(this._snr.ratio * 100);
           const snrColor = snrPct >= 70 ? c2.green : snrPct >= 40 ? c2.yellow : c2.red;
           const dPrimeStr = this._snr.dPrime.toFixed(1);
           const capStr = this._snr.capacityWarning ? c2.red(" !CAP") : "";
-          const snrExpanded = pastel2(183, "SNR: ") + snrColor(c2.bold(`${snrPct}%`)) + c2.dim(` d'${dPrimeStr}`) + capStr;
+          const snrExpanded = pastel2(183, "SNR ") + snrColor(c2.bold(`${snrPct}%`)) + c2.dim(` d'${dPrimeStr}`) + capStr;
           const snrCompact = snrColor(`${snrPct}%`);
-          const expW = 5 + `${snrPct}%`.length + 3 + dPrimeStr.length + (this._snr.capacityWarning ? 5 : 0);
+          const expW = 4 + `${snrPct}%`.length + 3 + dPrimeStr.length + (this._snr.capacityWarning ? 5 : 0);
           sections.push({ expanded: snrExpanded, compact: snrCompact, expandedW: expW, compactW: `${snrPct}%`.length, empty: false });
         }
         if (this._emotion) {
@@ -46904,9 +46914,7 @@ var init_status_bar = __esm({
             expanded: emotionExpanded,
             compact: emotionCompact,
             expandedW: 2 + 1 + this._emotion.label.length,
-            // emoji(2) + space + label
             compactW: 2,
-            // just emoji
             empty: false
           });
         }
@@ -46915,63 +46923,28 @@ var init_status_bar = __esm({
           if (ratio > 0) {
             const ratioStr = ratio >= 10 ? `${Math.round(ratio)}x` : `${ratio.toFixed(1)}x`;
             const ratioColor = ratio >= 2 ? c2.green : ratio >= 1 ? c2.yellow : c2.red;
-            const speedExpanded = pastel2(218, "Exp: ") + ratioColor(c2.bold(ratioStr));
+            const speedExpanded = pastel2(218, "Exp ") + ratioColor(c2.bold(ratioStr));
             sections.push({
               expanded: speedExpanded,
               compact: speedExpanded,
-              expandedW: 5 + ratioStr.length,
-              compactW: 5 + ratioStr.length,
+              expandedW: 4 + ratioStr.length,
+              compactW: 4 + ratioStr.length,
               empty: false
             });
           }
         }
         if (m.hasPricing && m.estimatedCost !== void 0) {
           const costStr = m.estimatedCost < 0.01 ? `$${m.estimatedCost.toFixed(4)}` : m.estimatedCost < 1 ? `$${m.estimatedCost.toFixed(3)}` : `$${m.estimatedCost.toFixed(2)}`;
-          const costExpanded = pastel2(222, "Cost: ") + c2.bold(costStr);
-          const costCompact = pastel2(222, "") + c2.bold(costStr);
+          const costExpanded = pastel2(222, "Cost ") + c2.bold(costStr);
+          const costCompact = c2.bold(costStr);
           sections.push({
             expanded: costExpanded,
             compact: costCompact,
-            expandedW: 6 + costStr.length,
+            expandedW: 5 + costStr.length,
             compactW: costStr.length,
             empty: false
           });
         }
-        if (this._modelName) {
-          const capParts = [];
-          if (this._caps.vision)
-            capParts.push("\u{1F441}");
-          if (this._caps.toolUse)
-            capParts.push("\u{1F527}");
-          if (this._caps.thinking)
-            capParts.push("\u{1F9E0}");
-          const capsStr = capParts.length > 0 ? " " + capParts.join(" ") : "";
-          const capsVisW = capParts.length > 0 ? 1 + capParts.length * 2 + (capParts.length - 1) : 0;
-          const paramMatch = this._modelName.match(/(\d+\.?\d*[bBmM])/);
-          const paramStr = paramMatch ? paramMatch[1] : this._modelName.split(":")[0]?.split("/").pop() ?? this._modelName;
-          const modelExpanded = pastel2(146, this._modelName) + (capsStr ? pastel2(60, " ") + pastel2(183, capParts.join(" ")) : "");
-          const modelCompact = pastel2(146, paramStr) + (capsStr ? pastel2(60, " ") + pastel2(183, capParts.join(" ")) : "");
-          sections.push({
-            expanded: modelExpanded,
-            compact: modelCompact,
-            expandedW: this._modelName.length + capsVisW,
-            compactW: paramStr.length + capsVisW,
-            empty: false
-          });
-        } else {
-          const capParts = [];
-          if (this._caps.vision)
-            capParts.push("\u{1F441}");
-          if (this._caps.toolUse)
-            capParts.push("\u{1F527}");
-          if (this._caps.thinking)
-            capParts.push("\u{1F9E0}");
-          if (capParts.length > 0) {
-            const capsStr = pastel2(183, capParts.join(" "));
-            const capsVisW = capParts.length * 2 + (capParts.length - 1);
-            sections.push({ expanded: capsStr, compact: capsStr, expandedW: capsVisW, compactW: capsVisW, empty: false });
-          }
-        }
         if (this._expose) {
           const INTERNAL_CAPS = /* @__PURE__ */ new Set(["system_metrics", "__list_capabilities"]);
           const statusEmoji = this._expose.activeConnections > 0 ? this._exposeBlinkOn ? "\u{1F7E2}" : "\u26AB" : this._expose.status === "active" ? "\u{1F7E2}" : this._expose.status === "error" ? "\u{1F534}" : "\u{1F7E0}";
@@ -46992,7 +46965,6 @@ var init_status_bar = __esm({
             expanded: exposeExpanded,
             compact: exposeCompact,
             expandedW: 2 + expFullStr.length,
-            // emoji(2) + text
             compactW: 2 + expCompStr.length,
             empty: false
           });
@@ -47010,39 +46982,39 @@ var init_status_bar = __esm({
           if (rm2.cpuUtil >= 0) {
             const cpuColor = rm2.cpuUtil > 80 ? c2.red : rm2.cpuUtil > 50 ? c2.yellow : c2.green;
             const cpuCoresInfo = rm2.cpuCores > 0 ? ` (${rm2.cpuCores}c` + (rm2.cpuModel ? " " + rm2.cpuModel.replace(/\s+/g, " ").slice(0, 30) : "") + ")" : "";
-            hwExpStr += `CPU:${cpuColor(rm2.cpuUtil + "%")}${c2.dim(cpuCoresInfo)}`;
-            hwCompStr += `CPU:${cpuColor(rm2.cpuUtil + "%")}`;
+            hwExpStr += `CPU ${cpuColor(rm2.cpuUtil + "%")}${c2.dim(cpuCoresInfo)}`;
+            hwCompStr += `CPU ${cpuColor(rm2.cpuUtil + "%")}`;
             hwExpW += 4 + `${rm2.cpuUtil}%`.length + cpuCoresInfo.length;
             hwCompW += 4 + `${rm2.cpuUtil}%`.length;
           }
           if (rm2.memUtil >= 0) {
             const memColor = rm2.memUtil > 80 ? c2.red : rm2.memUtil > 50 ? c2.yellow : c2.green;
             const memDetail = rm2.memTotalGB > 0 ? ` (${rm2.memUsedGB}/${rm2.memTotalGB}GB)` : "";
-            hwExpStr += ` RAM:${memColor(rm2.memUtil + "%")}${c2.dim(memDetail)}`;
-            hwCompStr += ` RAM:${memColor(rm2.memUtil + "%")}`;
+            hwExpStr += ` RAM ${memColor(rm2.memUtil + "%")}${c2.dim(memDetail)}`;
+            hwCompStr += ` RAM ${memColor(rm2.memUtil + "%")}`;
             hwExpW += 5 + `${rm2.memUtil}%`.length + memDetail.length;
             hwCompW += 5 + `${rm2.memUtil}%`.length;
           }
           if (rm2.gpuUtil >= 0) {
             const gpuColor = rm2.gpuUtil > 80 ? c2.red : rm2.gpuUtil > 50 ? c2.yellow : c2.green;
             const gpuNameShort = rm2.gpuName ? ` (${rm2.gpuName.slice(0, 20)})` : "";
-            hwExpStr += ` GPU:${gpuColor(rm2.gpuUtil + "%")}${c2.dim(gpuNameShort)}`;
-            hwCompStr += ` GPU:${gpuColor(rm2.gpuUtil + "%")}`;
+            hwExpStr += ` GPU ${gpuColor(rm2.gpuUtil + "%")}${c2.dim(gpuNameShort)}`;
+            hwCompStr += ` GPU ${gpuColor(rm2.gpuUtil + "%")}`;
             hwExpW += 5 + `${rm2.gpuUtil}%`.length + gpuNameShort.length;
             hwCompW += 5 + `${rm2.gpuUtil}%`.length;
           }
           if (rm2.vramUtil >= 0) {
             const vramColor = rm2.vramUtil > 80 ? c2.red : rm2.vramUtil > 50 ? c2.yellow : c2.green;
             const vramDetail = rm2.vramTotalMB > 0 ? ` (${rm2.vramUsedMB}/${rm2.vramTotalMB}MB)` : "";
-            hwExpStr += ` VRAM:${vramColor(rm2.vramUtil + "%")}${c2.dim(vramDetail)}`;
+            hwExpStr += ` VRAM ${vramColor(rm2.vramUtil + "%")}${c2.dim(vramDetail)}`;
             hwExpW += 6 + `${rm2.vramUtil}%`.length + vramDetail.length;
           }
           const net = um.network;
           const rxStr = formatRate(net.rxBytesPerSec);
           const txStr = formatRate(net.txBytesPerSec);
-          const netExpStr = ` ${c2.dim("i:")}${pastel2(116, rxStr)} ${c2.dim("o:")}${pastel2(218, txStr)}`;
-          const netCompStr = ` ${c2.dim("i:")}${pastel2(116, rxStr)} ${c2.dim("o:")}${pastel2(218, txStr)}`;
-          const netW = 3 + rxStr.length + 3 + txStr.length;
+          const netExpStr = ` ${pastel2(116, "\u2193" + rxStr)} ${pastel2(218, "\u2191" + txStr)}`;
+          const netCompStr = netExpStr;
+          const netW = 1 + 1 + rxStr.length + 1 + 1 + txStr.length;
           const sysExpanded = srcTag + " " + hwExpStr + netExpStr;
           const sysCompact = srcTag + " " + hwCompStr + netCompStr;
           sections.push({
@@ -47061,34 +47033,54 @@ var init_status_bar = __esm({
           sections.push({ expanded: recStr, compact: recStr, expandedW: recW, compactW: recW, empty: false });
         }
         if (this._version) {
-          const vExpanded = pastel2(245, "v" + this._version);
-          const vCompact = pastel2(245, "v" + this._version);
+          versionSectionIdx = sections.length;
+          const vStr = pastel2(245, "v" + this._version);
           const vW = 1 + this._version.length;
-          sections.push({ expanded: vExpanded, compact: vCompact, expandedW: vW, compactW: vW, empty: false });
+          sections.push({ expanded: vStr, compact: vStr, expandedW: vW, compactW: vW, empty: false });
         }
         const activeIndices = sections.map((s, i) => !s.empty ? i : -1).filter((i) => i >= 0);
         const isCompact = new Array(sections.length).fill(false);
+        const isHidden = new Array(sections.length).fill(false);
+        if (modelSectionIdx >= 0)
+          compactOrder.push(modelSectionIdx);
+        if (versionSectionIdx >= 0)
+          compactOrder.push(versionSectionIdx);
+        for (let j = activeIndices.length - 1; j >= 0; j--) {
+          const idx = activeIndices[j];
+          if (idx !== modelSectionIdx && idx !== versionSectionIdx) {
+            compactOrder.push(idx);
+          }
+        }
         const calcTotalWidth = () => {
           let w = 1;
-          for (let j = 0; j < activeIndices.length; j++) {
-            const idx = activeIndices[j];
+          let first2 = true;
+          for (const idx of activeIndices) {
+            if (isHidden[idx])
+              continue;
             const sec = sections[idx];
-            if (j > 0)
+            if (!first2)
               w += pipeW;
+            first2 = false;
             w += isCompact[idx] ? sec.compactW : sec.expandedW;
           }
           return w;
         };
         let totalW = calcTotalWidth();
-        for (let j = activeIndices.length - 1; j >= 0 && totalW > termWidth; j--) {
-          const idx = activeIndices[j];
+        for (const idx of compactOrder) {
+          if (totalW <= termWidth)
+            break;
           if (!isCompact[idx] && sections[idx].compactW < sections[idx].expandedW) {
             isCompact[idx] = true;
             totalW = calcTotalWidth();
           }
         }
-        for (let j = 0; j < activeIndices.length; j++) {
-          const idx = activeIndices[j];
+        if (totalW > termWidth && versionSectionIdx >= 0 && !isHidden[versionSectionIdx]) {
+          isHidden[versionSectionIdx] = true;
+          totalW = calcTotalWidth();
+        }
+        for (const idx of activeIndices) {
+          if (isHidden[idx])
+            continue;
           if (isCompact[idx]) {
             const savings = sections[idx].expandedW - sections[idx].compactW;
             if (totalW + savings <= termWidth) {
@@ -47100,10 +47092,13 @@ var init_status_bar = __esm({
           }
         }
         let result = " ";
-        for (let j = 0; j < activeIndices.length; j++) {
-          const idx = activeIndices[j];
-          if (j > 0)
+        let first = true;
+        for (const idx of activeIndices) {
+          if (isHidden[idx])
+            continue;
+          if (!first)
             result += pipe;
+          first = false;
           result += isCompact[idx] ? sections[idx].compact : sections[idx].expanded;
         }
         return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.103.88",
+  "version": "0.103.90",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",