agentsw 0.6.2 → 0.7.1

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"))

package/dist/menu.js

@@ -1,16 +1,20 @@
 import pc from "picocolors";
 import prompts from "prompts";
-import { cmdAdd, cmdQuickAdd, cmdApps, cmdInstall, cmdDiscover, cmdImport, cmdList, cmdRemove, cmdStatus, cmdSync, cmdUpgrade, cmdUse, } from "./commands.js";
+import { cmdAdd, cmdQuickAdd, cmdApps, cmdInstall, cmdDiscover, cmdImport, cmdList, cmdStatus, cmdSync, cmdUpgrade, cmdUse, } from "./commands.js";
 import { getLocale, setLocale, t } from "./i18n.js";
 import { loadStore, saveStore } from "./store.js";
 import { appPackages, appCommand, installedVersion } from "./apps.js";
+import { cmdRemoveProvider, cmdRename } from "./provider-actions.js";
+import { listRemovableProviders } from "./remove.js";
+import { providerIdFromBaseUrl } from "./slug.js";
+import { targets } from "./targets/index.js";
 function bye() {
     console.log(pc.dim(`\n${t("menu.bye")}`));
     process.exit(0);
 }
 const cancel = { onCancel: () => bye() };
-async function askToggle(message, initial = false) {
-    const { v } = await prompts({ type: "toggle", name: "v", message, active: t("menu.yes"), inactive: t("menu.no"), initial }, cancel);
+async function askToggle(message, initial = false, labels) {
+    const { v } = await prompts({ type: "toggle", name: "v", message, active: labels?.active ?? t("menu.yes"), inactive: labels?.inactive ?? t("menu.no"), initial }, cancel);
     return v === true;
 }
 async function chooseLanguage() {
@@ -57,6 +61,86 @@ async function pickProvider(message) {
     const p = store.providers[id];
     return { id, defaultModel: p.defaultModel, models: p.models.map((m) => m.id) };
 }
+async function renameFromMenu() {
+    const picked = await pickProvider(t("menu.renameProvider"));
+    if (!picked)
+        return;
+    const provider = loadStore().providers[picked.id];
+    const { newId } = await prompts({
+        type: "text",
+        name: "newId",
+        message: t("menu.newId"),
+        initial: providerIdFromBaseUrl(provider.baseUrl, provider.protocol),
+        validate: (value) => /^[a-z0-9][a-z0-9_-]*$/.test(value.trim()) || t("add.idInvalid"),
+    }, cancel);
+    if (!newId)
+        return;
+    const next = String(newId).trim();
+    await cmdRename(picked.id, next, { dryRun: true });
+    if (await askToggle(t("menu.renameConfirm", { oldId: picked.id, newId: next }), false, {
+        active: t("menu.confirmRename"), inactive: t("menu.cancelAction"),
+    })) {
+        await cmdRename(picked.id, next);
+    }
+}
+async function removeFromMenu() {
+    const { scope } = await prompts({
+        type: "select",
+        name: "scope",
+        message: t("menu.removeScope"),
+        hint: t("menu.selectInstructions"),
+        choices: [
+            { title: t("menu.removeStore"), description: t("menu.removeStoreHelp"), value: "store" },
+            { title: t("menu.removeLocal"), description: t("menu.removeLocalHelp"), value: "local" },
+            { title: t("menu.removeEverywhere"), description: t("menu.removeEverywhereHelp"), value: "everywhere" },
+        ],
+    }, cancel);
+    if (!scope)
+        return;
+    let app;
+    if (scope === "local") {
+        const answer = await prompts({
+            type: "select",
+            name: "app",
+            message: t("menu.removeApp"),
+            hint: t("menu.selectInstructions"),
+            choices: targets.map((target) => ({ title: `${target.id} · ${target.name}`, value: target.id })),
+        }, cancel);
+        app = answer.app;
+        if (!app)
+            return;
+    }
+    const entries = app
+        ? listRemovableProviders(app)
+        : Object.values(loadStore().providers).map((provider) => ({ id: provider.id, name: provider.name }));
+    if (!entries.length) {
+        console.log(pc.dim(t("menu.noRemovable")));
+        return;
+    }
+    const { selected } = await prompts({
+        type: "select",
+        name: "selected",
+        message: t("menu.removeProvider"),
+        hint: t("menu.selectInstructions"),
+        choices: entries.map((entry, index) => ({
+            title: `${entry.id} · ${entry.app ?? "agentsw"}${entry.name && entry.name !== entry.id ? ` · ${entry.name}` : ""}`,
+            value: index,
+        })),
+    }, cancel);
+    const picked = entries[selected];
+    if (!picked)
+        return;
+    const opts = scope === "local" ? { apps: picked.app } : { prune: scope === "everywhere" };
+    await cmdRemoveProvider(picked.id, { ...opts, dryRun: true });
+    const confirmation = picked.app
+        ? t("menu.removeConfirmLocal", { id: picked.id, app: picked.app })
+        : t(scope === "everywhere" ? "menu.removeConfirmEverywhere" : "menu.removeConfirmStore", { id: picked.id });
+    if (await askToggle(confirmation, false, {
+        active: t("menu.confirmRemove"), inactive: t("menu.cancelAction"),
+    })) {
+        await cmdRemoveProvider(picked.id, opts);
+    }
+}
 export async function cmdMenu() {
     if (!loadStore().language)
         await chooseLanguage();
@@ -74,19 +158,20 @@ export async function cmdMenu() {
             message: t("menu.what"),
             hint: t("menu.selectInstructions"),
             choices: [
-                { title: t("menu.add"), value: "add" },
-                { title: t("menu.quickAdd"), value: "quickAdd" },
-                { title: t("menu.import"), value: "import" },
-                { title: t("menu.use"), value: "use" },
-                { title: t("menu.status"), value: "status" },
-                { title: t("menu.list"), value: "list" },
-                { title: t("menu.sync"), value: "sync" },
-                { title: t("menu.discover"), value: "discover" },
-                { title: t("menu.remove"), value: "remove" },
-                { title: t("menu.apps"), value: "apps" },
-                { title: t("menu.installApp"), value: "install" },
-                { title: t("menu.language"), value: "language" },
-                { title: t("menu.quit"), value: "quit" },
+                { title: t("menu.quickAdd"), description: t("menu.quickAddHelp"), value: "quickAdd" },
+                { title: t("menu.add"), description: t("menu.addHelp"), value: "add" },
+                { title: t("menu.import"), description: t("menu.importHelp"), value: "import" },
+                { title: t("menu.use"), description: t("menu.useHelp"), value: "use" },
+                { title: t("menu.status"), description: t("menu.statusHelp"), value: "status" },
+                { title: t("menu.list"), description: t("menu.listHelp"), value: "list" },
+                { title: t("menu.sync"), description: t("menu.syncHelp"), value: "sync" },
+                { title: t("menu.discover"), description: t("menu.discoverHelp"), value: "discover" },
+                { title: t("menu.rename"), description: t("menu.renameHelp"), value: "rename" },
+                { title: t("menu.remove"), description: t("menu.removeHelp"), value: "remove" },
+                { title: t("menu.apps"), description: t("menu.appsHelp"), value: "apps" },
+                { title: t("menu.installApp"), description: t("menu.installAppHelp"), value: "install" },
+                { title: t("menu.language"), description: t("menu.languageHelp"), value: "language" },
+                { title: t("menu.quit"), description: t("menu.quitHelp"), value: "quit" },
             ],
         }, cancel);
         if (action === undefined || action === "quit")
@@ -142,14 +227,16 @@ export async function cmdMenu() {
             const sync = await askToggle(t("menu.pushRefresh"));
             await cmdDiscover(picked.id, { sync });
         }
-        else if (action === "remove") {
-            const picked = await pickProvider(t("menu.removeProvider"));
-            if (!picked)
-                continue;
-            if (!(await askToggle(t("menu.reallyRemove", { id: pc.bold(picked.id) }))))
-                continue;
-            const prune = await askToggle(t("menu.pruneConfigs"));
-            await cmdRemove(picked.id, { prune });
+        else if (action === "rename" || action === "remove") {
+            try {
+                if (action === "rename")
+                    await renameFromMenu();
+                else
+                    await removeFromMenu();
+            }
+            catch (error) {
+                console.error(pc.red(error instanceof Error ? error.message : String(error)));
+            }
         }
         else if (action === "apps") {
             await cmdApps();

package/dist/provider-actions.js

@@ -0,0 +1,37 @@
+import pc from "picocolors";
+import { t } from "./i18n.js";
+import { renameProvider } from "./rename.js";
+import { listRemovableProviders, removeProvider } from "./remove.js";
+function reportChanges(result, dryRun) {
+    console.log(t(dryRun ? "manage.preview" : "manage.changed", { count: result.files.length }));
+    for (const file of result.files)
+        console.log(`  ${file}`);
+    if (result.backupDir)
+        console.log(pc.dim(t("manage.backup", { path: result.backupDir })));
+}
+export async function cmdRename(id, newId, opts = {}) {
+    const result = await renameProvider(id, newId, opts);
+    if (!opts.dryRun)
+        console.log(pc.green(t("rename.done", { oldId: id, newId })));
+    reportChanges(result, opts.dryRun);
+}
+export async function cmdRemoveProvider(id, opts = {}) {
+    const result = await removeProvider(id, opts);
+    if (!opts.dryRun) {
+        console.log(pc.green(opts.apps
+            ? t("remove.localDone", { id, apps: opts.apps })
+            : t("remove.removed", { id })));
+        if (!opts.apps && !opts.prune)
+            console.log(pc.dim(t("remove.note")));
+    }
+    reportChanges(result, opts.dryRun);
+}
+export function cmdListLocalProviders(apps) {
+    const rows = listRemovableProviders(apps);
+    if (!rows.length) {
+        console.log(t("list.localNone"));
+        return;
+    }
+    for (const row of rows)
+        console.log(`${row.app.padEnd(12)} ${row.id}${row.name && row.name !== row.id ? ` · ${row.name}` : ""}`);
+}