omnius 1.0.308 → 1.0.310

package/dist/index.js

@@ -557607,6 +557607,17 @@ var init_ollama_pool = __esm({
               return;
             tryKill(pid, "SIGKILL");
           }, 8e3).unref();
+        },
+        onExit: (cb) => {
+          let fired = false;
+          const fireOnce = () => {
+            if (fired)
+              return;
+            fired = true;
+            cb();
+          };
+          child.once("exit", fireOnce);
+          child.once("error", fireOnce);
         }
       };
       child.stdout?.on("data", () => {
@@ -558136,6 +558147,18 @@ var init_ollama_pool = __esm({
           spawnedAtMs
         }, proc);
         this.instances.push(inst);
+        proc.onExit?.(() => {
+          const idx = this.instances.indexOf(inst);
+          if (idx < 0)
+            return;
+          this.instances.splice(idx, 1);
+          this.emit("instance-exited", {
+            id: inst.state.id,
+            pid: proc.pid,
+            port
+          });
+          this.wakeNextSlotWaiter();
+        });
         this.emit("instance-spawned", {
           id: inst.state.id,
           pid: proc.pid,
@@ -565967,6 +565990,23 @@ function isOllamaModelNotFoundResponse(status, text2, model) {
   const modelLower = model.toLowerCase();
   return lower.includes("model") && lower.includes("not found") || lower.includes("not_found_error") || modelLower.length > 0 && lower.includes(modelLower) && lower.includes("not found");
 }
+function isBackendConnectionError(err) {
+  if (err instanceof Error && err.name === "AbortError")
+    return false;
+  const parts = [];
+  if (err instanceof Error) {
+    parts.push(err.message);
+    const cause = err.cause;
+    if (cause instanceof Error)
+      parts.push(cause.message);
+    const code8 = cause?.code;
+    if (typeof code8 === "string")
+      parts.push(code8);
+  } else if (typeof err === "string") {
+    parts.push(err);
+  }
+  return /fetch failed|ECONNREFUSED|ECONNRESET|ETIMEDOUT|EHOSTUNREACH|ENOTFOUND|EPIPE|socket hang up|UND_ERR/i.test(parts.join(" "));
+}
 function computeEffectiveThink(params) {
   if (process.env["OMNIUS_FORCE_NO_THINK"] === "1")
     return false;
@@ -581606,7 +581646,25 @@ ${description}`
           };
           if (combinedAbortSignal)
             fetchOpts.signal = combinedAbortSignal;
-          let resp = await fetch(`${requestBaseUrl}/v1/chat/completions`, fetchOpts);
+          let resp;
+          try {
+            resp = await fetch(`${requestBaseUrl}/v1/chat/completions`, fetchOpts);
+          } catch (err) {
+            if (poolSlot?.poolOwned && isBackendConnectionError(err)) {
+              const deadInstanceId = poolSlot.instanceId;
+              releasePoolSlot(false);
+              try {
+                await getOllamaPool({
+                  baseInstanceUrl: this.baseUrl
+                }).evictInstance(deadInstanceId);
+              } catch {
+              }
+              requestBaseUrl = this.baseUrl;
+              resp = await fetch(`${requestBaseUrl}/v1/chat/completions`, fetchOpts);
+            } else {
+              throw err;
+            }
+          }
           if (!resp.ok) {
             const text2 = await resp.text().catch(() => "");
             if (poolSlot?.poolOwned && isOllamaModelNotFoundResponse(resp.status, text2, this.model)) {
@@ -581962,7 +582020,25 @@ ${description}`
             body: JSON.stringify(body),
             signal: streamAbort.signal
           };
-          let resp = await fetch(`${requestBaseUrl}/v1/chat/completions`, streamFetchOpts);
+          let resp;
+          try {
+            resp = await fetch(`${requestBaseUrl}/v1/chat/completions`, streamFetchOpts);
+          } catch (err) {
+            if (poolSlot?.poolOwned && isBackendConnectionError(err)) {
+              const deadInstanceId = poolSlot.instanceId;
+              releasePoolSlot(false);
+              try {
+                await getOllamaPool({
+                  baseInstanceUrl: this.baseUrl
+                }).evictInstance(deadInstanceId);
+              } catch {
+              }
+              requestBaseUrl = this.baseUrl;
+              resp = await fetch(`${requestBaseUrl}/v1/chat/completions`, streamFetchOpts);
+            } else {
+              throw err;
+            }
+          }
           if (!resp.ok) {
             const text2 = await resp.text().catch(() => "");
             if (poolSlot?.poolOwned && isOllamaModelNotFoundResponse(resp.status, text2, this.model)) {
@@ -607067,6 +607143,45 @@ __export(status_bar_exports, {
   unlockFooterRedraws: () => unlockFooterRedraws
 });
 import { readFileSync as readFileSync91 } from "node:fs";
+function stripSubAgentPrefix(label) {
+  const stripped = label.replace(/^\s*sub[-\s]?agents?\b[\s:_–—-]*/i, "").trim();
+  return stripped.length > 0 ? stripped : label.trim();
+}
+function xterm256ToRgb(i2) {
+  if (i2 >= 232) {
+    const v = 8 + (i2 - 232) * 10;
+    return [v, v, v];
+  }
+  if (i2 >= 16) {
+    const n2 = i2 - 16;
+    const conv = (c8) => c8 === 0 ? 0 : 55 + c8 * 40;
+    return [conv(Math.floor(n2 / 36)), conv(Math.floor(n2 % 36 / 6)), conv(n2 % 6)];
+  }
+  const base3 = [
+    [0, 0, 0],
+    [128, 0, 0],
+    [0, 128, 0],
+    [128, 128, 0],
+    [0, 0, 128],
+    [128, 0, 128],
+    [0, 128, 128],
+    [192, 192, 192],
+    [128, 128, 128],
+    [255, 0, 0],
+    [0, 255, 0],
+    [255, 255, 0],
+    [0, 0, 255],
+    [255, 0, 255],
+    [0, 255, 255],
+    [255, 255, 255]
+  ];
+  return base3[i2] ?? [0, 0, 0];
+}
+function contrastTextColor(colorIndex) {
+  const [r2, g, b] = xterm256ToRgb(colorIndex);
+  const luma = 0.299 * r2 + 0.587 * g + 0.114 * b;
+  return luma >= 140 ? 16 : 231;
+}
 function formatPoolAge(ms) {
   if (ms < 6e4) return `${Math.max(0, Math.floor(ms / 1e3))}s`;
   if (ms < 60 * 6e4) return `${Math.floor(ms / 6e4)}m`;
@@ -607298,7 +607413,7 @@ var init_status_bar = __esm({
     BOX_FG = tuiBoxFg();
     TEXT_PRIMARY = tuiTextPrimary() < 0 ? 252 : tuiTextPrimary();
     TEXT_DIM = tuiTextDim();
-    NO_SUB_AGENTS_HEADER_LABEL = " no sub-agents ";
+    NO_SUB_AGENTS_HEADER_LABEL = " no agents ";
     HEADER_ACCENT_GREEN = 154;
     HEADER_ACCENT_BOLD_FG = `\x1B[1;38;5;${HEADER_ACCENT_GREEN}m`;
     HEADER_BUTTON_BG = `\x1B[48;5;${HEADER_ACCENT_GREEN}m`;
@@ -607775,6 +607890,12 @@ var init_status_bar = __esm({
         const decorateMenuButton = (cmd, label) => {
           return `\x1B[38;5;${HEADER_ACCENT_GREEN}m🭁\x1B[0m${HEADER_BUTTON_FG}${HEADER_BUTTON_BG}${label}\x1B[0m${PANEL_BG_SEQ}\x1B[38;5;${HEADER_ACCENT_GREEN}m🭝\x1B[0m${PANEL_BG_SEQ}`;
         };
+        const decorateAgentButton = (content, color, active) => {
+          const bg = `\x1B[48;5;${color}m`;
+          const fg2 = `\x1B[38;5;${contrastTextColor(color)}m`;
+          const weight = active ? "\x1B[1m" : "";
+          return `\x1B[38;5;${color}m🭁\x1B[0m${weight}${fg2}${bg}${content}\x1B[0m${PANEL_BG_SEQ}\x1B[38;5;${color}m🭝\x1B[0m${PANEL_BG_SEQ}`;
+        };
         const renderBtn = (cmd, label) => {
           const fg2 = buttonFg(cmd);
           const left = _isWindows ? "" : "🛁";
@@ -607868,12 +607989,14 @@ var init_status_bar = __esm({
           for (const view of this._agentViews.values()) {
             if (view.id === "main" && this._activeViewId === "main") continue;
             const icon = view.status === "running" ? "●" : view.status === "completed" ? "✓" : view.status === "failed" ? "✗" : "○";
-            const base3 = ` ${trunc3(view.label)} ${icon} `;
+            const content = ` ${trunc3(view.label)} ${icon} `;
             const viewColor = view.colorCode ?? (view.type === "telegram" ? 45 : 213);
-            const colored = view.id === this._activeViewId ? `\x1B[1;38;5;${viewColor}m${base3}\x1B[0m` : `\x1B[38;5;${viewColor}m${base3}\x1B[0m`;
+            const active = view.id === this._activeViewId;
+            const btn = decorateAgentButton(content, viewColor, active);
             sysItems.push({
-              render: () => renderBtn(`view:${view.id}`, colored) + " ",
-              w: base3.length + 1
+              render: () => linkify(`view:${view.id}`, btn) + " ",
+              w: content.length + 2 + 1
+              // 2 border glyphs + trailing space
             });
           }
         } else {
@@ -608042,7 +608165,7 @@ var init_status_bar = __esm({
               if (view.id === "main" && this._activeViewId === "main") continue;
               const icon = view.status === "running" ? "●" : view.status === "completed" ? "✓" : view.status === "failed" ? "✗" : "○";
               const base3 = ` ${trunc3(view.label)} ${icon} `;
-              zones.push({ w: base3.length + 1, id: view.id, render: () => "" });
+              zones.push({ w: base3.length + 2 + 1, id: view.id, render: () => "" });
             }
           } else {
             zones.push({ w: NO_SUB_AGENTS_HEADER_LABEL.length, render: () => "" });
@@ -609109,20 +609232,14 @@ var init_status_bar = __esm({
               return;
             }
             if (cmd === "header-toggle") {
-              const wasExpanded = this._headerExpanded;
               this._headerExpanded = !this._headerExpanded;
               this.refreshHeaderAndFooter();
               this.scrollRegionTop += this._headerExpanded ? 2 : -2;
               if (this.active) {
                 this.applyScrollRegion();
+                this.repaintContent();
                 this.renderFooterAndPositionInput();
               }
-              if (!this._headerExpanded && wasExpanded) {
-                const base3 = this.scrollRegionTop;
-                let buf = `\x1B[${base3};1H\x1B[2K\x1B[${base3 + 1};1H\x1B[2K`;
-                buf += `\x1B[${base3};1H\x1BM\x1BM`;
-                this.termWrite(buf);
-              }
               return;
             }
             setPressedButton(cmd);
@@ -609212,7 +609329,7 @@ var init_status_bar = __esm({
       registerAgentView(id, label, type, taskSummary) {
         this._agentViews.set(id, {
           id,
-          label,
+          label: stripSubAgentPrefix(label),
           type,
           contentLines: [],
           scrollOffset: 0,
@@ -609345,8 +609462,9 @@ var init_status_bar = __esm({
         for (const view of this._agentViews.values()) {
           if (view.id === "main" && this._activeViewId === "main") continue;
           const icon = view.status === "running" ? "●" : view.status === "completed" ? "✓" : view.status === "failed" ? "✗" : "○";
-          const label = ` ${view.label} ${icon} `;
-          const endCol = testCol + label.length - 1;
+          const content = ` ${view.label} ${icon} `;
+          const visW = content.length + 2;
+          const endCol = testCol + visW - 1;
           if (col >= testCol && col <= endCol) return view.id;
           testCol = endCol + 2;
         }
@@ -610479,8 +610597,10 @@ ${CONTENT_BG_SEQ}`);
           if (rm4.ollamaPool?.enabled) {
             const pool3 = rm4.ollamaPool;
             const isConstrained = pool3.mode === "constrained";
-            const ready = isConstrained ? Math.max(1, pool3.readyGpuInstances) : pool3.readyGpuInstances;
-            const target = Math.max(1, pool3.targetGpuInstances);
+            const baseCount = pool3.instances.some((i2) => !i2.poolOwned) ? 1 : 0;
+            const spawnedReady = pool3.instances.filter((i2) => i2.poolOwned).length;
+            const ready = isConstrained ? Math.max(1, baseCount + spawnedReady) : baseCount + spawnedReady;
+            const target = isConstrained ? 1 : Math.max(ready, pool3.targetGpuInstances + baseCount);
             const allReady = ready >= target;
             const poolColor = allReady ? c3.green : c3.yellow;
             const poolDetail = `${_StatusBar.digitBar(ready)}/${_StatusBar.digitBar(target)}`;
@@ -640856,7 +640976,7 @@ async function handleBroker(arg, _ctx) {
       `  ${c3.dim("Idle-evict threshold:")} ${Math.round(broker.idleEvictMs / 1e3)}s`
     );
     safeLog(
-      `  ${c3.dim("Slot capacity:")} ${snap.slots.inUse}/${snap.slots.capacity} active, queue ${snap.slots.queueDepth}/${snap.slots.queueCapacity}`
+      `  ${c3.dim("Slot capacity:")} ${snap.slots.inUse}/${snap.slots.capacity} active, QUEUE ${snap.slots.queueDepth}/${snap.slots.queueCapacity}`
     );
     safeLog("");
     if (snap.loaded.length === 0) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "omnius",
-  "version": "1.0.308",
+  "version": "1.0.310",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omnius",
-      "version": "1.0.308",
+      "version": "1.0.310",
       "bundleDependencies": [
         "image-to-ascii"
       ],
@@ -2397,12 +2397,13 @@
       }
     },
     "node_modules/bare-stream": {
-      "version": "2.13.2",
-      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.13.2.tgz",
-      "integrity": "sha512-2V5j0dOfxv3iIngIWMnW1O6UPXpeoU70HJzUJGVth/+RURhDyq7SEWTD70Y2SkUB0MQonYYWpIX3f85P/I22+Q==",
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.13.3.tgz",
+      "integrity": "sha512-Kc+brLqvEqGkjyfiwJmImAOqLZL7OsoLKuavx+hJjgVV3nLTOjloJyPMFxjUPerGGHrNH0fLU06jjykMLWrERQ==",
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
+        "b4a": "^1.8.1",
         "streamx": "^2.25.0",
         "teex": "^1.0.1"
       },
@@ -3526,16 +3527,16 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz",
+      "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
+        "hasown": "^2.0.4",
+        "mime-types": "^2.1.35"
       },
       "engines": {
         "node": ">= 6"
@@ -6690,9 +6691,9 @@
       }
     },
     "node_modules/streamx": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.27.0.tgz",
-      "integrity": "sha512-WZ189TKnHoAokYHvwzaAQMpd55cgUmFIcJFzBSgGcb886jau5DL+XdDhTWV4ps3FLvk+OORp0dLRTPsLZ21CSA==",
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.28.0.tgz",
+      "integrity": "sha512-1Yowhzjf0ivGMrTIkY9hav5TxobO9qIVqUE41fiCGMGgc3CLlf4MY+9AHmZqBWgDTue0fY9zWjYFVyf6Diuobw==",
       "license": "MIT",
       "optional": true,
       "dependencies": {

package/package.json

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