agent-shim 11.25.0 → 11.27.0

package/dist/index.cjs

@@ -56,7 +56,10 @@ var init_categories_default = __esm({
         "usage-data",
         "ide",
         "cache",
-        "scheduled_tasks.lock"
+        "scheduled_tasks.lock",
+        "policy-limits.json*",
+        "remote-settings.json*",
+        "state"
       ],
       history: [
         "projects",
@@ -242,7 +245,7 @@ function isTimeZone(name) {
     return false;
   }
 }
-var import_node_path2, import_zod, import_trilean, 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, HttpProviderSchema, CodexProviderSchema, AntigravityProviderSchema, ProviderSchema, 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, FrontDoorGlobalConfigSchema, UPDATE_MODES, UpdateGlobalConfigSchema, GlobalConfigSchema, IdentitySchema, CategoryClassificationSchema, CategoryClassificationOverlaySchema, SHIPPED_CATEGORY_DEFAULTS;
+var import_node_path2, import_zod, import_trilean, 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, AntigravityProviderSchema, ProviderSchema, 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, FrontDoorGlobalConfigSchema, UPDATE_MODES, UpdateGlobalConfigSchema, GlobalConfigSchema, IdentitySchema, CategoryClassificationSchema, CategoryClassificationOverlaySchema, SHIPPED_CATEGORY_DEFAULTS;
 var init_schema = __esm({
   "src/config/schema.ts"() {
     "use strict";
@@ -424,6 +427,12 @@ var init_schema = __esm({
       description: import_zod.z.string().min(1).optional()
     });
     PickerModelsSchema = import_zod.z.array(PickerModelSchema).refine((models) => new Set(models.map((entry) => entry.model)).size === models.length, { message: "pickerModels names a model more than once" });
+    ProviderCatalogueSchema = import_zod.z.strictObject({
+      tier: import_zod.z.enum(CLAUDE_TIERS),
+      include: import_zod.z.array(import_zod.z.string().min(1)).min(1).optional(),
+      exclude: import_zod.z.array(import_zod.z.string().min(1)).min(1).optional(),
+      url: import_zod.z.url().optional()
+    });
     HttpProviderSchema = import_zod.z.strictObject({
       $schema: import_zod.z.string().optional(),
       kind: import_zod.z.literal("http").optional(),
@@ -433,6 +442,8 @@ var init_schema = __esm({
       env: ProviderEnvSchema.optional(),
       /** Extra models `/model` lists beside the ones the tier settings name. */
       pickerModels: PickerModelsSchema.optional(),
+      /** The provider's own model catalogue, listed in `/model` when set. */
+      catalogue: ProviderCatalogueSchema.optional(),
       /** Per-request routing: when present, each request this provider would serve is matched against the list in order, and the first definite match is sent to that entry's provider instead (itself resolved exactly as a directly dialled request would be). Unmatched requests stay on this provider. */
       routes: import_zod.z.array(ProviderRouteSchema).optional()
     });
@@ -643,7 +654,7 @@ function parseIgnoringUnrecognisedKeys(schema, raw) {
   return second.success ? { success: true, data: second.data, ignored } : { success: false, issues: second.error.issues };
 }
 function describeIgnoredKeys(filePath, ignored) {
-  const places = ignored.map(({ path: path42, keys }) => `${path42.length === 0 ? "" : `${path42.map(String).join(".")}.`}${keys.join(", ")}`);
+  const places = ignored.map(({ path: path43, keys }) => `${path43.length === 0 ? "" : `${path43.map(String).join(".")}.`}${keys.join(", ")}`);
   return `${filePath} has settings this version of agent-shim does not know and ignores: ${places.join("; ")}. A newer release may read them.`;
 }
 function noteIgnoredKeys(filePath, ignored) {
@@ -665,9 +676,9 @@ function restoreIgnoredKeys(filePath, value) {
     return value;
   }
   const restored = structuredClone(value);
-  for (const { path: path42, values } of ignored) {
+  for (const { path: path43, values } of ignored) {
     let holder = restored;
-    for (const step of path42) {
+    for (const step of path43) {
       holder = isRecord(holder) ? holder[step] : void 0;
     }
     if (isRecord(holder)) {
@@ -1475,6 +1486,12 @@ var init_flatten = __esm({
 });
 
 // src/resolve/decide.ts
+function unclassifiedEntryMessage(names) {
+  const quoted = names.map((name) => `"${name}"`).join(", ");
+  const subject = names.length === 1 ? `${quoted} is not` : `${String(names.length)} entries are not`;
+  const excluded = names.length === 1 ? "it is excluded" : `they are excluded: ${quoted}`;
+  return `${subject} in the category map, so ${excluded}. Run \`agent-shim configure\` to classify ${names.length === 1 ? "it" : "them"}, which records the answer in the local overlay without touching the shipped default map.`;
+}
 function selectRule(relPath, flattened, context) {
   const eliminated = [];
   for (const rule of matchingRules(flattened, relPath)) {
@@ -1512,7 +1529,7 @@ function resolveEntry(relPath, params) {
     diagnostics.push({
       code: "UNCLASSIFIED_ENTRY",
       severity: "warning",
-      message: `"${head}" is not in the category map, so it is excluded. Run \`agent-shim configure\` to classify it, which records the answer in the local overlay without touching the shipped default map.`,
+      message: unclassifiedEntryMessage([head]),
       subject: head
     });
     return { decision: { relPath, shared: false, via: "unclassified", category }, diagnostics };
@@ -2947,7 +2964,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "agent-shim",
-      version: "11.25.0",
+      version: "11.27.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>",
@@ -4113,6 +4130,40 @@ var init_supervisor = __esm({
   }
 });
 
+// src/logStyle.ts
+function styledDiagnostic(style, colour, line) {
+  const lead = DIAGNOSTIC_LEAD.exec(line);
+  if (lead === null) {
+    return style([colour], line);
+  }
+  const [whole, prefix = "", code = "", separator = ""] = lead;
+  return `${style([colour], prefix)}${style([colour, "bold"], code)}${style([colour], `${separator}${line.slice(whole.length)}`)}`;
+}
+function createLogPort(sinks, styleFor) {
+  return {
+    info: (message) => {
+      sinks.out(styleFor.out(["dim"], message));
+    },
+    warn: (message) => {
+      sinks.warn(styledDiagnostic(styleFor.err, "yellow", message));
+    },
+    error: (message) => {
+      sinks.err(styledDiagnostic(styleFor.err, "red", message));
+    }
+  };
+}
+function styleTextFor(stream) {
+  return (formats, text) => (0, import_node_util.styleText)([...formats], text, { stream });
+}
+var import_node_util, DIAGNOSTIC_LEAD;
+var init_logStyle = __esm({
+  "src/logStyle.ts"() {
+    "use strict";
+    import_node_util = require("node:util");
+    DIAGNOSTIC_LEAD = /^(agent-shim: )([A-Z][A-Z0-9_]*)(: )/;
+  }
+});
+
 // src/realPorts.ts
 function isEnoent3(error) {
   return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
@@ -4351,7 +4402,7 @@ function realResolveClaudeBinary(isOwnBinary) {
 function realInstalledClaudeVersions() {
   return installedVersions(listVersionsDir(defaultVersionsDir()));
 }
-var import_node_child_process2, import_node_crypto8, import_node_fs2, import_node_os2, import_node_path14, import_node_sea, realFsPort, OWNER_ONLY_DIR_MODE, OWNER_ONLY_FILE_MODE, PERMISSION_BITS, realFarmFs, INT32_BYTE_LENGTH, PS_TIMEOUT_MS, realRunPort, MACOS_GUI_SESSION_MANAGER, realCredentialPort, SOCKET_PERMISSION_BITS, realHeadroomSocketTrust, realSpawnPort, realProcPort, EXECUTE_BITS_MASK, WINDOWS_DEFAULT_PATHEXT;
+var import_node_child_process2, import_node_crypto8, import_node_fs2, import_node_os2, import_node_path14, import_node_sea, realFsPort, OWNER_ONLY_DIR_MODE, OWNER_ONLY_FILE_MODE, PERMISSION_BITS, realFarmFs, INT32_BYTE_LENGTH, PS_TIMEOUT_MS, realRunPort, MACOS_GUI_SESSION_MANAGER, realCredentialPort, SOCKET_PERMISSION_BITS, realHeadroomSocketTrust, realSpawnPort, realProcPort, realLogPort, EXECUTE_BITS_MASK, WINDOWS_DEFAULT_PATHEXT;
 var init_realPorts = __esm({
   "src/realPorts.ts"() {
     "use strict";
@@ -4368,6 +4419,7 @@ var init_realPorts = __esm({
     init_ensure();
     init_supervisor();
     init_state2();
+    init_logStyle();
     realFsPort = {
       readFileUtf8(filePath) {
         try {
@@ -4573,6 +4625,16 @@ var init_realPorts = __esm({
       argv: process.argv.slice(2),
       exit: (code) => process.exit(code)
     };
+    realLogPort = createLogPort(
+      { out: (line) => {
+        console.log(line);
+      }, warn: (line) => {
+        console.warn(line);
+      }, err: (line) => {
+        console.error(line);
+      } },
+      { out: styleTextFor(process.stdout), err: styleTextFor(process.stderr) }
+    );
     EXECUTE_BITS_MASK = 73;
     WINDOWS_DEFAULT_PATHEXT = ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PS1";
   }
@@ -6055,6 +6117,7 @@ function buildLayoutPaths(root) {
     usageDir: import_node_path23.default.join(root, "usage"),
     usageLogDir: import_node_path23.default.join(root, "usage", "log"),
     usageSnapshotsDir: import_node_path23.default.join(root, "usage", "snapshots"),
+    catalogueDir: import_node_path23.default.join(root, "catalogues"),
     usagePicksFile: import_node_path23.default.join(root, "usage", "picks.json"),
     usageAnchorsFile: import_node_path23.default.join(root, "usage", "anchors.json"),
     usageJobsFile: import_node_path23.default.join(root, "usage", "jobs.json"),
@@ -6501,7 +6564,10 @@ function loadProvider(providersDir, name, port) {
   const raw = port.readConfigFile(filePath);
   return raw === void 0 ? void 0 : parseProviderFile(filePath, raw);
 }
-function listProviders(paths) {
+function reportInvalidProvider(name, message) {
+  console.error(`agent-shim: providers/${name}.json is invalid and was skipped: ${message}`);
+}
+function listProviders(paths, onInvalid = reportInvalidProvider) {
   const names = listProviderNames(
     (dir) => import_node_fs6.default.readdirSync(dir),
     paths.providersDir
@@ -6515,7 +6581,7 @@ function listProviders(paths) {
       if (!(error instanceof ConfigValidationError || error instanceof LegacyProviderFileError)) {
         throw error;
       }
-      console.error(`agent-shim: providers/${name}.json is invalid and was skipped: ${error.message}`);
+      onInvalid(name, error.message);
       continue;
     }
     if (provider !== void 0) {
@@ -6565,6 +6631,9 @@ function addProvider(paths, name, input) {
   if (kind === "http" && input.baseUrl === void 0) {
     throw new ProviderKindMismatchError("An http provider needs --base-url.");
   }
+  if (kind !== "http" && input.catalogue !== void 0) {
+    throw new ProviderKindMismatchError("A model catalogue applies only to an http provider.");
+  }
   if (kind !== "codex" && !isEmptyCodexConfig(input.codex)) {
     throw new ProviderKindMismatchError("Codex settings apply only to a codex provider (--kind codex).");
   }
@@ -6578,7 +6647,7 @@ function addProvider(paths, name, input) {
     ...input.pickerModels === void 0 || input.pickerModels.length === 0 ? {} : { pickerModels: input.pickerModels }
   };
   const parsed = ProviderSchema.safeParse(
-    kind === "codex" ? { kind, ...shared, ...isEmptyCodexConfig(input.codex) ? {} : { codex: input.codex } } : kind === "antigravity" ? { kind, ...shared, ...isEmptyAntigravityConfig(input.antigravity) ? {} : { antigravity: input.antigravity } } : { ...shared, baseUrl: input.baseUrl }
+    kind === "codex" ? { kind, ...shared, ...isEmptyCodexConfig(input.codex) ? {} : { codex: input.codex } } : kind === "antigravity" ? { kind, ...shared, ...isEmptyAntigravityConfig(input.antigravity) ? {} : { antigravity: input.antigravity } } : { ...shared, baseUrl: input.baseUrl, ...input.catalogue === void 0 ? {} : { catalogue: input.catalogue } }
   );
   if (!parsed.success) {
     throw new ConfigValidationError(providerJsonPath(paths, name), parsed.error.issues);
@@ -6607,6 +6676,9 @@ function updateProvider(paths, name, input) {
   if (isAntigravityProvider(existing) && input.baseUrl !== void 0) {
     throw new ProviderKindMismatchError(`Provider "${name}" is an antigravity provider, which has no base URL.`);
   }
+  if ((isCodexProvider(existing) || isAntigravityProvider(existing)) && input.catalogue !== void 0 && input.catalogue !== false) {
+    throw new ProviderKindMismatchError(`Provider "${name}" is not an http provider; a model catalogue applies only to an http provider.`);
+  }
   if (!isCodexProvider(existing) && !isEmptyCodexConfig(input.codex)) {
     throw new ProviderKindMismatchError(`Provider "${name}" is not a codex provider; codex settings apply only to a codex provider.`);
   }
@@ -6639,7 +6711,8 @@ function updateProvider(paths, name, input) {
     };
     candidate = { ...existing, ...shared, antigravity: isEmptyAntigravityConfig(antigravity) ? void 0 : antigravity };
   } else {
-    candidate = { ...existing, ...shared, ...input.baseUrl === void 0 ? {} : { baseUrl: input.baseUrl } };
+    const catalogue = input.catalogue === void 0 ? existing.catalogue : input.catalogue === false ? void 0 : input.catalogue;
+    candidate = { ...existing, ...shared, catalogue, ...input.baseUrl === void 0 ? {} : { baseUrl: input.baseUrl } };
   }
   const parsed = ProviderSchema.safeParse(candidate);
   if (!parsed.success) {
@@ -7872,6 +7945,42 @@ var init_claudeSession = __esm({
   }
 });
 
+// src/launcher/diagnostics.ts
+function diagnosticLines(diagnostics) {
+  const unclassified = [...new Set(diagnostics.filter((diagnostic) => diagnostic.code === "UNCLASSIFIED_ENTRY").map((diagnostic) => diagnostic.subject))];
+  const lines = [];
+  let unclassifiedReported = false;
+  for (const diagnostic of diagnostics) {
+    if (diagnostic.severity === "info") {
+      continue;
+    }
+    if (diagnostic.code === "UNCLASSIFIED_ENTRY") {
+      if (!unclassifiedReported) {
+        unclassifiedReported = true;
+        lines.push({ severity: diagnostic.severity, text: `agent-shim: ${diagnostic.code}: ${unclassifiedEntryMessage(unclassified.filter((name) => name !== void 0))}` });
+      }
+      continue;
+    }
+    lines.push({ severity: diagnostic.severity, text: `agent-shim: ${diagnostic.code}: ${diagnostic.message}` });
+  }
+  return lines;
+}
+function reportDiagnostics(log, diagnostics, options) {
+  for (const line of diagnosticLines(diagnostics)) {
+    if (line.severity === "error" && !options.errorsAsWarnings) {
+      log.error(line.text);
+    } else {
+      log.warn(line.text);
+    }
+  }
+}
+var init_diagnostics = __esm({
+  "src/launcher/diagnostics.ts"() {
+    "use strict";
+    init_decide();
+  }
+});
+
 // src/antigravity/cloudUpstream.ts
 var init_cloudUpstream = __esm({
   "src/antigravity/cloudUpstream.ts"() {
@@ -8032,6 +8141,49 @@ var init_translate2 = __esm({
   }
 });
 
+// src/providerCatalogue.ts
+function catalogueCachePath(paths, name) {
+  return import_node_path38.default.join(paths.catalogueDir, `${name}.json`);
+}
+function parseCatalogueCache(text) {
+  if (text === void 0) {
+    return void 0;
+  }
+  try {
+    const parsed = CatalogueCacheSchema.safeParse(JSON.parse(text));
+    return parsed.success ? parsed.data : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function filterCatalogue(models, catalogue) {
+  const included = catalogue.include === void 0 ? void 0 : (0, import_picomatch4.default)(catalogue.include, { dot: true });
+  const excluded = catalogue.exclude === void 0 ? void 0 : (0, import_picomatch4.default)(catalogue.exclude, { dot: true });
+  return models.filter((model) => included?.(model.id) !== false && excluded?.(model.id) !== true);
+}
+var import_node_path38, import_picomatch4, import_zod30, DEFAULT_CANDIDATE_URLS, MS_PER_SECOND7, SECONDS_PER_HOUR2, HOURS_PER_DAY5, MS_PER_HOUR5, HOURS_BETWEEN_RETRIES, CATALOGUE_MAX_AGE_MS, CATALOGUE_RETRY_MS, CATALOGUE_REQUEST_SECONDS, CATALOGUE_REQUEST_TIMEOUT_MS, CATALOGUE_REFRESH_TIMEOUT_MS, CatalogueModelSchema, CatalogueCacheSchema;
+var init_providerCatalogue = __esm({
+  "src/providerCatalogue.ts"() {
+    "use strict";
+    import_node_path38 = __toESM(require("node:path"), 1);
+    import_picomatch4 = __toESM(require("picomatch"), 1);
+    import_zod30 = require("zod");
+    DEFAULT_CANDIDATE_URLS = 2;
+    MS_PER_SECOND7 = 1e3;
+    SECONDS_PER_HOUR2 = 3600;
+    HOURS_PER_DAY5 = 24;
+    MS_PER_HOUR5 = SECONDS_PER_HOUR2 * MS_PER_SECOND7;
+    HOURS_BETWEEN_RETRIES = 1;
+    CATALOGUE_MAX_AGE_MS = HOURS_PER_DAY5 * MS_PER_HOUR5;
+    CATALOGUE_RETRY_MS = HOURS_BETWEEN_RETRIES * MS_PER_HOUR5;
+    CATALOGUE_REQUEST_SECONDS = 10;
+    CATALOGUE_REQUEST_TIMEOUT_MS = CATALOGUE_REQUEST_SECONDS * MS_PER_SECOND7;
+    CATALOGUE_REFRESH_TIMEOUT_MS = DEFAULT_CANDIDATE_URLS * CATALOGUE_REQUEST_TIMEOUT_MS;
+    CatalogueModelSchema = import_zod30.z.strictObject({ id: import_zod30.z.string().min(1), name: import_zod30.z.string().min(1).optional() });
+    CatalogueCacheSchema = import_zod30.z.strictObject({ fetchedAt: import_zod30.z.number(), url: import_zod30.z.string().min(1), models: import_zod30.z.array(CatalogueModelSchema) });
+  }
+});
+
 // src/launcher/modelPicker.ts
 function labelOf(model) {
   return model.toLowerCase().endsWith(CONTEXT_MARKER_1M) ? model.slice(0, -CONTEXT_MARKER_1M.length) : model;
@@ -8098,14 +8250,23 @@ function declaredRow(entry) {
     behavesAs: TIER_BEHAVES_AS[entry.tier]
   };
 }
-function providerModelRows(provider) {
+function catalogueRows(provider, models) {
+  if (provider.kind !== void 0 && provider.kind !== "http" || provider.catalogue === void 0) {
+    return [];
+  }
+  const { tier } = provider.catalogue;
+  return filterCatalogue(models, provider.catalogue).map((model) => ({ model: model.id, label: labelOf(model.id), description: describedAs(model.id, model.name === void 0 ? "Listed by the provider" : `Listed by the provider as ${model.name}`), behavesAs: TIER_BEHAVES_AS[tier] })).sort((left, right) => left.model.localeCompare(right.model));
+}
+function providerModelRows(provider, catalogue = []) {
   const derived = provider.kind === "codex" ? codexRows(provider) : provider.kind === "antigravity" ? antigravityRows(provider) : httpRows(provider);
   const declared = (provider.pickerModels ?? []).map(declaredRow);
   const declaredModels = new Set(declared.map((row) => row.model));
-  return [...derived.filter((row) => !declaredModels.has(row.model)), ...declared];
+  const named = [...derived.filter((row) => !declaredModels.has(row.model)), ...declared];
+  const taken = new Set(named.map((row) => labelOf(row.model)));
+  return [...named, ...catalogueRows(provider, catalogue).filter((row) => !taken.has(labelOf(row.model)))];
 }
-function modelPickerSettings(provider) {
-  const options = providerModelRows(provider);
+function modelPickerSettings(provider, catalogue = []) {
+  const options = providerModelRows(provider, catalogue);
   return options.length === 0 ? void 0 : JSON.stringify({ modelPicker: { options, replaceBuiltInOptions: true } });
 }
 var CONTEXT_MARKER_1M, TIER_BEHAVES_AS, TIER_ENV_VARIABLES;
@@ -8114,6 +8275,7 @@ var init_modelPicker = __esm({
     "use strict";
     init_translate();
     init_translate2();
+    init_providerCatalogue();
     init_schema();
     CONTEXT_MARKER_1M = "[1m]";
     TIER_BEHAVES_AS = Object.freeze({
@@ -8445,7 +8607,7 @@ function decideLaunch(params, readOnly) {
     identityDefaultConfigProfile: loadedIdentity?.config.defaultConfigProfile,
     globalDefaultConfigProfile: params.globalDefaultConfigProfile
   });
-  if (configProfileDecision.name !== void 0 && params.allowMissingConfigProfile !== true && fs13.readConfigFile(import_node_path38.default.join(paths.configProfilesDir, `${configProfileDecision.name}.json`)) === void 0) {
+  if (configProfileDecision.name !== void 0 && params.allowMissingConfigProfile !== true && fs13.readConfigFile(import_node_path39.default.join(paths.configProfilesDir, `${configProfileDecision.name}.json`)) === void 0) {
     log.error(
       `agent-shim: no configuration profile named "${configProfileDecision.name}" (selected via ${configProfileDecision.source}). Run \`agent-shim profile add ${configProfileDecision.name}\` first.`
     );
@@ -8525,17 +8687,7 @@ function decideLaunch(params, readOnly) {
     const flattened = flattenLayers(assembled.layers, { home: params.farm.home });
     cascadeLaunch = flattened.launch;
     if (readOnly || farmContext === void 0) {
-      for (const diagnostic of [...assembled.diagnostics, ...flattened.diagnostics]) {
-        if (diagnostic.severity === "info") {
-          continue;
-        }
-        const message = `agent-shim: ${diagnostic.code}: ${diagnostic.message}`;
-        if (diagnostic.severity === "error" && !readOnly) {
-          log.error(message);
-        } else {
-          log.warn(message);
-        }
-      }
+      reportDiagnostics(log, [...assembled.diagnostics, ...flattened.diagnostics], { errorsAsWarnings: readOnly });
     }
   }
   const pinnedVersion = resolveClaudeVersion({ env, ...parsedArgv.claudeVersion === void 0 ? {} : { flag: parsedArgv.claudeVersion }, ...cascadeLaunch?.claudeVersion === void 0 ? {} : { cascade: cascadeLaunch.claudeVersion } });
@@ -8555,7 +8707,8 @@ function decideLaunch(params, readOnly) {
     log.info(`agent-shim: identity ${loginlessProvider.identity} has no stored login, so Remote Control, which needs one, is off for this launch; provider ${loginlessProvider.provider} runs without it`);
   }
   const flags = loginlessProvider === void 0 ? requestedFlags : { ...requestedFlags, remoteControl: false };
-  const pickerSettings = selectedProvider === void 0 ? void 0 : modelPickerSettings(selectedProvider.definition);
+  const catalogue = selectedProvider === void 0 ? void 0 : parseCatalogueCache(params.fs.readFileUtf8(catalogueCachePath(paths, selectedProvider.name)));
+  const pickerSettings = selectedProvider === void 0 ? void 0 : modelPickerSettings(selectedProvider.definition, catalogue?.models);
   const callerSettings = hasSettingsArgument(parsedArgv.rest);
   if (pickerSettings !== void 0 && callerSettings && !readOnly) {
     log.info("agent-shim: this launch passes its own --settings, so /model keeps Claude Code's own model names instead of listing the provider's models");
@@ -8566,7 +8719,7 @@ function decideLaunch(params, readOnly) {
     extraFlags: splitExtraFlags(env.CLAUDE_EXTRA_FLAGS),
     passthrough: withLauncherSettings(params.supervised === void 0 ? parsedArgv.rest : withSupervision(parsedArgv.rest, params.supervised), launcherSettings)
   });
-  const configDir = configDirEscapeHatchApplies || identityDecision.name === void 0 ? env.CLAUDE_CONFIG_DIR : import_node_path38.default.join(paths.identitiesDir, identityDecision.name);
+  const configDir = configDirEscapeHatchApplies || identityDecision.name === void 0 ? env.CLAUDE_CONFIG_DIR : import_node_path39.default.join(paths.identitiesDir, identityDecision.name);
   const decision = {
     identitySource: identityDecision.source,
     configDirEscapeHatch: identityDecision.configDirEscapeHatch,
@@ -8607,7 +8760,7 @@ function prepareLaunch(params) {
   );
   const updateCheck = runLaunchUpdateCheck({
     mode: params.updateMode ?? "off",
-    checkPath: import_node_path38.default.join(paths.root, "update.check"),
+    checkPath: import_node_path39.default.join(paths.root, "update.check"),
     currentVersion: package_default.version,
     port: params.update
   });
@@ -8639,16 +8792,12 @@ function prepareLaunch(params) {
       }
       throw error;
     }
-    for (const diagnostic of result.diagnostics) {
-      if (diagnostic.severity === "error") {
-        log.error(`agent-shim: ${diagnostic.code}: ${diagnostic.message}`);
-      } else if (diagnostic.severity === "warning") {
-        log.warn(`agent-shim: ${diagnostic.code}: ${diagnostic.message}`);
-      }
+    reportDiagnostics(log, result.diagnostics, { errorsAsWarnings: false });
+    if (!result.noOp) {
+      log.info(
+        `agent-shim: farm at ${result.farmRoot} resynced (${String(result.manifest.links.length)} link(s), ${String(result.manifest.materialised.length)} built director(ies)${result.adopted.length === 0 ? "" : `, ${String(result.adopted.length)} adopted into ${resyncFarmRuntime.claudeHome}`})`
+      );
     }
-    log.info(
-      result.noOp ? `agent-shim: farm at ${result.farmRoot} already matches the resolved cascade` : `agent-shim: farm at ${result.farmRoot} resynced (${String(result.manifest.links.length)} link(s), ${String(result.manifest.materialised.length)} built director(ies)${result.adopted.length === 0 ? "" : `, ${String(result.adopted.length)} adopted into ${resyncFarmRuntime.claudeHome}`})`
-    );
   }
   if (decided.pinnedVersion !== void 0) {
     log.info(`agent-shim: Claude Code ${decided.pinnedVersion.version} (pinned by ${decided.pinnedVersion.source})`);
@@ -8741,12 +8890,12 @@ function runLaunchPlan(plan, spawn3) {
 function runLauncher(params) {
   params.proc.exit(runLaunchPlan(prepareLaunch(params), params.spawn));
 }
-var import_node_crypto11, import_node_path38;
+var import_node_crypto11, import_node_path39;
 var init_launcher = __esm({
   "src/launcher.ts"() {
     "use strict";
     import_node_crypto11 = require("node:crypto");
-    import_node_path38 = __toESM(require("node:path"), 1);
+    import_node_path39 = __toESM(require("node:path"), 1);
     init_package();
     init_envBool();
     init_argv();
@@ -8757,7 +8906,9 @@ var init_launcher = __esm({
     init_flags();
     init_extraFlags();
     init_claudeSession();
+    init_diagnostics();
     init_modelPicker();
+    init_providerCatalogue();
     init_pool();
     init_resumeContext();
     init_lock();
@@ -8780,13 +8931,13 @@ function agentShimCliPath(distDir = typeof __AGENT_SHIM_DIST_DIR__ === "string"
   if (distDir === void 0) {
     throw new OwnCliPathUnknownError();
   }
-  return import_node_path39.default.join(distDir, OWN_CLI_FILE_NAME);
+  return import_node_path40.default.join(distDir, OWN_CLI_FILE_NAME);
 }
-var import_node_path39, OWN_CLI_FILE_NAME, OwnCliPathUnknownError;
+var import_node_path40, OWN_CLI_FILE_NAME, OwnCliPathUnknownError;
 var init_ownCli = __esm({
   "src/ownCli.ts"() {
     "use strict";
-    import_node_path39 = __toESM(require("node:path"), 1);
+    import_node_path40 = __toESM(require("node:path"), 1);
     init_cliError();
     OWN_CLI_FILE_NAME = "cli.cjs";
     OwnCliPathUnknownError = class extends CliError {
@@ -8812,7 +8963,7 @@ var init_selfIdentity = __esm({
 // src/frontdoor/trust.ts
 function resolveTrustBundle(params) {
   const { caCertFile, bundlesDir, variable, inherited, fs: fs13 } = params;
-  if (inherited === void 0 || inherited === "" || import_node_path40.default.resolve(inherited) === import_node_path40.default.resolve(caCertFile)) {
+  if (inherited === void 0 || inherited === "" || import_node_path41.default.resolve(inherited) === import_node_path41.default.resolve(caCertFile)) {
     return { path: caCertFile };
   }
   const caPem = fs13.readFileUtf8(caCertFile);
@@ -8830,19 +8981,19 @@ function resolveTrustBundle(params) {
   }
   const combined = `${inheritedPem.trimEnd()}
 ${caPem}`;
-  const bundle = import_node_path40.default.join(bundlesDir, `${(0, import_node_crypto12.createHash)("sha256").update(combined).digest("hex").slice(0, BUNDLE_NAME_HEX_DIGITS)}.pem`);
+  const bundle = import_node_path41.default.join(bundlesDir, `${(0, import_node_crypto12.createHash)("sha256").update(combined).digest("hex").slice(0, BUNDLE_NAME_HEX_DIGITS)}.pem`);
   if (!fs13.exists(bundle)) {
     fs13.mkdirp(bundlesDir);
     fs13.writeFileAtomic(bundle, combined);
   }
   return { path: bundle };
 }
-var import_node_crypto12, import_node_path40, BUNDLE_NAME_HEX_DIGITS;
+var import_node_crypto12, import_node_path41, BUNDLE_NAME_HEX_DIGITS;
 var init_trust = __esm({
   "src/frontdoor/trust.ts"() {
     "use strict";
     import_node_crypto12 = require("node:crypto");
-    import_node_path40 = __toESM(require("node:path"), 1);
+    import_node_path41 = __toESM(require("node:path"), 1);
     BUNDLE_NAME_HEX_DIGITS = 16;
   }
 });
@@ -8961,7 +9112,7 @@ function realPrepareLaunchParams(paths, options) {
     headroom: realHeadroomPort(paths, { spawnDaemon: options.spawnDaemon, cwd: farm.runtime.cwd }),
     frontdoor: realFrontDoorPort(paths, options.spawnDaemon),
     credentials: { ...realCredentialPort, cache: realCredentialCacheEnv(paths) },
-    hasStoredLogin: (identity) => identitySignIn(realFarmFs, { platform: process.platform, run: realRunPort }, { farmRoot: import_node_path41.default.join(paths.identitiesDir, identity), hasCredentialBlock: false }).state !== "signed-out",
+    hasStoredLogin: (identity) => identitySignIn(realFarmFs, { platform: process.platform, run: realRunPort }, { farmRoot: import_node_path42.default.join(paths.identitiesDir, identity), hasCredentialBlock: false }).state !== "signed-out",
     ...farm.directoryIdentity === void 0 ? {} : { directoryPinnedIdentity: farm.directoryIdentity },
     ...farm.directoryConfigProfile === void 0 ? {} : { directoryRuleConfigProfile: farm.directoryConfigProfile },
     ...farm.globalDefaultConfigProfile === void 0 ? {} : { globalDefaultConfigProfile: farm.globalDefaultConfigProfile },
@@ -9018,12 +9169,12 @@ function resolveClaudeLaunch(options) {
   };
   return { resolution: resolveLaunch(realPrepareLaunchParams(paths, { proc, log, spawnDaemon, farm: buildFarmRuntime(paths, options.cwd) })), warnings };
 }
-var import_node_os7, import_node_path41, import_node_crypto13, LaunchRefusedError;
+var import_node_os7, import_node_path42, import_node_crypto13, LaunchRefusedError;
 var init_launchWiring = __esm({
   "src/launchWiring.ts"() {
     "use strict";
     import_node_os7 = __toESM(require("node:os"), 1);
-    import_node_path41 = __toESM(require("node:path"), 1);
+    import_node_path42 = __toESM(require("node:path"), 1);
     import_node_crypto13 = require("node:crypto");
     init_cliError();
     init_claudeShim();
@@ -9239,76 +9390,76 @@ var init_identityClaude = __esm({
 });
 
 // src/usage/providerQuota.ts
-var import_zod30, MS_PER_SECOND7, SECONDS_PER_HOUR2, HOURS_PER_DAY5, DAYS_PER_MONTH, ZAI_HOST, ZAI_QUOTA_URL, ZAI_UNIT_HOURS, ZAI_UNIT_MONTHS, ZAI_UNIT_MS, ZaiLimitSchema, ZaiResponseSchema, OPENROUTER_HOST, OPENROUTER_KEY_URL, OPENROUTER_CREDITS_URL, MS_PER_DAY3, OpenRouterKeySchema, OpenRouterCreditsSchema, ANTIGRAVITY_HOST, ANTIGRAVITY_QUOTA_URL, ANTIGRAVITY_USER_URL, FIVE_HOURS2, DAYS_PER_WEEK2, FIVE_HOURS_MS, WEEK_MS, AntigravityBucketSchema, AntigravitySummarySchema, GoogleTokenInfoSchema, AntigravityUserSchema;
+var import_zod31, MS_PER_SECOND8, SECONDS_PER_HOUR3, HOURS_PER_DAY6, DAYS_PER_MONTH, ZAI_HOST, ZAI_QUOTA_URL, ZAI_UNIT_HOURS, ZAI_UNIT_MONTHS, ZAI_UNIT_MS, ZaiLimitSchema, ZaiResponseSchema, OPENROUTER_HOST, OPENROUTER_KEY_URL, OPENROUTER_CREDITS_URL, MS_PER_DAY3, OpenRouterKeySchema, OpenRouterCreditsSchema, ANTIGRAVITY_HOST, ANTIGRAVITY_QUOTA_URL, ANTIGRAVITY_USER_URL, FIVE_HOURS2, DAYS_PER_WEEK2, FIVE_HOURS_MS, WEEK_MS, AntigravityBucketSchema, AntigravitySummarySchema, GoogleTokenInfoSchema, AntigravityUserSchema;
 var init_providerQuota = __esm({
   "src/usage/providerQuota.ts"() {
     "use strict";
-    import_zod30 = require("zod");
+    import_zod31 = require("zod");
     init_cloudUpstream();
     init_schema2();
-    MS_PER_SECOND7 = 1e3;
-    SECONDS_PER_HOUR2 = 3600;
-    HOURS_PER_DAY5 = 24;
+    MS_PER_SECOND8 = 1e3;
+    SECONDS_PER_HOUR3 = 3600;
+    HOURS_PER_DAY6 = 24;
     DAYS_PER_MONTH = 30;
     ZAI_HOST = "api.z.ai";
     ZAI_QUOTA_URL = `https://${ZAI_HOST}/api/monitor/usage/quota/limit`;
     ZAI_UNIT_HOURS = 3;
     ZAI_UNIT_MONTHS = 5;
     ZAI_UNIT_MS = /* @__PURE__ */ new Map([
-      [ZAI_UNIT_HOURS, SECONDS_PER_HOUR2 * MS_PER_SECOND7],
-      [ZAI_UNIT_MONTHS, DAYS_PER_MONTH * HOURS_PER_DAY5 * SECONDS_PER_HOUR2 * MS_PER_SECOND7]
+      [ZAI_UNIT_HOURS, SECONDS_PER_HOUR3 * MS_PER_SECOND8],
+      [ZAI_UNIT_MONTHS, DAYS_PER_MONTH * HOURS_PER_DAY6 * SECONDS_PER_HOUR3 * MS_PER_SECOND8]
     ]);
-    ZaiLimitSchema = import_zod30.z.object({
-      type: import_zod30.z.string(),
-      unit: import_zod30.z.number().int(),
-      number: import_zod30.z.number().int().positive(),
-      percentage: import_zod30.z.number().nonnegative(),
-      nextResetTime: import_zod30.z.number().positive().optional(),
-      usage: import_zod30.z.number().nonnegative().optional(),
-      currentValue: import_zod30.z.number().nonnegative().optional(),
-      remaining: import_zod30.z.number().nonnegative().optional()
+    ZaiLimitSchema = import_zod31.z.object({
+      type: import_zod31.z.string(),
+      unit: import_zod31.z.number().int(),
+      number: import_zod31.z.number().int().positive(),
+      percentage: import_zod31.z.number().nonnegative(),
+      nextResetTime: import_zod31.z.number().positive().optional(),
+      usage: import_zod31.z.number().nonnegative().optional(),
+      currentValue: import_zod31.z.number().nonnegative().optional(),
+      remaining: import_zod31.z.number().nonnegative().optional()
     });
-    ZaiResponseSchema = import_zod30.z.object({
-      success: import_zod30.z.boolean(),
-      msg: import_zod30.z.string().optional(),
-      data: import_zod30.z.object({ level: import_zod30.z.string().optional(), limits: import_zod30.z.array(ZaiLimitSchema) })
+    ZaiResponseSchema = import_zod31.z.object({
+      success: import_zod31.z.boolean(),
+      msg: import_zod31.z.string().optional(),
+      data: import_zod31.z.object({ level: import_zod31.z.string().optional(), limits: import_zod31.z.array(ZaiLimitSchema) })
     });
     OPENROUTER_HOST = "openrouter.ai";
     OPENROUTER_KEY_URL = `https://${OPENROUTER_HOST}/api/v1/key`;
     OPENROUTER_CREDITS_URL = `https://${OPENROUTER_HOST}/api/v1/credits`;
-    MS_PER_DAY3 = HOURS_PER_DAY5 * SECONDS_PER_HOUR2 * MS_PER_SECOND7;
-    OpenRouterKeySchema = import_zod30.z.object({
-      data: import_zod30.z.object({
-        limit: import_zod30.z.number().nonnegative().nullable(),
-        limit_remaining: import_zod30.z.number().nullable(),
-        limit_reset: import_zod30.z.string().nullable(),
-        is_free_tier: import_zod30.z.boolean().optional(),
-        free_model_daily_requests: import_zod30.z.object({ used: import_zod30.z.number().nonnegative(), limit: import_zod30.z.number().nonnegative(), remaining: import_zod30.z.number() }).optional()
+    MS_PER_DAY3 = HOURS_PER_DAY6 * SECONDS_PER_HOUR3 * MS_PER_SECOND8;
+    OpenRouterKeySchema = import_zod31.z.object({
+      data: import_zod31.z.object({
+        limit: import_zod31.z.number().nonnegative().nullable(),
+        limit_remaining: import_zod31.z.number().nullable(),
+        limit_reset: import_zod31.z.string().nullable(),
+        is_free_tier: import_zod31.z.boolean().optional(),
+        free_model_daily_requests: import_zod31.z.object({ used: import_zod31.z.number().nonnegative(), limit: import_zod31.z.number().nonnegative(), remaining: import_zod31.z.number() }).optional()
       })
     });
-    OpenRouterCreditsSchema = import_zod30.z.object({ data: import_zod30.z.object({ total_credits: import_zod30.z.number().nonnegative(), total_usage: import_zod30.z.number().nonnegative() }) });
+    OpenRouterCreditsSchema = import_zod31.z.object({ data: import_zod31.z.object({ total_credits: import_zod31.z.number().nonnegative(), total_usage: import_zod31.z.number().nonnegative() }) });
     ANTIGRAVITY_HOST = "daily-cloudcode-pa.googleapis.com";
     ANTIGRAVITY_QUOTA_URL = `https://${ANTIGRAVITY_HOST}/v1internal:retrieveUserQuotaSummary`;
     ANTIGRAVITY_USER_URL = `https://${ANTIGRAVITY_HOST}/v1internal:loadCodeAssist`;
     FIVE_HOURS2 = 5;
     DAYS_PER_WEEK2 = 7;
-    FIVE_HOURS_MS = FIVE_HOURS2 * SECONDS_PER_HOUR2 * MS_PER_SECOND7;
-    WEEK_MS = DAYS_PER_WEEK2 * HOURS_PER_DAY5 * SECONDS_PER_HOUR2 * MS_PER_SECOND7;
-    AntigravityBucketSchema = import_zod30.z.object({
-      bucketId: import_zod30.z.string(),
-      remainingFraction: import_zod30.z.number().optional(),
-      resetTime: import_zod30.z.string().optional()
+    FIVE_HOURS_MS = FIVE_HOURS2 * SECONDS_PER_HOUR3 * MS_PER_SECOND8;
+    WEEK_MS = DAYS_PER_WEEK2 * HOURS_PER_DAY6 * SECONDS_PER_HOUR3 * MS_PER_SECOND8;
+    AntigravityBucketSchema = import_zod31.z.object({
+      bucketId: import_zod31.z.string(),
+      remainingFraction: import_zod31.z.number().optional(),
+      resetTime: import_zod31.z.string().optional()
     });
-    AntigravitySummarySchema = import_zod30.z.object({ groups: import_zod30.z.array(import_zod30.z.object({ buckets: import_zod30.z.array(AntigravityBucketSchema) })) });
-    GoogleTokenInfoSchema = import_zod30.z.object({
-      email: import_zod30.z.string().optional(),
-      sub: import_zod30.z.string().optional()
+    AntigravitySummarySchema = import_zod31.z.object({ groups: import_zod31.z.array(import_zod31.z.object({ buckets: import_zod31.z.array(AntigravityBucketSchema) })) });
+    GoogleTokenInfoSchema = import_zod31.z.object({
+      email: import_zod31.z.string().optional(),
+      sub: import_zod31.z.string().optional()
     });
-    AntigravityUserSchema = import_zod30.z.object({
+    AntigravityUserSchema = import_zod31.z.object({
       /** The code-assist tier context, which defaults to the free tier for every account. */
-      currentTier: import_zod30.z.object({ name: import_zod30.z.string().optional(), id: import_zod30.z.string().optional() }).optional(),
+      currentTier: import_zod31.z.object({ name: import_zod31.z.string().optional(), id: import_zod31.z.string().optional() }).optional(),
       /** The account's paid subscription; absent when the account has none. */
-      paidTier: import_zod30.z.object({ name: import_zod30.z.string().optional(), id: import_zod30.z.string().optional() }).optional()
+      paidTier: import_zod31.z.object({ name: import_zod31.z.string().optional(), id: import_zod31.z.string().optional() }).optional()
     });
   }
 });
@@ -10321,8 +10472,8 @@ function parseConnectTarget(authority) {
 function isInterceptedHost(host, interceptHosts) {
   return interceptHosts.includes(host);
 }
-function servedByPipeline(path42) {
-  return path42?.startsWith(ROUTED_PATH_PREFIX) === true;
+function servedByPipeline(path43) {
+  return path43?.startsWith(ROUTED_PATH_PREFIX) === true;
 }
 var HOP_BY_HOP_HEADERS = /* @__PURE__ */ new Set([
   "connection",
@@ -11116,11 +11267,11 @@ function createRcSessionTracker(deps) {
   };
   const observeExchange = (request4) => {
     const method = (request4.method ?? "").toUpperCase();
-    const path42 = new URL(request4.url ?? "/", "http://127.0.0.1").pathname;
-    if (!path42.startsWith(RC_SESSIONS_PATH_PREFIX)) {
+    const path43 = new URL(request4.url ?? "/", "http://127.0.0.1").pathname;
+    if (!path43.startsWith(RC_SESSIONS_PATH_PREFIX)) {
       return void 0;
     }
-    const tail = path42.slice(RC_SESSIONS_PATH_PREFIX.length);
+    const tail = path43.slice(RC_SESSIONS_PATH_PREFIX.length);
     const facts = {
       oauthAuthorization: oauthAuthorizationOf(request4.headers),
       anthropicVersion: singleHeader(request4.headers, "anthropic-version"),
@@ -11510,8 +11661,8 @@ var RC_READ_FILE_ENCODINGS = ["utf-8", "base64"];
 function isRcReadFileEncoding(value) {
   return RC_READ_FILE_ENCODINGS.some((encoding) => encoding === value);
 }
-function buildRcReadFilePayload(requestId, path42, options) {
-  return buildRcControlRequestPayload(requestId, { subtype: "read_file", path: path42, ...options?.maxBytes === void 0 ? {} : { max_bytes: options.maxBytes }, ...options?.encoding === void 0 ? {} : { encoding: options.encoding } });
+function buildRcReadFilePayload(requestId, path43, options) {
+  return buildRcControlRequestPayload(requestId, { subtype: "read_file", path: path43, ...options?.maxBytes === void 0 ? {} : { max_bytes: options.maxBytes }, ...options?.encoding === void 0 ? {} : { encoding: options.encoding } });
 }
 function buildRcFileSuggestionsPayload(requestId, query) {
   return buildRcControlRequestPayload(requestId, { subtype: "file_suggestions", query });
@@ -11613,15 +11764,15 @@ async function getRcSessionContextUsage(deps, sessionId, detail) {
   const result = await deliverRcClientPayload(deps, sessionId, buildRcGetContextUsagePayload(requestId, detail), `request the context usage of session ${sessionId}`);
   return result.ok ? { ...result, requestId } : result;
 }
-async function readRcSessionFile(deps, sessionId, path42, options) {
-  if (path42 === "") {
+async function readRcSessionFile(deps, sessionId, path43, options) {
+  if (path43 === "") {
     return { ok: false, message: "a read-file write needs a non-empty path: the SDK's own field names the file the worker resolves against the session's cwd, and an empty string names none" };
   }
   if (options?.maxBytes !== void 0 && (!Number.isInteger(options.maxBytes) || options.maxBytes <= 0)) {
     return { ok: false, message: "a read-file write's max-bytes is a positive whole number of bytes: the SDK's own field caps the read, and a zero or negative cap reads nothing" };
   }
   const requestId = deps.newUuid();
-  const result = await deliverRcClientPayload(deps, sessionId, buildRcReadFilePayload(requestId, path42, options), `read ${path42} from session ${sessionId}`);
+  const result = await deliverRcClientPayload(deps, sessionId, buildRcReadFilePayload(requestId, path43, options), `read ${path43} from session ${sessionId}`);
   return result.ok ? { ...result, requestId } : result;
 }
 async function suggestRcSessionFiles(deps, sessionId, query) {
@@ -11790,11 +11941,11 @@ function createRcControlHandler(deps) {
       path: "read-file",
       read: (body) => {
         const session = bodyString(body, "session");
-        const path42 = bodyString(body, "path");
+        const path43 = bodyString(body, "path");
         const maxBytes = "maxBytes" in body ? bodyPositiveInteger(body, "maxBytes") : void 0;
         const encoding = "encoding" in body && isRcReadFileEncoding(body.encoding) ? body.encoding : void 0;
-        const refused2 = session === void 0 || path42 === void 0 || "maxBytes" in body && maxBytes === void 0 || "encoding" in body && encoding === void 0;
-        return refused2 ? { error: `the read-file body must be JSON naming a non-empty session id and path, maxBytes only as a positive whole number or absent, and an encoding the SDK's own type permits (${RC_READ_FILE_ENCODINGS.join(", ")}) or none` } : { session, run: async () => await deps.readFile(session, path42, { ...maxBytes === void 0 ? {} : { maxBytes }, ...encoding === void 0 ? {} : { encoding } }) };
+        const refused2 = session === void 0 || path43 === void 0 || "maxBytes" in body && maxBytes === void 0 || "encoding" in body && encoding === void 0;
+        return refused2 ? { error: `the read-file body must be JSON naming a non-empty session id and path, maxBytes only as a positive whole number or absent, and an encoding the SDK's own type permits (${RC_READ_FILE_ENCODINGS.join(", ")}) or none` } : { session, run: async () => await deps.readFile(session, path43, { ...maxBytes === void 0 ? {} : { maxBytes }, ...encoding === void 0 ? {} : { encoding } }) };
       }
     },
     {
@@ -12104,9 +12255,9 @@ function requestIdOfBody(body) {
 }
 function frontDoorRcControl(transport, token) {
   const headers = { authorization: `Bearer ${token}` };
-  const listAnswerOf = async (path42, what) => {
+  const listAnswerOf = async (path43, what) => {
     try {
-      return await transport.request({ method: "GET", path: path42, headers });
+      return await transport.request({ method: "GET", path: path43, headers });
     } catch (error) {
       throw new Error(`${what}: could not reach the front door's control listener: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
     }
@@ -12178,10 +12329,10 @@ function frontDoorRcControl(transport, token) {
     }
     return pending;
   };
-  const writeOf = async (path42, body, describeFailure2) => {
+  const writeOf = async (path43, body, describeFailure2) => {
     let answer;
     try {
-      answer = await transport.request({ method: "POST", path: path42, headers: { ...headers, "content-type": "application/json" }, body });
+      answer = await transport.request({ method: "POST", path: path43, headers: { ...headers, "content-type": "application/json" }, body });
     } catch (error) {
       return { ok: false, message: `could not reach the front door's control listener: ${error instanceof Error ? error.message : String(error)}` };
     }
@@ -12212,10 +12363,10 @@ function frontDoorRcControl(transport, token) {
     endSession: async (sessionId, reason) => await writeOf(`${CONTROL_PATH_PREFIX}/end-session`, JSON.stringify({ session: sessionId, ...reason === void 0 ? {} : { reason } }), (status, message) => `ending ${sessionId} failed (HTTP ${String(status)}): ${message}`),
     getUsage: async (sessionId, skipBehaviors) => await writeOf(`${CONTROL_PATH_PREFIX}/get-usage`, JSON.stringify({ session: sessionId, ...skipBehaviors === void 0 ? {} : { skipBehaviors } }), (status, message) => `requesting the usage of ${sessionId} failed (HTTP ${String(status)}): ${message}`),
     getContextUsage: async (sessionId, detail) => await writeOf(`${CONTROL_PATH_PREFIX}/get-context-usage`, JSON.stringify({ session: sessionId, ...detail === void 0 ? {} : { detail } }), (status, message) => `requesting the context usage of ${sessionId} failed (HTTP ${String(status)}): ${message}`),
-    readFile: async (sessionId, path42, options) => await writeOf(
+    readFile: async (sessionId, path43, options) => await writeOf(
       `${CONTROL_PATH_PREFIX}/read-file`,
-      JSON.stringify({ session: sessionId, path: path42, ...options?.maxBytes === void 0 ? {} : { maxBytes: options.maxBytes }, ...options?.encoding === void 0 ? {} : { encoding: options.encoding } }),
-      (status, message) => `reading ${path42} from ${sessionId} failed (HTTP ${String(status)}): ${message}`
+      JSON.stringify({ session: sessionId, path: path43, ...options?.maxBytes === void 0 ? {} : { maxBytes: options.maxBytes }, ...options?.encoding === void 0 ? {} : { encoding: options.encoding } }),
+      (status, message) => `reading ${path43} from ${sessionId} failed (HTTP ${String(status)}): ${message}`
     ),
     fileSuggestions: async (sessionId, query) => await writeOf(`${CONTROL_PATH_PREFIX}/file-suggestions`, JSON.stringify({ session: sessionId, query }), (status, message) => `requesting file suggestions from ${sessionId} failed (HTTP ${String(status)}): ${message}`),
     keepAlive: async (sessionId) => await writeOf(`${CONTROL_PATH_PREFIX}/keep-alive`, JSON.stringify({ session: sessionId }), (status, message) => `keeping ${sessionId} alive failed (HTTP ${String(status)}): ${message}`),
@@ -12374,12 +12525,12 @@ function tlsFacts(options) {
 }
 function realRcEventDial(target = { host: CONNECT_INTERCEPT_HOST, port: HTTPS_PORT }) {
   const agent = new ExemptTlsAgent();
-  const post = async (path42, headers, body) => await new Promise((resolve, reject) => {
+  const post = async (path43, headers, body) => await new Promise((resolve, reject) => {
     const options = {
       host: target.host,
       port: target.port,
       method: "POST",
-      path: path42,
+      path: path43,
       // The Host header names the host whose API this is, not the address dialled: a redirected test dials a loopback stand-in while still speaking to the API host by name, exactly as the forwarded paths present their SNI.
       headers: { ...headers, host: target.servername ?? target.host, "content-length": String(Buffer.byteLength(body, "utf8")) },
       agent
@@ -12444,12 +12595,12 @@ function lateRcStreamDial(resolve) {
 }
 function realRcStreamDial(target = { host: CONNECT_INTERCEPT_HOST, port: HTTPS_PORT }) {
   const agent = new ExemptTlsAgent();
-  const request4 = async (method, path42, headers, body, signal) => await new Promise((resolve, reject) => {
+  const request4 = async (method, path43, headers, body, signal) => await new Promise((resolve, reject) => {
     const options = {
       host: target.host,
       port: target.port,
       method,
-      path: path42,
+      path: path43,
       // The Host header names the host whose API this is, not the address dialled: a redirected test dials a loopback stand-in while still speaking to the API host by name, exactly as the forwarded paths present their SNI.
       headers: { ...headers, host: target.servername ?? target.host, ...body === void 0 ? {} : { "content-length": String(Buffer.byteLength(body, "utf8")) } },
       agent,
@@ -12491,9 +12642,9 @@ function realRcStreamDial(target = { host: CONNECT_INTERCEPT_HOST, port: HTTPS_P
       return { status, body: await readAll(response) };
     },
     openStream: async (sessionId, headers, resume, signal) => {
-      const path42 = resume === void 0 ? `/v1/code/sessions/${encodeURIComponent(sessionId)}/events/stream` : `/v1/code/sessions/${encodeURIComponent(sessionId)}/events/stream?from_sequence_num=${String(resume.fromSequenceNum)}`;
+      const path43 = resume === void 0 ? `/v1/code/sessions/${encodeURIComponent(sessionId)}/events/stream` : `/v1/code/sessions/${encodeURIComponent(sessionId)}/events/stream?from_sequence_num=${String(resume.fromSequenceNum)}`;
       const streamHeaders = resume === void 0 ? headers : { ...headers, "last-event-id": String(resume.fromSequenceNum) };
-      const { status, response } = await request4("GET", path42, streamHeaders, void 0, signal);
+      const { status, response } = await request4("GET", path43, streamHeaders, void 0, signal);
       if (!isSuccessful2(status)) {
         await readAll(response);
         return { status, chunks: NO_CHUNKS };
@@ -13645,19 +13796,19 @@ function writePools(paths, pools) {
   applyPatch(paths.globalConfigFile, GlobalConfigSchema, { pools }, { defaults: {} });
 }
 function poolCycleOf(pools, name) {
-  const walk = (current, path42) => {
+  const walk = (current, path43) => {
     for (const entry of pools[current]?.identities ?? []) {
       const nested = poolNameOf(poolMemberIdentity(entry));
       if (nested === void 0) {
         continue;
       }
       if (nested === name) {
-        return [...path42, nested];
+        return [...path43, nested];
       }
-      if (path42.includes(nested)) {
+      if (path43.includes(nested)) {
         continue;
       }
-      const found = walk(nested, [...path42, nested]);
+      const found = walk(nested, [...path43, nested]);
       if (found !== void 0) {
         return found;
       }
@@ -15936,7 +16087,7 @@ function profileValue(name, paths) {
 function createConfigApiRouter(deps) {
   const authed = doorApiAuth(deps.expectedToken);
   const { paths } = deps;
-  const route = (path42, summary) => authed.meta((0, import_openapi3.openapi)({ method: "POST", path: path42, summary, tags: [CONFIG_API_TAG] }));
+  const route = (path43, summary) => authed.meta((0, import_openapi3.openapi)({ method: "POST", path: path43, summary, tags: [CONFIG_API_TAG] }));
   return {
     config: {
       identity: {