@vtstech/pi-status 1.0.8 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtstech/pi-status",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "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.8"
+    "@vtstech/pi-shared": "1.1.0"
   },
   "peerDependencies": {
     "@mariozechner/pi-coding-agent": ">=0.66"

package/status.js

@@ -1,11 +1,8 @@
 // .build-npm/status/status.temp.ts
 import os from "node:os";
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { execSync } from "node:child_process";
-import { getOllamaBaseUrl } from "@vtstech/pi-shared/ollama";
+import { execSync as gitExecSync } from "node:child_process";
+import { getOllamaBaseUrl, fetchModelContextLength, readModelsJson } from "@vtstech/pi-shared/ollama";
 import { fmtBytes, fmtDur } from "@vtstech/pi-shared/format";
-import { readRecentAuditEntries } from "@vtstech/pi-shared/security";
 function status_temp_default(pi) {
   let lastResponseTime = null;
   let agentStartTime = null;
@@ -69,7 +66,7 @@ function status_temp_default(pi) {
   }
   function getSwap() {
     try {
-      const out = execSync("cat /proc/meminfo", { encoding: "utf-8", timeout: 3e3 });
+      const out = gitExecSync("cat /proc/meminfo", { encoding: "utf-8", timeout: 3e3 });
       const swapTotal2 = Number(out.match(/SwapTotal:\s+(\d+)/)?.[1]) * 1024;
       const swapFree = Number(out.match(/SwapFree:\s+(\d+)/)?.[1]) * 1024;
       if (swapTotal2 > 0) return { used: swapTotal2 - swapFree, total: swapTotal2 };
@@ -107,26 +104,9 @@ function status_temp_default(pi) {
       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);
+          const ctx = await fetchModelContextLength(ollamaBase, modelId);
+          if (ctx != null) {
+            footerNativeCtx = ctx >= 1e3 ? `${(ctx / 1e3).toFixed(0)}k` : String(ctx);
           }
         } catch {
         } finally {
@@ -136,26 +116,33 @@ function status_temp_default(pi) {
     }
     return footerNativeCtx;
   }
-  function getOllamaLoadedModel() {
-    const now = Date.now();
-    if (now - ollamaLoadedLastCheck < OLLAMA_LOADED_INTERVAL) return ollamaLoadedCache;
-    ollamaLoadedLastCheck = now;
+  async function fetchOllamaLoadedModel() {
     try {
       const ollamaBase = getOllamaBaseUrl();
-      const out = execSync(`curl -s "${ollamaBase}/api/ps"`, { encoding: "utf-8", timeout: 5e3 });
-      if (out.trim()) {
-        const data = JSON.parse(out.trim());
-        const models = data?.models || [];
-        if (Array.isArray(models) && models.length > 0) {
-          ollamaLoadedCache = models[0].name || models[0].model || "unknown";
-          return ollamaLoadedCache;
-        }
+      const res = await fetch(`${ollamaBase}/api/ps`, {
+        signal: AbortSignal.timeout(5e3)
+      });
+      if (!res.ok) return "";
+      const data = await res.json();
+      const models = data?.models || [];
+      if (Array.isArray(models) && models.length > 0) {
+        return models[0].name || models[0].model || "";
       }
     } catch {
     }
-    ollamaLoadedCache = "";
     return "";
   }
+  function getOllamaLoadedModel() {
+    const now = Date.now();
+    if (now - ollamaLoadedLastCheck < OLLAMA_LOADED_INTERVAL) return ollamaLoadedCache;
+    ollamaLoadedLastCheck = now;
+    fetchOllamaLoadedModel().then((loaded) => {
+      ollamaLoadedCache = loaded;
+    }).catch(() => {
+      ollamaLoadedCache = "";
+    });
+    return ollamaLoadedCache;
+  }
   function extractParams(payload) {
     const params = [];
     if (payload.temperature !== void 0) params.push(`temp:${payload.temperature}`);
@@ -180,7 +167,7 @@ function status_temp_default(pi) {
   function getGitBranch() {
     if (gitBranchCache) return gitBranchCache;
     try {
-      const branch = execSync("git rev-parse --abbrev-ref HEAD 2>/dev/null", {
+      const branch = gitExecSync("git rev-parse --abbrev-ref HEAD 2>/dev/null", {
         encoding: "utf-8",
         timeout: 3e3
       }).trim();
@@ -189,18 +176,8 @@ function status_temp_default(pi) {
     }
     return gitBranchCache;
   }
-  function refreshBlockedCount() {
-    try {
-      const entries = readRecentAuditEntries(50);
-      blockedCount = 0;
-      for (const entry of entries) {
-        if (entry.blocked === true || entry.safe === false || entry.action === "block") {
-          blockedCount++;
-        }
-      }
-    } catch {
-      blockedCount = 0;
-    }
+  function incrementBlockedCount() {
+    blockedCount++;
   }
   function updateMetrics() {
     cpuUsage = getCpuUsage();
@@ -216,15 +193,7 @@ function status_temp_default(pi) {
       hasSwap = false;
     }
     ollamaLoaded = getOllamaLoadedModel();
-    let modelsJson = null;
-    try {
-      const raw = fs.readFileSync(
-        path.join(os.homedir(), ".pi", "agent", "models.json"),
-        "utf-8"
-      );
-      modelsJson = JSON.parse(raw);
-    } catch {
-    }
+    const modelsJson = readModelsJson();
     isLocalProvider = modelsJson ? detectLocalProvider(modelsJson) : false;
     if (currentCtx) {
       footerModel = currentCtx.model?.id || "";
@@ -241,7 +210,6 @@ function status_temp_default(pi) {
         getNativeModelCtx(modelId);
       }
     }
-    refreshBlockedCount();
   }
   pi.on("session_start", async (_event, ctx) => {
     currentCtx = ctx;
@@ -251,7 +219,7 @@ function status_temp_default(pi) {
     ctx.ui.setFooter((tui, theme, footerData) => {
       tuiRef = tui;
       const dim = (s) => theme?.fg?.("dim", s) ?? s;
-      const red = (s) => theme?.fg?.("red", s) ?? s;
+      const red = (s) => theme?.fg?.("error", s) ?? s;
       const yellow = (s) => theme?.fg?.("yellow", s) ?? s;
       const sep = dim(" \xB7 ");
       const truncateLine = (line, maxW) => {
@@ -364,6 +332,7 @@ function status_temp_default(pi) {
     const out = usage.output ?? usage.completionTokens ?? usage.completion_tokens;
     if (inp != null) lastUpstream = inp;
     if (out != null) lastDownstream = out;
+    if (tuiRef) tuiRef.requestRender();
   }
   pi.on("message_end", captureUsage);
   pi.on("turn_end", captureUsage);
@@ -388,7 +357,7 @@ function status_temp_default(pi) {
     if (isBlocked) {
       securityFlashTool = event.tool ?? event.name ?? "unknown";
       securityFlashUntil = Date.now() + 3e3;
-      refreshBlockedCount();
+      incrementBlockedCount();
       if (tuiRef) tuiRef.requestRender();
     }
   });