agentsw 0.6.1 → 0.7.0

package/dist/targets/pistyle.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
-import { backupFile, home, readJsonIfExists, writeFileAtomic } from "../fsutil.js";
+import { backupFile, home, writeFileAtomic } from "../fsutil.js";
+import { editJsoncObject, isJsonObject, readJsoncObject } from "../jsonc.js";
 import { looksLikeEnvName } from "../slug.js";
 import { apiValue, classifyApi, entryApi, mergeModels, sdkBaseUrl, stripConflictingOverrides } from "./wire.js";
 /** Per-model keys this adapter writes; one that stops being emitted is cleared, not inherited. */
@@ -14,6 +15,28 @@ const OWNED_MODEL_KEYS = [
     "maxTokens",
     "cost",
 ];
+function readModels(file) {
+    const document = readJsoncObject(file);
+    const providers = document.value.providers;
+    if (providers !== undefined) {
+        if (!isJsonObject(providers))
+            throw new Error(`${file}: expected providers to be a JSON object`);
+        for (const entry of Object.values(providers)) {
+            if (!isJsonObject(entry))
+                throw new Error(`${file}: expected every provider entry to be a JSON object`);
+        }
+    }
+    return { ...document, value: document.value };
+}
+function readSettings(file) {
+    const document = readJsoncObject(file);
+    for (const key of ["defaultProvider", "defaultModel"]) {
+        if (document.value[key] !== undefined && typeof document.value[key] !== "string") {
+            throw new Error(`${file}: expected ${key} to be a string`);
+        }
+    }
+    return { ...document, value: document.value };
+}
 /**
  * pi-family agents (pi, prime-agent) share the same config layout:
  *   <dir>/models.json   — { providers: { <id>: { baseUrl, apiKey, api, models[] } } }
@@ -50,14 +73,14 @@ export function piStyleTarget(opts) {
             const modelsFile = path.join(dir, "models.json");
             const settingsFile = path.join(dir, "settings.json");
             const notes = [];
-            const modelsConfig = readJsonIfExists(modelsFile) ?? {};
+            // Validate both files before preparing any writes, including a malformed settings file.
+            const modelsDocument = readModels(modelsFile);
+            const settingsDocument = readSettings(settingsFile);
+            const modelsConfig = { ...modelsDocument.value };
             const providers = { ...modelsConfig.providers };
             // Keys agentsw does not model (headers, authHeader, oauth, ...) and per-model extras
             // are the user's; a re-sync overwrites only the fields it owns.
-            const existing = providers[provider.id];
-            const prev = (existing && typeof existing === "object" && !Array.isArray(existing)
-                ? existing
-                : {});
+            const prev = providers[provider.id] ?? {};
             const api = apiValue(provider.protocol, provider.openaiApi, entryApi(prev));
             const baseUrl = sdkBaseUrl(provider.protocol, provider.baseUrl);
             const models = mergeModels(prev.models, provider.models.map((m) => ({
@@ -93,60 +116,70 @@ export function piStyleTarget(opts) {
                 models,
             };
             modelsConfig.providers = providers;
+            const settings = {
+                ...settingsDocument.value,
+                defaultProvider: provider.id,
+                defaultModel: provider.defaultModel,
+            };
+            const modelsText = editJsoncObject(modelsDocument, modelsConfig);
+            const settingsText = editJsoncObject(settingsDocument, settings);
             const modelsBackup = backupFile(modelsFile);
             if (modelsBackup)
                 notes.push(`backup: ${modelsBackup}`);
-            writeFileAtomic(modelsFile, JSON.stringify(modelsConfig, null, 2) + "\n");
-            const settings = readJsonIfExists(settingsFile) ?? {};
-            settings.defaultProvider = provider.id;
-            settings.defaultModel = provider.defaultModel;
+            writeFileAtomic(modelsFile, modelsText);
             const settingsBackup = backupFile(settingsFile);
             if (settingsBackup)
                 notes.push(`backup: ${settingsBackup}`);
-            writeFileAtomic(settingsFile, JSON.stringify(settings, null, 2) + "\n");
+            writeFileAtomic(settingsFile, settingsText);
             return { app: opts.id, changed: [modelsFile, settingsFile], notes };
         },
         async prune(provider) {
             const dir = resolveDir();
             const modelsFile = path.join(dir, "models.json");
             const settingsFile = path.join(dir, "settings.json");
-            const modelsConfig = readJsonIfExists(modelsFile);
-            const providers = modelsConfig?.providers;
-            if (!modelsConfig || !providers?.[provider.id]) {
+            const modelsDocument = readModels(modelsFile);
+            const settingsDocument = readSettings(settingsFile);
+            const providers = { ...modelsDocument.value.providers };
+            if (!Object.hasOwn(providers, provider.id)) {
                 return { app: opts.id, changed: [], notes: [], skipped: `no providers.${provider.id} entry` };
             }
             delete providers[provider.id];
+            const settings = { ...settingsDocument.value };
+            const resetDefault = settings.defaultProvider === provider.id;
+            if (resetDefault) {
+                delete settings.defaultProvider;
+                delete settings.defaultModel;
+            }
+            const modelsText = editJsoncObject(modelsDocument, { ...modelsDocument.value, providers });
+            const settingsText = resetDefault ? editJsoncObject(settingsDocument, settings) : undefined;
             const notes = [];
             const changed = [modelsFile];
             const modelsBackup = backupFile(modelsFile);
             if (modelsBackup)
                 notes.push(`backup: ${modelsBackup}`);
-            writeFileAtomic(modelsFile, JSON.stringify(modelsConfig, null, 2) + "\n");
-            const settings = readJsonIfExists(settingsFile);
-            if (settings?.defaultProvider === provider.id) {
-                delete settings.defaultProvider;
-                delete settings.defaultModel;
+            writeFileAtomic(modelsFile, modelsText);
+            if (settingsText !== undefined) {
                 const settingsBackup = backupFile(settingsFile);
                 if (settingsBackup)
                     notes.push(`backup: ${settingsBackup}`);
-                writeFileAtomic(settingsFile, JSON.stringify(settings, null, 2) + "\n");
+                writeFileAtomic(settingsFile, settingsText);
                 changed.push(settingsFile);
                 notes.push("default model reset (was pointing at this provider)");
             }
             return { app: opts.id, changed, notes };
         },
         current() {
-            const settings = readJsonIfExists(path.join(resolveDir(), "settings.json"));
+            const settings = readSettings(path.join(resolveDir(), "settings.json")).value;
             if (!settings?.defaultProvider)
                 return undefined;
             return `${settings.defaultProvider} · ${settings.defaultModel ?? "?"}`;
         },
         candidates() {
             const dir = resolveDir();
-            const mc = readJsonIfExists(path.join(dir, "models.json"));
-            if (!mc?.providers)
+            const mc = readModels(path.join(dir, "models.json")).value;
+            const settings = readSettings(path.join(dir, "settings.json")).value;
+            if (!mc.providers)
                 return [];
-            const settings = readJsonIfExists(path.join(dir, "settings.json"));
             const self = opts.id;
             return Object.entries(mc.providers).flatMap(([id, entry]) => {
                 if (!entry || typeof entry.baseUrl !== "string")

package/dist/targets/workbuddy.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { appDataDir, backupFile, home, readJsonIfExists, writeFileAtomic } from "../fsutil.js";
-import { slugFromBaseUrl } from "../slug.js";
+import { providerIdFromBaseUrl, providerNameFromBaseUrl } from "../slug.js";
 function configDir() {
     return process.env.WORKBUDDY_CONFIG_DIR?.trim() ?? process.env.CODEBUDDY_CONFIG_DIR?.trim() ??
         (process.platform === "win32" ? appDataDir("workbuddy") : path.join(home, ".workbuddy"));
@@ -109,7 +109,7 @@ export const workbuddy = {
         return settings?.model;
     },
     candidates() {
-        // every entry carries its own full chat/completions url + key; group by the underlying base URL
+        // Each model has its own endpoint and credential; different accounts must stay separate.
         const { models } = readWorkbuddyModels(path.join(configDir(), "models.json"));
         if (models.length === 0)
             return [];
@@ -122,23 +122,24 @@ export const workbuddy = {
             const baseUrl = row.url.replace(/\/+$/, "").replace(/\/chat\/completions$/, "");
             if (!/^https?:\/\//.test(baseUrl))
                 continue;
-            let g = groups.get(baseUrl);
+            const apiKey = typeof row.apiKey === "string" && row.apiKey ? row.apiKey : undefined;
+            const key = JSON.stringify([baseUrl, apiKey ?? null]);
+            let g = groups.get(key);
             if (!g) {
-                g = { ids: [] };
-                groups.set(baseUrl, g);
+                g = { baseUrl, apiKey, ids: [] };
+                groups.set(key, g);
             }
             if (!g.ids.includes(m.id))
                 g.ids.push(m.id);
-            if (!g.apiKey && typeof row.apiKey === "string")
-                g.apiKey = row.apiKey;
             if (!g.vendor && typeof row.vendor === "string")
                 g.vendor = row.vendor;
         }
         const self = this.id;
-        return [...groups.entries()].map(([baseUrl, g]) => {
-            const id = slugFromBaseUrl(baseUrl);
+        return [...groups.values()].map((g) => {
+            const { baseUrl } = g;
+            const id = providerIdFromBaseUrl(baseUrl, "openai");
             const defaultModel = settings?.model && g.ids.includes(settings.model) ? settings.model : undefined;
-            return { id, name: g.vendor ?? id, protocol: "openai", baseUrl, apiKey: g.apiKey, models: g.ids, defaultModel, source: self };
+            return { id, generatedId: true, name: g.vendor ?? providerNameFromBaseUrl(baseUrl, "openai"), protocol: "openai", baseUrl, apiKey: g.apiKey, models: g.ids, defaultModel, source: self };
         });
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentsw",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "CLI provider switcher for coding agents: manage OpenAI/Anthropic-protocol providers in one place and sync them, with models.dev metadata, into Claude Code, Codex, omp, pi, prime-agent, opencode, Hermes, WorkBuddy and DeepSeek Harness",
   "type": "module",
   "repository": {
@@ -41,6 +41,7 @@
   },
   "dependencies": {
     "commander": "^15.0.0",
+    "jsonc-parser": "^3.3.1",
     "picocolors": "^1.1.1",
     "prompts": "^2.4.2",
     "smol-toml": "^1.8.0",