@vtstech/pi-status 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtstech/pi-status",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "System monitor / status bar extension for Pi Coding Agent",
   "main": "status.js",
   "keywords": ["pi-extensions"],
@@ -14,7 +14,7 @@
     "url": "https://github.com/VTSTech/pi-coding-agent"
   },
   "dependencies": {
-    "@vtstech/pi-shared": "1.0.6"
+    "@vtstech/pi-shared": "1.0.8"
   },
   "peerDependencies": {
     "@mariozechner/pi-coding-agent": ">=0.66"

package/status.js

@@ -26,7 +26,11 @@ function status_temp_default(pi) {
   let footerModel = "";
   let footerThinking = "";
   let footerCtxPct = "";
+  let footerNativeCtx = "";
+  let nativeCtxModel = "";
   let isLocalProvider = true;
+  let lastUpstream = 0;
+  let lastDownstream = 0;
   let securityFlashTool = "";
   let securityFlashUntil = 0;
   let activeTool = "";
@@ -77,25 +81,61 @@ function status_temp_default(pi) {
   let ollamaLoadedLastCheck = 0;
   const OLLAMA_LOADED_INTERVAL = 15e3;
   function detectLocalProvider(modelsJson) {
+    const isLocalUrl = (url) => url.includes("localhost") || url.includes("127.0.0.1") || url.includes("0.0.0.0");
     try {
-      for (const provider of Object.values(modelsJson.providers || {})) {
-        const url = provider.baseUrl || "";
-        const hasLocalUrl = url.includes("localhost") || url.includes("127.0.0.1") || url.includes("0.0.0.0");
-        const modelId = footerModel || "";
-        if (modelId && (provider.models || []).some((m) => m.id === modelId)) {
-          return hasLocalUrl;
-        }
-      }
-      for (const [name, provider] of Object.entries(modelsJson.providers || {})) {
-        const url = provider.baseUrl || "";
-        if (url.includes("localhost") || url.includes("127.0.0.1") || url.includes("0.0.0.0") || name === "ollama") {
-          return true;
+      const ctxUrl = currentCtx?.provider?.baseUrl || currentCtx?.provider?.url || "";
+      if (ctxUrl) return isLocalUrl(ctxUrl);
+      const modelId = footerModel || "";
+      if (modelsJson && modelId) {
+        for (const provider of Object.values(modelsJson.providers || {})) {
+          const url = provider.baseUrl || "";
+          if ((provider.models || []).some((m) => m.id === modelId)) {
+            return isLocalUrl(url);
+          }
         }
       }
     } catch {
     }
     return false;
   }
+  let nativeCtxPromise = null;
+  function getNativeModelCtx(modelId) {
+    if (!modelId) return "";
+    if (modelId === nativeCtxModel && footerNativeCtx) return footerNativeCtx;
+    nativeCtxModel = modelId;
+    if (!nativeCtxPromise) {
+      nativeCtxPromise = (async () => {
+        try {
+          const ollamaBase = getOllamaBaseUrl();
+          const res = await fetch(`${ollamaBase}/api/show`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ name: modelId }),
+            signal: AbortSignal.timeout(5e3)
+          });
+          if (!res.ok) return;
+          const data = await res.json();
+          for (const key of Object.keys(data?.model_info ?? {})) {
+            if (key.endsWith(".context_length")) {
+              const val = data.model_info[key];
+              if (typeof val === "number") {
+                footerNativeCtx = val >= 1e3 ? `${(val / 1e3).toFixed(0)}k` : String(val);
+                return;
+              }
+            }
+          }
+          const numCtx = data?.model_info?.["num_ctx"];
+          if (typeof numCtx === "number") {
+            footerNativeCtx = numCtx >= 1e3 ? `${(numCtx / 1e3).toFixed(0)}k` : String(numCtx);
+          }
+        } catch {
+        } finally {
+          nativeCtxPromise = null;
+        }
+      })();
+    }
+    return footerNativeCtx;
+  }
   function getOllamaLoadedModel() {
     const now = Date.now();
     if (now - ollamaLoadedLastCheck < OLLAMA_LOADED_INTERVAL) return ollamaLoadedCache;
@@ -128,6 +168,10 @@ function status_temp_default(pi) {
     if (payload.reasoning_effort !== void 0) params.push(`think:${payload.reasoning_effort}`);
     return params;
   }
+  function fmtTk(n) {
+    if (n >= 1e3) return `${(n / 1e3).toFixed(1)}k`;
+    return String(n);
+  }
   function getPwd() {
     const cwd = process.cwd();
     if (cwd.startsWith(os.homedir())) return "~" + cwd.slice(os.homedir().length);
@@ -181,6 +225,7 @@ function status_temp_default(pi) {
       modelsJson = JSON.parse(raw);
     } catch {
     }
+    isLocalProvider = modelsJson ? detectLocalProvider(modelsJson) : false;
     if (currentCtx) {
       footerModel = currentCtx.model?.id || "";
       footerThinking = pi.getThinkingLevel?.() ?? "";
@@ -192,17 +237,10 @@ function status_temp_default(pi) {
         footerCtxPct = "";
       }
       const modelId = currentCtx.model?.id || "";
-      if (modelId && !footerCtxPct && modelsJson) {
-        for (const prov of Object.values(modelsJson.providers || {})) {
-          const match = (prov.models || []).find((m) => m.id === modelId);
-          if (match?.contextLength) {
-            footerCtxPct = `${(match.contextLength / 1e3).toFixed(0)}k ctx`;
-            break;
-          }
-        }
+      if (modelId && isLocalProvider) {
+        getNativeModelCtx(modelId);
       }
     }
-    isLocalProvider = modelsJson ? detectLocalProvider(modelsJson) : false;
     refreshBlockedCount();
   }
   pi.on("session_start", async (_event, ctx) => {
@@ -216,56 +254,68 @@ function status_temp_default(pi) {
       const red = (s) => theme?.fg?.("red", s) ?? s;
       const yellow = (s) => theme?.fg?.("yellow", s) ?? s;
       const sep = dim(" \xB7 ");
+      const truncateLine = (line, maxW) => {
+        const ellipsis = dim("...");
+        const visible = line.replace(/\x1b\[[0-9;]*m/g, "");
+        if (visible.length > maxW) {
+          let vis = 0, cut = 0;
+          for (let i = 0; i < line.length && vis < maxW - 3; i++) {
+            if (line[i] === "\x1B") {
+              while (i < line.length && line[i] !== "m") i++;
+            } else {
+              vis++;
+            }
+            cut = i + 1;
+          }
+          return line.slice(0, cut) + ellipsis;
+        }
+        return line;
+      };
       return {
         render(width) {
           const lines = [];
-          const parts = [];
-          parts.push(getPwd());
           let branch = "";
           try {
             branch = footerData?.getGitBranch?.() || "";
           } catch {
           }
           if (!branch) branch = getGitBranch();
-          if (branch) parts.push(dim(branch));
-          if (footerModel) parts.push(dim(footerModel));
-          if (footerThinking && footerThinking !== "off") parts.push(dim(footerThinking));
-          if (footerCtxPct) parts.push(footerCtxPct);
+          const line1Parts = [];
+          if (footerModel) line1Parts.push(`conf:${footerModel}`);
+          line1Parts.push(getPwd());
+          if (footerThinking && footerThinking !== "off") line1Parts.push(dim(footerThinking));
           if (isLocalProvider) {
-            parts.push(dim(`CPU ${cpuUsage.toFixed(0)}%`));
-            parts.push(`RAM ${fmtBytes(memUsed)}/${fmtBytes(memTotal)}`);
+            line1Parts.push(dim(`CPU ${cpuUsage.toFixed(0)}%`));
+          }
+          let line1 = truncateLine(line1Parts.join(sep), width);
+          lines.push(line1);
+          const line2Parts = [];
+          if (ollamaLoaded) line2Parts.push(`load:${ollamaLoaded}`);
+          if (footerNativeCtx) line2Parts.push(`M:${footerNativeCtx}`);
+          if (footerCtxPct) line2Parts.push(`S:${footerCtxPct}`);
+          if (isLocalProvider) {
+            line2Parts.push(`RAM ${fmtBytes(memUsed)}/${fmtBytes(memTotal)}`);
             if (hasSwap && swapUsed > 0) {
-              parts.push(`Swap ${fmtBytes(swapUsed)}/${fmtBytes(swapTotal)}`);
+              line2Parts.push(`Swap ${fmtBytes(swapUsed)}/${fmtBytes(swapTotal)}`);
             }
           }
-          if (ollamaLoaded) parts.push(`${ollamaLoaded}`);
-          if (lastResponseTime !== null) parts.push(`Resp ${fmtDur(lastResponseTime)}`);
+          if (lastUpstream > 0 || lastDownstream > 0) {
+            line2Parts.push(dim(`\u2191${fmtTk(lastUpstream)} \u2193${fmtTk(lastDownstream)}`));
+          }
+          if (lastResponseTime !== null) line2Parts.push(`Resp ${fmtDur(lastResponseTime)}`);
           if (lastPayload) {
             const params = extractParams(lastPayload);
-            if (params.length > 0) parts.push(...params.map((p) => dim(p)));
+            if (params.length > 0) line2Parts.push(...params.map((p) => dim(p)));
           }
           const now = Date.now();
           if (securityFlashTool && now < securityFlashUntil) {
-            parts.push(red(`BLOCKED:${securityFlashTool}`));
+            line2Parts.push(red(`BLOCKED:${securityFlashTool}`));
           }
           if (blockedCount > 0) {
-            parts.push(red(`SEC:${blockedCount}`));
-          }
-          let line = parts.join(sep);
-          const visible = line.replace(/\x1b\[[0-9;]*m/g, "");
-          if (visible.length > width) {
-            let vis = 0, cut = 0;
-            for (let i = 0; i < line.length && vis < width - 3; i++) {
-              if (line[i] === "\x1B") {
-                while (i < line.length && line[i] !== "m") i++;
-              } else {
-                vis++;
-              }
-              cut = i + 1;
-            }
-            line = line.slice(0, cut) + dim("...");
+            line2Parts.push(red(`SEC:${blockedCount}`));
           }
-          lines.push(line);
+          let line2 = truncateLine(line2Parts.join(sep), width);
+          if (line2) lines.push(line2);
           if (activeTool && activeToolStart > 0) {
             const elapsed = performance.now() - activeToolStart;
             lines.push(`${yellow("\u23F3")} ${activeTool}: ${fmtDur(elapsed)}`);
@@ -298,12 +348,29 @@ function status_temp_default(pi) {
     activeTool = "";
     activeToolStart = 0;
     blockedCount = 0;
+    lastUpstream = 0;
+    lastDownstream = 0;
   });
   pi.on("before_provider_request", (event) => {
     lastPayload = event.payload;
   });
+  function captureUsage(event) {
+    if (event?.message?.role !== "assistant") return;
+    const usage = event?.message?.usage ?? // normalised Pi usage
+    event?.usage ?? // alternative path
+    null;
+    if (!usage) return;
+    const inp = usage.input ?? usage.promptTokens ?? usage.prompt_tokens;
+    const out = usage.output ?? usage.completionTokens ?? usage.completion_tokens;
+    if (inp != null) lastUpstream = inp;
+    if (out != null) lastDownstream = out;
+  }
+  pi.on("message_end", captureUsage);
+  pi.on("turn_end", captureUsage);
   pi.on("agent_start", async () => {
     agentStartTime = performance.now();
+    lastUpstream = 0;
+    lastDownstream = 0;
   });
   pi.on("agent_end", async () => {
     if (agentStartTime !== null) {