@vtstech/pi-ollama-sync 1.1.7 → 1.1.9

package/ollama-sync.js

@@ -4,11 +4,13 @@ import {
   fetchOllamaModels,
   fetchContextLengthsBatched,
   readModelsJson,
-  writeModelsJson,
+  readModifyWriteModelsJson,
   isReasoningModel,
   getOllamaBaseUrl,
   EXTENSION_VERSION
 } from "@vtstech/pi-shared/ollama";
+import { mergeModels } from "@vtstech/pi-shared/provider-sync";
+import { getEffectiveConfig } from "@vtstech/pi-shared/model-test-utils";
 import { section, ok, warn, info, bytesHuman, estimateMemory } from "@vtstech/pi-shared/format";
 var BRANDING = [
   `  \u26A1 Pi Ollama Sync v${EXTENSION_VERSION}`,
@@ -41,24 +43,15 @@ function buildModelEntry(m, contextLength) {
     estimatedSize
   };
 }
-function mergeModels(newModels, oldModels) {
-  const oldModelMap = new Map(oldModels.map((m) => [m.id, m]));
-  return newModels.map((m) => {
-    const old = oldModelMap.get(m.id);
-    if (old) {
-      const merged = { ...m };
-      for (const [k, v] of Object.entries(old)) {
-        if (!(k in m)) merged[k] = v;
-      }
-      return merged;
-    }
-    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();
+  let ollamaBaseUrl;
+  if (overrideUrl) {
+    ollamaBaseUrl = overrideUrl.replace(/\/v1$/, "").replace(/\/+$/, "");
+  } else {
+    const preview = readModelsJson();
+    const config = getProviderConfig(preview);
+    ollamaBaseUrl = config.baseUrl?.replace(/\/v1$/, "") ?? getOllamaBaseUrl();
+  }
   try {
     const models = await fetchOllamaModels(ollamaBaseUrl);
     if (models.length === 0) {
@@ -71,28 +64,35 @@ async function performSync(overrideUrl) {
       };
     }
     const sorted = [...models].sort((a, b) => a.size - b.size);
+    const testConfig = getEffectiveConfig();
     const contextMap = await fetchContextLengthsBatched(
       ollamaBaseUrl,
-      sorted.map((m) => m.name)
+      sorted.map((m) => m.name),
+      testConfig.CONTEXT_BATCH_SIZE
     );
     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);
+    let added = [];
+    let removed = [];
+    await readModifyWriteModelsJson((existing) => {
+      const config = getProviderConfig(existing);
+      const oldIds = new Set(
+        existing.providers["ollama"]?.models?.map((m) => m.id) ?? []
+      );
+      added = newModels.filter((m) => !oldIds.has(m.id));
+      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
+      };
+      return existing;
+    });
     return {
       ollamaBaseUrl,
       newModels,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtstech/pi-ollama-sync",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "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.7"
+    "@vtstech/pi-shared": "1.1.9"
   },
   "peerDependencies": {
     "@mariozechner/pi-coding-agent": ">=0.66"