agentsw 0.9.1 → 0.9.2

package/dist/commands.js

@@ -8,7 +8,7 @@ import prompts from "prompts";
 import { loadStore, saveStore, getProvider, configFile } from "./store.js";
 import { scanCandidates, normalizeUrl, findMatchingProvider } from "./import.js";
 import { loadCatalog, searchCatalog } from "./modelsdev.js";
-import { enrichProviderModels, getMetadataMode, resolveMetadataOptions } from "./metadata.js";
+import { classifyUnresolved, enrichProviderModels, getMetadataMode, resolveMetadataOptions } from "./metadata.js";
 import { loadGatewayCatalog } from "./gateway.js";
 import { resolveTargets, supportsProtocol, targets } from "./targets/index.js";
 import { discoverProviderModels, probeProtocols } from "./discover.js";
@@ -70,11 +70,19 @@ function modelRows(models) {
     ]);
 }
 const MODEL_HEADER = ["MODEL", "CTX", "IN", "OUT", "REASONING", "$IN/$OUT per M"];
-/** Print a dim hint when some models have no catalog metadata. */
-function printUncatalogedHint(models) {
+/**
+ * Explain why some models stayed bare: only ambiguous ids are worth the user's
+ * attention, so those are named separately from ids nothing can resolve.
+ */
+function printUncatalogedHint(models, catalog, hint) {
     const bare = models.filter((m) => m.contextWindow === undefined && !m.cost);
-    if (bare.length > 0) {
-        console.log(pc.dim(`${bare.length} model(s) have no catalog metadata (shown as "-")`));
+    if (bare.length === 0)
+        return;
+    console.log(pc.dim(t("meta.gap", { count: bare.length })));
+    const { ambiguous, unknown, noCreatorRow } = classifyUnresolved(catalog, bare.map((m) => m.id), hint);
+    for (const [key, ids] of [["meta.ambiguous", ambiguous], ["meta.noCreatorRow", noCreatorRow], ["meta.unknown", unknown]]) {
+        if (ids.length)
+            console.log(pc.dim(`  ${t(key, { count: ids.length, ids: ids.join(", "), id: ids[0] })}`));
     }
 }
 /** Guess the models.dev provider whose API host matches the configured baseUrl. */
@@ -197,8 +205,15 @@ export async function cmdAdd(opts) {
         fail(t("add.openaiApiInvalid"));
     const baseUrl = normalizeUrl(answers.baseUrl);
     const explicitId = answers.id || undefined;
-    const existing = explicitId ? store.providers[explicitId] : findMatchingProvider(Object.values(store.providers), { protocol, baseUrl, apiKey: answers.apiKey });
-    const id = explicitId ?? existing?.id ?? availableProviderId(providerIdFromBaseUrl(baseUrl, protocol), store.providers);
+    const byId = explicitId ? store.providers[explicitId] : undefined;
+    // Endpoint plus credential is the account identity, so an explicit id never
+    // licenses a second entry for an account that is already configured.
+    const sameAccount = byId ? undefined : findMatchingProvider(Object.values(store.providers), { protocol, baseUrl, apiKey: answers.apiKey });
+    const existing = byId ?? sameAccount;
+    if (byId === undefined && explicitId && sameAccount) {
+        console.log(pc.yellow(t("add.alreadyConfigured", { id: pc.bold(sameAccount.id) })));
+    }
+    const id = byId?.id ?? sameAccount?.id ?? explicitId ?? availableProviderId(providerIdFromBaseUrl(baseUrl, protocol), store.providers);
     const openaiApi = protocol === "openai" ? wire ?? existing?.openaiApi : undefined;
     const metadataOptions = resolveMetadataOptions(opts, existing);
     const manualIds = (answers.models ?? "").split(",").map((s) => s.trim()).filter(Boolean);
@@ -256,7 +271,7 @@ export async function cmdAdd(opts) {
     console.log(pc.green(t("add.saved", { status: savedStatus, id: pc.bold(provider.id), protocol })));
     console.log(t("add.metadata", { matched, total: models.length }) + (hint ? t("add.providerHint", { hint }) : ""));
     console.log(table(modelRows(models), MODEL_HEADER));
-    printUncatalogedHint(models);
+    printUncatalogedHint(models, catalog, hint);
     console.log(pc.dim(`\n${t("add.next", { id: provider.id })}`));
 }
 /** Shared logic to create and save a single provider from discovered models. */
@@ -297,7 +312,7 @@ async function createProvider(opts) {
     console.log(pc.green(t("add.saved", { status: savedStatus, id: pc.bold(provider.id), protocol })));
     console.log(t("add.metadata", { matched, total: models.length }) + (hint ? t("add.providerHint", { hint }) : ""));
     console.log(table(modelRows(models), MODEL_HEADER));
-    printUncatalogedHint(models);
+    printUncatalogedHint(models, catalog, hint);
     return provider;
 }
 /**
@@ -339,8 +354,13 @@ export async function cmdQuickAdd(opts) {
     const gatewayLoader = sharedGatewayLoader();
     for (const protocol of protocols) {
         const explicitId = opts.id === undefined ? undefined : `${opts.id}${multi ? `-${protocol}` : ""}`;
-        const existing = explicitId === undefined ? findMatchingProvider(Object.values(store.providers), { protocol, baseUrl, apiKey }) : store.providers[explicitId];
-        const id = explicitId ?? existing?.id ?? availableProviderId(providerIdFromBaseUrl(baseUrl, protocol), store.providers);
+        const byId = explicitId ? store.providers[explicitId] : undefined;
+        const sameAccount = byId ? undefined : findMatchingProvider(Object.values(store.providers), { protocol, baseUrl, apiKey });
+        const existing = byId ?? sameAccount;
+        if (byId === undefined && explicitId && sameAccount) {
+            console.log(pc.yellow(t("add.alreadyConfigured", { id: pc.bold(sameAccount.id) })));
+        }
+        const id = byId?.id ?? sameAccount?.id ?? explicitId ?? availableProviderId(providerIdFromBaseUrl(baseUrl, protocol), store.providers);
         const name = opts.name ?? existing?.name ?? (opts.id === undefined ? providerNameFromBaseUrl(baseUrl, protocol) : multi ? `${opts.id} (${protocol})` : opts.id);
         const modelFilter = parseFilterOpts(opts, existing?.modelFilter);
         process.stderr.write(pc.dim(`${t("add.discovering", { url: baseUrl })} [${protocol}]\n`));
@@ -641,7 +661,7 @@ export async function cmdModels(query, opts) {
         }
         console.log(`${pc.bold(provider.id)} (${provider.protocol}) · ${provider.baseUrl}`);
         console.log(table(modelRows(provider.models), MODEL_HEADER));
-        printUncatalogedHint(provider.models);
+        printUncatalogedHint(provider.models, await loadCatalog(), provider.modelsDevId);
         return;
     }
     const catalog = await loadCatalog({ refresh: opts.refresh });
@@ -680,9 +700,11 @@ export async function cmdRefreshMeta(opts = {}) {
             updated++;
     }
     saveStore(store);
-    console.log(pc.green(`checked model metadata (${updated} provider(s) changed)`));
+    console.log(pc.green(t("refresh.checked", { changed: updated })));
     if (updated > 0)
-        console.log(pc.dim("run `agentsw sync` to push updated metadata into app configs"));
+        console.log(pc.dim(t("refresh.next")));
+    for (const provider of providers)
+        printUncatalogedHint(provider.models, catalog, provider.modelsDevId);
 }
 export async function cmdDiscover(id, opts) {
     resolveTargets(opts.apps);
@@ -715,7 +737,7 @@ export async function cmdDiscover(id, opts) {
         (added.length ? `\n  new: ${added.join(", ")}` : "") +
         (gone.length ? `\n  removed upstream: ${gone.join(", ")}` : ""));
     console.log(table(modelRows(provider.models), MODEL_HEADER));
-    printUncatalogedHint(provider.models);
+    printUncatalogedHint(provider.models, catalog, provider.modelsDevId);
     if (opts.sync) {
         console.log("");
         await cmdSync({ provider: id, apps: opts.apps });

package/dist/i18n.js

@@ -190,6 +190,7 @@ const messages = {
     "add.defaultMissing": { en: "default model {model} is not in the model list", "zh-CN": "默认模型 {model} 不在模型列表中" },
     "add.smallMissing": { en: "small model {model} is not in the model list", "zh-CN": "小型模型 {model} 不在模型列表中" },
     "add.added": { en: "added", "zh-CN": "已添加" },
+    "add.alreadyConfigured": { en: "same endpoint and key are already configured as {id}; updating it instead of creating a duplicate", "zh-CN": "相同地址与密钥已配置为 {id};将更新该供应商,不会新建重复项" },
     "add.updated": { en: "updated", "zh-CN": "已更新" },
     "add.saved": { en: "{status} provider {id} ({protocol})", "zh-CN": "{status}供应商 {id} ({protocol})" },
     "add.metadata": { en: "model metadata: {matched}/{total} models have a context limit", "zh-CN": "模型参数：{matched}/{total} 个模型已有上下文上限" },
@@ -245,6 +246,18 @@ const messages = {
     "status.config": { en: "config: {file}", "zh-CN": "配置:{file}" },
     "status.active": { en: "active provider: {id}", "zh-CN": "当前供应商:{id}" },
     "status.none": { en: "(none)", "zh-CN": "(无)" },
+    "meta.gap": { en: "{count} model(s) have no catalog metadata (shown as \"-\")", "zh-CN": "{count} 个模型没有目录元数据(显示为 \"-\")" },
+    "meta.ambiguous": {
+        en: "ambiguous ({count}): {ids} — several creators list these; pin with --gateway-models '{\"{id}\":\"creator/model\"}'",
+        "zh-CN": "存在歧义({count}):{ids} —— 多个厂商都提供;用 --gateway-models '{\"{id}\":\"creator/model\"}' 指定",
+    },
+    "meta.unknown": { en: "not listed by any creator ({count}): {ids}", "zh-CN": "所有厂商均未收录({count}):{ids}" },
+    "meta.noCreatorRow": {
+        en: "no models.dev row for the creator ({count}): {ids} — filled from AI Gateway when available",
+        "zh-CN": "厂商在 models.dev 无对应条目({count}):{ids} —— 有 AI Gateway 数据时会自动补全",
+    },
+    "refresh.checked": { en: "checked model metadata ({changed} provider(s) changed)", "zh-CN": "已检查模型元数据({changed} 个供应商有变化)" },
+    "refresh.next": { en: "run `agentsw sync` to push updated metadata into app configs", "zh-CN": "运行 `agentsw sync` 将更新的元数据写入各智能体配置" },
 };
 let current = detectSystemLocale();
 export function normalizeLocale(value) {

package/dist/metadata.js

@@ -105,25 +105,42 @@ function equalValue(a, b) {
 function indexCatalog(catalog) {
     const exact = new Map();
     const canonical = new Map();
+    const identities = new Map();
+    const push = (map, key, entry) => {
+        const matches = map.get(key);
+        if (matches)
+            matches.push(entry);
+        else
+            map.set(key, [entry]);
+    };
     for (const provider of Object.values(catalog)) {
         for (const [key, model] of Object.entries(provider.models)) {
             const modelId = model.id.includes("/") ? model.id : `${provider.id}/${model.id}`;
-            const entry = { provider: provider.id, modelId, model };
-            for (const id of new Set([key, model.id])) {
-                const matches = exact.get(id);
-                if (matches)
-                    matches.push(entry);
-                else
-                    exact.set(id, [entry]);
-            }
-            const matches = canonical.get(modelId);
-            if (matches)
-                matches.push(entry);
-            else
-                canonical.set(modelId, [entry]);
+            const entry = { provider: provider.id, modelId, identity: model.canonical_model_id ?? modelId, model };
+            for (const id of new Set([key, model.id]))
+                push(exact, id, entry);
+            push(canonical, modelId, entry);
+            push(identities, entry.identity, entry);
         }
     }
-    return { exact, canonical };
+    return { exact, canonical, identities };
+}
+/** Creator identity of a catalog model id, or undefined when its rows disagree. */
+function catalogIdentity(index, modelId) {
+    const identities = new Set(index?.canonical.get(modelId)?.map((entry) => entry.identity));
+    return identities?.size === 1 ? [...identities][0] : undefined;
+}
+/**
+ * The creator's own listing for an identity, when models.dev carries one.
+ * Gateways also key their rows by the canonical id, and those rows carry the
+ * gateway's own limits and prices, so only a row from the creator's own
+ * namespace counts as authoritative.
+ */
+function creatorEntry(index, identity) {
+    const slash = identity.indexOf("/");
+    if (slash < 1)
+        return undefined;
+    return index?.identities.get(identity)?.find((entry) => entry.modelId === identity && entry.provider === identity.slice(0, slash));
 }
 function indexGatewayBareIds(gateway) {
     const result = new Map();
@@ -147,10 +164,15 @@ function selectExact(index, id, hint, aliases, gateway, gatewayBareIds) {
             const candidate = gatewayBareIds?.get(id);
             const evidence = index?.exact.get(id);
             const hintedEvidence = hint ? evidence?.filter((entry) => entry.provider === hint) : undefined;
-            const identities = new Set((hintedEvidence?.length ? hintedEvidence : evidence)?.map((entry) => entry.modelId));
+            const identities = new Set((hintedEvidence?.length ? hintedEvidence : evidence)?.map((entry) => entry.identity));
+            // Gateway names the creator while models.dev names the listing provider, so
+            // the two agree only once both are reduced to a creator identity. A gateway
+            // id the catalog has no row for stands for itself.
+            const candidateIdentity = candidate ? catalogIdentity(index, candidate) ?? candidate : undefined;
             // A unique exact basename is safe only with absent or agreeing primary evidence.
             // Explicit provider hints can resolve primary ambiguity, but never Gateway ambiguity.
-            if (candidate && (identities.size === 0 || (identities.size === 1 && identities.has(candidate))))
+            if (candidate && candidateIdentity !== undefined
+                && (identities.size === 0 || (identities.size === 1 && identities.has(candidateIdentity))))
                 gatewayId = candidate;
         }
     }
@@ -159,10 +181,10 @@ function selectExact(index, id, hint, aliases, gateway, gatewayBareIds) {
         : (bare && hint ? index?.canonical.get(`${hint}/${id}`) : undefined)
             ?? index?.canonical.get(id) ?? index?.exact.get(id);
     const hinted = candidates?.find((entry) => entry.provider === hint);
-    const identities = new Set(candidates?.map((entry) => entry.modelId));
-    const primary = hinted ?? (identities.size === 1
-        ? candidates?.find((entry) => entry.modelId.startsWith(`${entry.provider}/`)) ?? candidates?.[0]
-        : undefined);
+    const identities = new Set(candidates?.map((entry) => entry.identity));
+    // Reseller rows for one model share an identity but disagree on limits and
+    // prices, so only the creator's own row is authoritative.
+    const primary = hinted ?? (identities.size === 1 ? creatorEntry(index, [...identities][0]) : undefined);
     return { primary, gatewayId, alias };
 }
 function legacyPrimary(catalog, id, hint) {
@@ -398,3 +420,30 @@ export async function enrichProviderModels(catalog, ids, settings, options = {})
     // bounds must be resolved with the supplement against the original values.
     return gateway ? enrich(gateway) : primaryOnly ?? enrich();
 }
+/**
+ * Why a model id stayed bare after enrichment, so callers can tell the user
+ * what is worth acting on: "ambiguous" ids are listed under more than one
+ * creator and an explicit mapping resolves them; "unknown" ids no creator
+ * lists at all, so no mapping helps; "noCreatorRow" ids have one unambiguous
+ * creator but models.dev carries no authoritative row for it, so only Gateway
+ * can fill them.
+ */
+export function classifyUnresolved(catalog, ids, hint) {
+    const ambiguous = [];
+    const unknown = [];
+    const noCreatorRow = [];
+    if (!catalog)
+        return { ambiguous, unknown: [...ids], noCreatorRow };
+    const index = indexCatalog(catalog);
+    for (const id of ids) {
+        const hinted = hint ? index.canonical.get(`${hint}/${id}`) : undefined;
+        const candidates = hinted ?? index.canonical.get(id) ?? index.exact.get(id);
+        if (!candidates?.length)
+            unknown.push(id);
+        else if (new Set(candidates.map((entry) => entry.identity)).size > 1)
+            ambiguous.push(id);
+        else if (!creatorEntry(index, [...new Set(candidates.map((entry) => entry.identity))][0]))
+            noCreatorRow.push(id);
+    }
+    return { ambiguous, unknown, noCreatorRow };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentsw",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "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": {