agentsw 0.7.1 → 0.7.2

package/dist/fsutil.js

@@ -1,6 +1,8 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { AsyncLocalStorage } from "node:async_hooks";
+import { randomUUID } from "node:crypto";
 // AGENTSW_HOME is an explicit portable/test override. Native Windows otherwise
 // uses USERPROFILE/os.homedir(), while Unix follows HOME as expected.
 export const home = process.env.AGENTSW_HOME?.trim() ||
@@ -24,14 +26,62 @@ export function expandHome(p) {
     return p.startsWith("~") ? path.join(home, p.slice(1)) : p;
 }
 export function ensureDir(dir) {
-    fs.mkdirSync(dir, { recursive: true });
+    if (isDryRun() || stagedFiles.getStore())
+        return;
+    fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
+}
+/** Read exactly one regular file. A broken path or unreadable file is not an empty config. */
+export function readFileSnapshot(file) {
+    try {
+        const stat = fs.lstatSync(file, { bigint: true });
+        if (!stat.isFile())
+            throw new Error(`${file}: not a regular configuration file`);
+        return { text: fs.readFileSync(file, "utf8"), mode: Number(stat.mode & 511n), identity: `${stat.dev}:${stat.ino}` };
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return { text: undefined };
+        throw new Error(`${file}: cannot read a regular configuration file`);
+    }
+}
+const stagedFiles = new AsyncLocalStorage();
+function stagedSnapshot(scope, file) {
+    if (scope.closed)
+        throw new Error("configuration transaction already finished");
+    let snapshot = scope.reads.get(file);
+    if (!snapshot) {
+        snapshot = readFileSnapshot(file);
+        scope.reads.set(file, snapshot);
+    }
+    return snapshot;
+}
+/** Scope only this asynchronous adapter invocation, never unrelated filesystem calls. */
+export async function stageFileWrites(operation) {
+    if (stagedFiles.getStore())
+        throw new Error("nested configuration transaction is not supported");
+    const scope = { reads: new Map(), writes: new Map(), dryRun, closed: false };
+    try {
+        const result = await stagedFiles.run(scope, operation);
+        return { result, changes: [...scope.writes.values()], reads: scope.reads, dryRun: scope.dryRun };
+    }
+    finally {
+        scope.closed = true;
+    }
 }
 export function readTextIfExists(file) {
+    const scope = stagedFiles.getStore();
+    if (scope) {
+        file = path.resolve(file);
+        const snapshot = stagedSnapshot(scope, file);
+        return scope.writes.has(file) ? scope.writes.get(file).after : snapshot.text;
+    }
     try {
         return fs.readFileSync(file, "utf8");
     }
-    catch {
-        return undefined;
+    catch (error) {
+        if (error.code === "ENOENT")
+            return undefined;
+        throw error;
     }
 }
 export function readJsonIfExists(file) {
@@ -40,9 +90,12 @@ export function readJsonIfExists(file) {
         return undefined;
     return JSON.parse(text);
 }
-/** dry-run mode: writeFileAtomic records intents instead of touching disk; backups are skipped */
+/** Compatibility preview switch. Each target captures its value when its scoped work starts. */
 let dryRun = false;
 const pendingWrites = [];
+export function isDryRun() {
+    return stagedFiles.getStore()?.dryRun ?? dryRun;
+}
 export function setDryRun(on) {
     dryRun = on;
     pendingWrites.length = 0;
@@ -50,25 +103,67 @@ export function setDryRun(on) {
 export function drainPendingWrites() {
     return pendingWrites.splice(0);
 }
-/** Atomic write: tmp file + rename. Creates parent dirs. In dry-run mode, records the intent instead. */
+/** Publish previews only after the adapter has validated all of its input files. */
+export function recordPendingWrites(changes) {
+    for (const change of changes) {
+        if (change.before !== change.after && change.after !== undefined) {
+            pendingWrites.push({ file: change.file, content: change.after });
+        }
+    }
+}
+/** Atomic replacement, preserving existing permissions and defaulting new secret files to 0600. */
 export function writeFileAtomic(file, content, mode) {
+    const scope = stagedFiles.getStore();
+    if (scope) {
+        file = path.resolve(file);
+        const expected = stagedSnapshot(scope, file);
+        scope.writes.set(file, { file, before: expected.text, after: content, mode, expected });
+        return;
+    }
     if (dryRun) {
         pendingWrites.push({ file, content });
         return;
     }
+    const existing = readFileSnapshot(file);
+    const permissions = mode ?? existing.mode ?? 0o600;
+    if (!Number.isInteger(permissions) || permissions < 0 || permissions > 0o777) {
+        throw new Error(`${file}: invalid file permissions`);
+    }
     ensureDir(path.dirname(file));
-    const tmp = `${file}.tmp-${process.pid}`;
-    fs.writeFileSync(tmp, content, mode !== undefined ? { mode } : undefined);
-    fs.renameSync(tmp, file);
+    const tmp = path.join(path.dirname(file), `.${path.basename(file)}.agentsw-${randomUUID()}.tmp`);
+    try {
+        fs.writeFileSync(tmp, content, { flag: "wx", mode: permissions });
+        fs.chmodSync(tmp, permissions);
+        fs.renameSync(tmp, file);
+    }
+    finally {
+        fs.rmSync(tmp, { force: true });
+    }
 }
 export const backupsDir = path.join(appDataDir("agentsw"), "backups");
-/** Copy `file` into the backups dir with a timestamp suffix. No-op if file missing. */
+/** Each original gets a private, unique directory even for equal basenames and timestamps. */
 export function backupFile(file) {
-    if (!fs.existsSync(file) || dryRun)
+    const scope = stagedFiles.getStore();
+    if (scope) {
+        stagedSnapshot(scope, path.resolve(file));
+        return undefined;
+    }
+    if (dryRun)
+        return undefined;
+    const snapshot = readFileSnapshot(file);
+    if (snapshot.text === undefined)
         return undefined;
-    ensureDir(backupsDir);
-    const stamp = new Date().toISOString().replace(/[:.]/g, "-");
-    const dest = path.join(backupsDir, `${path.basename(file)}.${stamp}`);
-    fs.copyFileSync(file, dest);
+    fs.mkdirSync(backupsDir, { recursive: true, mode: 0o700 });
+    const dir = fs.mkdtempSync(path.join(backupsDir, "file-"));
+    const dest = path.join(dir, path.basename(file));
+    try {
+        fs.chmodSync(dir, 0o700);
+        fs.copyFileSync(file, dest, fs.constants.COPYFILE_EXCL);
+        fs.chmodSync(dest, 0o600);
+    }
+    catch (error) {
+        fs.rmSync(dir, { recursive: true, force: true });
+        throw error;
+    }
     return dest;
 }

package/dist/i18n.js

@@ -38,6 +38,7 @@ const messages = {
     "opt.discover": { en: "list model ids from the provider's /v1/models", "zh-CN": "从供应商 /v1/models 获取模型 id" },
     "opt.include": { en: "keep only models matching comma-separated globs", "zh-CN": "仅保留匹配逗号分隔 glob 的模型" },
     "opt.exclude": { en: "drop models matching comma-separated globs", "zh-CN": "排除匹配逗号分隔 glob 的模型" },
+    "opt.dedup": { en: "deduplicate model snapshot aliases", "zh-CN": "合并重复的模型快照别名" },
     "opt.noDedup": { en: "keep snapshot duplicates (-latest/date suffixes)", "zh-CN": "保留快照重复项(-latest/日期后缀)" },
     "opt.modelsDev": { en: "models.dev provider id for metadata matching", "zh-CN": "用于元数据匹配的 models.dev 供应商 id" },
     "opt.yes": { en: "non-interactive; require all flags", "zh-CN": "非交互模式;要求提供全部参数" },
@@ -45,7 +46,7 @@ const messages = {
     "opt.apps": { en: "comma-separated apps or 'all'", "zh-CN": "逗号分隔的应用或 'all'" },
     "opt.removeApps": { en: "delete only from these apps; keep the agentsw store and other apps unchanged", "zh-CN": "仅从这些智能体删除，保留 agentsw 中央配置和其他智能体配置" },
     "opt.manageDryRun": { en: "preview affected paths without changing files or creating backups", "zh-CN": "仅预览受影响路径，不修改文件或创建备份" },
-    "opt.appsDetailed": { en: "comma-separated apps (claude,codex,omp,pi,prime,opencode,hermes,workbuddy) or 'all'", "zh-CN": "逗号分隔的应用(claude,codex,omp,pi,prime,opencode,hermes,workbuddy)或 'all'" },
+    "opt.appsDetailed": { en: "comma-separated apps (claude,codex,omp,pi,prime,opencode,hermes,workbuddy,dsh) or 'all'", "zh-CN": "逗号分隔的应用(claude,codex,omp,pi,prime,opencode,hermes,workbuddy,dsh)或 'all'" },
     "opt.model": { en: "override default model while switching", "zh-CN": "切换时覆盖默认模型" },
     "opt.dryRun": { en: "preview config diff without writing", "zh-CN": "仅预览配置差异,不写入" },
     "opt.provider": { en: "sync this provider instead of the active one", "zh-CN": "同步指定供应商而非当前供应商" },

package/dist/import.js

@@ -12,12 +12,12 @@ export function normalizeUrl(u) {
 }
 /** True when the path already names the API version, e.g. `.../v1`. */
 const hasApiVersion = (baseUrl) => /\/v\d+(?:beta\d*)?$/.test(baseUrl.split(/[?#]/, 1)[0]);
-/** Apps may append their own API version; all other URL components remain significant. */
+/** Apps may append /v1; other API versions and URL components remain significant. */
 export function endpointKey(baseUrl) {
     const normalized = normalizeUrl(baseUrl);
     const suffixAt = normalized.search(/[?#]/);
     const path = suffixAt < 0 ? normalized : normalized.slice(0, suffixAt);
-    return path.replace(/\/v\d+(?:beta\d*)?$/, "") + (suffixAt < 0 ? "" : normalized.slice(suffixAt));
+    return path.replace(/\/v1$/, "") + (suffixAt < 0 ? "" : normalized.slice(suffixAt));
 }
 /** An unresolved credential is not evidence that two configurations use the same account. */
 export function findMatchingProvider(existing, candidate) {

package/dist/index.js

@@ -6,8 +6,17 @@ import { detectSystemLocale, extractCliLocale, normalizeLocale, setLocale, t } f
 import { cmdMenu } from "./menu.js";
 import { loadStore } from "./store.js";
 import { cmdListLocalProviders, cmdRemoveProvider, cmdRename } from "./provider-actions.js";
+// Locale lookup is best effort: help/version and app-local commands do not need the store.
+function savedLocale() {
+    try {
+        return loadStore().language;
+    }
+    catch {
+        return undefined;
+    }
+}
 // Locale precedence: CLI flag > environment > saved preference > system locale.
-setLocale(extractCliLocale() ?? process.env.AGENTSW_LANG ?? loadStore().language ?? detectSystemLocale());
+setLocale(extractCliLocale() ?? process.env.AGENTSW_LANG ?? savedLocale() ?? detectSystemLocale());
 function parseLocale(value) {
     const locale = normalizeLocale(value);
     if (!locale)
@@ -51,6 +60,7 @@ program
     .option("-d, --discover", t("opt.discover"))
     .option("--include <globs>", t("opt.include"))
     .option("--exclude <globs>", t("opt.exclude"))
+    .option("--dedup", t("opt.dedup"))
     .option("--no-dedup", t("opt.noDedup"))
     .option("--models-dev <id>", t("opt.modelsDev"))
     .option("-y, --yes", t("opt.yes"))
@@ -59,6 +69,9 @@ program
     .command("quick")
     .description(t("cmd.quick"))
     .option("--id <slug>", t("opt.id"))
+    .option("--name <name>", t("opt.name"))
+    .option("--openai-api <flavor>", t("opt.openaiApi"))
+    .option("--models-dev <id>", t("opt.modelsDev"))
     .option("--base-url <url>", t("opt.baseUrl"))
     .option("--api-key <key>", t("opt.apiKey"))
     .option("--default-model <id>", t("opt.defaultModel"))
@@ -66,6 +79,7 @@ program
     .option("--reasoning-effort <level>", t("opt.reasoning"))
     .option("--include <globs>", t("opt.include"))
     .option("--exclude <globs>", t("opt.exclude"))
+    .option("--dedup", t("opt.dedup"))
     .option("--no-dedup", t("opt.noDedup"))
     .option("-y, --yes", t("opt.yes"))
     .action(cmdQuickAdd);
@@ -122,6 +136,7 @@ program
     .option("-a, --apps <apps>", t("opt.appsSync"))
     .option("--include <globs>", t("opt.setInclude"))
     .option("--exclude <globs>", t("opt.setExclude"))
+    .option("--dedup", t("opt.dedup"))
     .option("--no-dedup", t("opt.noDedup"))
     .option("--no-filter", t("opt.noFilter"))
     .action(cmdDiscover);

package/dist/jsonc.js

@@ -1,4 +1,4 @@
-import fs from "node:fs";
+import { readTextIfExists } from "./fsutil.js";
 import { applyEdits, createScanner, getNodeValue, modify, parseTree, printParseErrorCode, } from "jsonc-parser";
 export function isJsonObject(value) {
     return value !== null && typeof value === "object" && !Array.isArray(value);
@@ -34,15 +34,9 @@ function parseJsoncObject(file, text) {
 }
 /** Only missing files initialize to an empty object; unreadable or invalid files must not be replaced. */
 export function readJsoncObject(file) {
-    let text;
-    try {
-        text = fs.readFileSync(file, "utf8");
-    }
-    catch (error) {
-        if (error.code === "ENOENT")
-            return { file, text: "{}\n", value: {} };
-        throw error;
-    }
+    const text = readTextIfExists(file);
+    if (text === undefined)
+        return { file, text: "{}\n", value: {} };
     return { file, text, value: parseJsoncObject(file, text) };
 }
 function comments(text) {

package/dist/modelsdev.js

@@ -75,9 +75,13 @@ export function findModelMeta(catalog, modelId, providerHint) {
         if (m)
             return { spec: toModelSpec(modelId, m), provider: hinted.id };
     }
-    for (const p of Object.values(catalog)) {
-        if (p === hinted)
-            continue;
+    const providers = Object.values(catalog).filter((p) => p !== hinted);
+    for (const p of providers) {
+        const m = p.models[modelId];
+        if (m)
+            return { spec: toModelSpec(modelId, m), provider: p.id };
+    }
+    for (const p of providers) {
         const m = scan(p);
         if (m)
             return { spec: toModelSpec(modelId, m), provider: p.id };

package/dist/provider-identity.js

@@ -0,0 +1,25 @@
+import { createHash } from "node:crypto";
+/** Previous releases used this lossy encoding; recognize it, never generate it. */
+export function legacyManagedCredentialRef(id) {
+    return `AGENTSW_${id.toUpperCase().replace(/[^A-Z0-9]/g, "_")}_API_KEY`;
+}
+/** Human-readable prefix plus an exact, case-sensitive provider identity digest. */
+export function managedCredentialRef(id) {
+    const prefix = id.toUpperCase().replace(/[^A-Z0-9]/g, "_").slice(0, 48) || "PROVIDER";
+    const digest = createHash("sha256").update(id).digest("hex").slice(0, 24).toUpperCase();
+    return `AGENTSW_${prefix}_${digest}_API_KEY`;
+}
+export function isManagedCredentialRef(ref, id) {
+    return ref === managedCredentialRef(id) || ref === legacyManagedCredentialRef(id);
+}
+/** Account-qualified app-local selector; never embeds endpoints or credentials. */
+export function localProviderId(candidate) {
+    const identity = JSON.stringify([
+        candidate.id,
+        candidate.protocol,
+        candidate.baseUrl,
+        candidate.apiKey ?? null,
+        candidate.keyEnv ?? null,
+    ]);
+    return `local-${createHash("sha256").update(identity).digest("hex").slice(0, 32)}`;
+}

package/dist/remove.js

@@ -11,6 +11,8 @@ import { endpointKey } from "./import.js";
 import { envAssignments } from "./envfile.js";
 import { resolveTargets, targets } from "./targets/index.js";
 import { classifyApi, entryApi } from "./targets/wire.js";
+import { isManagedCredentialRef, legacyManagedCredentialRef, managedCredentialRef } from "./provider-identity.js";
+import { workbuddyBaseUrl } from "./targets/workbuddy.js";
 function readText(file) {
     try {
         return fs.readFileSync(file, "utf8");
@@ -298,9 +300,6 @@ function candidateProvider(candidate) {
         defaultModel: candidate.defaultModel ?? candidate.models[0] ?? "",
     };
 }
-function credentialRef(id) {
-    return `AGENTSW_${id.toUpperCase().replace(/[^A-Z0-9]/g, "_")}_API_KEY`;
-}
 function addPlan(plans, change) {
     const file = path.resolve(change.file);
     const previous = plans.get(file);
@@ -383,6 +382,13 @@ function assertNamedIdentities(target, files, stored) {
             protocol = "openai";
             if (typeof entry.env_key === "string")
                 apiKey = process.env[entry.env_key];
+            else if (entry.requires_openai_auth === true && valueAt(document, ["model_provider"]) === stored.id) {
+                const authFile = path.join(path.dirname(document.file), "auth.json");
+                const authText = readText(authFile);
+                files.extras.set(authFile, authText);
+                if (authText !== undefined)
+                    apiKey = valueAt(parseDocument(authFile, authText), ["OPENAI_API_KEY"]);
+            }
         }
         assertIdentity(target.id, stored, { baseUrl, protocol, apiKey });
     }
@@ -399,11 +405,12 @@ function matchingCandidate(target, id, stored) {
     const candidates = candidatesFor(target);
     if (!candidates.length)
         return undefined;
-    const local = candidates.find((candidate) => candidate.id === id);
-    if (local) {
-        if (stored)
-            assertIdentity(target.id, stored, local);
-        return candidateProvider(local);
+    const local = candidates.filter((candidate) => (candidate.localId ?? candidate.id) === id);
+    const legacy = local.length ? local : candidates.filter((candidate) => candidate.id === id);
+    if (!stored && legacy.length) {
+        if (legacy.length !== 1)
+            throw new Error(`${target.name}: ambiguous provider ID; use an account-qualified ID from list --apps`);
+        return legacy[0];
     }
     // Single-endpoint apps have no persisted provider ID. A custom store ID can
     // still select them, but only when both endpoint and credential match.
@@ -418,9 +425,15 @@ function matchingCandidate(target, id, stored) {
     }
     if (!stored || typeof stored.baseUrl !== "string")
         return undefined;
-    const matching = candidates.find((candidate) => candidate.protocol === stored.protocol &&
+    const matching = (legacy.length ? legacy : candidates).filter((candidate) => candidate.protocol === stored.protocol &&
         sameEndpoint(candidate.baseUrl, stored.baseUrl) && candidate.apiKey === stored.apiKey);
-    return matching ? candidateProvider(matching) : undefined;
+    if (matching.length > 1)
+        throw new Error(`${target.name}: ambiguous provider identity; use an account-qualified ID from list --apps`);
+    if (matching.length === 1)
+        return matching[0];
+    if (legacy.length)
+        throw new Error(`${target.name}: provider "${id}" has a different account; use --apps with an account-qualified ID`);
+    return undefined;
 }
 /** One row per store ID and per app-local ID, never endpoint or credential values. */
 export function listRemovableProviders(apps) {
@@ -437,7 +450,7 @@ export function listRemovableProviders(apps) {
         const entries = new Map();
         if (target.id === "claude" || target.id === "workbuddy") {
             for (const candidate of candidatesFor(target))
-                entries.set(candidate.id, candidate.name);
+                entries.set(candidate.localId ?? candidate.id, candidate.name);
         }
         else {
             for (const { document, at } of files.maps) {
@@ -465,14 +478,27 @@ async function planTargetRemoval(target, id, plans, stored) {
         if (!provider)
             return false;
         found = true;
-        await previewPrune(target, provider, files);
+        await previewPrune(target, candidateProvider(provider), files);
         for (const document of files.refs)
             removeAt(document, ["env", "ANTHROPIC_API_KEY"]);
     }
     else if (["omp", "pi", "prime", "codex"].includes(target.id)) {
         await previewPrune(target, namedProvider(id), files);
     }
-    const managedKey = credentialRef(id);
+    const managedKeys = [managedCredentialRef(id), legacyManagedCredentialRef(id)];
+    const ownedRefs = new Set();
+    for (const { document, at } of files.maps) {
+        const entry = providerMap(document, at)[id];
+        if (!isJsonObject(entry))
+            continue;
+        const ref = target.id === "hermes" ? entry.key_env : entry.apiKeyEnv;
+        if (typeof ref === "string" && isManagedCredentialRef(ref, id))
+            ownedRefs.add(ref);
+        // No explicit reference: older releases may have left an unused managed key.
+        else if (ref === undefined)
+            for (const key of managedKeys)
+                ownedRefs.add(key);
+    }
     for (const { document, at } of files.maps) {
         const removed = removeAt(document, [...at, id]);
         if (removed && ["opencode", "codex", "hermes", "dsh"].includes(target.id))
@@ -521,28 +547,32 @@ async function planTargetRemoval(target, id, plans, stored) {
                 clearModelRefs(document, [key], id);
         }
     }
-    if (target.id === "hermes" && found) {
-        const stillUsed = files.maps.some(({ document, at }) => Object.values(providerMap(document, at)).some((entry) => isJsonObject(entry) && entry.key_env === managedKey));
-        if (!stillUsed) {
-            for (const [file, before] of files.extras) {
-                if (before === undefined)
-                    continue;
-                const edits = envAssignments(file, before).filter((assignment) => assignment.name === managedKey)
-                    .map((assignment) => ({ offset: assignment.start, length: assignment.length, content: "" }));
-                const after = applyEdits(before, edits);
-                if (after !== before)
-                    addPlan(plans, { file, before, after, mode: 0o600 });
+    for (const managedKey of ownedRefs) {
+        if (target.id === "hermes" && found) {
+            const stillUsed = files.maps.some(({ document, at }) => Object.entries(providerMap(document, at)).some(([otherId, entry]) => isJsonObject(entry) && (entry.key_env === managedKey || isManagedCredentialRef(managedKey, otherId))));
+            if (!stillUsed) {
+                for (const [file, before] of files.extras) {
+                    if (before === undefined)
+                        continue;
+                    const prior = plans.get(path.resolve(file));
+                    const source = prior?.after ?? before;
+                    const edits = envAssignments(file, source).filter((assignment) => assignment.name === managedKey)
+                        .map((assignment) => ({ offset: assignment.start, length: assignment.length, content: "" }));
+                    const after = applyEdits(source, edits);
+                    if (after !== source)
+                        plans.set(path.resolve(file), { file, before, after, mode: 0o600 });
+                }
             }
         }
-    }
-    if (target.id === "dsh" && (found || stored)) {
-        const stillUsed = files.maps.some(({ document, at }) => Object.values(providerMap(document, at)).some((entry) => isJsonObject(entry) && entry.apiKeyEnv === managedKey));
-        if (!stillUsed) {
-            for (const document of files.documents.values()) {
-                if (path.basename(document.file) !== ".credentials.yaml")
-                    continue;
-                removeAt(document, ["refs", managedKey]);
-                removeAt(document, [managedKey]);
+        if (target.id === "dsh" && found) {
+            const stillUsed = files.maps.some(({ document, at }) => Object.entries(providerMap(document, at)).some(([otherId, entry]) => isJsonObject(entry) && (entry.apiKeyEnv === managedKey || isManagedCredentialRef(managedKey, otherId))));
+            if (!stillUsed) {
+                for (const document of files.documents.values()) {
+                    if (path.basename(document.file) !== ".credentials.yaml")
+                        continue;
+                    removeAt(document, ["refs", managedKey]);
+                    removeAt(document, [managedKey]);
+                }
             }
         }
     }
@@ -552,11 +582,15 @@ async function planTargetRemoval(target, id, plans, stored) {
         addPlan(plans, { file: document.file, before: document.before, after: render(document),
             ...(path.basename(document.file) === ".credentials.yaml" ? { mode: 0o600 } : {}) });
     }
+    for (const [file, before] of files.extras) {
+        if (!plans.has(path.resolve(file)))
+            addPlan(plans, { file, before, after: before });
+    }
     return found;
 }
 function planWorkbuddyRemoval(target, id, plans, stored) {
-    const dir = process.env.WORKBUDDY_CONFIG_DIR?.trim() ?? process.env.CODEBUDDY_CONFIG_DIR?.trim() ??
-        (process.platform === "win32" ? appDataDir("workbuddy") : path.join(home, ".workbuddy"));
+    const override = process.env.WORKBUDDY_CONFIG_DIR?.trim() || process.env.CODEBUDDY_CONFIG_DIR?.trim();
+    const dir = override ? expandHome(override) : (process.platform === "win32" ? appDataDir("workbuddy") : path.join(home, ".workbuddy"));
     const file = path.join(dir, "models.json");
     const before = readText(file);
     if (before === undefined)
@@ -571,6 +605,16 @@ function planWorkbuddyRemoval(target, id, plans, stored) {
     const models = Array.isArray(raw) ? raw : isJsonObject(raw) && Array.isArray(raw.models) ? raw.models : undefined;
     if (!models)
         throw new Error(`${file}: expected a model array`);
+    if (stored)
+        for (const entry of models) {
+            if (!isJsonObject(entry) || entry.agentswProviderId !== stored.id)
+                continue;
+            assertIdentity(target.id, stored, {
+                protocol: "openai",
+                baseUrl: typeof entry.url === "string" ? workbuddyBaseUrl(entry.url) : undefined,
+                apiKey: entry.apiKey,
+            });
+        }
     const provider = matchingCandidate(target, id, stored);
     if (!provider)
         return false;
@@ -578,9 +622,11 @@ function planWorkbuddyRemoval(target, id, plans, stored) {
     const kept = models.filter((entry) => {
         if (!isJsonObject(entry) || typeof entry.id !== "string" || typeof entry.url !== "string")
             return true;
-        const endpoint = entry.url.replace(/\/chat\/completions\/?$/, "");
-        if (!sameEndpoint(endpoint, provider.baseUrl) || entry.apiKey !== provider.apiKey ||
-            !provider.models.some((model) => model.id === entry.id))
+        if (stored && typeof entry.agentswProviderId === "string" && entry.agentswProviderId !== stored.id)
+            return true;
+        const endpoint = workbuddyBaseUrl(entry.url);
+        if (endpoint === undefined || !sameEndpoint(endpoint, provider.baseUrl) || entry.apiKey !== provider.apiKey ||
+            !provider.models.includes(entry.id))
             return true;
         removed.add(entry.id);
         return false;