@mcowger/oh-my-pi-plexus 1.3.8 → 1.3.10

package/README.md

@@ -244,6 +244,47 @@ Both adapters also accept pi-style environment interpolation in configured strin
 
 ---
 
+## Model suppression
+
+All plugin packages support suppressing models by name or pattern so undesired models do not appear in model selectors or cache restored lists.
+
+### Pattern matching syntax
+
+- **Exact match** (case-insensitive): Matches model `id`, `name`, or short ID (suffix after `/` or `:`). Example: `"gpt-4o"`, `"Claude 3.5 Sonnet"`.
+- **Glob wildcards**: Supports `*` (0+ characters) and `?` (1 character). Example: `"gpt-3.5*"`, `"*deprecated*"`, `"anthropic/*"`.
+- **Regex patterns**: Prefix with `regex:`. Example: `"regex:^gpt-[34]"`.
+
+### Configuration methods
+
+- **Environment variables**:
+  ```sh
+  export PLEXUS_SUPPRESS_MODELS="gpt-3.5*, *deprecated*, whisper"
+  ```
+  `PLEXUS_EXCLUDE_MODELS` is also accepted. Values can be comma-, semicolon-, or newline-separated.
+
+- **pi / Oh My Pi config**: Add `suppressModels` (or `suppress`) to `config.json`:
+  ```json
+  {
+    "baseUrl": "https://plexus.example.com",
+    "suppressModels": ["gpt-3.5*", "*deprecated*"]
+  }
+  ```
+
+- **OpenCode config**: Add `suppressModels` (or `suppress`) under `provider.plexus.options` in `opencode.json`:
+  ```json
+  {
+    "provider": {
+      "plexus": {
+        "options": {
+          "suppressModels": ["gpt-3.5*", "claude-2*"]
+        }
+      }
+    }
+  }
+  ```
+
+---
+
 ## Package layout
 
 ```
@@ -252,6 +293,7 @@ packages/
     src/
       types.ts          # wire types (PlexusApiModel, PlexusModelDescriptor, etc.)
       convert.ts        # model fetching, conversion, compat detection
+      suppress.ts       # model pattern suppression / exclusion matching
       index.ts          # barrel export
   plexus-pi/            # pi host adapter
     src/

package/dist/extension.js

@@ -109228,6 +109228,55 @@ var init_devin = __esm(() => {
   NO_REASONING_LABEL_PATTERN = /\bno thinking\b/i;
 });
 
+// ../plexus-models/src/suppress.ts
+function parseSuppressionPatterns(raw) {
+  if (!raw)
+    return [];
+  const items = Array.isArray(raw) ? raw : raw.split(/[\n,;]+/);
+  return items.map((s) => s.trim()).filter((s) => s.length > 0);
+}
+function getEnvSuppressedModels() {
+  const env = typeof process !== "undefined" && process?.env ? process.env : {};
+  const raw = env.PLEXUS_SUPPRESS_MODELS ?? env.PLEXUS_EXCLUDE_MODELS;
+  return parseSuppressionPatterns(raw);
+}
+function isModelSuppressed(model, patterns) {
+  const envPatterns = getEnvSuppressedModels();
+  const explicitPatterns = parseSuppressionPatterns(patterns);
+  const allPatterns = [...envPatterns, ...explicitPatterns];
+  if (allPatterns.length === 0)
+    return false;
+  const id = model.id.toLowerCase();
+  const name = (model.name ?? "").toLowerCase();
+  const shortId = id.includes("/") ? id.split("/").pop() : id.includes(":") ? id.split(":").pop() : id;
+  for (const pattern of allPatterns) {
+    if (matchesPattern(id, name, shortId, pattern)) {
+      return true;
+    }
+  }
+  return false;
+}
+function matchesPattern(id, name, shortId, pattern) {
+  const p = pattern.toLowerCase();
+  if (p.startsWith("regex:")) {
+    try {
+      const re = new RegExp(pattern.slice(6), "i");
+      return re.test(id) || re.test(name) || re.test(shortId);
+    } catch {
+      return false;
+    }
+  }
+  if (p.includes("*") || p.includes("?")) {
+    const regexStr = "^" + p.replace(/([.+^${}()|[\]\\])/g, "\\$1").replace(/\*/g, ".*").replace(/\?/g, ".") + "$";
+    try {
+      const re = new RegExp(regexStr, "i");
+      return re.test(id) || re.test(name) || re.test(shortId);
+    } catch {
+      return false;
+    }
+  }
+  return id === p || name === p || shortId === p;
+}
 // ../plexus-models/src/convert.ts
 var REASONING_PARAMS = new Set(["reasoning", "include_reasoning", "reasoning_effort"]);
 var NON_CHAT_PATTERN = /(?:^|[\W_])(?:embed(?:ding|dings)?|transcri(?:be[ds]?|ptions?)|whisper|speech[\W_]*to[\W_]*text|stt|text[\W_]*to[\W_]*speech|tts|image[\W_]*(?:gen(?:eration)?|\d+)|diffusion|dall[\W_]*e|stable[\W_]*diffusion|sdxl|dream)(?:$|[\W_])/i;
@@ -109361,11 +109410,68 @@ function isChatModel(model) {
   const apiHints = Array.isArray(model.preferred_api) ? model.preferred_api.join(" ") : model.preferred_api ?? "";
   return !NON_CHAT_PATTERN.test(`${model.id} ${model.name ?? ""} ${apiHints}`);
 }
-function convertDescriptors(models, baseUrl) {
+function parseSuppressionPatterns2(input) {
+  if (!input)
+    return [];
+  const rawItems = Array.isArray(input) ? input : [input];
+  const patterns = [];
+  for (const item of rawItems) {
+    if (!item || typeof item !== "string")
+      continue;
+    const parts = item.split(/[\n,]/);
+    for (const part of parts) {
+      const trimmed = part.trim();
+      if (trimmed.length > 0) {
+        patterns.push(trimmed);
+      }
+    }
+  }
+  return patterns;
+}
+function isSuppressedModel(model, suppress) {
+  if (!model || !model.id)
+    return false;
+  const patterns = parseSuppressionPatterns2(suppress);
+  if (patterns.length === 0)
+    return false;
+  const idLower = model.id.toLowerCase();
+  const nameLower = (model.name ?? "").toLowerCase();
+  for (const pattern of patterns) {
+    const patternLower = pattern.toLowerCase();
+    if (idLower === patternLower || nameLower && nameLower === patternLower) {
+      return true;
+    }
+    if (pattern.startsWith("/") && pattern.lastIndexOf("/") > 0) {
+      const lastSlash = pattern.lastIndexOf("/");
+      const regexBody = pattern.slice(1, lastSlash);
+      const regexFlags = pattern.slice(lastSlash + 1) || "i";
+      try {
+        const re = new RegExp(regexBody, regexFlags);
+        if (re.test(model.id) || model.name && re.test(model.name)) {
+          return true;
+        }
+      } catch {}
+    }
+    if (pattern.includes("*") || pattern.includes("?")) {
+      try {
+        const escaped = patternLower.replace(/[.+^$()|[{}]\\]/g, "\\$&");
+        const regexStr = "^" + escaped.replace(/\*/g, ".*").replace(/\?/g, ".") + "$";
+        const globRe = new RegExp(regexStr, "i");
+        if (globRe.test(model.id) || model.name && globRe.test(model.name)) {
+          return true;
+        }
+      } catch {}
+    }
+  }
+  return false;
+}
+function convertDescriptors(models, baseUrl, suppress) {
   const result = [];
   for (const m of models) {
     if (!isChatModel(m))
       continue;
+    if (isSuppressedModel(m, suppress))
+      continue;
     result.push(convertToDescriptor(m, baseUrl));
   }
   return result;
@@ -109430,22 +109536,28 @@ function detectOpenAICompletionsCompat(providerName, baseUrl) {
   return compat;
 }
 var DEFAULT_MODELS_FETCH_TIMEOUT_MS = 1e4;
-async function fetchPlexusModels(apiKey, modelsUrl, timeoutMs = DEFAULT_MODELS_FETCH_TIMEOUT_MS) {
+async function fetchPlexusModels(apiKey, modelsUrl, timeoutMs = DEFAULT_MODELS_FETCH_TIMEOUT_MS, etag) {
   const controller = new AbortController;
   const timer = setTimeout(() => controller.abort(), timeoutMs);
   try {
     const headers = { Accept: "application/json" };
     if (apiKey)
       headers.Authorization = `Bearer ${apiKey}`;
+    if (etag)
+      headers["If-None-Match"] = etag;
     const res = await fetch(modelsUrl, {
       headers,
       signal: controller.signal
     });
+    if (res.status === 304) {
+      return { models: [], notModified: true };
+    }
     if (!res.ok) {
       throw new Error(`Plexus models fetch failed: ${res.status} ${res.statusText}`);
     }
     const raw = await res.json();
-    return { models: raw.data ?? [], raw };
+    const responseEtag = res.headers.get("etag") ?? undefined;
+    return { models: raw.data ?? [], raw, etag: responseEtag };
   } catch (err) {
     if (err instanceof Error && err.name === "AbortError") {
       throw new Error(`Plexus models fetch timed out after ${timeoutMs}ms`);
@@ -109579,6 +109691,12 @@ function getBaseUrl() {
   const raw = getRawBaseUrl();
   return raw ? normalizeApiBase(raw) : null;
 }
+function getSuppressedModels() {
+  const config = getConfigSync();
+  const envSuppressed = getEnvSuppressedModels();
+  const configSuppressed = parseSuppressionPatterns(config.suppressModels ?? config.suppress);
+  return [...envSuppressed, ...configSuppressed];
+}
 
 // src/cache.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
@@ -109598,7 +109716,8 @@ function parseCacheData(raw) {
       return null;
     return {
       models: obj["models"],
-      timestamp: typeof obj["timestamp"] === "number" ? obj["timestamp"] : 0
+      timestamp: typeof obj["timestamp"] === "number" ? obj["timestamp"] : 0,
+      etag: typeof obj["etag"] === "string" ? obj["etag"] : undefined
     };
   } catch {
     return null;
@@ -109614,9 +109733,9 @@ function readCachedModelsSync() {
     return null;
   }
 }
-async function writeCachedModels(models) {
+async function writeCachedModels(models, etag) {
   await mkdir2(getCacheDir(), { recursive: true });
-  const payload = { models, timestamp: Date.now() };
+  const payload = { models, timestamp: Date.now(), etag };
   await writeFile2(getModelsCachePath(), `${JSON.stringify(payload, null, 2)}
 `, "utf8");
 }
@@ -129293,8 +129412,9 @@ function getProviderApiKeyConfig() {
 var currentModels = [];
 function plexusExtension(pi) {
   const cached3 = readCachedModelsSync();
+  const suppressPatterns = getSuppressedModels();
   const startupBaseUrl = getBaseUrl() ?? "http://localhost/v1";
-  const startupModels = cached3?.models.map(descriptorToOhMyPiModel) ?? [];
+  const startupModels = (cached3?.models ?? []).filter((m) => !isModelSuppressed({ id: m.id, name: m.name }, suppressPatterns)).map(descriptorToOhMyPiModel);
   log("startup", {
     cachedModelCount: startupModels.length,
     startupBaseUrl
@@ -129416,10 +129536,18 @@ async function doRefresh(pi, apiKey, ctx) {
     return;
   }
   try {
-    const { models: apiModels, raw } = await fetchPlexusModels(apiKey, modelsUrl);
-    const descriptors3 = convertDescriptors(apiModels, baseUrl);
+    const cached3 = readCachedModelsSync();
+    const { models: apiModels, raw, etag, notModified } = await fetchPlexusModels(apiKey, modelsUrl, undefined, cached3?.etag);
+    if (notModified) {
+      log("doRefresh: not modified", { etag: cached3?.etag });
+      if (ctx)
+        ctx.ui.notify(`Refreshed ${currentModels.length} Plexus models (not modified)`, "info");
+      return;
+    }
+    const suppressPatterns = getSuppressedModels();
+    const descriptors3 = convertDescriptors(apiModels, baseUrl, suppressPatterns);
     const ohMyPiModels = descriptors3.map(descriptorToOhMyPiModel);
-    await Promise.all([writeCachedModels(descriptors3), writeRawResponse(raw)]);
+    await Promise.all([writeCachedModels(descriptors3, etag), raw ? writeRawResponse(raw) : Promise.resolve()]);
     currentModels = ohMyPiModels;
     pi.registerProvider(PROVIDER_NAME, {
       api: "openai-completions",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@mcowger/oh-my-pi-plexus",
-	"version": "1.3.8",
+	"version": "1.3.10",
 	"description": "Plexus AI proxy plugin for the Oh My Pi coding agent",
 	"type": "module",
 	"files": [