agentsw 0.6.2 → 0.7.0

package/README.md

@@ -164,14 +164,18 @@ Explicit `--models` entries and the default model are never filtered out.
 |---|---|
 | `agentsw` | interactive menu (no arguments) |
 | `add` | add or update a provider; `--discover` fills the model list |
+| `quick` | discover protocols/models from URL + API key; auto-name by hostname + protocol |
 | `import [--all]` | adopt providers from your agents' configs and cc-switch |
 | `list` / `status` | configured providers / what each agent points at |
+| `list --apps omp,prime` | list agent-local provider IDs, including entries absent from agentsw |
+| `rename <id> <new-id>` | back up and migrate the ID and config references; supports `--dry-run` |
 | `use <id>` | switch every detected agent; `-a codex,omp`, `-m <model>`, `--dry-run` |
 | `sync` | re-apply the active provider (after an agent update, say) |
 | `discover <id> [--sync]` | refresh the model list + metadata from `/v1/models` |
 | `models [query]` | search the models.dev catalog |
 | `refresh` | re-fetch metadata for every configured provider |
 | `prune <id>` / `remove <id> [--prune]` | remove from app configs / from the store |
+| `remove <id> --apps omp` | delete only the selected app's entry; supports `--dry-run` |
 | `apps` / `install <app>` / `upgrade` | agent version manager |
 
 ```bash
@@ -180,6 +184,24 @@ asw discover myproxy --sync
 asw remove myproxy --prune
 ```
 
+New automatic IDs include the full hostname and protocol, e.g. `api-example-com-openai`.
+An explicit `--id` is retained, and syncing never renames an existing provider. Import
+deduplication compares endpoint, protocol, and credentials; different accounts remain separate.
+
+```bash
+asw rename myproxy api-example-com-openai --dry-run
+asw rename myproxy api-example-com-openai
+asw list --apps omp
+asw remove unused-provider --apps omp --dry-run
+asw remove unused-provider --apps omp
+```
+
+`remove` alone changes only the agentsw store; `--prune` also cleans matching app configs.
+`--apps` is instead app-only and can remove a provider never imported into agentsw.
+Do not combine `--apps` and `--prune`. Renames and removals preflight changes and create
+private backups before writes. App-only removal leaves the store intact, so a later explicit
+sync of a managed provider can add it back to that app.
+
 ## How your configs are treated
 
 - Every modified file is backed up first to `~/.config/agentsw/backups/`.

package/README.zh-CN.md

@@ -161,14 +161,18 @@ asw discover myproxy --no-filter                # 清除规则
 |---|---|
 | `agentsw` | 交互菜单（不带参数） |
 | `add` | 添加或更新供应商；`--discover` 自动填模型列表 |
+| `quick` | 只需 URL + API key，自动探测协议与模型，按完整域名 + 协议命名 |
 | `import [--all]` | 接管各智能体配置与 cc-switch 里已有的供应商 |
 | `list` / `status` | 已配置的供应商 / 各智能体当前指向 |
+| `list --apps omp,prime` | 列出智能体本地供应商 ID，包括未导入 agentsw 的条目 |
+| `rename <id> <new-id>` | 备份并迁移 ID 和配置引用，支持 `--dry-run` |
 | `use <id>` | 切换所有检测到的智能体；`-a codex,omp`、`-m <model>`、`--dry-run` |
 | `sync` | 重新应用当前供应商（比如某个智能体升级之后） |
 | `discover <id> [--sync]` | 从 `/v1/models` 刷新模型列表与元数据 |
 | `models [query]` | 搜索 models.dev 目录 |
 | `refresh` | 重新拉取所有供应商的元数据 |
 | `prune <id>` / `remove <id> [--prune]` | 从各应用配置中清除 / 从存储中删除 |
+| `remove <id> --apps omp` | 仅删除指定智能体内的条目，支持 `--dry-run` |
 | `apps` / `install <app>` / `upgrade` | 智能体版本管理 |
 
 ```bash
@@ -177,6 +181,23 @@ asw discover myproxy --sync
 asw remove myproxy --prune
 ```
 
+新建供应商的自动 ID 使用完整域名和协议，例如 `api-example-com-openai`。
+显式指定的 `--id` 会保留，同步不会自动重命名。导入去重会同时比较端点、协议和凭据，
+不同账号保持独立；同一账号的自定义名称优先于自动生成名称。
+
+```bash
+asw rename myproxy api-example-com-openai --dry-run
+asw rename myproxy api-example-com-openai
+asw list --apps omp
+asw remove unused-provider --apps omp --dry-run
+asw remove unused-provider --apps omp
+```
+
+单独 `remove` 只删除 agentsw 中央条目；`--prune` 还会清理匹配的智能体配置。
+`--apps` 则仅作用于指定智能体，也能删除从未导入 agentsw 的供应商，请勿和 `--prune` 同用。
+重命名和删除会先检查全部计划变更，再创建私有备份并写入。
+仅从智能体删除时中央条目仍保留，之后主动同步该供应商会重新写入该智能体。
+
 ## 它如何对待你的配置
 
 - 每个被修改的文件先备份到 `~/.config/agentsw/backups/`。

package/dist/commands.js

@@ -1,14 +1,14 @@
 import pc from "picocolors";
 import prompts from "prompts";
 import { loadStore, saveStore, getProvider, configFile } from "./store.js";
-import { scanCandidates, normalizeUrl } from "./import.js";
+import { scanCandidates, normalizeUrl, findMatchingProvider } from "./import.js";
 import { enrichModels, loadCatalog, searchCatalog } from "./modelsdev.js";
 import { resolveTargets, supportsProtocol, targets } from "./targets/index.js";
 import { discoverProviderModels, probeProtocols } from "./discover.js";
 import { appCommand, appPackages, installedVersion, isNewer, latestVersion, runShell } from "./apps.js";
 import { drainPendingWrites, readTextIfExists, setDryRun } from "./fsutil.js";
 import { applyModelFilter } from "./filter.js";
-import { slugFromBaseUrl } from "./slug.js";
+import { availableProviderId, providerIdFromBaseUrl, providerNameFromBaseUrl } from "./slug.js";
 import { t } from "./i18n.js";
 function fail(message) {
     process.stderr.write(pc.red(`error: ${message}\n`));
@@ -123,8 +123,8 @@ export async function cmdAdd(opts) {
             {
                 type: "text",
                 name: "id",
-                message: t("add.id"),
-                validate: (v) => (/^[a-z0-9][a-z0-9_-]*$/.test(v) ? true : t("add.idInvalid")),
+                message: t("add.idAuto"),
+                validate: (v) => (!v || /^[a-z0-9][a-z0-9_-]*$/.test(v) ? true : t("add.idInvalid")),
             },
             { type: "text", name: "name", message: t("add.name"), initial: (prev) => prev },
             {
@@ -159,15 +159,15 @@ export async function cmdAdd(opts) {
     }
     else {
         const required = opts.discover
-            ? ["id", "protocol", "baseUrl", "apiKey"]
-            : ["id", "protocol", "baseUrl", "apiKey", "models"];
+            ? ["protocol", "baseUrl", "apiKey"]
+            : ["protocol", "baseUrl", "apiKey", "models"];
         for (const field of required) {
             if (!opts[field])
                 fail(t("add.fieldRequired", { field: field === "baseUrl" ? "base-url" : field === "apiKey" ? "api-key" : field }));
         }
         answers = {
-            id: opts.id,
-            name: opts.name ?? opts.id,
+            id: opts.id ?? "",
+            name: opts.name ?? "",
             protocol: opts.protocol,
             baseUrl: opts.baseUrl,
             apiKey: opts.apiKey,
@@ -182,7 +182,7 @@ export async function cmdAdd(opts) {
     if (wire && wire !== "completions" && wire !== "responses")
         fail(t("add.openaiApiInvalid"));
     const openaiApi = protocol === "openai" ? wire : undefined;
-    const baseUrl = answers.baseUrl.replace(/\/+$/, "");
+    const baseUrl = normalizeUrl(answers.baseUrl);
     const manualIds = (answers.models ?? "").split(",").map((s) => s.trim()).filter(Boolean);
     let modelIds = manualIds;
     const modelFilter = parseFilterOpts(opts);
@@ -211,9 +211,12 @@ export async function cmdAdd(opts) {
         fail(t("add.defaultMissing", { model: defaultModel }));
     if (opts.smallModel && !modelIds.includes(opts.smallModel))
         fail(t("add.smallMissing", { model: opts.smallModel }));
+    const explicitId = answers.id || undefined;
+    const existing = explicitId ? undefined : findMatchingProvider(Object.values(store.providers), { protocol, baseUrl, apiKey: answers.apiKey });
+    const id = explicitId ?? existing?.id ?? availableProviderId(providerIdFromBaseUrl(baseUrl, protocol), store.providers);
     const provider = {
-        id: answers.id,
-        name: answers.name || answers.id,
+        id,
+        name: answers.name || existing?.name || (explicitId ? explicitId : providerNameFromBaseUrl(baseUrl, protocol)),
         protocol,
         ...(openaiApi ? { openaiApi } : {}),
         baseUrl,
@@ -282,24 +285,21 @@ export async function cmdQuickAdd(opts) {
     const interactive = process.stdin.isTTY && !opts.yes;
     let baseUrl;
     let apiKey;
-    let baseId;
     if (interactive) {
         const answers = await prompts([
             { type: "text", name: "baseUrl", message: t("add.baseUrl"), validate: (v) => (/^https?:\/\//.test(v) ? true : t("add.baseUrlInvalid")) },
             { type: "password", name: "apiKey", message: t("add.apiKey") },
         ], { onCancel: () => fail(t("add.cancelled")) });
-        baseUrl = answers.baseUrl.replace(/\/+$/, "");
+        baseUrl = normalizeUrl(answers.baseUrl);
         apiKey = answers.apiKey;
-        baseId = opts.id ?? slugFromBaseUrl(baseUrl);
     }
     else {
         if (!opts.baseUrl)
             fail(t("add.fieldRequired", { field: "base-url" }));
         if (!opts.apiKey)
             fail(t("add.fieldRequired", { field: "api-key" }));
-        baseUrl = opts.baseUrl.replace(/\/+$/, "");
+        baseUrl = normalizeUrl(opts.baseUrl);
         apiKey = opts.apiKey;
-        baseId = opts.id ?? slugFromBaseUrl(baseUrl);
     }
     process.stderr.write(pc.dim(t("quick.probing", { url: baseUrl }) + "\n"));
     const protocols = await probeProtocols({ baseUrl, apiKey });
@@ -310,9 +310,10 @@ export async function cmdQuickAdd(opts) {
     const multi = protocols.length > 1;
     const createdIds = [];
     for (const protocol of protocols) {
-        const suffix = multi ? `-${protocol}` : "";
-        const id = `${baseId}${suffix}`;
-        const name = multi ? `${baseId} (${protocol})` : baseId;
+        const explicitId = opts.id === undefined ? undefined : `${opts.id}${multi ? `-${protocol}` : ""}`;
+        const existing = explicitId === undefined ? findMatchingProvider(Object.values(store.providers), { protocol, baseUrl, apiKey }) : undefined;
+        const id = explicitId ?? existing?.id ?? availableProviderId(providerIdFromBaseUrl(baseUrl, protocol), store.providers);
+        const name = existing?.name ?? (opts.id === undefined ? providerNameFromBaseUrl(baseUrl, protocol) : multi ? `${opts.id} (${protocol})` : opts.id);
         process.stderr.write(pc.dim(`${t("add.discovering", { url: baseUrl })} [${protocol}]\n`));
         const discovered = await discoverProviderModels({ baseUrl, apiKey, protocol });
         console.log(t("add.providerLists", { count: discovered.length }));
@@ -366,22 +367,6 @@ export function cmdList() {
     });
     console.log(table(rows, [" ", "ID", t("table.protocol"), "BASE URL", t("table.defaultModel"), t("table.models")]));
 }
-export async function cmdRemove(id, opts) {
-    const store = loadStore();
-    const provider = getProvider(store, id);
-    if (opts.prune) {
-        console.log(`${t("remove.pruning", { id: pc.bold(id) })}\n`);
-        reportResults(await runTargets("prune", provider, undefined));
-        console.log("");
-    }
-    delete store.providers[id];
-    if (store.active === id)
-        store.active = undefined;
-    saveStore(store);
-    console.log(pc.green(t("remove.removed", { id })));
-    if (!opts.prune)
-        console.log(pc.dim(t("remove.note")));
-}
 export async function cmdPrune(id, opts) {
     const store = loadStore();
     const provider = getProvider(store, id);
@@ -686,7 +671,7 @@ export async function cmdUpgrade(ids) {
         }
     }
 }
-/** Collect custom providers from app configs, dedupe by protocol+baseUrl, import what is new. */
+/** Collect custom providers, dedupe by endpoint and credentials, and import what is new. */
 export async function cmdImport(opts) {
     const rows = scanCandidates();
     const fresh = rows.filter((r) => !r.configured);
@@ -748,6 +733,12 @@ export async function cmdImport(opts) {
             }, { onCancel: () => fail(t("add.cancelled")) });
             apiKey = a.key;
         }
+        // A prompted credential can identify a provider imported earlier in this same batch.
+        const existing = findMatchingProvider(Object.values(store.providers), { protocol: c.protocol, baseUrl: c.baseUrl, apiKey });
+        if (existing) {
+            console.log(`${pc.yellow(t("import.skip"))} ${pc.bold(c.id)} · ${c.protocol} · ${c.baseUrl} — ${t("import.already", { id: pc.bold(existing.id) })}`);
+            continue;
+        }
         let ids = [...c.models];
         if (ids.length === 0) {
             process.stderr.write(pc.dim(`${t("import.discovering", { id: c.id })}\n`));
@@ -761,9 +752,7 @@ export async function cmdImport(opts) {
         }
         if (ids.length === 0)
             fail(t("import.noModelsImport", { id: c.id }));
-        let id = c.id;
-        for (let n = 2; store.providers[id]; n++)
-            id = `${c.id}-${n}`;
+        const id = availableProviderId(c.id, store.providers);
         const hint = guessProviderHint(catalog, c.baseUrl);
         const models = enrichModels(catalog, ids, hint);
         const defaultModel = c.defaultModel && ids.includes(c.defaultModel) ? c.defaultModel : ids[0];
@@ -785,5 +774,6 @@ export async function cmdImport(opts) {
         console.log(`${pc.green(t(existed ? "import.updated" : "import.imported"))} ${pc.bold(id)} · ${c.protocol} · ${c.baseUrl} · ${t("import.modelsCount", { count: ids.length })} [${t("import.from")} ${c.sources.join(", ")}]`);
     }
     saveStore(store);
-    console.log(pc.dim(`\n${t("import.next", { id: imported[0] })}`));
+    if (imported.length)
+        console.log(pc.dim(`\n${t("import.next", { id: imported[0] })}`));
 }

package/dist/config-transaction.js

@@ -0,0 +1,138 @@
+import fs from "node:fs";
+import path from "node:path";
+import { randomUUID } from "node:crypto";
+import { backupsDir } from "./fsutil.js";
+function snapshot(file) {
+    try {
+        const stat = fs.lstatSync(file);
+        if (!stat.isFile())
+            throw new Error("not a regular file");
+        return { text: fs.readFileSync(file, "utf8"), mode: stat.mode & 0o777, identity: `${stat.dev}:${stat.ino}` };
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return { text: undefined };
+        throw new Error(`${file}: cannot read a regular configuration file`);
+    }
+}
+function atomicWrite(file, text, mode) {
+    const temp = path.join(path.dirname(file), `.${path.basename(file)}.agentsw-${randomUUID()}.tmp`);
+    try {
+        fs.writeFileSync(temp, text, { flag: "wx", mode });
+        fs.chmodSync(temp, mode);
+        fs.renameSync(temp, file);
+    }
+    finally {
+        fs.rmSync(temp, { force: true });
+    }
+}
+/** Validate the entire plan and save every original before mutating any configuration. */
+export function commitFileChanges(changes, opts = {}) {
+    const paths = new Set();
+    const identities = new Set();
+    const plan = changes.map((change) => {
+        const file = path.resolve(change.file);
+        // Resolve the parent too, so directory symlinks cannot disguise duplicate plans.
+        let canonical = file;
+        try {
+            canonical = path.join(fs.realpathSync(path.dirname(file)), path.basename(file));
+        }
+        catch (error) {
+            if (error.code !== "ENOENT") {
+                throw new Error(`${file}: cannot resolve configuration directory`);
+            }
+        }
+        if (paths.has(canonical))
+            throw new Error(`${file}: duplicate file plan`);
+        paths.add(canonical);
+        const current = snapshot(file);
+        if (current.identity && identities.has(current.identity))
+            throw new Error(`${file}: duplicate file plan`);
+        if (current.identity)
+            identities.add(current.identity);
+        if (current.text !== change.before)
+            throw new Error(`${file}: configuration changed since it was read`);
+        if (change.mode !== undefined && (!Number.isInteger(change.mode) || change.mode < 0 || change.mode > 0o777)) {
+            throw new Error(`${file}: invalid file permissions`);
+        }
+        return { ...change, file, originalMode: current.mode };
+    }).filter((change) => change.before !== change.after);
+    const files = plan.map((change) => change.file);
+    if (!plan.length || opts.dryRun)
+        return { files };
+    let backupDir;
+    let currentFile = backupsDir;
+    try {
+        fs.mkdirSync(backupsDir, { recursive: true, mode: 0o700 });
+        backupDir = fs.mkdtempSync(path.join(backupsDir, "transaction-"));
+        fs.chmodSync(backupDir, 0o700);
+        for (const [index, change] of plan.entries()) {
+            currentFile = change.file;
+            if (change.before === undefined)
+                continue;
+            const backup = path.join(backupDir, `${index}-${path.basename(change.file)}`);
+            fs.writeFileSync(backup, change.before, { flag: "wx", mode: 0o600 });
+            fs.chmodSync(backup, 0o600);
+        }
+        fs.writeFileSync(path.join(backupDir, "manifest.json"), JSON.stringify(plan.map((change, index) => ({
+            file: change.file,
+            backup: change.before === undefined ? null : `${index}-${path.basename(change.file)}`,
+            mode: change.originalMode,
+        })), null, 2) + "\n", { flag: "wx", mode: 0o600 });
+        for (const change of plan) {
+            currentFile = change.file;
+            if (snapshot(change.file).text !== change.before)
+                throw new Error("stale snapshot");
+        }
+    }
+    catch {
+        throw new Error(`${currentFile}: backup or pre-write validation failed; configuration files were not changed`);
+    }
+    const applied = [];
+    const createdDirectories = [];
+    try {
+        for (const change of plan) {
+            currentFile = change.file;
+            if (snapshot(change.file).text !== change.before)
+                throw new Error("stale snapshot");
+            if (change.after === undefined)
+                fs.unlinkSync(change.file);
+            else {
+                const missing = [];
+                for (let dir = path.dirname(change.file); !fs.existsSync(dir); dir = path.dirname(dir))
+                    missing.push(dir);
+                for (const dir of missing.reverse()) {
+                    fs.mkdirSync(dir, { mode: 0o700 });
+                    createdDirectories.push(dir);
+                }
+                atomicWrite(change.file, change.after, change.mode ?? change.originalMode ?? 0o600);
+            }
+            applied.push(change);
+        }
+    }
+    catch {
+        const failed = [];
+        for (const change of applied.reverse()) {
+            try {
+                // Do not overwrite a third party's intervening edit while rolling back.
+                if (snapshot(change.file).text !== change.after)
+                    throw new Error("stale rollback snapshot");
+                if (change.before === undefined)
+                    fs.unlinkSync(change.file);
+                else
+                    atomicWrite(change.file, change.before, change.originalMode ?? 0o600);
+            }
+            catch {
+                failed.push(change.file);
+            }
+        }
+        for (const dir of createdDirectories.reverse()) {
+            try {
+                fs.rmdirSync(dir);
+            }
+            catch { /* Only remove empty directories created by this transaction. */ }
+        }
+        throw new Error(`${currentFile}: configuration transaction failed; ${failed.length ? `rollback incomplete for ${failed.join(", ")}` : "previous writes rolled back"}; backups: ${backupDir}`);
+    }
+    return { files, backupDir };
+}

package/dist/envfile.js

@@ -0,0 +1,27 @@
+/** Tokenize complete dotenv assignments, including quoted multiline values. */
+export function envAssignments(file, text) {
+    const result = [];
+    const pattern = /^([\t ]*(?:export[\t ]+)?)([A-Za-z_][A-Za-z0-9_]*)([\t ]*=[\t ]*)("(?:\\[\s\S]|[^"\\])*"|'[^']*'|[^\r\n]*)(?:[\t ]*#[^\r\n]*)?[\t ]*(?:\r?\n|$)/gm;
+    let end = 0;
+    const trivia = (text) => text.split(/\r?\n/).every((line) => !line.trim() || line.trimStart().startsWith("#"));
+    for (const match of text.matchAll(pattern)) {
+        if (!trivia(text.slice(end, match.index)))
+            throw new Error(`${file}: invalid environment configuration`);
+        let value = match[4];
+        if (value.startsWith('"') || value.startsWith("'")) {
+            if (value.at(-1) !== value[0])
+                throw new Error(`${file}: invalid quoted environment value`);
+            const quote = value[0];
+            value = value.slice(1, -1);
+            if (quote === '"')
+                value = value.replace(/\\n/g, "\n").replace(/\\r/g, "\r");
+        }
+        else
+            value = value.split("#", 1)[0].trim();
+        result.push({ name: match[2], offset: match.index + match[1].length, value, start: match.index, length: match[0].length });
+        end = match.index + match[0].length;
+    }
+    if (!trivia(text.slice(end)))
+        throw new Error(`${file}: invalid environment configuration`);
+    return result;
+}

package/dist/i18n.js

@@ -8,9 +8,10 @@ const messages = {
     "error.unknownCommand": { en: "unknown command '{value}', see --help", "zh-CN": "未知命令 '{value}',请查看 --help" },
     "cmd.add": { en: "add or update a provider (interactive when flags are omitted)", "zh-CN": "添加或更新供应商(省略参数时进入交互流程)" },
     "cmd.quick": { en: "quick add — auto-detect protocol(s) and models from just base URL + API key", "zh-CN": "快速添加 — 只需 base URL + API key,自动探测协议和模型" },
-    "cmd.list": { en: "list configured providers", "zh-CN": "列出已配置供应商" },
-    "cmd.remove": { en: "remove a provider", "zh-CN": "删除供应商" },
+    "cmd.list": { en: "list configured providers (or agent-local entries with --apps)", "zh-CN": "列出已配置供应商（--apps 可查看智能体独有配置）" },
+    "cmd.remove": { en: "remove a store provider, or only agent-local entries with --apps", "zh-CN": "删除中央供应商，或用 --apps 仅删除指定智能体的供应商" },
     "cmd.prune": { en: "remove a provider's entries from app configs (keeps it in agentsw)", "zh-CN": "从应用配置移除供应商条目(仍保留在 agentsw)" },
+    "cmd.rename": { en: "rename a provider and migrate config references with backups", "zh-CN": "重命名供应商并迁移配置引用（自动备份）" },
     "cmd.use": { en: "set the active provider and write it into app configs", "zh-CN": "设为当前供应商并写入应用配置" },
     "cmd.sync": { en: "re-apply the active provider (or --provider) to app configs", "zh-CN": "将当前供应商(或 --provider)重新应用到应用配置" },
     "cmd.status": { en: "show detected apps and what they currently point at", "zh-CN": "显示检测到的应用及当前供应商" },
@@ -21,7 +22,7 @@ const messages = {
     "cmd.install": { en: "install an agent CLI", "zh-CN": "安装智能体 CLI" },
     "cmd.upgrade": { en: "upgrade agent CLIs (no args = everything outdated)", "zh-CN": "升级智能体 CLI(无参数时升级全部过期项)" },
     "cmd.refresh": { en: "re-fetch models.dev metadata for all providers", "zh-CN": "重新拉取所有供应商的 models.dev 元数据" },
-    "opt.id": { en: "provider id, e.g. glm, my-proxy", "zh-CN": "供应商 id,例如 glm、my-proxy" },
+    "opt.id": { en: "custom provider id (default: full hostname + protocol)", "zh-CN": "自定义供应商 ID（默认：完整域名 + 协议）" },
     "opt.name": { en: "display name", "zh-CN": "显示名称" },
     "opt.protocol": { en: "wire protocol: openai | anthropic", "zh-CN": "接口协议: openai | anthropic" },
     "opt.openaiApi": {
@@ -42,6 +43,8 @@ const messages = {
     "opt.yes": { en: "non-interactive; require all flags", "zh-CN": "非交互模式;要求提供全部参数" },
     "opt.prune": { en: "also remove entries from app configs", "zh-CN": "同时从应用配置中移除条目" },
     "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.model": { en: "override default model while switching", "zh-CN": "切换时覆盖默认模型" },
     "opt.dryRun": { en: "preview config diff without writing", "zh-CN": "仅预览配置差异,不写入" },
@@ -72,6 +75,17 @@ const messages = {
     "menu.sync": { en: "sync active provider    (re-apply to app configs)", "zh-CN": "同步当前供应商          (重新应用到应用配置)" },
     "menu.discover": { en: "discover models         (refresh provider list + metadata)", "zh-CN": "发现模型                (刷新供应商模型与元数据)" },
     "menu.remove": { en: "remove provider", "zh-CN": "删除供应商" },
+    "menu.rename": { en: "rename provider         (migrate references with backups)", "zh-CN": "重命名供应商            （备份并迁移引用）" },
+    "menu.renameProvider": { en: "which provider to rename?", "zh-CN": "重命名哪个供应商？" },
+    "menu.newId": { en: "new provider ID", "zh-CN": "新的供应商 ID" },
+    "menu.renameConfirm": { en: "rename {oldId} to {newId} across configured apps?", "zh-CN": "将 {oldId} 重命名为 {newId}，并迁移已配置智能体的引用？" },
+    "menu.removeScope": { en: "where should this provider be removed?", "zh-CN": "从哪里删除供应商？" },
+    "menu.removeStore": { en: "agentsw store only (keep app configs)", "zh-CN": "仅从 agentsw 删除（保留智能体配置）" },
+    "menu.removeEverywhere": { en: "agentsw and matching app configurations", "zh-CN": "从 agentsw 和匹配的智能体配置中删除" },
+    "menu.removeLocal": { en: "one agent only (including entries not imported into agentsw)", "zh-CN": "仅从一个智能体删除（包括未导入 agentsw 的供应商）" },
+    "menu.noRemovable": { en: "no providers found in this scope", "zh-CN": "这个范围内没有可删除的供应商" },
+    "menu.removeApp": { en: "which agent should this provider be removed from?", "zh-CN": "从哪个智能体删除供应商？" },
+    "menu.removeConfirmScope": { en: "remove {id} from {scope}? Default references will be cleared; files are backed up first.", "zh-CN": "从 {scope} 删除 {id}？相关默认引用将被清理，文件会先备份。" },
     "menu.apps": { en: "agent versions          (check installed CLIs / upgrade)", "zh-CN": "智能体版本              (检查已安装 CLI / 升级)" },
     "menu.language": { en: "language / 语言", "zh-CN": "语言 / Language" },
     "menu.quit": { en: "quit", "zh-CN": "退出" },
@@ -96,6 +110,7 @@ const messages = {
     "menu.allInstalled": { en: "all agents already installed", "zh-CN": "所有智能体均已安装" },
     "menu.bye": { en: "bye", "zh-CN": "再见" },
     "add.id": { en: "provider id (slug)", "zh-CN": "供应商 id(slug)" },
+    "add.idAuto": { en: "provider id (leave blank for hostname + protocol)", "zh-CN": "供应商 ID（留空使用完整域名 + 协议）" },
     "add.idInvalid": { en: "lowercase slug, e.g. glm or my-proxy", "zh-CN": "请用小写 slug,例如 glm 或 my-proxy" },
     "add.name": { en: "display name", "zh-CN": "显示名称" },
     "add.protocol": { en: "wire protocol", "zh-CN": "接口协议" },
@@ -171,6 +186,12 @@ const messages = {
     "remove.pruning": { en: "pruning {id} from app configs", "zh-CN": "正在从应用配置清理 {id}" },
     "remove.removed": { en: "removed provider {id}", "zh-CN": "已删除供应商 {id}" },
     "remove.note": { en: "note: app configs are unchanged; use --prune to clean them", "zh-CN": "注意:应用配置未改动;可使用 --prune 清理" },
+    "manage.preview": { en: "preview: {count} file(s) would change", "zh-CN": "预览：将修改 {count} 个文件" },
+    "manage.changed": { en: "updated {count} file(s)", "zh-CN": "已更新 {count} 个文件" },
+    "manage.backup": { en: "backup directory: {path}", "zh-CN": "备份目录：{path}" },
+    "rename.done": { en: "renamed {oldId} to {newId}", "zh-CN": "已将 {oldId} 重命名为 {newId}" },
+    "remove.localDone": { en: "removed {id} only from {apps}; agentsw and other apps are unchanged", "zh-CN": "已仅从 {apps} 删除 {id}；agentsw 和其他智能体保持不变" },
+    "list.localNone": { en: "no agent-local provider entries found", "zh-CN": "未发现智能体本地供应商条目" },
     "common.skip": { en: "skip", "zh-CN": "跳过" },
     "common.yes": { en: "yes", "zh-CN": "是" },
     "common.no": { en: "no", "zh-CN": "否" },

package/dist/import.js

@@ -1,38 +1,52 @@
 import { loadStore } from "./store.js";
 import { ccSwitchCandidates } from "./sources/ccswitch.js";
 import { targets } from "./targets/index.js";
+/** Normalize host casing and trailing path slashes without rewriting paths or explicit ports. */
 export function normalizeUrl(u) {
-    return u.replace(/\/+$/, "");
+    const parts = /^([a-z][a-z0-9+.-]*:\/\/)([^/?#]*)([^?#]*)([?#].*)?$/i.exec(u);
+    if (!parts)
+        return u.replace(/\/+$/, "");
+    const [, scheme, authority, pathname, suffix] = parts;
+    const at = authority.lastIndexOf("@") + 1;
+    return `${scheme.toLowerCase()}${authority.slice(0, at)}${authority.slice(at).toLowerCase()}${pathname.replace(/\/+$/, "")}${suffix ?? ""}`;
 }
-/** True when a base URL already names the API version, e.g. `.../v1`. */
-const hasApiVersion = (baseUrl) => /\/v\d+(?:beta\d*)?$/i.test(baseUrl);
-/**
- * Endpoint identity for dedupe. Apps disagree about who owns the `/v1` segment:
- * omp/pi/opencode store it in the base URL, while Codex (and cc-switch's Codex
- * rows) leave it off because the client appends it. `https://host` and
- * `https://host/v1` on one protocol are the same upstream, so they must merge
- * into one provider instead of importing twice.
- */
-const matchKey = (protocol, baseUrl) => `${protocol}|${normalizeUrl(baseUrl).replace(/\/v\d+(?:beta\d*)?$/i, "")}`;
-/** pure merge: dedupe candidates by protocol+baseUrl, union models, keep first resolved key */
+/** 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. */
+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));
+}
+/** An unresolved credential is not evidence that two configurations use the same account. */
+export function findMatchingProvider(existing, candidate) {
+    if (!candidate.apiKey)
+        return undefined;
+    const endpoint = endpointKey(candidate.baseUrl);
+    return existing.find((p) => p.protocol === candidate.protocol && p.apiKey === candidate.apiKey && endpointKey(p.baseUrl) === endpoint);
+}
+/** Pure merge: union models only within the same credential-qualified endpoint. */
 export function mergeCandidates(rows, existing) {
     const merged = new Map();
     for (const { source, ...c } of rows) {
-        const key = matchKey(c.protocol, c.baseUrl);
+        const credentials = c.apiKey ? ["literal", c.apiKey] : c.keyEnv ? ["env", c.keyEnv] : ["missing", source, c.id];
+        const key = JSON.stringify([c.protocol, endpointKey(c.baseUrl), credentials]);
         const cur = merged.get(key);
         if (!cur) {
             merged.set(key, { ...c, baseUrl: normalizeUrl(c.baseUrl), models: [...new Set(c.models)], sources: [source] });
             continue;
         }
+        // Explicit app identities outrank endpoint-derived suggestions, regardless of scan order.
+        if (cur.generatedId && !c.generatedId) {
+            cur.id = c.id;
+            cur.name = c.name;
+            delete cur.generatedId;
+        }
         if (!cur.sources.includes(source))
             cur.sources.push(source);
-        if (!cur.apiKey && c.apiKey) {
-            cur.apiKey = c.apiKey;
+        if (!cur.keyEnv && c.keyEnv)
             cur.keyEnv = c.keyEnv;
-        }
-        else if (!cur.keyEnv && c.keyEnv) {
-            cur.keyEnv = c.keyEnv;
-        }
         for (const m of c.models)
             if (!cur.models.includes(m))
                 cur.models.push(m);
@@ -49,7 +63,7 @@ export function mergeCandidates(rows, existing) {
     }
     const out = [...merged.values()];
     for (const m of out) {
-        const hit = existing.find((e) => matchKey(e.protocol, e.baseUrl) === matchKey(m.protocol, m.baseUrl));
+        const hit = findMatchingProvider(existing, m);
         if (hit)
             m.configured = hit.id;
     }
@@ -75,5 +89,5 @@ export function scanCandidates() {
         // a cc-switch store this build cannot read is not this scan's problem
     }
     const store = loadStore();
-    return mergeCandidates(rows, Object.values(store.providers).map((p) => ({ id: p.id, protocol: p.protocol, baseUrl: p.baseUrl })));
+    return mergeCandidates(rows, Object.values(store.providers));
 }

package/dist/index.js

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 import { readFileSync } from "node:fs";
 import { Command, InvalidArgumentError } from "commander";
-import { cmdAdd, cmdQuickAdd, cmdApps, cmdDiscover, cmdImport, cmdInstall, cmdList, cmdModels, cmdRefreshMeta, cmdPrune, cmdRemove, cmdStatus, cmdSync, cmdUpgrade, cmdUse, } from "./commands.js";
+import { cmdAdd, cmdQuickAdd, cmdApps, cmdDiscover, cmdImport, cmdInstall, cmdList, cmdModels, cmdRefreshMeta, cmdPrune, cmdStatus, cmdSync, cmdUpgrade, cmdUse, } from "./commands.js";
 import { detectSystemLocale, extractCliLocale, normalizeLocale, setLocale, t } from "./i18n.js";
 import { cmdMenu } from "./menu.js";
 import { loadStore } from "./store.js";
+import { cmdListLocalProviders, cmdRemoveProvider, cmdRename } from "./provider-actions.js";
 // Locale precedence: CLI flag > environment > saved preference > system locale.
 setLocale(extractCliLocale() ?? process.env.AGENTSW_LANG ?? loadStore().language ?? detectSystemLocale());
 function parseLocale(value) {
@@ -68,13 +69,25 @@ program
     .option("--no-dedup", t("opt.noDedup"))
     .option("-y, --yes", t("opt.yes"))
     .action(cmdQuickAdd);
-program.command("list").alias("ls").description(t("cmd.list")).action(cmdList);
+program
+    .command("list")
+    .alias("ls")
+    .description(t("cmd.list"))
+    .option("-a, --apps <apps>", t("opt.apps"))
+    .action((opts) => opts.apps ? cmdListLocalProviders(opts.apps) : cmdList());
+program
+    .command("rename <id> <new-id>")
+    .description(t("cmd.rename"))
+    .option("-n, --dry-run", t("opt.manageDryRun"))
+    .action(cmdRename);
 program
     .command("remove <id>")
     .alias("rm")
     .description(t("cmd.remove"))
     .option("--prune", t("opt.prune"))
-    .action(cmdRemove);
+    .option("-a, --apps <apps>", t("opt.removeApps"))
+    .option("-n, --dry-run", t("opt.manageDryRun"))
+    .action(cmdRemoveProvider);
 program
     .command("prune <id>")
     .description(t("cmd.prune"))