@agentproto/runtime 2.10.0 → 2.10.1

package/dist/index.d.ts

@@ -4924,6 +4924,16 @@ interface SessionDescriptor {
      * may name a gateway route.
      */
     adapterProvider?: string;
+    /**
+     * The adapter manifest's `authDescriptor.modelDerivedApiKey` — recorded at
+     * spawn time so a live `setModel` applies the SAME wire normalization the
+     * spawn path used (`normalizeModelForWire`'s `ModelWireOptions.modelDerivedApiKey`
+     * doc): for a `derived-from-model` adapter billed through a gateway/router,
+     * this decides whether the wire model needs the router re-added as a
+     * literal leading segment (opencode/mastracode/jcode/pi/mastra-agent) or
+     * left bare (hermes).
+     */
+    modelDerivedApiKey?: boolean;
     /**
      * AIP-45 mode the session was spawned with (`AgentCliStartOptions.config.
      * mode` — e.g. claude-code's `plan`/`accept-edits`, a gateway preset mode
@@ -6240,6 +6250,10 @@ interface SpawnAgentInput {
      *  {@link SessionDescriptor.adapterProvider} so live `setModel` knows when
      *  to bare a direct `vendor/product` ref; ignored for derived adapters. */
     adapterProvider?: string;
+    /** Manifest-declared `authDescriptor.modelDerivedApiKey` — recorded onto
+     *  {@link SessionDescriptor.modelDerivedApiKey} so live `setModel` applies
+     *  the same router re-prefixing the spawn path used. */
+    modelDerivedApiKey?: boolean;
     /** Optional initial prompt to dispatch immediately. The promise
      *  the registry returns resolves AFTER the spawn — the prompt
      *  runs in the background, projecting events into the ring
@@ -8489,6 +8503,10 @@ interface RouteAwareLaunchConfigInput {
     routeSelection?: "free" | "derived-from-model";
     /** Fixed provider for this adapter (e.g. `"anthropic"`), used for wire-model prefix stripping. */
     adapterProvider?: string;
+    /** `AdapterAuthDescriptor.modelDerivedApiKey` — see `normalizeModelForWire`'s
+     *  `ModelWireOptions.modelDerivedApiKey` doc for why this changes the wire
+     *  shape on a gateway-routed `derived-from-model` adapter. */
+    modelDerivedApiKey?: boolean;
     /** Skills list folded into `options.skills` per the manifest's declared shape. */
     skills?: string[];
     /**

package/dist/index.mjs

@@ -11,7 +11,7 @@ import { EventEmitter } from 'events';
 import { listAuthProfiles, eligibleProfiles, getAuthProfile, createAuthProfile, AuthProfileValidationError, deleteAuthProfile, KeychainStore, removeAuthProfile, addAuthProfile, setAuthProfileEnabled, setAuthProfileModels, refreshAuthProfileModels, credentialIdentity } from '@agentproto/auth';
 import { resolveRecipeMethod, resolveSourceSpec } from '@agentproto/secrets/provision/recipe';
 import { getModelProvider, resolveContextWindow, formatTokens, resolvePricing, LLM_PRICING_CATALOG, resolvePricingExact, MODEL_ALIASES } from '@agentproto/model-catalog/llm';
-import { resolveCustomRoute, registerCustomRoute, stripRouteSuffix, stripFixedNativeVendor, formatModelRef, resolveLlmModelRoute, tryParseModelRef } from '@agentproto/model-catalog/route-identity';
+import { resolveCustomRoute, registerCustomRoute, formatModelRef, resolveLlmModelRoute, tryParseModelRef, stripRouteSuffix, stripFixedNativeVendor } from '@agentproto/model-catalog/route-identity';
 import { findAnthropicGatewayPreset, anthropicGatewayPresetList, getAnthropicGatewayPreset } from '@agentproto/provider-presets';
 import * as providers_store_star from '@agentproto/providers-store';
 import { makeAdapterLister, makeAdapterResolver, makeCredsStore, discoverAdapterPackages, makeSetupLedger, makeListTool, makeSetupTool } from '@agentproto/provider-kit';
@@ -3831,60 +3831,6 @@ function resolveWorktreeIdentity(cwd) {
     dir = parent;
   }
 }
-function normalizeModelForWire(model, opts) {
-  if (opts.routeSelection === "derived-from-model") {
-    return stripRouteSuffix(model);
-  }
-  const nativeVendor = opts.gateway ?? opts.fixedProvider;
-  if (nativeVendor) {
-    return stripFixedNativeVendor(model, nativeVendor);
-  }
-  return stripRouteSuffix(model);
-}
-
-// src/launch-config.ts
-function buildRouteAwareLaunchConfig(input) {
-  const prefix = input.prefix ?? "agent_start";
-  const baseOptions = input.options ?? {};
-  const hasExplicitBaseUrlOption = typeof baseOptions.base_url === "string" && baseOptions.base_url.length > 0;
-  const gatewayResolvedBaseUrl = input.authSpec?.baseUrl;
-  const resolvedBaseUrl = gatewayResolvedBaseUrl ?? input.route?.baseUrl;
-  let routedOptions = baseOptions;
-  if (!hasExplicitBaseUrlOption && typeof resolvedBaseUrl === "string" && resolvedBaseUrl.length > 0) {
-    const declaresBaseUrl = input.declaredOptions?.some((o) => o.id === "base_url") ?? false;
-    const declaredOptionsKnown = input.declaredOptions !== void 0;
-    if (declaresBaseUrl || !declaredOptionsKnown) {
-      routedOptions = { ...baseOptions, base_url: resolvedBaseUrl };
-    } else if (input.routeSelection === "derived-from-model") {
-      routedOptions = baseOptions;
-    } else {
-      throw new Error(
-        `${prefix}: adapter "${input.adapter}" cannot be routed through gateway "${input.route?.gateway ?? "unknown"}" \u2014 it declares no \`base_url\` option and does not derive its route from the model id (routeSelection !== "derived-from-model"), so the resolved gateway endpoint has nowhere to go. Declare a \`base_url\` option on the adapter manifest, or mark it \`routeSelection: "derived-from-model"\` if it already resolves its own gateway from the model prefix.`
-      );
-    }
-  }
-  const effectiveOptions = normalizeSkillsOption(
-    input.skills ?? [],
-    routedOptions,
-    input.declaredOptions
-  );
-  const wireModel = input.model ? normalizeModelForWire(input.model, {
-    routeSelection: input.routeSelection,
-    gateway: input.route?.gateway,
-    fixedProvider: input.adapterProvider
-  }) : void 0;
-  const out = {};
-  if (Object.keys(effectiveOptions).length > 0) {
-    out.options = effectiveOptions;
-  }
-  if (wireModel) {
-    out.wireModel = wireModel;
-  }
-  if (resolvedBaseUrl) {
-    out.resolvedBaseUrl = resolvedBaseUrl;
-  }
-  return out;
-}
 var WIDENING_ROUTES = ["openrouter", "requesty", "huggingface"];
 var VENDOR_COMPATIBILITY_ROUTES = {
   xai: ["xai", "xai-anthropic"]
@@ -4279,6 +4225,67 @@ function modelWalletIneligibleMessage(opts) {
   return `${opts.prefix}: model "${opts.model}" is not serviceable on the resolved ${wallet} (adapter "${opts.adapter}") and would 404 upstream. This model bills route "${primary}"${also} \u2014 re-spawn on it: set route.gateway="${primary}" with an eligible "${primary}" api-key profile (access.profileRef). This guard only rejects; it never switches wallets for you.`;
 }
 
+// src/model-wire.ts
+function normalizeModelForWire(model, opts) {
+  if (opts.routeSelection === "derived-from-model") {
+    const bare = stripRouteSuffix(model);
+    if (opts.modelDerivedApiKey && opts.gateway && WIDENING_ROUTES.includes(opts.gateway) && !bare.startsWith(`${opts.gateway}/`)) {
+      return `${opts.gateway}/${bare}`;
+    }
+    return bare;
+  }
+  const nativeVendor = opts.gateway ?? opts.fixedProvider;
+  if (nativeVendor) {
+    return stripFixedNativeVendor(model, nativeVendor);
+  }
+  return stripRouteSuffix(model);
+}
+
+// src/launch-config.ts
+function buildRouteAwareLaunchConfig(input) {
+  const prefix = input.prefix ?? "agent_start";
+  const baseOptions = input.options ?? {};
+  const hasExplicitBaseUrlOption = typeof baseOptions.base_url === "string" && baseOptions.base_url.length > 0;
+  const gatewayResolvedBaseUrl = input.authSpec?.baseUrl;
+  const resolvedBaseUrl = gatewayResolvedBaseUrl ?? input.route?.baseUrl;
+  let routedOptions = baseOptions;
+  if (!hasExplicitBaseUrlOption && typeof resolvedBaseUrl === "string" && resolvedBaseUrl.length > 0) {
+    const declaresBaseUrl = input.declaredOptions?.some((o) => o.id === "base_url") ?? false;
+    const declaredOptionsKnown = input.declaredOptions !== void 0;
+    if (declaresBaseUrl || !declaredOptionsKnown) {
+      routedOptions = { ...baseOptions, base_url: resolvedBaseUrl };
+    } else if (input.routeSelection === "derived-from-model") {
+      routedOptions = baseOptions;
+    } else {
+      throw new Error(
+        `${prefix}: adapter "${input.adapter}" cannot be routed through gateway "${input.route?.gateway ?? "unknown"}" \u2014 it declares no \`base_url\` option and does not derive its route from the model id (routeSelection !== "derived-from-model"), so the resolved gateway endpoint has nowhere to go. Declare a \`base_url\` option on the adapter manifest, or mark it \`routeSelection: "derived-from-model"\` if it already resolves its own gateway from the model prefix.`
+      );
+    }
+  }
+  const effectiveOptions = normalizeSkillsOption(
+    input.skills ?? [],
+    routedOptions,
+    input.declaredOptions
+  );
+  const wireModel = input.model ? normalizeModelForWire(input.model, {
+    routeSelection: input.routeSelection,
+    gateway: input.route?.gateway,
+    fixedProvider: input.adapterProvider,
+    modelDerivedApiKey: input.modelDerivedApiKey
+  }) : void 0;
+  const out = {};
+  if (Object.keys(effectiveOptions).length > 0) {
+    out.options = effectiveOptions;
+  }
+  if (wireModel) {
+    out.wireModel = wireModel;
+  }
+  if (resolvedBaseUrl) {
+    out.resolvedBaseUrl = resolvedBaseUrl;
+  }
+  return out;
+}
+
 // src/context-continuity.ts
 var CONTEXT_CONTINUITY_DEFAULTS = {
   mode: "ask",
@@ -6248,6 +6255,7 @@ async function spawnAgentSession(deps2, input) {
       declaredOptions: resolved?.declaredOptions,
       routeSelection: resolved?.routeSelection,
       adapterProvider: resolved?.authDescriptor?.provider,
+      modelDerivedApiKey: resolved?.authDescriptor?.modelDerivedApiKey,
       skills: spawnDefaults.skills,
       prefix: "agent_start"
     });
@@ -6352,6 +6360,7 @@ async function spawnAgentSession(deps2, input) {
         ...worktreeAutoProvisioned ? { worktreeAutoProvisioned: true } : {},
         ...resolved?.routeSelection !== void 0 ? { routeSelection: resolved.routeSelection } : {},
         ...resolved?.authDescriptor?.provider !== void 0 ? { adapterProvider: resolved.authDescriptor.provider } : {},
+        ...resolved?.authDescriptor?.modelDerivedApiKey !== void 0 ? { modelDerivedApiKey: resolved.authDescriptor.modelDerivedApiKey } : {},
         ...input.model ? { model: input.model } : defaultModel2 ? { model: defaultModel2 } : {},
         ...input.mode ? { mode: input.mode } : {},
         ...input.effort ? { effort: input.effort } : {},
@@ -6629,6 +6638,7 @@ ${effectivePrompt}`;
       harness: input.harness ?? input.adapter,
       ...resolved?.routeSelection !== void 0 ? { routeSelection: resolved.routeSelection } : {},
       ...resolved?.authDescriptor?.provider !== void 0 ? { adapterProvider: resolved.authDescriptor.provider } : {},
+      ...resolved?.authDescriptor?.modelDerivedApiKey !== void 0 ? { modelDerivedApiKey: resolved.authDescriptor.modelDerivedApiKey } : {},
       ...input.model ? { model: input.model } : defaultModel ? { model: defaultModel } : {},
       ...input.mode ? { mode: input.mode } : {},
       ...input.effort ? { effort: input.effort } : {},
@@ -10151,6 +10161,7 @@ ${message}`;
         harness: input.harness ?? input.adapterSlug,
         ...input.routeSelection !== void 0 ? { routeSelection: input.routeSelection } : {},
         ...input.adapterProvider !== void 0 ? { adapterProvider: input.adapterProvider } : {},
+        ...input.modelDerivedApiKey !== void 0 ? { modelDerivedApiKey: input.modelDerivedApiKey } : {},
         // ACP-level session id — sticks across daemon restart so
         // `agentproto sessions restart <id>` can pass it as
         // `resumeSessionId` and the adapter reattaches to the prior
@@ -10276,6 +10287,7 @@ ${message}`;
         harness: input.harness ?? input.adapterSlug,
         ...input.routeSelection !== void 0 ? { routeSelection: input.routeSelection } : {},
         ...input.adapterProvider !== void 0 ? { adapterProvider: input.adapterProvider } : {},
+        ...input.modelDerivedApiKey !== void 0 ? { modelDerivedApiKey: input.modelDerivedApiKey } : {},
         ...input.label ? { label: input.label } : {},
         ...input.title ? { title: input.title } : {},
         ...input.label ? { renamedByUser: false } : {},
@@ -10812,7 +10824,8 @@ ${message}`;
       }
       let routeSelection = rt.desc.routeSelection;
       let adapterProvider = rt.desc.adapterProvider;
-      const needsAdapterMetadata = routeSelection === void 0 || routeSelection !== "derived-from-model" && adapterProvider === void 0;
+      let modelDerivedApiKey = rt.desc.modelDerivedApiKey;
+      const needsAdapterMetadata = routeSelection === void 0 || modelDerivedApiKey === void 0 || routeSelection !== "derived-from-model" && adapterProvider === void 0;
       const adapterSlug = rt.desc.adapterSlug ?? rt.adapterSlug;
       if (needsAdapterMetadata && resolveAgentAdapter && adapterSlug) {
         try {
@@ -10828,6 +10841,11 @@ ${message}`;
             rt.desc.adapterProvider = adapterProvider;
             hydrated = true;
           }
+          if (modelDerivedApiKey === void 0 && resolved?.authDescriptor?.modelDerivedApiKey !== void 0) {
+            modelDerivedApiKey = resolved.authDescriptor.modelDerivedApiKey;
+            rt.desc.modelDerivedApiKey = modelDerivedApiKey;
+            hydrated = true;
+          }
           if (hydrated) schedulePersist();
         } catch {
         }
@@ -10835,7 +10853,8 @@ ${message}`;
       const wireModel = normalizeModelForWire(modelId, {
         routeSelection,
         gateway: rt.desc.route?.gateway,
-        fixedProvider: adapterProvider
+        fixedProvider: adapterProvider,
+        modelDerivedApiKey
       });
       const result = await rt.agentSession.setModel(wireModel);
       if (result.applied) {
@@ -13989,6 +14008,7 @@ async function restartAgentSession(registry, resolveAgentAdapter, prev, opts = {
         declaredOptions: resolved.declaredOptions,
         routeSelection: resolved.routeSelection,
         adapterProvider: resolved.authDescriptor?.provider,
+        modelDerivedApiKey: resolved.authDescriptor?.modelDerivedApiKey,
         prefix: "restart"
       });
     } catch (err) {
@@ -14031,6 +14051,7 @@ async function restartAgentSession(registry, resolveAgentAdapter, prev, opts = {
       harness: effHarness,
       ...resolved.routeSelection !== void 0 ? { routeSelection: resolved.routeSelection } : {},
       ...resolved.authDescriptor?.provider !== void 0 ? { adapterProvider: resolved.authDescriptor.provider } : {},
+      ...resolved.authDescriptor?.modelDerivedApiKey !== void 0 ? { modelDerivedApiKey: resolved.authDescriptor.modelDerivedApiKey } : {},
       ...prev.label ? { label: prev.label } : {},
       ...prev.mcpServers ? { mcpServers: prev.mcpServers } : {},
       ...effModel ? { model: effModel } : {},