claude-use 11.40.5 → 11.41.0

package/README.md

@@ -131,6 +131,10 @@ agent-shim model set <name> [--mode <mode>] [--member <ref>]...
 agent-shim model remove <name> [--yes]
 agent-shim model tier <tier> --ref <ref> | --clear
 agent-shim model price <ref> --input <usd> --output <usd> | --clear
+agent-shim model same <ref> <ref>...   # assert these refs are one model under several names
+agent-shim model distinct <left> <right>   # assert two alike names are two models
+agent-shim model unassert <ref>
+agent-shim model family <key> [--mode <mode>] [--name <ref>]... [--context <tokens>] [--[no-]vision|tools|thinking] | --clear
 agent-shim model list [--json]
 agent-shim model explain <name>   # which member the virtual model's mode picks now, and why
 agent-shim provider remove <name> [--yes] [--json]

package/dist/cli.cjs

@@ -26990,7 +26990,7 @@ function isTimeZone(name) {
     return false;
   }
 }
-var import_node_path4, CATEGORY_NAMES, OVERRIDABLE_CATEGORIES, CategoryMapSchema, DURATION_RE, DurationSchema, WhenConditionObjectSchema, WhenSchema, EntryValueSchema, ENTRY_KEY_RE, EntriesSchema, LaunchSchema, CREDENTIAL_TARGETS, PROVIDER_CREDENTIAL_TARGETS, CREDENTIAL_TARGET_VARS, ArgvSchema, CommandSourceOptions, EnvCredentialSourceSchema, FileCredentialSourceSchema, CommandCredentialSourceSchema, OpCredentialSourceSchema, KeychainCredentialSourceSchema, LiteralCredentialSourceSchema, CredentialSourceSchema, RemoteCredentialSourceSchema, CREDENTIAL_CACHE_STORES, CredentialCacheSchema, CredentialSchema, ProviderCredentialSchema, RESERVED_PROVIDER_ENV_KEYS, ProviderEnvSchema, PROVIDER_KINDS, ANTIGRAVITY_MODES, CLAUDE_TIERS, ANTIGRAVITY_EFFORTS, ANTIGRAVITY_DEFAULT_MODE, ANTIGRAVITY_DEFAULT_MODEL, ANTIGRAVITY_DEFAULT_TIER_MODELS, ANTIGRAVITY_DEFAULT_EFFORT, AntigravityModelTargetSchema, AntigravityProviderConfigSchema, CODEX_EFFORTS, CODEX_LOGINS, CODEX_DEFAULT_LOGIN, CODEX_DEFAULT_MODEL, CODEX_DEFAULT_TIER_MODELS, CODEX_DEFAULT_EFFORT, CodexProviderConfigSchema, ProviderRouteSchema, PickerModelSchema, PickerModelsSchema, ProviderCatalogueSchema, HttpProviderSchema, CodexProviderSchema, RouterProviderSchema, AntigravityProviderSchema, ProviderSchema, SELECTION_MODES, VirtualModelSchema, ModelPricesSchema, ModelsConfigSchema, ModelsLayerSchema, ConfigProfileSchema, POOL_SELECTOR_PREFIX, POOL_NAME_PATTERN, IDENTITY_NAME_PATTERN, PoolNameSchema, SELECTOR_RE, IdentitySelectorSchema, PoolMemberSchema, POOL_PREFERENCES, PoolPreferenceSchema, WHOLE_PERCENT_MAX, CompactAtUtilisationSchema, PoolSchema, WEEKDAYS, AnchorSchema, JOB_WINDOWS, JobTriggerSchema, JobTargetSchema, JobSchema, DirectoryRuleSchema, DirectoryRulesSchema, PortableConfigSchema, HEADROOM_MODES, HEADROOM_CCR_MODES, HEADROOM_ROLLOUT_CHANNELS, INTERCEPT_CHANNELS, READ_MATURATION_CHANNELS, HeadroomGlobalConfigObjectSchema, HeadroomGlobalConfigSchema, HEADROOM_DEFAULT_SOURCE, HEADROOM_DEFAULT_IDLE_SHUTDOWN_MINUTES, FRONTDOOR_DEFAULT_IDLE_SHUTDOWN_MINUTES, FrontDoorGlobalConfigSchema, UPDATE_MODES, UpdateGlobalConfigSchema, GlobalConfigSchema, IdentitySchema, CategoryClassificationSchema, CategoryClassificationOverlaySchema, SHIPPED_CATEGORY_DEFAULTS;
+var import_node_path4, CATEGORY_NAMES, OVERRIDABLE_CATEGORIES, CategoryMapSchema, DURATION_RE, DurationSchema, WhenConditionObjectSchema, WhenSchema, EntryValueSchema, ENTRY_KEY_RE, EntriesSchema, LaunchSchema, CREDENTIAL_TARGETS, PROVIDER_CREDENTIAL_TARGETS, CREDENTIAL_TARGET_VARS, ArgvSchema, CommandSourceOptions, EnvCredentialSourceSchema, FileCredentialSourceSchema, CommandCredentialSourceSchema, OpCredentialSourceSchema, KeychainCredentialSourceSchema, LiteralCredentialSourceSchema, CredentialSourceSchema, RemoteCredentialSourceSchema, CREDENTIAL_CACHE_STORES, CredentialCacheSchema, CredentialSchema, ProviderCredentialSchema, RESERVED_PROVIDER_ENV_KEYS, ProviderEnvSchema, PROVIDER_KINDS, ANTIGRAVITY_MODES, CLAUDE_TIERS, ANTIGRAVITY_EFFORTS, ANTIGRAVITY_DEFAULT_MODE, ANTIGRAVITY_DEFAULT_MODEL, ANTIGRAVITY_DEFAULT_TIER_MODELS, ANTIGRAVITY_DEFAULT_EFFORT, AntigravityModelTargetSchema, AntigravityProviderConfigSchema, CODEX_EFFORTS, CODEX_LOGINS, CODEX_DEFAULT_LOGIN, CODEX_DEFAULT_MODEL, CODEX_DEFAULT_TIER_MODELS, CODEX_DEFAULT_EFFORT, CodexProviderConfigSchema, ProviderRouteSchema, PickerModelSchema, PickerModelsSchema, ProviderCatalogueSchema, HttpProviderSchema, CodexProviderSchema, RouterProviderSchema, AntigravityProviderSchema, ProviderSchema, SELECTION_MODES, VirtualModelSchema, ModelPricesSchema, FamilySettingsSchema, ModelsConfigSchema, ModelsLayerSchema, ConfigProfileSchema, POOL_SELECTOR_PREFIX, POOL_NAME_PATTERN, IDENTITY_NAME_PATTERN, PoolNameSchema, SELECTOR_RE, IdentitySelectorSchema, PoolMemberSchema, POOL_PREFERENCES, PoolPreferenceSchema, WHOLE_PERCENT_MAX, CompactAtUtilisationSchema, PoolSchema, WEEKDAYS, AnchorSchema, JOB_WINDOWS, JobTriggerSchema, JobTargetSchema, JobSchema, DirectoryRuleSchema, DirectoryRulesSchema, PortableConfigSchema, HEADROOM_MODES, HEADROOM_CCR_MODES, HEADROOM_ROLLOUT_CHANNELS, INTERCEPT_CHANNELS, READ_MATURATION_CHANNELS, HeadroomGlobalConfigObjectSchema, HeadroomGlobalConfigSchema, HEADROOM_DEFAULT_SOURCE, HEADROOM_DEFAULT_IDLE_SHUTDOWN_MINUTES, FRONTDOOR_DEFAULT_IDLE_SHUTDOWN_MINUTES, FrontDoorGlobalConfigSchema, UPDATE_MODES, UpdateGlobalConfigSchema, GlobalConfigSchema, IdentitySchema, CategoryClassificationSchema, CategoryClassificationOverlaySchema, SHIPPED_CATEGORY_DEFAULTS;
 var init_schema = __esm({
   "src/config/schema.ts"() {
     "use strict";
@@ -27237,6 +27237,14 @@ var init_schema = __esm({
       input: external_exports.number().positive(),
       output: external_exports.number().positive()
     });
+    FamilySettingsSchema = external_exports.strictObject({
+      names: external_exports.array(external_exports.string().min(1)).optional(),
+      mode: external_exports.enum(SELECTION_MODES).optional(),
+      context: external_exports.number().int().positive().optional(),
+      vision: external_exports.boolean().optional(),
+      tools: external_exports.boolean().optional(),
+      thinking: external_exports.boolean().optional()
+    });
     ModelsConfigSchema = external_exports.strictObject({
       /** Virtual models, by name. */
       virtual: external_exports.record(external_exports.string().min(1), VirtualModelSchema).optional(),
@@ -27252,7 +27260,13 @@ var init_schema = __esm({
       /** Model refs hidden from the picker and from routing, whatever else names them. */
       hide: external_exports.array(external_exports.string().min(1)).optional(),
       /** When set, the only model refs visible; everything else is hidden. */
-      show: external_exports.array(external_exports.string().min(1)).optional()
+      show: external_exports.array(external_exports.string().min(1)).optional(),
+      /** Assertions that each group of refs is one model under several names, overriding what the names alone say. */
+      same: external_exports.array(external_exports.array(external_exports.string().min(1)).min(2)).optional(),
+      /** Assertions that each pair of refs is two models however alike their names look. */
+      distinct: external_exports.array(external_exports.tuple([external_exports.string().min(1), external_exports.string().min(1)])).optional(),
+      /** Per-family settings and the names the normaliser cannot know, by family key. */
+      families: external_exports.record(external_exports.string().min(1), FamilySettingsSchema).optional()
     });
     ModelsLayerSchema = external_exports.strictObject({
       virtual: external_exports.record(external_exports.string().min(1), external_exports.union([VirtualModelSchema, external_exports.null()])).optional(),
@@ -27264,7 +27278,10 @@ var init_schema = __esm({
       }).optional(),
       prices: external_exports.record(external_exports.string().min(1), external_exports.union([ModelPricesSchema, external_exports.null()])).optional(),
       hide: external_exports.array(external_exports.string().min(1)).optional(),
-      show: external_exports.array(external_exports.string().min(1)).optional()
+      show: external_exports.array(external_exports.string().min(1)).optional(),
+      same: external_exports.array(external_exports.array(external_exports.string().min(1)).min(2)).optional(),
+      distinct: external_exports.array(external_exports.tuple([external_exports.string().min(1), external_exports.string().min(1)])).optional(),
+      families: external_exports.record(external_exports.string().min(1), external_exports.union([FamilySettingsSchema, external_exports.null()])).optional()
     });
     ConfigProfileSchema = external_exports.strictObject({
       $schema: external_exports.string().optional(),
@@ -32964,6 +32981,26 @@ function mergeModels(current, layer) {
   if (layer.show !== void 0) {
     pieces.show = layer.show;
   }
+  if (layer.same !== void 0) {
+    pieces.same = [...current?.same ?? [], ...layer.same.filter((group) => !(current?.same ?? []).some((known) => known.length === group.length && known.every((ref, index) => ref === group[index])))];
+  }
+  if (layer.distinct !== void 0) {
+    pieces.distinct = [...current?.distinct ?? [], ...layer.distinct.filter(([left, right]) => !(current?.distinct ?? []).some(([a10, b]) => a10 === left && b === right))];
+  }
+  if (layer.families !== void 0) {
+    const families = {};
+    for (const [key, settings2] of Object.entries(current?.families ?? {})) {
+      if (layer.families[key] === void 0) {
+        families[key] = settings2;
+      }
+    }
+    for (const [key, settings2] of Object.entries(layer.families)) {
+      if (settings2 !== null) {
+        families[key] = settings2;
+      }
+    }
+    pieces.families = families;
+  }
   const merged = modelsOf(pieces);
   return Object.keys(merged).length === 0 ? void 0 : merged;
 }
@@ -32973,7 +33010,10 @@ function modelsOf(pieces) {
     ...pieces.tiers === void 0 || Object.keys(pieces.tiers).length === 0 ? {} : { tiers: pieces.tiers },
     ...pieces.prices === void 0 || Object.keys(pieces.prices).length === 0 ? {} : { prices: pieces.prices },
     ...pieces.hide === void 0 || pieces.hide.length === 0 ? {} : { hide: [...pieces.hide] },
-    ...pieces.show === void 0 || pieces.show.length === 0 ? {} : { show: [...pieces.show] }
+    ...pieces.show === void 0 || pieces.show.length === 0 ? {} : { show: [...pieces.show] },
+    ...pieces.same === void 0 || pieces.same.length === 0 ? {} : { same: pieces.same.map((group) => [...group]) },
+    ...pieces.distinct === void 0 || pieces.distinct.length === 0 ? {} : { distinct: pieces.distinct.map(([left, right]) => [left, right]) },
+    ...pieces.families === void 0 || Object.keys(pieces.families).length === 0 ? {} : { families: pieces.families }
   };
 }
 var init_flatten = __esm({
@@ -34636,7 +34676,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.40.5",
+      version: "11.41.0",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -65690,6 +65730,15 @@ function stripEmpty(models) {
   if (models.show !== void 0 && models.show.length > 0) {
     kept.show = models.show;
   }
+  if (models.same !== void 0 && models.same.length > 0) {
+    kept.same = models.same;
+  }
+  if (models.distinct !== void 0 && models.distinct.length > 0) {
+    kept.distinct = models.distinct;
+  }
+  if (models.families !== void 0 && Object.keys(models.families).length > 0) {
+    kept.families = models.families;
+  }
   return kept;
 }
 function memberKindOf(ref, models) {
@@ -65757,6 +65806,39 @@ function setTier(paths, tier, ref) {
   }
   writeModels(paths, stripEmpty({ ...current, tiers: Object.keys(tiers).length === 0 ? void 0 : tiers }));
 }
+function addSameGroup(paths, refs) {
+  const current = readModels(paths) ?? {};
+  const overlapping = (current.same ?? []).filter((group) => group.some((ref) => refs.includes(ref)));
+  const rest = (current.same ?? []).filter((group) => !overlapping.includes(group));
+  const joined2 = [.../* @__PURE__ */ new Set([...overlapping.flat(), ...refs])];
+  writeModels(paths, stripEmpty({ ...current, same: [...rest, joined2] }));
+}
+function addDistinctPair(paths, left, right) {
+  const current = readModels(paths) ?? {};
+  const known = (current.distinct ?? []).some(([a10, b]) => a10 === left && b === right || a10 === right && b === left);
+  if (!known) {
+    writeModels(paths, stripEmpty({ ...current, distinct: [...current.distinct ?? [], [left, right]] }));
+  }
+}
+function removeAssertionsNaming(paths, ref) {
+  const current = readModels(paths);
+  if (current === void 0) {
+    return 0;
+  }
+  const same = (current.same ?? []).filter((group) => !group.includes(ref));
+  const distinct = (current.distinct ?? []).filter(([left, right]) => left !== ref && right !== ref);
+  const removed = (current.same ?? []).length - same.length + ((current.distinct ?? []).length - distinct.length);
+  if (removed > 0) {
+    writeModels(paths, stripEmpty({ ...current, same: same.length === 0 ? void 0 : same, distinct: distinct.length === 0 ? void 0 : distinct }));
+  }
+  return removed;
+}
+function setFamily(paths, key, settings2) {
+  const current = readModels(paths) ?? {};
+  const others = Object.fromEntries(Object.entries(current.families ?? {}).filter(([existing]) => existing !== key));
+  const next = settings2 === void 0 ? others : { ...others, [key]: settings2 };
+  writeModels(paths, stripEmpty({ ...current, families: Object.keys(next).length === 0 ? void 0 : next }));
+}
 var VirtualModelNotFoundError;
 var init_modelsStore = __esm({
   "src/modelsStore.ts"() {
@@ -119737,6 +119819,57 @@ init_source();
 
 // src/models/doctor.ts
 init_modelsStore();
+
+// src/models/families.ts
+init_identity2();
+var FAMILY_PREFIX = "family:";
+var VARIANT_SEPARATOR = "+";
+function modelOf2(ref) {
+  const slash = ref.indexOf("/");
+  return slash === -1 ? ref : ref.slice(slash + 1);
+}
+function familyKeyOf(rawModel) {
+  const identity = modelIdentity(rawModel);
+  return identity.variant === "" ? identity.familyAndVersion : `${identity.familyAndVersion}${VARIANT_SEPARATOR}${identity.variant}`;
+}
+function assertionsOf(models) {
+  return { same: models?.same ?? [], distinct: models?.distinct ?? [] };
+}
+function sameModel(left, right, assertions) {
+  if (assertions.distinct.some(([a10, b]) => a10 === left && b === right || a10 === right && b === left)) {
+    return false;
+  }
+  const leftGroup = assertions.same.find((group) => group.includes(left));
+  const rightGroup = assertions.same.find((group) => group.includes(right));
+  if (leftGroup !== void 0 && leftGroup === rightGroup) {
+    return true;
+  }
+  if (leftGroup !== void 0 && !leftGroup.includes(right) || rightGroup !== void 0 && !rightGroup.includes(left)) {
+    return false;
+  }
+  return relateModels(modelOf2(left), modelOf2(right)) === "same";
+}
+function pinnedTo(settings2, ref) {
+  return settings2?.names?.some((name) => name === ref || name === modelOf2(ref)) === true;
+}
+function buildFamilies(refs, models) {
+  const assertions = assertionsOf(models);
+  const settingsByKey = models?.families ?? {};
+  const groups = [];
+  for (const ref of refs) {
+    const pinnedKey = Object.entries(settingsByKey).find(([, settings2]) => pinnedTo(settings2, ref))?.[0];
+    const joined2 = groups.find((group) => pinnedKey === void 0 ? group.refs.some((first) => sameModel(first, ref, assertions)) : group.key === pinnedKey);
+    if (joined2 !== void 0) {
+      joined2.refs.push(ref);
+    } else {
+      groups.push({ key: pinnedKey ?? familyKeyOf(modelOf2(ref)), refs: [ref] });
+    }
+  }
+  return groups.map((group) => ({ key: group.key, refs: group.refs, settings: settingsByKey[group.key] ?? {} }));
+}
+
+// src/models/doctor.ts
+init_identity2();
 function modelsFindings(input2) {
   const findings = [];
   const { models } = input2;
@@ -119781,6 +119914,38 @@ function modelsFindings(input2) {
       findings.push({ severity: "fail", message: `Tier ${tier} points at "${ref}", which names nothing defined.` });
     }
   }
+  const modelOfRef = (ref) => ref.slice(ref.indexOf("/") + 1);
+  for (const group of models.same ?? []) {
+    for (let outer = 0; outer < group.length; outer += 1) {
+      for (let inner = outer + 1; inner < group.length; inner += 1) {
+        const left = group[outer] ?? "";
+        const right = group[inner] ?? "";
+        if (!left.startsWith("acct:") && !right.startsWith("acct:") && relateModels(modelOfRef(left), modelOfRef(right)) === "distinct") {
+          findings.push({ severity: "warn", message: `"${left}" and "${right}" are asserted to be one model, but their names say they are different models; check the assertion is not a typo.` });
+        }
+        if ((models.distinct ?? []).some(([a10, b]) => a10 === left && b === right || a10 === right && b === left)) {
+          findings.push({ severity: "fail", message: `"${left}" and "${right}" are asserted to be both one model and two models.` });
+        }
+      }
+    }
+  }
+  for (const [name, model] of Object.entries(models.virtual ?? {})) {
+    const concrete = model.members.filter((member) => memberKindOf(member, models) === "provider" && member.includes("/"));
+    const looksAlike = concrete.flatMap((left, index) => concrete.slice(index + 1).filter((right) => relateModels(modelOfRef(left), modelOfRef(right)) === "same").map((right) => [left, right]));
+    for (const [left, right] of looksAlike) {
+      findings.push({ severity: "warn", message: `Virtual model "${name}" lists "${left}" and "${right}", which look like one model; a member ${FAMILY_PREFIX}${familyKeyOf(modelOfRef(left))} names every target of it.` });
+    }
+  }
+  if (input2.targets !== void 0) {
+    const families = buildFamilies(input2.targets, models);
+    for (const [name, model] of Object.entries(models.virtual ?? {})) {
+      for (const member of model.members.filter((entry) => entry.startsWith(FAMILY_PREFIX))) {
+        if (!families.some((family) => `${FAMILY_PREFIX}${family.key}` === member)) {
+          findings.push({ severity: "warn", message: `Virtual model "${name}" names ${member}, but no target the providers offer belongs to that family.` });
+        }
+      }
+    }
+  }
   const hidden = new Set(models.hide ?? []);
   const shown = new Set(models.show ?? []);
   for (const ref of hidden) {
@@ -119791,6 +119956,21 @@ function modelsFindings(input2) {
   return findings;
 }
 
+// src/models/targets.ts
+init_modelPicker();
+init_providerCatalogue();
+init_providersStore();
+init_realPorts();
+function providerModels(paths) {
+  return listProviders(paths).flatMap((entry) => {
+    const catalogue = parseCatalogueCache(realFsPort.readFileUtf8(catalogueCachePath(paths, entry.name)));
+    return providerModelRows(entry.provider, catalogue?.models).map((row) => ({ provider: entry.name, model: row.model }));
+  });
+}
+function targetRefs(paths) {
+  return providerModels(paths).map((entry) => `${entry.provider}/${entry.model}`);
+}
+
 // src/doctorReport.ts
 init_configProfilesStore();
 
@@ -120344,7 +120524,7 @@ function runDoctor(params) {
     if (models === void 0) {
       push("models", "pass", "No models block configured.");
     } else {
-      for (const finding of modelsFindings({ models, providers: params.providers.map((entry) => entry.name), identities: params.identities.map((entry) => entry.name) })) {
+      for (const finding of modelsFindings({ models, providers: params.providers.map((entry) => entry.name), identities: params.identities.map((entry) => entry.name), ...params.modelTargets === void 0 ? {} : { targets: params.modelTargets } })) {
         push("models", finding.severity, finding.message);
       }
       push("models", "pass", "The models block is consistent.");
@@ -120578,6 +120758,7 @@ function collectDoctorReport(params) {
     directoryRules: { path: paths.directoryRulesFile, raw: realFsPort.readFileUtf8(paths.directoryRulesFile) },
     globalConfig: { path: paths.globalConfigFile, raw: realFsPort.readFileUtf8(paths.globalConfigFile) },
     models: parsedModelsOf(paths),
+    modelTargets: targetRefs(paths),
     categoriesLocal: { path: paths.categoriesLocalFile, raw: realFsPort.readFileUtf8(paths.categoriesLocalFile) },
     activeIdentity: { path: paths.activeIdentityFile, raw: realFsPort.readFileUtf8(paths.activeIdentityFile) },
     binaryDiscovery,
@@ -147640,10 +147821,6 @@ function registerProviderCommand(program2, deps) {
 
 // src/models.ts
 init_commandDeps();
-init_providersStore();
-init_modelPicker();
-init_providerCatalogue();
-init_realPorts();
 init_schema();
 init_cliError();
 init_identity2();
@@ -147705,22 +147882,13 @@ function explainVirtualModel(paths, name) {
     console.log(`  ${line}`);
   }
 }
-function providerModels(paths) {
-  return listProviders(paths).flatMap((entry) => {
-    const catalogue = parseCatalogueCache(realFsPort.readFileUtf8(catalogueCachePath(paths, entry.name)));
-    return providerModelRows(entry.provider, catalogue?.models).map((row) => ({ provider: entry.name, model: row.model }));
-  });
-}
-function matchModels(models) {
-  const same = [];
-  for (const model of models) {
-    const group = same.find((candidates) => candidates.some((other) => relateModels(other.model, model.model) === "same" && other.provider !== model.provider));
-    if (group === void 0) {
-      same.push([model]);
-    } else {
-      group.push(model);
-    }
-  }
+function matchModels(models, config2) {
+  const refOf = (model) => `${model.provider}/${model.model}`;
+  const byRef = new Map(models.map((model) => [refOf(model), model]));
+  const families = buildFamilies(models.map(refOf), config2);
+  const familyOf = new Map(families.flatMap((family) => family.refs.map((ref) => [ref, family])));
+  const same = families.map((family) => family.refs.flatMap((ref) => byRef.get(ref) ?? [])).filter((group) => new Set(group.map((entry) => entry.provider)).size > 1);
+  const distinct = config2?.distinct ?? [];
   const similar = [];
   for (let outer = 0; outer < models.length; outer += 1) {
     for (let inner = outer + 1; inner < models.length; inner += 1) {
@@ -147729,12 +147897,13 @@ function matchModels(models) {
       if (left === void 0 || right === void 0 || left.provider === right.provider) {
         continue;
       }
-      if (relateModels(left.model, right.model) === "similar" && !same.some((group) => group.includes(left) && group.includes(right))) {
+      const asserted = distinct.some(([a10, b]) => a10 === refOf(left) && b === refOf(right) || a10 === refOf(right) && b === refOf(left));
+      if (!asserted && familyOf.get(refOf(left)) !== familyOf.get(refOf(right)) && relateModels(left.model, right.model) === "similar") {
         similar.push([left, right]);
       }
     }
   }
-  return { same: same.filter((group) => group.length > 1), similar };
+  return { same, similar };
 }
 function registerModelsCommand(program2, deps) {
   const { paths } = deps;
@@ -147751,7 +147920,7 @@ function registerModelsCommand(program2, deps) {
     ["agent-shim model match"]
   ).action((options) => {
     const models = providerModels(paths);
-    const { same, similar } = matchModels(models);
+    const { same, similar } = matchModels(models, readModels(paths));
     if (options.json === true) {
       printJson({ models, same, similar });
       return;
@@ -147830,7 +147999,53 @@ function registerModelsCommand(program2, deps) {
     console.log(options.clear === true ? `Removed prices for ${ref}.` : `Prices for ${ref}: ${String(options.input)} in, ${String(options.output)} out per million tokens.`);
   });
   withExamples(
-    modelsCommand.command("list").description("List the defined virtual models, the tier pointers and the visibility filter.").option("--json", "Print the models block as JSON."),
+    modelsCommand.command("same <ref> <ref...>").description("Assert that these refs are one model under several names, which makes them one family a mode can route across."),
+    ["agent-shim model same z/glm-5.1 o/zai-glm-51"]
+  ).action((first, rest) => {
+    addSameGroup(paths, [first, ...rest]);
+    console.log(`Asserted one model: ${[first, ...rest].join(" = ")}`);
+  });
+  withExamples(
+    modelsCommand.command("distinct <left> <right>").description("Assert that two refs are two models, however alike their names look, so they are never put in one family."),
+    ["agent-shim model distinct z/glm-5.1 s/hf:zai-org/GLM-5.1"]
+  ).action((left, right) => {
+    addDistinctPair(paths, left, right);
+    console.log(`Asserted two models: ${left} / ${right}`);
+  });
+  withExamples(
+    modelsCommand.command("unassert <ref>").description("Remove every identity assertion that names this ref."),
+    ["agent-shim model unassert z/glm-5.1"]
+  ).action((ref) => {
+    const removed = removeAssertionsNaming(paths, ref);
+    console.log(removed === 0 ? `No assertion names ${ref}.` : `Removed ${String(removed)} assertion${removed === 1 ? "" : "s"} naming ${ref}.`);
+  });
+  withExamples(
+    modelsCommand.command("family <key>").description("Set one family's own settings: how a row that selects the whole family chooses, the names the normaliser cannot know, and what every target of it can do.").option("--mode <mode>", "How a row selecting the whole family chooses among its targets.", (value2) => asMode(value2)).option("--name <ref>", "Pin a ref or bare model name into the family (repeatable).", collectRepeated).option("--context <tokens>", "The family's context window, in tokens.", (value2) => asPositiveInteger(value2)).option("--vision", "Every target of the family accepts images.").option("--no-vision", "No target of the family accepts images.").option("--tools", "Every target of the family accepts tools.").option("--no-tools", "No target of the family accepts tools.").option("--thinking", "Every target of the family thinks.").option("--no-thinking", "No target of the family thinks.").option("--clear", "Remove the family's settings instead."),
+    ["agent-shim model family glm-5-1 --mode cheapest --no-vision", "agent-shim model family claude-opus-5-5 --name o/opus-latest"]
+  ).action((key, options) => {
+    if (options.clear === true) {
+      setFamily(paths, key, void 0);
+      console.log(`Removed the settings of family ${key}.`);
+      return;
+    }
+    const existing = readModels(paths)?.families?.[key] ?? {};
+    const settings2 = {
+      ...existing,
+      ...options.mode === void 0 ? {} : { mode: options.mode },
+      ...options.name === void 0 ? {} : { names: [.../* @__PURE__ */ new Set([...existing.names ?? [], ...options.name])] },
+      ...options.context === void 0 ? {} : { context: options.context },
+      ...options.vision === void 0 ? {} : { vision: options.vision },
+      ...options.tools === void 0 ? {} : { tools: options.tools },
+      ...options.thinking === void 0 ? {} : { thinking: options.thinking }
+    };
+    if (Object.keys(settings2).length === 0) {
+      throw new UsageError("Nothing to set: pass --mode, --name, --context, a capability flag, or --clear.");
+    }
+    setFamily(paths, key, settings2);
+    console.log(`Family ${key}: ${JSON.stringify(settings2)}`);
+  });
+  withExamples(
+    modelsCommand.command("list").description("List the defined virtual models, the tier pointers, the visibility filter, the identity assertions and the family settings.").option("--json", "Print the models block as JSON."),
     ["agent-shim model list"]
   ).action((options) => {
     const found = readModels(paths);
@@ -147854,8 +148069,24 @@ function registerModelsCommand(program2, deps) {
     if (found.show !== void 0) {
       console.log(`visible only: ${found.show.join(", ")}`);
     }
+    for (const group of found.same ?? []) {
+      console.log(`same: ${group.join(" = ")}`);
+    }
+    for (const [left, right] of found.distinct ?? []) {
+      console.log(`distinct: ${left} / ${right}`);
+    }
+    for (const [key, settings2] of Object.entries(found.families ?? {})) {
+      console.log(`family ${key}: ${JSON.stringify(settings2)}`);
+    }
   });
 }
+function asPositiveInteger(value2) {
+  const parsed = Number(value2);
+  if (!Number.isInteger(parsed) || parsed <= 0) {
+    throw new UsageError(`"${value2}" is not a token count: pass a positive whole number.`);
+  }
+  return parsed;
+}
 function asMode(value2) {
   const mode = SELECTION_MODES.find((candidate) => candidate === value2);
   if (mode === void 0) {