claude-use 11.36.0 → 11.38.0

package/dist/cli.cjs

@@ -34635,7 +34635,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.36.0",
+      version: "11.38.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>",
@@ -36496,6 +36496,58 @@ function resolveProvider(params) {
   }
   return { ok: true, provider: { name, definition, credential: resolution.credential }, warnings: resolution.credential.warnings };
 }
+function resolveRoutedProviderCredentials(params) {
+  const { models } = params;
+  if (models === void 0) {
+    return { ok: true, checked: [] };
+  }
+  const virtualNames = new Set(Object.keys(models.virtual ?? {}));
+  const providerNames = /* @__PURE__ */ new Set();
+  const collect = (ref) => {
+    if (ref.startsWith("acct:") || ref.startsWith("family:") || virtualNames.has(ref)) {
+      return;
+    }
+    const [provider] = ref.split("/", 1);
+    if (provider !== void 0 && provider !== "") {
+      providerNames.add(provider);
+    }
+  };
+  for (const model of Object.values(models.virtual ?? {})) {
+    for (const member of model.members) {
+      collect(member);
+    }
+  }
+  for (const ref of Object.values(models.tiers ?? {})) {
+    collect(ref);
+  }
+  if (providerNames.size === 0) {
+    return { ok: true, checked: [] };
+  }
+  if (params.credentials === void 0) {
+    return { ok: false, status: 1, message: `agent-shim: the models block routes to providers ${[...providerNames].sort().join(", ")}, which need their credentials resolved, but this launcher has no credential port wired` };
+  }
+  const failures = [];
+  let credentialFailure = false;
+  for (const name of [...providerNames].sort()) {
+    const definition = loadProvider(params.paths.providersDir, name, params.port);
+    if (definition === void 0) {
+      failures.push(`no provider named "${name}"`);
+      continue;
+    }
+    if (isRouterProvider(definition)) {
+      continue;
+    }
+    const resolution = resolveCredential({ credential: definition.credential, env: params.env, port: params.credentials, subject: `provider ${name}` });
+    if (!resolution.ok) {
+      failures.push(resolution.message.replace(/^agent-shim: /, ""));
+      credentialFailure = true;
+    }
+  }
+  if (failures.length > 0) {
+    return { ok: false, status: credentialFailure ? CREDENTIAL_UNAVAILABLE_EXIT : 1, message: `agent-shim: this launch routes model names through the models block, but: ${failures.join("; ")}` };
+  }
+  return { ok: true, checked: [...providerNames].sort() };
+}
 var import_node_fs10, import_node_path29, ProviderNotFoundError, ProviderAlreadyExistsError, InvalidProviderNameError, PROVIDER_NAME_RE, LEGACY_PROVIDER_FIELDS, LEGACY_ENV_CREDENTIAL_KEYS, LEGACY_LITERAL_PLACEHOLDER, LegacyProviderFileError, ProviderKindMismatchError;
 var init_providersStore = __esm({
   "src/providersStore.ts"() {
@@ -65437,10 +65489,10 @@ function routedModelRows(models, providers) {
   return [...virtual, ...concrete.filter((row) => visible(row.model))];
 }
 function modelPickerSettings(provider, catalogue = []) {
-  return modelPickerSettingsFromRows(providerModelRows(provider, catalogue));
+  return modelPickerSettingsFromRows(providerModelRows(provider, catalogue), true);
 }
-function modelPickerSettingsFromRows(options) {
-  return options.length === 0 ? void 0 : JSON.stringify({ modelPicker: { options, replaceBuiltInOptions: true } });
+function modelPickerSettingsFromRows(options, replaceBuiltInOptions) {
+  return options.length === 0 ? void 0 : JSON.stringify({ modelPicker: { options, replaceBuiltInOptions } });
 }
 var CONTEXT_MARKER_1M2, TIER_BEHAVES_AS, TIER_ENV_VARIABLES;
 var init_modelPicker = __esm({
@@ -65996,7 +66048,7 @@ function decideLaunch(params, readOnly) {
   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 pickerSettings = routesByName ? modelPickerSettingsFromRows(routedModelRows(readModels(paths) ?? {}, listProviders(paths).map((entry) => [entry.name, entry.provider]))) : selectedProvider === void 0 ? void 0 : modelPickerSettings(selectedProvider.definition, catalogue?.models);
+  const pickerSettings = routesByName ? modelPickerSettingsFromRows(routedModelRows(readModels(paths) ?? {}, listProviders(paths).map((entry) => [entry.name, entry.provider])), selectedProvider !== void 0) : selectedProvider === void 0 ? void 0 : modelPickerSettings(selectedProvider.definition, catalogue?.models);
   const callerSettings = hasSettingsArgument(parsedArgv.rest);
   if (pickerSettings !== void 0 && callerSettings) {
     notes.push("--settings was passed, so /model keeps Claude Code's own model names");
@@ -66098,6 +66150,14 @@ function prepareLaunch(params) {
   if (decided.pinnedVersion !== void 0) {
     rows.push(pinnedVersionRow(decided.pinnedVersion.version, decided.pinnedVersion.source));
   }
+  const routesByName = resolvedFlags.routeByName || resolvedProvider !== void 0 && isRouterProvider(resolvedProvider.definition);
+  if (routesByName) {
+    const check2 = resolveRoutedProviderCredentials({ paths, port: params.fs, env, ...params.credentials === void 0 ? {} : { credentials: params.credentials }, models: loadConfigFile(paths.globalConfigFile, GlobalConfigSchema, params.fs.readConfigFile)?.config.models });
+    if (!check2.ok) {
+      log.error(check2.message);
+      proc.exit(check2.status);
+    }
+  }
   const frontDoorPort = params.frontdoor;
   const frontDoorEngaged = resolvedProvider !== void 0 || resolvedFlags.headroom || resolvedFlags.trackUsage;
   if (frontDoorEngaged && frontDoorPort === void 0) {
@@ -66130,7 +66190,7 @@ function prepareLaunch(params) {
     ...headroom === void 0 ? {} : { headroom },
     sessionId,
     remoteControl: resolvedFlags.remoteControl,
-    routeByName: resolvedFlags.routeByName || resolvedProvider !== void 0 && isRouterProvider(resolvedProvider.definition)
+    routeByName: routesByName
   });
   const releases = [...headroom === void 0 || headroomPort === void 0 ? [] : [headroomPort.release], ...frontDoorRelease === void 0 ? [] : [frontDoorRelease]];
   const release = () => {
@@ -66220,9 +66280,11 @@ var init_launcher = __esm({
     init_lock();
     init_spawn();
     init_providersStore();
+    init_load();
     init_flatten();
     init_walk();
     init_schema();
+    init_schema();
     init_credential();
     init_middleware();
     init_preflight();
@@ -131365,19 +131427,20 @@ function createProviderRouteResolver(deps) {
         routes = void 0;
         isRouter = false;
       }
-      const routesByName = isRouter || current.session.routeByName && providerName !== void 0;
+      const routesByName = (isRouter || current.session.routeByName) && !isRcSelfHostPath(path65);
       if (routesByName) {
         const scan2 = await scanRequestHead(current, false);
         if (scan2.replayed !== void 0) {
           replay = scan2.replayed;
         }
-        const target = scan2.model === void 0 || providerName === void 0 ? void 0 : resolveModelTarget(scan2.model, deps.models?.(), isRouter || current.session.routeByName);
+        const target = scan2.model === void 0 ? void 0 : resolveModelTarget(scan2.model, deps.models?.(), isRouter || current.session.routeByName && providerName !== void 0);
         if (target === providerName) {
           const resolution = resolve2(current);
           return resolution.ok && replay !== void 0 ? { ok: true, route: servingRewritten(resolution.route, { ...replay, url: current.url }), request: { ...replay, url: current.url } } : resolution.ok ? serveScoped(resolution) : resolution;
         }
         if (target !== void 0) {
-          const rest2 = path65.slice(`${PROVIDER_PATH_PREFIX}${encodeURIComponent(providerName ?? "")}`.length);
+          const scopedPrefix = providerName === void 0 ? void 0 : `${PROVIDER_PATH_PREFIX}${encodeURIComponent(providerName)}`;
+          const rest2 = scopedPrefix !== void 0 && path65.startsWith(scopedPrefix) ? path65.slice(scopedPrefix.length) : path65;
           const query2 = current.url.includes("?") ? current.url.slice(current.url.indexOf("?")) : "";
           const carried = scan2.replayed ?? current;
           current = { ...current, url: `${PROVIDER_PATH_PREFIX}${encodeURIComponent(target)}${rest2}${query2}`, body: carried.body, headers: carried.headers };

package/dist/index.cjs

@@ -3106,7 +3106,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.36.0",
+      version: "11.38.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>",
@@ -7175,6 +7175,58 @@ function resolveProvider(params) {
   }
   return { ok: true, provider: { name, definition, credential: resolution.credential }, warnings: resolution.credential.warnings };
 }
+function resolveRoutedProviderCredentials(params) {
+  const { models } = params;
+  if (models === void 0) {
+    return { ok: true, checked: [] };
+  }
+  const virtualNames = new Set(Object.keys(models.virtual ?? {}));
+  const providerNames = /* @__PURE__ */ new Set();
+  const collect = (ref) => {
+    if (ref.startsWith("acct:") || ref.startsWith("family:") || virtualNames.has(ref)) {
+      return;
+    }
+    const [provider] = ref.split("/", 1);
+    if (provider !== void 0 && provider !== "") {
+      providerNames.add(provider);
+    }
+  };
+  for (const model of Object.values(models.virtual ?? {})) {
+    for (const member of model.members) {
+      collect(member);
+    }
+  }
+  for (const ref of Object.values(models.tiers ?? {})) {
+    collect(ref);
+  }
+  if (providerNames.size === 0) {
+    return { ok: true, checked: [] };
+  }
+  if (params.credentials === void 0) {
+    return { ok: false, status: 1, message: `agent-shim: the models block routes to providers ${[...providerNames].sort().join(", ")}, which need their credentials resolved, but this launcher has no credential port wired` };
+  }
+  const failures = [];
+  let credentialFailure = false;
+  for (const name of [...providerNames].sort()) {
+    const definition = loadProvider(params.paths.providersDir, name, params.port);
+    if (definition === void 0) {
+      failures.push(`no provider named "${name}"`);
+      continue;
+    }
+    if (isRouterProvider(definition)) {
+      continue;
+    }
+    const resolution = resolveCredential({ credential: definition.credential, env: params.env, port: params.credentials, subject: `provider ${name}` });
+    if (!resolution.ok) {
+      failures.push(resolution.message.replace(/^agent-shim: /, ""));
+      credentialFailure = true;
+    }
+  }
+  if (failures.length > 0) {
+    return { ok: false, status: credentialFailure ? CREDENTIAL_UNAVAILABLE_EXIT : 1, message: `agent-shim: this launch routes model names through the models block, but: ${failures.join("; ")}` };
+  }
+  return { ok: true, checked: [...providerNames].sort() };
+}
 var import_node_fs6, import_node_path25, ProviderNotFoundError, ProviderAlreadyExistsError, InvalidProviderNameError, PROVIDER_NAME_RE, LEGACY_PROVIDER_FIELDS, LEGACY_ENV_CREDENTIAL_KEYS, LEGACY_LITERAL_PLACEHOLDER, LegacyProviderFileError, ProviderKindMismatchError;
 var init_providersStore = __esm({
   "src/providersStore.ts"() {
@@ -8903,10 +8955,10 @@ function routedModelRows(models, providers) {
   return [...virtual, ...concrete.filter((row) => visible(row.model))];
 }
 function modelPickerSettings(provider, catalogue = []) {
-  return modelPickerSettingsFromRows(providerModelRows(provider, catalogue));
+  return modelPickerSettingsFromRows(providerModelRows(provider, catalogue), true);
 }
-function modelPickerSettingsFromRows(options) {
-  return options.length === 0 ? void 0 : JSON.stringify({ modelPicker: { options, replaceBuiltInOptions: true } });
+function modelPickerSettingsFromRows(options, replaceBuiltInOptions) {
+  return options.length === 0 ? void 0 : JSON.stringify({ modelPicker: { options, replaceBuiltInOptions } });
 }
 var CONTEXT_MARKER_1M, TIER_BEHAVES_AS, TIER_ENV_VARIABLES;
 var init_modelPicker = __esm({
@@ -9354,7 +9406,7 @@ function decideLaunch(params, readOnly) {
   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 pickerSettings = routesByName ? modelPickerSettingsFromRows(routedModelRows(readModels(paths) ?? {}, listProviders(paths).map((entry) => [entry.name, entry.provider]))) : selectedProvider === void 0 ? void 0 : modelPickerSettings(selectedProvider.definition, catalogue?.models);
+  const pickerSettings = routesByName ? modelPickerSettingsFromRows(routedModelRows(readModels(paths) ?? {}, listProviders(paths).map((entry) => [entry.name, entry.provider])), selectedProvider !== void 0) : selectedProvider === void 0 ? void 0 : modelPickerSettings(selectedProvider.definition, catalogue?.models);
   const callerSettings = hasSettingsArgument(parsedArgv.rest);
   if (pickerSettings !== void 0 && callerSettings) {
     notes.push("--settings was passed, so /model keeps Claude Code's own model names");
@@ -9456,6 +9508,14 @@ function prepareLaunch(params) {
   if (decided.pinnedVersion !== void 0) {
     rows.push(pinnedVersionRow(decided.pinnedVersion.version, decided.pinnedVersion.source));
   }
+  const routesByName = resolvedFlags.routeByName || resolvedProvider !== void 0 && isRouterProvider(resolvedProvider.definition);
+  if (routesByName) {
+    const check = resolveRoutedProviderCredentials({ paths, port: params.fs, env, ...params.credentials === void 0 ? {} : { credentials: params.credentials }, models: loadConfigFile(paths.globalConfigFile, GlobalConfigSchema, params.fs.readConfigFile)?.config.models });
+    if (!check.ok) {
+      log.error(check.message);
+      proc.exit(check.status);
+    }
+  }
   const frontDoorPort = params.frontdoor;
   const frontDoorEngaged = resolvedProvider !== void 0 || resolvedFlags.headroom || resolvedFlags.trackUsage;
   if (frontDoorEngaged && frontDoorPort === void 0) {
@@ -9488,7 +9548,7 @@ function prepareLaunch(params) {
     ...headroom === void 0 ? {} : { headroom },
     sessionId,
     remoteControl: resolvedFlags.remoteControl,
-    routeByName: resolvedFlags.routeByName || resolvedProvider !== void 0 && isRouterProvider(resolvedProvider.definition)
+    routeByName: routesByName
   });
   const releases = [...headroom === void 0 || headroomPort === void 0 ? [] : [headroomPort.release], ...frontDoorRelease === void 0 ? [] : [frontDoorRelease]];
   const release = () => {
@@ -9578,9 +9638,11 @@ var init_launcher = __esm({
     init_lock();
     init_spawn();
     init_providersStore();
+    init_load();
     init_flatten();
     init_walk();
     init_schema();
+    init_schema();
     init_credential();
     init_middleware();
     init_preflight();

package/dist/index.mjs

@@ -3082,7 +3082,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.36.0",
+      version: "11.38.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>",
@@ -7150,6 +7150,58 @@ function resolveProvider(params) {
   }
   return { ok: true, provider: { name, definition, credential: resolution.credential }, warnings: resolution.credential.warnings };
 }
+function resolveRoutedProviderCredentials(params) {
+  const { models } = params;
+  if (models === void 0) {
+    return { ok: true, checked: [] };
+  }
+  const virtualNames = new Set(Object.keys(models.virtual ?? {}));
+  const providerNames = /* @__PURE__ */ new Set();
+  const collect = (ref) => {
+    if (ref.startsWith("acct:") || ref.startsWith("family:") || virtualNames.has(ref)) {
+      return;
+    }
+    const [provider] = ref.split("/", 1);
+    if (provider !== void 0 && provider !== "") {
+      providerNames.add(provider);
+    }
+  };
+  for (const model of Object.values(models.virtual ?? {})) {
+    for (const member of model.members) {
+      collect(member);
+    }
+  }
+  for (const ref of Object.values(models.tiers ?? {})) {
+    collect(ref);
+  }
+  if (providerNames.size === 0) {
+    return { ok: true, checked: [] };
+  }
+  if (params.credentials === void 0) {
+    return { ok: false, status: 1, message: `agent-shim: the models block routes to providers ${[...providerNames].sort().join(", ")}, which need their credentials resolved, but this launcher has no credential port wired` };
+  }
+  const failures = [];
+  let credentialFailure = false;
+  for (const name of [...providerNames].sort()) {
+    const definition = loadProvider(params.paths.providersDir, name, params.port);
+    if (definition === void 0) {
+      failures.push(`no provider named "${name}"`);
+      continue;
+    }
+    if (isRouterProvider(definition)) {
+      continue;
+    }
+    const resolution = resolveCredential({ credential: definition.credential, env: params.env, port: params.credentials, subject: `provider ${name}` });
+    if (!resolution.ok) {
+      failures.push(resolution.message.replace(/^agent-shim: /, ""));
+      credentialFailure = true;
+    }
+  }
+  if (failures.length > 0) {
+    return { ok: false, status: credentialFailure ? CREDENTIAL_UNAVAILABLE_EXIT : 1, message: `agent-shim: this launch routes model names through the models block, but: ${failures.join("; ")}` };
+  }
+  return { ok: true, checked: [...providerNames].sort() };
+}
 var ProviderNotFoundError, ProviderAlreadyExistsError, InvalidProviderNameError, PROVIDER_NAME_RE, LEGACY_PROVIDER_FIELDS, LEGACY_ENV_CREDENTIAL_KEYS, LEGACY_LITERAL_PLACEHOLDER, LegacyProviderFileError, ProviderKindMismatchError;
 var init_providersStore = __esm({
   "src/providersStore.ts"() {
@@ -8875,10 +8927,10 @@ function routedModelRows(models, providers) {
   return [...virtual, ...concrete.filter((row) => visible(row.model))];
 }
 function modelPickerSettings(provider, catalogue = []) {
-  return modelPickerSettingsFromRows(providerModelRows(provider, catalogue));
+  return modelPickerSettingsFromRows(providerModelRows(provider, catalogue), true);
 }
-function modelPickerSettingsFromRows(options) {
-  return options.length === 0 ? void 0 : JSON.stringify({ modelPicker: { options, replaceBuiltInOptions: true } });
+function modelPickerSettingsFromRows(options, replaceBuiltInOptions) {
+  return options.length === 0 ? void 0 : JSON.stringify({ modelPicker: { options, replaceBuiltInOptions } });
 }
 var CONTEXT_MARKER_1M, TIER_BEHAVES_AS, TIER_ENV_VARIABLES;
 var init_modelPicker = __esm({
@@ -9328,7 +9380,7 @@ function decideLaunch(params, readOnly) {
   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 pickerSettings = routesByName ? modelPickerSettingsFromRows(routedModelRows(readModels(paths) ?? {}, listProviders(paths).map((entry) => [entry.name, entry.provider]))) : selectedProvider === void 0 ? void 0 : modelPickerSettings(selectedProvider.definition, catalogue?.models);
+  const pickerSettings = routesByName ? modelPickerSettingsFromRows(routedModelRows(readModels(paths) ?? {}, listProviders(paths).map((entry) => [entry.name, entry.provider])), selectedProvider !== void 0) : selectedProvider === void 0 ? void 0 : modelPickerSettings(selectedProvider.definition, catalogue?.models);
   const callerSettings = hasSettingsArgument(parsedArgv.rest);
   if (pickerSettings !== void 0 && callerSettings) {
     notes.push("--settings was passed, so /model keeps Claude Code's own model names");
@@ -9430,6 +9482,14 @@ function prepareLaunch(params) {
   if (decided.pinnedVersion !== void 0) {
     rows.push(pinnedVersionRow(decided.pinnedVersion.version, decided.pinnedVersion.source));
   }
+  const routesByName = resolvedFlags.routeByName || resolvedProvider !== void 0 && isRouterProvider(resolvedProvider.definition);
+  if (routesByName) {
+    const check = resolveRoutedProviderCredentials({ paths, port: params.fs, env, ...params.credentials === void 0 ? {} : { credentials: params.credentials }, models: loadConfigFile(paths.globalConfigFile, GlobalConfigSchema, params.fs.readConfigFile)?.config.models });
+    if (!check.ok) {
+      log.error(check.message);
+      proc.exit(check.status);
+    }
+  }
   const frontDoorPort = params.frontdoor;
   const frontDoorEngaged = resolvedProvider !== void 0 || resolvedFlags.headroom || resolvedFlags.trackUsage;
   if (frontDoorEngaged && frontDoorPort === void 0) {
@@ -9462,7 +9522,7 @@ function prepareLaunch(params) {
     ...headroom === void 0 ? {} : { headroom },
     sessionId,
     remoteControl: resolvedFlags.remoteControl,
-    routeByName: resolvedFlags.routeByName || resolvedProvider !== void 0 && isRouterProvider(resolvedProvider.definition)
+    routeByName: routesByName
   });
   const releases = [...headroom === void 0 || headroomPort === void 0 ? [] : [headroomPort.release], ...frontDoorRelease === void 0 ? [] : [frontDoorRelease]];
   const release = () => {
@@ -9549,9 +9609,11 @@ var init_launcher = __esm({
     init_lock();
     init_spawn();
     init_providersStore();
+    init_load();
     init_flatten();
     init_walk();
     init_schema();
+    init_schema();
     init_credential();
     init_middleware();
     init_preflight();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-use",
-  "version": "11.36.0",
+  "version": "11.38.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>",