@mcowger/oh-my-pi-plexus 1.4.3 → 1.4.6

package/dist/extension.js

@@ -109420,11 +109420,18 @@ function convertToDescriptor(raw, baseUrl) {
 function isChatModel(model) {
   if (!model.id)
     return false;
+  const inputModalities = model.architecture?.input_modalities;
+  if (inputModalities !== undefined && inputModalities.length > 0 && !inputModalities.includes("text")) {
+    return false;
+  }
   const outputModalities = model.architecture?.output_modalities;
   if (outputModalities !== undefined && !outputModalities.includes("text"))
     return false;
   const modality = model.architecture?.modality;
   if (modality?.includes("->")) {
+    const input = modality.split("->")[0] ?? "";
+    if (!input.toLowerCase().includes("text"))
+      return false;
     const output = modality.split("->").at(-1) ?? "";
     if (!output.toLowerCase().includes("text"))
       return false;
@@ -129431,49 +129438,43 @@ function descriptorToOhMyPiModel(descriptor) {
 
 // src/extension.ts
 var PROVIDER_NAME = "plexus";
-var currentModels = [];
 function getProviderApiKeyConfig() {
   return Bun.env[ENV_API_KEY]?.trim() ? { apiKey: ENV_API_KEY, authHeader: true } : {};
 }
+var currentModels = [];
 function plexusExtension(pi) {
+  const cached3 = readCachedModelsSync();
+  const suppressPatterns = getSuppressedModels();
   const startupBaseUrl = getBaseUrl() ?? "http://localhost/v1";
+  const startupModels = (cached3?.models ?? []).filter((m) => !isModelSuppressed({ id: m.id, name: m.name }, suppressPatterns)).map(descriptorToOhMyPiModel);
   log("startup", {
-    startupBaseUrl,
-    hasEnvApiKey: !!getEnvApiKey()
+    cachedModelCount: startupModels.length,
+    startupBaseUrl
   });
   pi.registerProvider(PROVIDER_NAME, {
     api: "openai-completions",
     ...getProviderApiKeyConfig(),
     baseUrl: startupBaseUrl,
-    authHeader: true,
-    fetchDynamicModels: fetchDynamicPlexusModels,
-    oauth: createPlexusLoginProvider()
+    models: startupModels,
+    oauth: createPlexusLoginProvider(pi)
   });
-  pi.on("session_start", (_event, ctx) => {
-    syncCurrentModels(ctx);
+  currentModels = startupModels;
+  pi.on("session_start", async (_event, ctx) => {
+    const apiKey = await ctx.modelRegistry.authStorage.getApiKey(PROVIDER_NAME) ?? getEnvApiKey();
     const baseUrl = getBaseUrl();
-    log("session_start", { baseUrl, modelCount: currentModels.length });
-    if (!baseUrl) {
-      log("session_start: no base URL configured, skipping refresh");
+    log("session_start", { hasApiKey: !!apiKey, baseUrl });
+    if (!apiKey || !baseUrl) {
+      log("session_start: no auth configured, skipping refresh");
       return;
     }
-    ctx.modelRegistry.refreshRuntimeProviders("online-if-uncached").then(() => {
-      syncCurrentModels(ctx);
-      log("session_start: background refresh complete", { count: currentModels.length });
-    }).catch((error51) => {
-      log("session_start: background refresh failed", { error: String(error51) });
-    });
+    await doRefresh(pi, apiKey, ctx);
   });
-  pi.registerCommand(PROVIDER_NAME, {
+  pi.registerCommand("plexus", {
     description: "Plexus provider commands: refresh, set-default-model (setup: /login plexus)",
     getArgumentCompletions: (prefix) => {
       const subcommands = [
         { value: "refresh", label: "refresh", description: "Refresh Plexus models from the API" },
-        {
-          value: "set-default-model",
-          label: "set-default-model",
-          description: "Choose the model Oh My Pi should use by default"
-        }
+        { value: "set-default-model", label: "set-default-model", description: "Choose the model Oh My Pi should use by default" }
       ];
       if (!prefix.includes(" ")) {
         return subcommands.filter((command) => command.value.startsWith(prefix));
@@ -129493,7 +129494,7 @@ function plexusExtension(pi) {
       const trimmed = args2.trim();
       const sub = trimmed.toLowerCase();
       if (sub === "refresh" || sub === "") {
-        await handleRefresh(ctx);
+        await handleRefresh(pi, ctx);
         return;
       }
       if (sub === "set-default-model" || sub.startsWith("set-default-model ")) {
@@ -129504,7 +129505,7 @@ function plexusExtension(pi) {
     }
   });
 }
-function createPlexusLoginProvider() {
+function createPlexusLoginProvider(pi) {
   return {
     name: "Plexus",
     async login(callbacks) {
@@ -129518,28 +129519,20 @@ function createPlexusLoginProvider() {
       if (!apiKey)
         throw new Error("Plexus API key is required.");
       await saveBaseUrl(baseUrl);
-      callbacks.onProgress?.("Plexus configured; model discovery is running in the background.");
+      callbacks.onProgress?.("Refreshing Plexus models...");
+      await doRefresh(pi, apiKey, null);
       return apiKey;
     }
   };
 }
-async function handleRefresh(ctx) {
-  const apiKey = await ctx.modelRegistry.getApiKeyForProvider(PROVIDER_NAME) ?? getEnvApiKey();
+async function handleRefresh(pi, ctx) {
+  const apiKey = await ctx.modelRegistry.authStorage.getApiKey(PROVIDER_NAME) ?? getEnvApiKey();
   if (!apiKey) {
     ctx.ui.notify("No Plexus API key configured. Run /login plexus first.", "error");
     return;
   }
-  if (!getBaseUrl()) {
-    ctx.ui.notify("Plexus base URL not configured. Run /login plexus first.", "error");
-    return;
-  }
   ctx.ui.notify("Refreshing Plexus models\u2026", "info");
-  await ctx.modelRegistry.refreshProvider(PROVIDER_NAME, "online");
-  syncCurrentModels(ctx);
-  ctx.ui.notify(currentModels.length > 0 ? `Refreshed ${currentModels.length} Plexus models` : "Refresh finished but no Plexus models are available. Check the Plexus server and /login plexus.", currentModels.length > 0 ? "info" : "warning");
-}
-function syncCurrentModels(ctx) {
-  currentModels = ctx.models.list().filter((model) => model.provider === PROVIDER_NAME);
+  await doRefresh(pi, apiKey, ctx);
 }
 async function handleSetDefaultModel(pi, ctx, requestedModelId) {
   let modelId = requestedModelId;
@@ -129565,27 +129558,45 @@ async function handleSetDefaultModel(pi, ctx, requestedModelId) {
   const active = await pi.setModel(registryModel);
   ctx.ui.notify(active ? `Plexus model selected: ${model.id}.` : `Plexus model ${model.id} was saved but could not be selected in this session.`, active ? "info" : "warning");
 }
-async function fetchDynamicPlexusModels(apiKey) {
+async function doRefresh(pi, apiKey, ctx) {
   const modelsUrl = getModelsUrl();
   const baseUrl = getBaseUrl();
-  if (!modelsUrl || !baseUrl || !apiKey)
-    return [];
-  const cached3 = readCachedModelsSync();
-  const { models: apiModels, raw, etag, notModified } = await fetchPlexusModels(apiKey, modelsUrl, undefined, cached3?.etag);
-  if (notModified) {
+  if (!modelsUrl || !baseUrl) {
+    if (ctx)
+      ctx.ui.notify("Plexus base URL not configured. Run /login plexus first.", "warning");
+    log("doRefresh: no base URL configured");
+    return;
+  }
+  try {
+    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 models3 = (cached3?.models ?? []).filter((model) => !isModelSuppressed({ id: model.id, name: model.name }, suppressPatterns)).map(descriptorToOhMyPiModel);
-    log("fetchDynamicModels: not modified", { count: models3.length, etag: cached3?.etag });
-    return models3;
-  }
-  const descriptors3 = convertDescriptors(apiModels, baseUrl, getSuppressedModels());
-  const models2 = descriptors3.map(descriptorToOhMyPiModel);
-  await Promise.all([
-    writeCachedModels(descriptors3, etag),
-    raw ? writeRawResponse(raw) : Promise.resolve()
-  ]);
-  log("fetchDynamicModels: fetched", { count: models2.length });
-  return models2;
+    const descriptors3 = convertDescriptors(apiModels, baseUrl, suppressPatterns);
+    const ohMyPiModels = descriptors3.map(descriptorToOhMyPiModel);
+    await Promise.all([writeCachedModels(descriptors3, etag), raw ? writeRawResponse(raw) : Promise.resolve()]);
+    currentModels = ohMyPiModels;
+    pi.registerProvider(PROVIDER_NAME, {
+      api: "openai-completions",
+      ...getProviderApiKeyConfig(),
+      baseUrl,
+      models: ohMyPiModels,
+      oauth: createPlexusLoginProvider(pi)
+    });
+    log("doRefresh: registered", { count: ohMyPiModels.length });
+    if (ctx)
+      ctx.ui.notify(`Refreshed ${ohMyPiModels.length} Plexus models`, "info");
+  } catch (error51) {
+    log("doRefresh: failed", { error: String(error51) });
+    if (ctx) {
+      ctx.ui.notify(`Refresh failed: ${error51 instanceof Error ? error51.message : String(error51)}`, "error");
+    }
+  }
 }
 export {
   plexusExtension as default,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@mcowger/oh-my-pi-plexus",
-	"version": "1.4.3",
+	"version": "1.4.6",
 	"description": "Plexus AI proxy plugin for the Oh My Pi coding agent",
 	"type": "module",
 	"files": [
@@ -26,15 +26,15 @@
 		"build": "bun run build.ts"
 	},
 	"peerDependencies": {
-		"@oh-my-pi/pi-ai": ">=18.0.3",
-		"@oh-my-pi/pi-coding-agent": ">=18.0.3",
-		"@oh-my-pi/pi-utils": ">=18.0.3"
+		"@oh-my-pi/pi-ai": ">=17.1.0",
+		"@oh-my-pi/pi-coding-agent": ">=17.1.0",
+		"@oh-my-pi/pi-utils": ">=17.1.0"
 	},
 	"devDependencies": {
-		"@oh-my-pi/pi-ai": "^18.0.3",
-		"@oh-my-pi/pi-catalog": "18.0.3",
-		"@oh-my-pi/pi-coding-agent": "^18.0.3",
-		"@oh-my-pi/pi-utils": "18.0.3",
+		"@oh-my-pi/pi-ai": "^17.1.0",
+		"@oh-my-pi/pi-catalog": "^17.1.0",
+		"@oh-my-pi/pi-coding-agent": "^17.1.0",
+		"@oh-my-pi/pi-utils": "^17.1.0",
 		"@types/bun": "latest"
 	},
 	"repository": {