@vtstech/pi-ollama-sync 1.1.2 → 1.1.4

package/ollama-sync.js

@@ -55,6 +55,60 @@ function mergeModels(newModels, oldModels) {
     return m;
   });
 }
+async function performSync(overrideUrl) {
+  const existing = readModelsJson();
+  const config = getProviderConfig(existing);
+  const ollamaBaseUrl = overrideUrl ? overrideUrl.replace(/\/v1$/, "").replace(/\/+$/, "") : config.baseUrl?.replace(/\/v1$/, "") ?? getOllamaBaseUrl();
+  try {
+    const models = await fetchOllamaModels(ollamaBaseUrl);
+    if (models.length === 0) {
+      return {
+        ollamaBaseUrl,
+        newModels: [],
+        added: [],
+        removed: [],
+        error: "No models found in Ollama"
+      };
+    }
+    const sorted = [...models].sort((a, b) => a.size - b.size);
+    const contextMap = await fetchContextLengthsBatched(
+      ollamaBaseUrl,
+      sorted.map((m) => m.name)
+    );
+    const newModels = sorted.map(
+      (m) => buildModelEntry(m, contextMap.get(m.name))
+    );
+    const oldIds = new Set(
+      existing.providers["ollama"]?.models?.map((m) => m.id) ?? []
+    );
+    const added = newModels.filter((m) => !oldIds.has(m.id));
+    const removed = [...oldIds].filter((id) => !newModels.some((m) => m.id === id));
+    const mergedModels = mergeModels(
+      newModels,
+      existing.providers["ollama"]?.models ?? []
+    );
+    existing.providers["ollama"] = {
+      ...config,
+      baseUrl: ollamaBaseUrl + "/v1",
+      models: mergedModels
+    };
+    writeModelsJson(existing);
+    return {
+      ollamaBaseUrl,
+      newModels,
+      added,
+      removed
+    };
+  } catch (err) {
+    return {
+      ollamaBaseUrl,
+      newModels: [],
+      added: [],
+      removed: [],
+      error: err.message
+    };
+  }
+}
 function ollama_sync_temp_default(pi) {
   pi.registerCommand("ollama-sync", {
     description: "Sync models from Ollama into models.json. Use: /ollama-sync [url]",
@@ -69,39 +123,13 @@ function ollama_sync_temp_default(pi) {
       const overrideUrl = arg || void 0;
       ctx.ui.setStatus("ollama-sync", "Fetching models from Ollama...");
       try {
-        const existing = readModelsJson();
-        const config = getProviderConfig(existing);
-        const ollamaBaseUrl = overrideUrl ? overrideUrl.replace(/\/v1$/, "").replace(/\/+$/, "") : config.baseUrl?.replace(/\/v1$/, "") ?? getOllamaBaseUrl();
-        const models = await fetchOllamaModels(ollamaBaseUrl);
-        if (models.length === 0) {
-          ctx.ui.notify("No models found in Ollama", "info");
+        const result = await performSync(overrideUrl);
+        if (result.error) {
+          ctx.ui.notify(result.error, result.newModels.length === 0 ? "info" : "error");
           ctx.ui.setStatus("ollama-sync", void 0);
           return;
         }
-        const sorted = [...models].sort((a, b) => a.size - b.size);
-        ctx.ui.setStatus("ollama-sync", "Fetching model details...");
-        const contextMap = await fetchContextLengthsBatched(
-          ollamaBaseUrl,
-          sorted.map((m) => m.name)
-        );
-        const newModels = sorted.map(
-          (m) => buildModelEntry(m, contextMap.get(m.name))
-        );
-        const oldIds = new Set(
-          existing.providers["ollama"]?.models?.map((m) => m.id) ?? []
-        );
-        const added = newModels.filter((m) => !oldIds.has(m.id));
-        const removed = [...oldIds].filter((id) => !newModels.some((m) => m.id === id));
-        const mergedModels = mergeModels(
-          newModels,
-          existing.providers["ollama"]?.models ?? []
-        );
-        existing.providers["ollama"] = {
-          ...config,
-          baseUrl: ollamaBaseUrl + "/v1",
-          models: mergedModels
-        };
-        writeModelsJson(existing);
+        const { ollamaBaseUrl, newModels, added, removed } = result;
         const lines = [""];
         lines.push(`  Ollama: ${ollamaBaseUrl}`);
         lines.push(`  Synced ${newModels.length} models from Ollama`);
@@ -161,55 +189,34 @@ function ollama_sync_temp_default(pi) {
     },
     async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
       const overrideUrl = params?.url;
-      const existing = readModelsJson();
-      const config = getProviderConfig(existing);
-      const ollamaBaseUrl = overrideUrl ? overrideUrl.replace(/\/v1$/, "").replace(/\/+$/, "") : config.baseUrl?.replace(/\/v1$/, "") ?? getOllamaBaseUrl();
-      try {
-        const models = await fetchOllamaModels(ollamaBaseUrl);
-        const sorted = [...models].sort((a, b) => a.size - b.size);
-        const contextMap = await fetchContextLengthsBatched(
-          ollamaBaseUrl,
-          sorted.map((m) => m.name)
-        );
-        const newModels = sorted.map(
-          (m) => buildModelEntry(m, contextMap.get(m.name))
-        );
-        const mergedModels = mergeModels(
-          newModels,
-          existing.providers["ollama"]?.models ?? []
-        );
-        existing.providers["ollama"] = {
-          ...config,
-          baseUrl: ollamaBaseUrl + "/v1",
-          models: mergedModels
-        };
-        writeModelsJson(existing);
-        const modelDetails = newModels.map(
-          (m) => {
-            const ctxStr = m.contextLength ?? "?";
-            const sizeStr = m.estimatedSize ? `GPU: ~${bytesHuman(m.estimatedSize.gpu)}, CPU: ~${bytesHuman(m.estimatedSize.cpu)}` : "?";
-            return `  \u2022 ${m.id} (${m.parameterSize}, ${m.quantizationLevel}, ctx: ${ctxStr}, ${sizeStr})`;
-          }
-        ).join("\n");
+      const result = await performSync(overrideUrl);
+      if (result.error) {
         return {
-          content: [
-            {
-              type: "text",
-              text: `${BRANDING}
+          content: [{ type: "text", text: `Error: ${result.error}` }],
+          details: {}
+        };
+      }
+      const { ollamaBaseUrl, newModels } = result;
+      const modelDetails = newModels.map(
+        (m) => {
+          const ctxStr = m.contextLength ?? "?";
+          const sizeStr = m.estimatedSize ? `GPU: ~${bytesHuman(m.estimatedSize.gpu)}, CPU: ~${bytesHuman(m.estimatedSize.cpu)}` : "?";
+          return `  \u2022 ${m.id} (${m.parameterSize}, ${m.quantizationLevel}, ctx: ${ctxStr}, ${sizeStr})`;
+        }
+      ).join("\n");
+      return {
+        content: [
+          {
+            type: "text",
+            text: `${BRANDING}
 
 Synced ${newModels.length} models from ${ollamaBaseUrl} to ${MODELS_FILE}. Run /reload to pick up changes.
 
 ${modelDetails}`
-            }
-          ],
-          details: { models: newModels }
-        };
-      } catch (err) {
-        return {
-          content: [{ type: "text", text: `Error: ${err.message}` }],
-          details: {}
-        };
-      }
+          }
+        ],
+        details: { models: newModels }
+      };
     }
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtstech/pi-ollama-sync",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Ollama model sync extension for Pi Coding Agent",
   "main": "ollama-sync.js",
   "keywords": ["pi-extensions"],
@@ -14,7 +14,7 @@
     "url": "https://github.com/VTSTech/pi-coding-agent"
   },
   "dependencies": {
-    "@vtstech/pi-shared": "1.1.2"
+    "@vtstech/pi-shared": "1.1.4"
   },
   "peerDependencies": {
     "@mariozechner/pi-coding-agent": ">=0.66"