open-agents-ai 0.187.90 → 0.187.91

package/dist/index.js

@@ -278632,131 +278632,110 @@ var init_status_bar = __esm({
         this._headerPanels.push({ id, render });
         return this._headerPanels.length - 1;
       }
-      /** Rebuild all header panels from the current item set.
-       *  Items are paginated across N pages — each page fills left-to-right
-       *  until no more items fit. Called on activate and resize. */
+      /** Rebuild all header panels. Two categories are kept separate:
+       *  - Category A: Version + menu buttons (help/voice/model/cohere)
+       *  - Category B: Systems (agents/voice status/nexus status)
+       *  Each category paginates independently across N pages. */
       _rebuildHeaderPanels() {
         this._headerPanels = [];
         const savedIdx = this._headerPanelIndex;
-        const buildItems = () => {
-          const items = [];
-          const verText = ` OA v${this._version}`;
-          items.push({ type: "text", text: verText, ansi: `\x1B[1;38;5;${TEXT_PRIMARY}m${verText}\x1B[0m`, w: verText.length });
-          for (const btn of [
-            { cmd: "help", label: " help " },
-            { cmd: "voice", label: " voice " },
-            { cmd: "model", label: " model " },
-            { cmd: "cohere", label: " cohere " }
-          ]) {
-            items.push({ type: "btn", cmd: btn.cmd, label: btn.label, w: btn.label.length + 1 });
-          }
-          items.push({ type: "sep", w: 3 });
-          if (this._agentViews.size > 1) {
-            for (const view of this._agentViews.values()) {
-              if (view.id === "main" && this._activeViewId === "main")
-                continue;
-              const icon = view.status === "running" ? "\u25CF" : view.status === "completed" ? "\u2713" : view.status === "failed" ? "\u2717" : "\u25CB";
-              const label = ` ${view.label} ${icon} `;
-              items.push({ type: "btn", cmd: `view:${view.id}`, label, w: label.length + 1 });
-            }
-          } else {
-            items.push({ type: "text", text: " no sub-agents", ansi: `\x1B[38;5;${TEXT_DIM}m no sub-agents`, w: 14 });
-          }
-          const voiceIcon = this._voiceActive ? "\u25CF" : "\u25CB";
-          const voiceColor = this._voiceActive ? 82 : TEXT_DIM;
-          const voiceLabel = this._voiceActive ? ` ${this._voiceModelId || "voice"} ` : " voice ";
-          items.push({
-            type: "btn",
-            cmd: "voice",
-            label: `${voiceIcon}${voiceLabel}`,
-            w: voiceLabel.length + 1 + 1
-            // icon + label + space
-          });
-          const nexusColor = this._nexusStatus === "connected" ? 82 : this._nexusStatus === "connecting" ? 208 : 196;
-          const nexusDot = this._nexusStatus === "connected" || this._nexusStatus === "connecting" ? "\u25CF" : "\u25CB";
-          items.push({
-            type: "btn",
-            cmd: "nexus",
-            label: `${nexusDot} nexus `,
-            w: 8
-            // dot + " nexus " + space
-          });
-          return items;
+        const availW = Math.max(10, termCols() - 5);
+        const renderBtn = (cmd, label) => {
+          const cmdPrefix = cmd.startsWith("view:") ? "oa-view:" + cmd.slice(5) : "oa-cmd:" + cmd;
+          let fg2 = TEXT_DIM;
+          if (cmd === "voice" && this._voiceActive)
+            fg2 = 82;
+          if (cmd === "nexus") {
+            fg2 = this._nexusStatus === "connected" ? 82 : this._nexusStatus === "connecting" ? 208 : 196;
+          }
+          return `\x1B]8;;${cmdPrefix}\x07\x1B[38;5;${fg2}m${label}\x1B]8;;\x07`;
         };
-        const allItems = buildItems();
-        const availW = Math.max(10, termCols() - 4);
-        let page = [];
-        let pageW = 0;
-        const pages = [];
-        for (const item of allItems) {
-          if (pageW + item.w > availW && page.length > 0) {
-            pages.push(page);
-            page = [];
-            pageW = 0;
-          }
-          page.push(item);
-          pageW += item.w;
-        }
-        if (page.length > 0)
-          pages.push(page);
-        for (let pi = 0; pi < pages.length; pi++) {
-          const pageItems = pages[pi];
-          this.registerHeaderPanel(`page-${pi}`, (innerW) => {
+        const verText = ` OA v${this._version}`;
+        const menuBtns = [
+          { cmd: "help", label: " help ", w: 6 },
+          { cmd: "voice", label: " voice ", w: 7 },
+          { cmd: "model", label: " model ", w: 7 },
+          { cmd: "cohere", label: " cohere ", w: 8 }
+        ];
+        const verW = verText.length;
+        let menuPages = [];
+        let curPage = [];
+        let curW = verW + 1;
+        for (const btn of menuBtns) {
+          const btnW = btn.w + 1;
+          if (curW + btnW > availW && curPage.length > 0) {
+            menuPages.push(curPage);
+            curPage = [];
+            curW = 0;
+          }
+          curPage.push(btn);
+          curW += btnW;
+        }
+        if (curPage.length > 0)
+          menuPages.push(curPage);
+        for (let pi = 0; pi < menuPages.length; pi++) {
+          const btns = menuPages[pi];
+          const isFirstPage = pi === 0;
+          this.registerHeaderPanel(`main-${pi}`, (innerW) => {
             let out = "";
             let usedW = 0;
-            for (const item of pageItems) {
-              if (item.type === "text") {
-                out += item.ansi;
-                usedW += item.w;
-              } else if (item.type === "btn") {
-                const cmdPrefix = item.cmd.startsWith("view:") ? "oa-view:" + item.cmd.slice(5) : "oa-cmd:" + item.cmd;
-                let fg2 = TEXT_DIM;
-                if (item.cmd === "voice" && this._voiceActive)
-                  fg2 = 82;
-                if (item.cmd === "nexus") {
-                  fg2 = this._nexusStatus === "connected" ? 82 : this._nexusStatus === "connecting" ? 208 : 196;
-                }
-                out += `\x1B]8;;${cmdPrefix}\x07\x1B[38;5;${fg2}m${item.label}\x1B]8;;\x07 `;
-                usedW += item.w;
-              } else if (item.type === "sep") {
-                out += `\x1B[38;5;${TEXT_DIM}m \u2502 `;
-                usedW += 3;
-              }
-            }
-            if (pi === 0 && usedW < innerW) {
-              const gapNeeded = innerW - usedW;
-              const verEnd = pageItems.findIndex((it) => it.type !== "text");
-              if (verEnd > 0) {
-                let out2 = "";
-                for (let i2 = 0; i2 < pageItems.length; i2++) {
-                  const item = pageItems[i2];
-                  if (item.type === "text") {
-                    out2 += item.ansi;
-                  } else {
-                    if (i2 === verEnd) {
-                      out2 += `\x1B[38;5;${TEXT_DIM}m${" ".repeat(gapNeeded)}`;
-                    }
-                    if (item.type === "btn") {
-                      const cmdPrefix = item.cmd.startsWith("view:") ? "oa-view:" + item.cmd.slice(5) : "oa-cmd:" + item.cmd;
-                      let fg2 = TEXT_DIM;
-                      if (item.cmd === "voice" && this._voiceActive)
-                        fg2 = 82;
-                      if (item.cmd === "nexus") {
-                        fg2 = this._nexusStatus === "connected" ? 82 : this._nexusStatus === "connecting" ? 208 : 196;
-                      }
-                      out2 += `\x1B]8;;${cmdPrefix}\x07\x1B[38;5;${fg2}m${item.label}\x1B]8;;\x07 `;
-                    } else if (item.type === "sep") {
-                      out2 += `\x1B[38;5;${TEXT_DIM}m \u2502 `;
-                    }
-                  }
-                }
-                return out2;
-              }
+            if (isFirstPage) {
+              out += `\x1B[1;38;5;${TEXT_PRIMARY}m${verText}\x1B[0m`;
+              usedW += verW;
+            }
+            let btnTotalW = 0;
+            for (const btn of btns)
+              btnTotalW += btn.w + 1;
+            const gap = Math.max(1, innerW - usedW - btnTotalW);
+            out += `\x1B[38;5;${TEXT_DIM}m${" ".repeat(gap)}`;
+            for (const btn of btns) {
+              out += renderBtn(btn.cmd, btn.label) + " ";
             }
             return out;
           });
         }
-        this._headerPanelIndex = Math.min(savedIdx, this._headerPanels.length - 1);
+        const sysItems = [];
+        if (this._agentViews.size > 1) {
+          for (const view of this._agentViews.values()) {
+            if (view.id === "main" && this._activeViewId === "main")
+              continue;
+            const icon = view.status === "running" ? "\u25CF" : view.status === "completed" ? "\u2713" : view.status === "failed" ? "\u2717" : "\u25CB";
+            const label = ` ${view.label} ${icon} `;
+            sysItems.push({ render: () => renderBtn(`view:${view.id}`, label) + " ", w: label.length + 1 });
+          }
+        } else {
+          sysItems.push({ render: () => `\x1B[38;5;${TEXT_DIM}m no sub-agents `, w: 14 });
+        }
+        sysItems.push({ render: () => `\x1B[38;5;${TEXT_DIM}m\u2502 `, w: 2 });
+        const voiceLabel = this._voiceActive ? ` ${this._voiceModelId || "voice"} ` : " voice ";
+        const voiceIcon = this._voiceActive ? "\u25CF" : "\u25CB";
+        sysItems.push({ render: () => renderBtn("voice", `${voiceIcon}${voiceLabel}`) + " ", w: voiceLabel.length + 2 });
+        const nexusDot = this._nexusStatus === "connected" || this._nexusStatus === "connecting" ? "\u25CF" : "\u25CB";
+        sysItems.push({ render: () => renderBtn("nexus", `${nexusDot} nexus `) + " ", w: 9 });
+        let sysPages = [];
+        let sCurPage = [];
+        let sCurW = 0;
+        for (const item of sysItems) {
+          if (sCurW + item.w > availW && sCurPage.length > 0) {
+            sysPages.push(sCurPage);
+            sCurPage = [];
+            sCurW = 0;
+          }
+          sCurPage.push(item);
+          sCurW += item.w;
+        }
+        if (sCurPage.length > 0)
+          sysPages.push(sCurPage);
+        for (let pi = 0; pi < sysPages.length; pi++) {
+          const items = sysPages[pi];
+          this.registerHeaderPanel(`sys-${pi}`, (_innerW) => {
+            let out = "";
+            for (const item of items)
+              out += item.render();
+            return out;
+          });
+        }
+        this._headerPanelIndex = Math.min(savedIdx, Math.max(0, this._headerPanels.length - 1));
       }
       /** Switch to the next header panel (wraps around) */
       nextHeaderPanel() {
@@ -278781,7 +278760,7 @@ var init_status_bar = __esm({
         if (!this.active)
           return;
         const w = termCols();
-        const innerW = w - 2;
+        const innerW = Math.max(1, w - 5);
         const panel = this._headerPanels[this._headerPanelIndex];
         if (!panel)
           return;

package/package.json

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