@vtstech/pi-shared 1.0.9 → 1.1.0

package/format.js

@@ -18,11 +18,12 @@ function info(msg) {
 function bytesHuman(bytes) {
   const units = ["B", "KB", "MB", "GB", "TB"];
   let i = 0;
-  while (bytes >= 1024 && i < units.length - 1) {
-    bytes /= 1024;
+  let b = bytes;
+  while (b >= 1024 && i < units.length - 1) {
+    b /= 1024;
     i++;
   }
-  return `${bytes.toFixed(1)}${units[i]}`;
+  return `${b.toFixed(1)}${units[i]}`;
 }
 function msHuman(ms) {
   if (ms < 1e3) return `${ms.toFixed(0)}ms`;
@@ -30,6 +31,7 @@ function msHuman(ms) {
   return `${(ms / 6e4).toFixed(1)}m`;
 }
 function fmtBytes(b) {
+  if (b === 0) return "0B";
   if (b >= 1073741824) return `${(b / 1073741824).toFixed(1)}G`;
   if (b >= 1048576) return `${(b / 1048576).toFixed(0)}M`;
   return `${(b / 1024).toFixed(0)}K`;
@@ -40,6 +42,7 @@ function fmtDur(ms) {
   return `${Math.floor(ms / 6e4)}m${Math.round(ms % 6e4 / 1e3)}s`;
 }
 function pct(used, total) {
+  if (total === 0) return "0.0%";
   return `${(used / total * 100).toFixed(1)}%`;
 }
 function truncate(s, max) {
@@ -49,7 +52,7 @@ function sanitizeForReport(s, maxLines = 40) {
   let cleaned = s.replace(/^\s*```[a-zA-Z]*[ \t]*\n?/gm, "");
   cleaned = cleaned.replace(/^\s*```[ \t]*\n?/gm, "");
   cleaned = cleaned.replace(/\n{3,}/g, "\n\n").trim();
-  if (/<[a-z][\s\S]*>/i.test(cleaned) && cleaned.includes("</")) {
+  if (/<!DOCTYPE\b|<html[\s>]/i.test(cleaned) || /<[a-z][\s\S]*>/i.test(cleaned) && cleaned.includes("</") && /<(?:div|span|p|head|body|html|table|form|script)\b/i.test(cleaned)) {
     const firstLine = cleaned.split("\n")[0];
     return truncate(firstLine, 200) + "\n  \u2139\uFE0F  (HTML response truncated)";
   }

package/ollama.js

@@ -2,33 +2,51 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import os from "node:os";
+var EXTENSION_VERSION = "1.1.0";
 var MODELS_JSON_PATH = path.join(os.homedir(), ".pi", "agent", "models.json");
+var _modelsJsonCache = null;
+var _ollamaBaseUrlCache = null;
+var CACHE_TTL_MS = 2e3;
 function getOllamaBaseUrl() {
+  const now = Date.now();
+  if (_ollamaBaseUrlCache && now - _ollamaBaseUrlCache.ts < CACHE_TTL_MS) return _ollamaBaseUrlCache.data;
   try {
     if (fs.existsSync(MODELS_JSON_PATH)) {
       const raw = fs.readFileSync(MODELS_JSON_PATH, "utf-8");
       const config = JSON.parse(raw);
       const baseUrl = config?.providers?.["ollama"]?.baseUrl;
       if (baseUrl) {
-        return baseUrl.replace(/\/v1\/?$/, "");
+        const result = baseUrl.replace(/\/v1\/?$/, "");
+        _ollamaBaseUrlCache = { data: result, ts: now };
+        return result;
       }
     }
   } catch {
   }
   if (process.env.OLLAMA_HOST) {
-    return `http://${process.env.OLLAMA_HOST.replace(/^https?:\/\//, "")}`;
+    const result = `http://${process.env.OLLAMA_HOST.replace(/^https?:\/\//, "")}`;
+    _ollamaBaseUrlCache = { data: result, ts: now };
+    return result;
   }
-  return "http://localhost:11434";
+  const fallback = "http://localhost:11434";
+  _ollamaBaseUrlCache = { data: fallback, ts: now };
+  return fallback;
 }
 function readModelsJson() {
+  const now = Date.now();
+  if (_modelsJsonCache && now - _modelsJsonCache.ts < CACHE_TTL_MS) return _modelsJsonCache.data;
   try {
     if (fs.existsSync(MODELS_JSON_PATH)) {
       const raw = fs.readFileSync(MODELS_JSON_PATH, "utf-8");
-      return JSON.parse(raw);
+      const data = JSON.parse(raw);
+      _modelsJsonCache = { data, ts: now };
+      return data;
     }
   } catch {
   }
-  return { providers: {} };
+  const empty = { providers: {} };
+  _modelsJsonCache = { data: empty, ts: now };
+  return empty;
 }
 function writeModelsJson(data) {
   const dir = path.dirname(MODELS_JSON_PATH);
@@ -36,6 +54,8 @@ function writeModelsJson(data) {
     fs.mkdirSync(dir, { recursive: true });
   }
   fs.writeFileSync(MODELS_JSON_PATH, JSON.stringify(data, null, 2) + "\n", "utf-8");
+  _modelsJsonCache = null;
+  _ollamaBaseUrlCache = null;
 }
 async function fetchOllamaModels(baseUrl) {
   const res = await fetch(`${baseUrl}/api/tags`, {
@@ -82,7 +102,7 @@ async function fetchContextLengthsBatched(baseUrl, modelNames, batchSize = 3) {
 }
 function isReasoningModel(name) {
   const lower = name.toLowerCase();
-  return lower.includes("deepseek-r1") || lower.includes("qwq") || lower.includes("o1") || lower.includes("o3") || lower.includes("qwen3") || lower.includes("think") || lower.includes("reason");
+  return lower.includes("deepseek-r1") || lower.includes("qwq") || lower.includes("o1") || lower.includes("o3") || lower.includes("qwen3") || lower.includes("reasoning") || lower.includes("thinker");
 }
 var BUILTIN_PROVIDERS = {
   openrouter: { api: "openai-completions", baseUrl: "https://openrouter.ai/api/v1", envKey: "OPENROUTER_API_KEY" },
@@ -127,10 +147,52 @@ function detectModelFamily(modelName) {
   }
   return "unknown";
 }
+function detectProvider(ctx) {
+  const model = ctx.model;
+  if (!model) return { kind: "unknown", name: "none" };
+  const providerName = model.provider || "";
+  if (!providerName) return { kind: "unknown", name: "none" };
+  const modelsJson = readModelsJson();
+  const userProviderCfg = (modelsJson.providers || {})[providerName];
+  if (userProviderCfg) {
+    const baseUrl = userProviderCfg.baseUrl || "";
+    const apiMode = userProviderCfg.api || "";
+    const apiKey = userProviderCfg.apiKey || "";
+    const isOllama = /ollama/i.test(providerName) || /localhost:\d+/.test(baseUrl) || /127\.0\.0\.1:\d+/.test(baseUrl) || /0\.0\.0\.0:\d+/.test(baseUrl) || /\/api\/chat/.test(baseUrl) || apiMode === "ollama";
+    if (isOllama) {
+      return { kind: "ollama", name: providerName, apiMode: "ollama", baseUrl, apiKey };
+    }
+    if (/\/api\/chat/.test(baseUrl)) {
+      return { kind: "ollama", name: providerName, apiMode: "ollama", baseUrl, apiKey };
+    }
+    return {
+      kind: "builtin",
+      name: providerName,
+      apiMode: apiMode || userProviderCfg.api || "openai-completions",
+      baseUrl,
+      apiKey
+    };
+  }
+  const builtin = BUILTIN_PROVIDERS[providerName];
+  if (builtin) {
+    const apiKey = process.env[builtin.envKey] || "";
+    return {
+      kind: "builtin",
+      name: providerName,
+      apiMode: builtin.api,
+      baseUrl: builtin.baseUrl,
+      envKey: builtin.envKey,
+      apiKey
+    };
+  }
+  return { kind: "unknown", name: providerName };
+}
 export {
   BUILTIN_PROVIDERS,
+  EXTENSION_VERSION,
   MODELS_JSON_PATH,
   detectModelFamily,
+  detectProvider,
   fetchContextLengthsBatched,
   fetchModelContextLength,
   fetchOllamaModels,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtstech/pi-shared",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "description": "Shared utilities for Pi Coding Agent extensions",
   "main": "index.js",
   "types": "index.d.ts",

package/security.js

@@ -84,6 +84,7 @@ var BLOCKED_URL_PATTERNS = /* @__PURE__ */ new Set([
   "127.0.0.1",
   "0.0.0.0",
   "::1",
+  "::ffff:127.0.0.1",
   // RFC1918 private ranges
   "10.",
   "192.168.",
@@ -325,6 +326,7 @@ function checkInjectionPatterns(input) {
   return { safe: true, rule: "", detail: "" };
 }
 export {
+  AUDIT_LOG_PATH,
   BLOCKED_COMMANDS,
   BLOCKED_URL_PATTERNS,
   appendAuditEntry,

package/types.js

@@ -1,69 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-
-// shared/types.ts
-var OllamaConnectionError = class extends Error {
-  constructor(message, cause) {
-    super(message);
-    /** The underlying error that caused this connection failure, if any. */
-    __publicField(this, "cause");
-    this.name = "OllamaConnectionError";
-    this.cause = cause;
-  }
-};
-var ModelTimeoutError = class extends Error {
-  constructor(model, timeoutMs) {
-    super(`Model ${model} timed out after ${timeoutMs}ms`);
-    /** The name of the model that timed out. */
-    __publicField(this, "model");
-    /** The timeout duration in milliseconds. */
-    __publicField(this, "timeoutMs");
-    this.name = "ModelTimeoutError";
-    this.model = model;
-    this.timeoutMs = timeoutMs;
-  }
-};
-var EmptyResponseError = class extends Error {
-  constructor(model, details) {
-    super(`Empty response from model ${model}: ${details}`);
-    /** The name of the model that returned an empty response. */
-    __publicField(this, "model");
-    /** Additional details about why the response was considered empty. */
-    __publicField(this, "details");
-    this.name = "EmptyResponseError";
-    this.model = model;
-    this.details = details;
-  }
-};
-var SecurityBlockError = class extends Error {
-  constructor(rule, detail, input) {
-    super(`[SECURITY] ${detail} (rule: ${rule})`);
-    /** The name of the security rule that was triggered. */
-    __publicField(this, "rule");
-    /** Detailed explanation of why the operation was blocked. */
-    __publicField(this, "detail");
-    /** The original input that was blocked. */
-    __publicField(this, "input");
-    this.name = "SecurityBlockError";
-    this.rule = rule;
-    this.detail = detail;
-    this.input = input;
-  }
-};
-var ToolParseError = class extends Error {
-  constructor(message, rawText) {
-    super(`Tool parse error: ${message}`);
-    /** The raw text that failed to parse. */
-    __publicField(this, "rawText");
-    this.name = "ToolParseError";
-    this.rawText = rawText;
-  }
-};
-export {
-  EmptyResponseError,
-  ModelTimeoutError,
-  OllamaConnectionError,
-  SecurityBlockError,
-  ToolParseError
-};