claude-use 11.44.4 → 11.45.0

package/README.md

@@ -196,7 +196,7 @@ agent-shim run [@<identity>] [launch flags] [claude arguments]
   #   --claude-version <version>   run exactly this installed Claude Code version
   #   --delay <duration>   wait this long after the launcher's own output before starting claude; --[no-]pause waits for a key press instead
   #   --[no-]explain   with @pool:<name>, list every member the pick ranked and why, not only the one picked
-  #   --[no-]route-by-name   route provider-qualified model names through the models block to the provider that serves them
+  #   --[no-]route-by-name   also route bare virtual-model names through the models block (qualified names route on every session)
   #   --native   run the real claude with nothing from agent-shim applied; cannot be combined with the flags above
 claude @<identity> ...                      # the same, once `agent-shim shim enable` has run
 ```

package/dist/cli.cjs

@@ -34701,7 +34701,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.44.4",
+      version: "11.45.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>",
@@ -65950,25 +65950,25 @@ function providerModelRows(provider, catalogue = []) {
   const taken = new Set(named.map((row) => labelOf(row.model)));
   return [...named, ...catalogueRows(provider, catalogue).filter((row) => !taken.has(labelOf(row.model)))];
 }
-function routedModelRows(models, providers) {
+function routedModelRows(models, providers, bare = true) {
   const hidden = new Set(models.hide ?? []);
   const shown = models.show === void 0 ? void 0 : new Set(models.show);
   const visible = (model) => shown === void 0 ? !hidden.has(model) : shown.has(model);
-  const concrete = providers.flatMap(([name, provider]) => providerModelRows(provider).map((row) => ({ ...row, model: `${name}/${row.model}`, label: `${name} / ${row.label}`, description: `${name}: ${row.description}` })));
+  const concrete = providers.flatMap(([name, provider, catalogue]) => providerModelRows(provider, catalogue).map((row) => ({ ...row, model: `${name}/${row.model}`, label: `${name} / ${row.label}`, description: `${name}: ${row.description}` })));
   const concreteByRef = new Map(concrete.map((row) => [row.model, row]));
   const families = buildFamilies([...concrete.map((row) => row.model), ...accountRefsOf(models)], models);
   const handlingOf = (refs) => refs.map((ref) => concreteByRef.get(ref)?.behavesAs).find((behavesAs) => behavesAs !== void 0) ?? TIER_BEHAVES_AS.sonnet;
-  const virtual = Object.entries(models.virtual ?? {}).flatMap(([name, definition]) => {
+  const virtual = bare ? Object.entries(models.virtual ?? {}).flatMap(([name, definition]) => {
     if (!visible(name)) {
       return [];
     }
     const targets = expandFamilyMembers(safeExpand(name, models), families);
     return [{ model: name, label: name, description: `Virtual (${definition.mode})`, behavesAs: handlingOf(targets) }];
-  });
-  const familyRows = sharedFamilies(families).flatMap((family) => {
+  }) : [];
+  const familyRows = bare ? sharedFamilies(families).flatMap((family) => {
     const member = `${FAMILY_PREFIX}${family.key}`;
     return visible(member) ? [{ model: member, label: family.key, description: `Family (${familyMode(family.settings)}): ${family.refs.join(", ")}`, behavesAs: handlingOf(family.refs) }] : [];
-  });
+  }) : [];
   return [...virtual, ...familyRows, ...concrete.filter((row) => visible(row.model))];
 }
 function safeExpand(name, models) {
@@ -65978,9 +65978,6 @@ function safeExpand(name, models) {
     return models.virtual?.[name]?.members ?? [];
   }
 }
-function modelPickerSettings(provider, catalogue = []) {
-  return modelPickerSettingsFromRows(providerModelRows(provider, catalogue), true);
-}
 function modelPickerSettingsFromRows(options, replaceBuiltInOptions) {
   return options.length === 0 ? void 0 : JSON.stringify({ modelPicker: { options, replaceBuiltInOptions } });
 }
@@ -66452,11 +66449,18 @@ function decideLaunch(params, readOnly) {
     notes.push(`${loginlessProvider.identity} has no stored login, so Remote Control is off; provider ${loginlessProvider.provider} runs without it`);
   }
   const flags = loginlessProvider === void 0 ? requestedFlags : { ...requestedFlags, remoteControl: false };
-  const catalogue = selectedProvider === void 0 ? void 0 : parseCatalogueCache(params.fs.readFileUtf8(catalogueCachePath(paths, selectedProvider.name)));
   const routesByName = flags.routeByName || selectedProvider !== void 0 && isRouterProvider(selectedProvider.definition);
   const globalModels = loadConfigFile(paths.globalConfigFile, GlobalConfigSchema, params.fs.readConfigFile)?.config.models;
   const models = launchCascade !== void 0 && params.farm !== void 0 ? cascadeModels : globalModels;
-  const pickerSettings = routesByName ? modelPickerSettingsFromRows(routedModelRows(models ?? {}, listProviders(paths).map((entry) => [entry.name, entry.provider])), selectedProvider !== void 0) : selectedProvider === void 0 ? void 0 : modelPickerSettings(selectedProvider.definition, catalogue?.models);
+  const listedProviders = listProviderNames(fs26.readdir, paths.providersDir).flatMap((name) => {
+    try {
+      const definition = loadProvider(paths.providersDir, name, fs26);
+      return definition === void 0 ? [] : [[name, definition, parseCatalogueCache(params.fs.readFileUtf8(catalogueCachePath(paths, name)))?.models ?? []]];
+    } catch {
+      return [];
+    }
+  });
+  const pickerSettings = modelPickerSettingsFromRows(routedModelRows(models ?? {}, listedProviders, routesByName), selectedProvider !== void 0);
   const callerSettings = hasSettingsArgument(parsedArgv.rest);
   if (pickerSettings !== void 0 && callerSettings) {
     notes.push("--settings was passed, so /model keeps Claude Code's own model names");
@@ -131990,17 +131994,17 @@ var CHARS_PER_TOKEN2 = 4;
 function needsOf(scan) {
   return { hasImage: scan.hasImage === true, hasTools: scan.toolsPresent === true, thinking: scan.thinking === true, contextTokens: Math.ceil((scan.text?.length ?? 0) / CHARS_PER_TOKEN2) };
 }
-function resolveRoutedModel(model, providerName, session, deps, memory, rotations, needs) {
+function resolveRoutedModel(model, providerName, session, deps, byName, memory, rotations, needs) {
   const models = deps.models?.(session);
   const qualified = model.includes("/") && !model.startsWith("acct:") ? model : void 0;
   if (qualified !== void 0) {
     const [provider2, ...rest2] = qualified.split("/");
     const named = rest2.join("/");
-    return provider2 === void 0 || named === "" ? void 0 : { provider: provider2, model: withoutContextMarker(named), ref: qualified };
+    return provider2 === void 0 || named === "" || deps.definesProvider !== void 0 && !deps.definesProvider(provider2) ? void 0 : { provider: provider2, model: withoutContextMarker(named), ref: qualified };
   }
   const isFamily = model.startsWith(FAMILY_PREFIX);
   const virtual = isFamily ? void 0 : models?.virtual?.[model];
-  if (virtual === void 0 && !isFamily) {
+  if (!byName || virtual === void 0 && !isFamily) {
     return void 0;
   }
   const declared = isFamily ? [model] : expandMembers(model, models);
@@ -132048,6 +132052,13 @@ function createProviderRouteResolver(deps) {
   const oauthRoute = createPassthroughRoute("anthropic", { baseUrl: `https://${CONNECT_INTERCEPT_HOST}:${String(HTTPS_PORT)}`, stripPrefix: void 0, headroomUpstream: void 0 });
   const antigravityQuotaSources = /* @__PURE__ */ new Map();
   const antigravityRoutingMemory = /* @__PURE__ */ new Map();
+  const definesProvider = (name) => {
+    try {
+      return loadProvider(deps.providersDir, name, deps.fs) !== void 0;
+    } catch {
+      return false;
+    }
+  };
   const routingMemory = /* @__PURE__ */ new Map();
   const rotations = /* @__PURE__ */ new Map();
   const memoryFor = (provider) => {
@@ -132211,8 +132222,8 @@ function createProviderRouteResolver(deps) {
         routes = void 0;
         isRouter = false;
       }
-      const routesByName = !nameResolved && (isRouter || current.session.routeByName) && !isRcSelfHostPath(path65);
-      if (routesByName) {
+      const resolvesNames = !nameResolved && !isRcSelfHostPath(path65);
+      if (resolvesNames) {
         const scan2 = await scanRequestHead(current, true);
         if (scan2.replayed === void 0) {
           const resolution = resolve2(current);
@@ -132229,8 +132240,11 @@ function createProviderRouteResolver(deps) {
             message: moved ? `model "${account.model}" runs under identity "${account.identity}"; this session is being moved there and will resume with it` : `model "${account.model}" runs under identity "${account.identity}", which needs a relaunch this session cannot make; start it there with: claude @${account.identity} --resume`
           };
         }
-        const routed = scan2.model === void 0 ? void 0 : resolveRoutedModel(scan2.model, providerName, current.session, deps, routingMemory, rotations, needsOf(scan2));
+        const routed = scan2.model === void 0 ? void 0 : resolveRoutedModel(scan2.model, providerName, current.session, { ...deps, definesProvider }, isRouter || current.session.routeByName, routingMemory, rotations, needsOf(scan2));
         const requested = scan2.model;
+        if (routed === void 0) {
+          current = scan2.replayed;
+        }
         if (routed !== void 0) {
           routingMemory.set(current.session.sessionId ?? "", routed.ref);
           if (routed.requested !== void 0) {
@@ -135075,7 +135089,7 @@ const { workerData, parentPort } = require("node:worker_threads");
 const fs = require("node:fs");
 const os = require("node:os");
 const inspector = require("node:inspector");
-const { shared, boundMs, checkEveryMs, pauseWaitMs, stateFile, ownPid, action, logFile, respawn, respawnGeneration, respawnMaxGeneration, awaitPidEnv, respawnGenerationEnv } = workerData;
+const { shared, boundMs, checkEveryMs, pauseWaitMs, stateFile, ownPid, action, logFile, respawn, respawnGeneration, respawnMaxGeneration, startLockFile, awaitPidEnv, respawnGenerationEnv } = workerData;
 const counter = new Int32Array(shared);
 let lastValue = Atomics.load(counter, 0);
 let lastChangeAt = Date.now();
@@ -135139,17 +135153,59 @@ const describeMainThread = (waitMs, resume) => new Promise((resolve) => {
     finish("the main thread could not be inspected: " + (error instanceof Error ? error.message : String(error)));
   }
 });
+// Whether a process is alive: signal 0 only tests, and EPERM means it exists under another user.
+const isRunning = (pid) => {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === "EPERM";
+  }
+};
+// The pid holding the start lock when that holder is alive, which means a door is already being started and another must not be: the launcher's ensure and this respawn are the two things that start a door, and the lock is the one protocol that keeps them from starting two. A dead holder's lock is litter and is cleared, exactly as the launcher's ensure clears it.
+const liveLockHolder = () => {
+  let holder;
+  try {
+    holder = JSON.parse(fs.readFileSync(startLockFile, "utf8")).pid;
+  } catch (error) {
+    return undefined;
+  }
+  if (typeof holder === "number" && isRunning(holder)) return holder;
+  fs.rmSync(startLockFile, { force: true });
+  return undefined;
+};
+// Creates the lock naming the replacement as its holder, atomically (the wx flag), so the launcher's ensure sees a live holder while the replacement boots and waits for it instead of starting a door of its own; the replacement removes the lock once it is serving, as every door does.
+const claimStartLock = (holder) => {
+  try {
+    fs.writeFileSync(startLockFile, JSON.stringify({ pid: holder, at: Date.now() }) + "\\n", { flag: "wx" });
+    return true;
+  } catch (error) {
+    if (error.code === "EEXIST") return false;
+    throw error;
+  }
+};
 const spawnReplacement = () => {
   if (respawn === undefined || logFile === undefined) return;
   if (respawnGeneration >= respawnMaxGeneration) {
     log("not starting another replacement: this door was replacement generation " + String(respawnGeneration) + " of " + String(respawnMaxGeneration) + ", so the stall has recurred through consecutive doors and the machine, not the door, is the one refusing to serve; leaving the next launch's ensure to start one");
     return;
   }
+  const startingBy = liveLockHolder();
+  if (startingBy !== undefined) {
+    log("not starting a replacement: process " + String(startingBy) + " holds the start lock, so a door is already being started and a second one would race it for the sticky ports");
+    return;
+  }
   try {
     const out = fs.openSync(logFile, "a");
     const child = require("node:child_process").spawn(respawn.command, respawn.args, { detached: true, stdio: ["ignore", out, out], env: Object.assign({}, respawn.env, { [awaitPidEnv]: String(ownPid), [respawnGenerationEnv]: String(respawnGeneration + 1) }) });
     child.unref();
     fs.closeSync(out);
+    if (!claimStartLock(child.pid)) {
+      // A launcher took the lock between the check and the spawn, so its door is the one that is starting: this one must not also bind.
+      process.kill(child.pid, "SIGKILL");
+      log("withdrew replacement door " + String(child.pid) + ": a launcher took the start lock first and its door is the one starting");
+      return;
+    }
     log("started replacement door " + String(child.pid) + " of generation " + String(respawnGeneration + 1) + ", which binds once this process is gone");
   } catch (error) {
     log("could not start a replacement door: " + (error instanceof Error ? error.message : String(error)));
@@ -135198,7 +135254,7 @@ function startThreadWatchdog(params) {
   const counter = new Int32Array(shared);
   const worker = new import_node_worker_threads2.Worker(WATCHDOG_SOURCE, {
     eval: true,
-    workerData: { shared, boundMs: params.boundMs, checkEveryMs: params.checkEveryMs, pauseWaitMs: params.pauseWaitMs, stateFile: params.stateFile, ownPid: params.ownPid, action: params.action, logFile: params.logFile, respawn: params.respawn, respawnGeneration: params.respawnGeneration, respawnMaxGeneration: params.respawnMaxGeneration, awaitPidEnv: DOOR_AWAIT_PID_ENV, respawnGenerationEnv: DOOR_RESPAWN_GENERATION_ENV }
+    workerData: { shared, boundMs: params.boundMs, checkEveryMs: params.checkEveryMs, pauseWaitMs: params.pauseWaitMs, stateFile: params.stateFile, ownPid: params.ownPid, action: params.action, logFile: params.logFile, respawn: params.respawn, respawnGeneration: params.respawnGeneration, respawnMaxGeneration: params.respawnMaxGeneration, startLockFile: params.startLockFile, awaitPidEnv: DOOR_AWAIT_PID_ENV, respawnGenerationEnv: DOOR_RESPAWN_GENERATION_ENV }
   });
   worker.unref();
   worker.on("message", (message) => {
@@ -135774,7 +135830,8 @@ function realFrontDoorSupervisorPorts(paths, respawnGeneration) {
       logFile: paths.frontdoorLogPath,
       respawn: respawnInvocation(paths),
       respawnGeneration,
-      respawnMaxGeneration: DOOR_RESPAWN_MAX_GENERATIONS
+      respawnMaxGeneration: DOOR_RESPAWN_MAX_GENERATIONS,
+      startLockFile: paths.frontdoorLockFile
     }),
     // The launch lifecycle publisher over the same backbone the typed API serves: the tick's registry facts go in here, and the door's own register, prune and end moments come out as source-tagged events.
     observeLaunchRegistry: createLaunchEventPublisher(doorEvents, () => Date.now()).observe,

package/dist/index.cjs

@@ -3151,7 +3151,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.44.4",
+      version: "11.45.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>",
@@ -8162,25 +8162,25 @@ function providerModelRows(provider, catalogue = []) {
   const taken = new Set(named.map((row) => labelOf(row.model)));
   return [...named, ...catalogueRows(provider, catalogue).filter((row) => !taken.has(labelOf(row.model)))];
 }
-function routedModelRows(models, providers) {
+function routedModelRows(models, providers, bare = true) {
   const hidden = new Set(models.hide ?? []);
   const shown = models.show === void 0 ? void 0 : new Set(models.show);
   const visible = (model) => shown === void 0 ? !hidden.has(model) : shown.has(model);
-  const concrete = providers.flatMap(([name, provider]) => providerModelRows(provider).map((row) => ({ ...row, model: `${name}/${row.model}`, label: `${name} / ${row.label}`, description: `${name}: ${row.description}` })));
+  const concrete = providers.flatMap(([name, provider, catalogue]) => providerModelRows(provider, catalogue).map((row) => ({ ...row, model: `${name}/${row.model}`, label: `${name} / ${row.label}`, description: `${name}: ${row.description}` })));
   const concreteByRef = new Map(concrete.map((row) => [row.model, row]));
   const families = buildFamilies([...concrete.map((row) => row.model), ...accountRefsOf(models)], models);
   const handlingOf = (refs) => refs.map((ref) => concreteByRef.get(ref)?.behavesAs).find((behavesAs) => behavesAs !== void 0) ?? TIER_BEHAVES_AS.sonnet;
-  const virtual = Object.entries(models.virtual ?? {}).flatMap(([name, definition]) => {
+  const virtual = bare ? Object.entries(models.virtual ?? {}).flatMap(([name, definition]) => {
     if (!visible(name)) {
       return [];
     }
     const targets = expandFamilyMembers(safeExpand(name, models), families);
     return [{ model: name, label: name, description: `Virtual (${definition.mode})`, behavesAs: handlingOf(targets) }];
-  });
-  const familyRows = sharedFamilies(families).flatMap((family) => {
+  }) : [];
+  const familyRows = bare ? sharedFamilies(families).flatMap((family) => {
     const member = `${FAMILY_PREFIX}${family.key}`;
     return visible(member) ? [{ model: member, label: family.key, description: `Family (${familyMode(family.settings)}): ${family.refs.join(", ")}`, behavesAs: handlingOf(family.refs) }] : [];
-  });
+  }) : [];
   return [...virtual, ...familyRows, ...concrete.filter((row) => visible(row.model))];
 }
 function safeExpand(name, models) {
@@ -8190,9 +8190,6 @@ function safeExpand(name, models) {
     return models.virtual?.[name]?.members ?? [];
   }
 }
-function modelPickerSettings(provider, catalogue = []) {
-  return modelPickerSettingsFromRows(providerModelRows(provider, catalogue), true);
-}
 function modelPickerSettingsFromRows(options, replaceBuiltInOptions) {
   return options.length === 0 ? void 0 : JSON.stringify({ modelPicker: { options, replaceBuiltInOptions } });
 }
@@ -9720,11 +9717,18 @@ function decideLaunch(params, readOnly) {
     notes.push(`${loginlessProvider.identity} has no stored login, so Remote Control is off; provider ${loginlessProvider.provider} runs without it`);
   }
   const flags = loginlessProvider === void 0 ? requestedFlags : { ...requestedFlags, remoteControl: false };
-  const catalogue = selectedProvider === void 0 ? void 0 : parseCatalogueCache(params.fs.readFileUtf8(catalogueCachePath(paths, selectedProvider.name)));
   const routesByName = flags.routeByName || selectedProvider !== void 0 && isRouterProvider(selectedProvider.definition);
   const globalModels = loadConfigFile(paths.globalConfigFile, GlobalConfigSchema, params.fs.readConfigFile)?.config.models;
   const models = launchCascade !== void 0 && params.farm !== void 0 ? cascadeModels : globalModels;
-  const pickerSettings = routesByName ? modelPickerSettingsFromRows(routedModelRows(models ?? {}, listProviders(paths).map((entry) => [entry.name, entry.provider])), selectedProvider !== void 0) : selectedProvider === void 0 ? void 0 : modelPickerSettings(selectedProvider.definition, catalogue?.models);
+  const listedProviders = listProviderNames(fs13.readdir, paths.providersDir).flatMap((name) => {
+    try {
+      const definition = loadProvider(paths.providersDir, name, fs13);
+      return definition === void 0 ? [] : [[name, definition, parseCatalogueCache(params.fs.readFileUtf8(catalogueCachePath(paths, name)))?.models ?? []]];
+    } catch {
+      return [];
+    }
+  });
+  const pickerSettings = modelPickerSettingsFromRows(routedModelRows(models ?? {}, listedProviders, routesByName), selectedProvider !== void 0);
   const callerSettings = hasSettingsArgument(parsedArgv.rest);
   if (pickerSettings !== void 0 && callerSettings) {
     notes.push("--settings was passed, so /model keeps Claude Code's own model names");

package/dist/index.mjs

@@ -3127,7 +3127,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.44.4",
+      version: "11.45.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>",
@@ -8135,25 +8135,25 @@ function providerModelRows(provider, catalogue = []) {
   const taken = new Set(named.map((row) => labelOf(row.model)));
   return [...named, ...catalogueRows(provider, catalogue).filter((row) => !taken.has(labelOf(row.model)))];
 }
-function routedModelRows(models, providers) {
+function routedModelRows(models, providers, bare = true) {
   const hidden = new Set(models.hide ?? []);
   const shown = models.show === void 0 ? void 0 : new Set(models.show);
   const visible = (model) => shown === void 0 ? !hidden.has(model) : shown.has(model);
-  const concrete = providers.flatMap(([name, provider]) => providerModelRows(provider).map((row) => ({ ...row, model: `${name}/${row.model}`, label: `${name} / ${row.label}`, description: `${name}: ${row.description}` })));
+  const concrete = providers.flatMap(([name, provider, catalogue]) => providerModelRows(provider, catalogue).map((row) => ({ ...row, model: `${name}/${row.model}`, label: `${name} / ${row.label}`, description: `${name}: ${row.description}` })));
   const concreteByRef = new Map(concrete.map((row) => [row.model, row]));
   const families = buildFamilies([...concrete.map((row) => row.model), ...accountRefsOf(models)], models);
   const handlingOf = (refs) => refs.map((ref) => concreteByRef.get(ref)?.behavesAs).find((behavesAs) => behavesAs !== void 0) ?? TIER_BEHAVES_AS.sonnet;
-  const virtual = Object.entries(models.virtual ?? {}).flatMap(([name, definition]) => {
+  const virtual = bare ? Object.entries(models.virtual ?? {}).flatMap(([name, definition]) => {
     if (!visible(name)) {
       return [];
     }
     const targets = expandFamilyMembers(safeExpand(name, models), families);
     return [{ model: name, label: name, description: `Virtual (${definition.mode})`, behavesAs: handlingOf(targets) }];
-  });
-  const familyRows = sharedFamilies(families).flatMap((family) => {
+  }) : [];
+  const familyRows = bare ? sharedFamilies(families).flatMap((family) => {
     const member = `${FAMILY_PREFIX}${family.key}`;
     return visible(member) ? [{ model: member, label: family.key, description: `Family (${familyMode(family.settings)}): ${family.refs.join(", ")}`, behavesAs: handlingOf(family.refs) }] : [];
-  });
+  }) : [];
   return [...virtual, ...familyRows, ...concrete.filter((row) => visible(row.model))];
 }
 function safeExpand(name, models) {
@@ -8163,9 +8163,6 @@ function safeExpand(name, models) {
     return models.virtual?.[name]?.members ?? [];
   }
 }
-function modelPickerSettings(provider, catalogue = []) {
-  return modelPickerSettingsFromRows(providerModelRows(provider, catalogue), true);
-}
 function modelPickerSettingsFromRows(options, replaceBuiltInOptions) {
   return options.length === 0 ? void 0 : JSON.stringify({ modelPicker: { options, replaceBuiltInOptions } });
 }
@@ -9695,11 +9692,18 @@ function decideLaunch(params, readOnly) {
     notes.push(`${loginlessProvider.identity} has no stored login, so Remote Control is off; provider ${loginlessProvider.provider} runs without it`);
   }
   const flags = loginlessProvider === void 0 ? requestedFlags : { ...requestedFlags, remoteControl: false };
-  const catalogue = selectedProvider === void 0 ? void 0 : parseCatalogueCache(params.fs.readFileUtf8(catalogueCachePath(paths, selectedProvider.name)));
   const routesByName = flags.routeByName || selectedProvider !== void 0 && isRouterProvider(selectedProvider.definition);
   const globalModels = loadConfigFile(paths.globalConfigFile, GlobalConfigSchema, params.fs.readConfigFile)?.config.models;
   const models = launchCascade !== void 0 && params.farm !== void 0 ? cascadeModels : globalModels;
-  const pickerSettings = routesByName ? modelPickerSettingsFromRows(routedModelRows(models ?? {}, listProviders(paths).map((entry) => [entry.name, entry.provider])), selectedProvider !== void 0) : selectedProvider === void 0 ? void 0 : modelPickerSettings(selectedProvider.definition, catalogue?.models);
+  const listedProviders = listProviderNames(fs13.readdir, paths.providersDir).flatMap((name) => {
+    try {
+      const definition = loadProvider(paths.providersDir, name, fs13);
+      return definition === void 0 ? [] : [[name, definition, parseCatalogueCache(params.fs.readFileUtf8(catalogueCachePath(paths, name)))?.models ?? []]];
+    } catch {
+      return [];
+    }
+  });
+  const pickerSettings = modelPickerSettingsFromRows(routedModelRows(models ?? {}, listedProviders, routesByName), selectedProvider !== void 0);
   const callerSettings = hasSettingsArgument(parsedArgv.rest);
   if (pickerSettings !== void 0 && callerSettings) {
     notes.push("--settings was passed, so /model keeps Claude Code's own model names");