@mastra/code-sdk 1.10.2-alpha.0 → 1.11.0-alpha.10

package/dist/auth/account-rotation-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account-rotation-processor.d.ts","sourceRoot":"","sources":["../../src/auth/account-rotation-processor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"account-rotation-processor.d.ts","sourceRoot":"","sources":["../../src/auth/account-rotation-processor.ts"],"names":[],"mappings":"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"}

package/dist/auth/account-rotation-processor.js

@@ -1,10 +1,8 @@
 import { getOAuthProviders } from "./storage.js";
 import { ProviderAuthRequiredError } from "./provider-auth-error.js";
-import { resolveModePackFallbackChain } from "../onboarding/packs.js";
-import { findModePackForModel, loadSettings, resolveModePackModels } from "../onboarding/settings.js";
 import { resolveCredentialStore } from "../agents/credential-resolver.js";
 import { getRequestAccountSelection, isRequestAccountRoutingExhausted, markRequestAccountRoutingExhausted, setRequestAccountSelection } from "./account-routing-context.js";
-import { listResolvableModePacks, resolveModel, resolveRequestThinkingLevel } from "../agents/model.js";
+import { resolveModel, resolveRequestThinkingLevel } from "../agents/model.js";
 import { TripWire } from "@mastra/core/agent";
 //#region src/auth/account-rotation-processor.ts
 /**
@@ -61,14 +59,10 @@ const NETWORK_ERROR_CODES = /* @__PURE__ */ new Set([
 ]);
 const NETWORK_MESSAGE_PATTERN = /fetch failed|network error|socket hang up|getaddrinfo|econnrefused|enotfound|etimedout|connection (?:refused|reset|closed|timed out)|other side closed|write epipe/i;
 const MAX_CAUSE_DEPTH = 4;
-/** Persisted data-part type for a fallback-pack hop. */
-const PACK_FALLBACK_PART_TYPE = "data-mastracode-pack-fallback";
-/**
-* Session-state key the processor sets when a pack hop happens. The TUI
-* listens for it on the typed `state_changed` controller event (data parts
-* never ride controller message events) and applies thread stickiness.
-*/
-const PACK_FALLBACK_STATE_KEY = "mastracodePendingPackFallback";
+/** Persisted data-part type for a model-route hop. */
+const MODEL_FALLBACK_PART_TYPE = "data-mastracode-model-fallback";
+/** Session-state key set when account rotation advances the model route. */
+const MODEL_FALLBACK_STATE_KEY = "mastracodePendingModelFallback";
 function isErrorWithCode(error) {
 	return typeof error === "object" && error !== null && "code" in error;
 }
@@ -246,19 +240,19 @@ function accountSwitchNoticeText(data) {
 	}
 	return `Switched ${provider} account: ${data.from?.label ?? "unknown"} → ${data.to.label} (${reason})`;
 }
-/** Transcript line for a pack-fallback hop; shared by the live info event and the TUI's history render. */
-function packFallbackNoticeText(data) {
+/** Transcript line for a model-route hop; shared by the live info event and the TUI's history render. */
+function modelFallbackNoticeText(data) {
 	const reason = REASON_TEXT[data.reason] ?? data.reason;
-	return `Switched model pack: ${data.from.label} → ${data.to.label} (${reason})`;
+	return `Switched model route: ${data.from.label} → ${data.to.label} (${reason})`;
 }
 /**
-* Whether a persisted pack-fallback reason is one this build understands.
+* Whether a persisted model-fallback reason is one this build understands.
 * `REASON_TEXT` also covers the account-switch reasons, so the notice text
 * alone would happily render a foreign value such as `rate-limit` as a
-* pack-fallback reason; history parsed from another build's part must be
+* model-fallback reason; history parsed from another build's part must be
 * rejected instead.
 */
-function isPackFallbackReason(value) {
+function isModelFallbackReason(value) {
 	return value === "pool-exhausted" || value === "persistent-outage";
 }
 async function emitAccountSwitchPart(args, data) {
@@ -284,19 +278,9 @@ function providerFromSession(args) {
 function getRoutingController(args) {
 	return args.requestContext?.get("controller");
 }
-/**
-* A12: the account a pack/model route targets, or `undefined` when the route
-* is `Automatic` (no entry — insertion order, full pool rotation).
-*
-* A targeted route is *exclusive*: only that account may serve the route, so
-* rotation must never spill the request onto a sibling subscription's quota.
-* A heavy model on one subscription can burn that subscription's quota in
-* hours; spilling it into a second subscription defeats the point of having
-* one.
-*/
-function getRouteTargetAccountId(settingsPath, route) {
-	if (!route) return void 0;
-	return loadSettings(settingsPath).models.packAccountPreferences?.[route.packId]?.[route.modelId];
+/** A targeted route is exclusive; an entry without accountId uses automatic pool rotation. */
+function getRouteTargetAccountId(route) {
+	return route?.accountId;
 }
 function getRequestActiveAccount(args, store, providerId) {
 	if (isRequestAccountRoutingExhausted(args.requestContext, providerId)) return void 0;
@@ -304,26 +288,22 @@ function getRequestActiveAccount(args, store, providerId) {
 	if (selectedId) return store.listAccounts?.(providerId).find((account) => account.id === selectedId);
 	return store.getActiveAccount?.(providerId) ?? store.listAccounts?.(providerId).find((account) => account.active);
 }
-function resolveAccountRoute(args, settingsPath, explicit) {
+function resolveAccountRoute(args, explicit) {
 	const controller = getRoutingController(args);
 	const state = controller?.getState?.();
-	const pending = state?.mastracodePendingPackFallback;
-	const pendingMatchesThread = pending && typeof pending.toPackId === "string" && typeof pending.toModelId === "string" && (pending.threadId === void 0 || pending.threadId === controller?.threadId);
-	const resolvedModelId = explicit?.modelId ?? (pendingMatchesThread ? pending.toModelId : void 0) ?? (typeof controller?.session?.modelId === "string" ? controller.session.modelId : void 0);
-	if (typeof resolvedModelId !== "string" || resolvedModelId.length === 0) return null;
-	const modelId = resolvedModelId;
-	const settings = loadSettings(settingsPath);
-	const packs = listResolvableModePacks(settings);
-	const modeId = typeof controller?.session?.modeId === "string" && controller.session.modeId.length > 0 ? controller.session.modeId : "build";
-	const explicitPackId = explicit?.packId ?? (pendingMatchesThread ? pending.toPackId : void 0) ?? (typeof state?.activeModelPackId === "string" ? state.activeModelPackId : settings.models.activeModelPackId);
-	const pack = explicitPackId ? packs.find((candidate) => candidate.id === explicitPackId) : findModePackForModel(settings, packs, modelId, modeId, void 0);
-	if (!pack || resolveModePackModels(settings, pack)[modeId] !== modelId) return null;
-	const providerId = providerFromModelId(modelId);
-	return providerId ? {
-		packId: pack.id,
-		modelId,
-		providerId
-	} : null;
+	const pending = state?.mastracodePendingModelFallback;
+	const pendingMatchesThread = pending && typeof pending.toEntryId === "string" && typeof pending.toModelId === "string" && (pending.threadId === void 0 || pending.threadId === controller?.threadId);
+	const routeEntries = Array.isArray((state?.modelRoute)?.entries) ? (state?.modelRoute).entries ?? [] : [];
+	const entry = explicit ? explicit : pendingMatchesThread ? routeEntries.find((candidate) => candidate.id === pending.toEntryId && candidate.modelId === pending.toModelId) : routeEntries.find((candidate) => candidate.modelId === controller?.session?.modelId);
+	if (!entry || typeof entry.id !== "string" || typeof entry.modelId !== "string") return null;
+	const providerId = providerFromModelId(entry.modelId);
+	if (!providerId) return null;
+	return {
+		entryId: entry.id,
+		modelId: entry.modelId,
+		providerId,
+		...typeof entry.accountId === "string" ? { accountId: entry.accountId } : {}
+	};
 }
 /**
 * A14: `Automatic` rotation starts *at* the persisted active account and walks
@@ -338,9 +318,9 @@ function orderAccountsFromActive(accounts, activeId) {
 	if (index <= 0) return accounts;
 	return [...accounts.slice(index), ...accounts.slice(0, index)];
 }
-async function applyPreferredAccountRoute(args, store, settingsPath, route) {
+async function applyPreferredAccountRoute(args, store, route) {
 	store.reload();
-	const preferredId = getRouteTargetAccountId(settingsPath, route);
+	const preferredId = getRouteTargetAccountId(route);
 	const accounts = store.listAccounts?.(route.providerId) ?? [];
 	if (accounts.length === 0 && preferredId === void 0) return false;
 	const tried = getTriedInstances(args.state);
@@ -394,22 +374,18 @@ var AccountRotationProcessor = class {
 			await this.gateChainHop(args, error);
 			return { retry: false };
 		}
-		const cascade = await this.getPackCascade(args);
-		const currentPack = cascade?.packs[cascade.position];
-		const cascadeModelId = currentPack ? cascade.models[currentPack.packId]?.[cascade.modeId] : void 0;
-		const providerId = providerFromError(error) ?? (typeof cascadeModelId === "string" ? providerFromModelId(cascadeModelId) : void 0) ?? (cascade ? void 0 : providerFromSession(args));
+		const cascade = await this.getModelRouteCascade(args);
+		const currentEntry = cascade?.entries[cascade.position];
+		const providerId = providerFromError(error) ?? (currentEntry ? providerFromModelId(currentEntry.modelId) : void 0) ?? (cascade ? void 0 : providerFromSession(args));
 		if (!providerId) {
-			await this.emitPackFallbackPart(args, classification.kind === "hop" ? "persistent-outage" : "pool-exhausted");
+			await this.emitModelFallbackPart(args, classification.kind === "hop" ? "persistent-outage" : "pool-exhausted");
 			return { retry: false };
 		}
 		const store = resolveCredentialStore(args.requestContext) ?? this.options.credentialStore;
 		store.reload();
 		const accounts = store.listAccounts?.(providerId) ?? [];
 		const active = getRequestActiveAccount(args, store, providerId);
-		const route = currentPack && typeof cascadeModelId === "string" ? resolveAccountRoute(args, this.options.settingsPath, {
-			packId: currentPack.packId,
-			modelId: cascadeModelId
-		}) : resolveAccountRoute(args, this.options.settingsPath);
+		const route = currentEntry ? resolveAccountRoute(args, currentEntry) : resolveAccountRoute(args);
 		if (classification.kind === "rotate" && classification.reason === "auth-failed" && active) {
 			const forced = getForcedRefreshInstances(state);
 			const refreshKey = `${providerId}:${active?.id ?? "active"}`;
@@ -418,7 +394,7 @@ var AccountRotationProcessor = class {
 				if (await store.forceRefreshActiveAccount(providerId, active?.id) !== void 0) return { retry: true };
 			}
 		}
-		const targetAccountId = route?.providerId === providerId ? getRouteTargetAccountId(this.options.settingsPath, route) : void 0;
+		const targetAccountId = route?.providerId === providerId ? getRouteTargetAccountId(route) : void 0;
 		if (classification.kind === "hop") return this.declarePoolUnavailable(args, providerId, "persistent-outage", targetAccountId !== void 0);
 		if (targetAccountId !== void 0) return this.declarePoolUnavailable(args, providerId, "pool-exhausted", true);
 		const tried = getTriedInstances(state);
@@ -446,78 +422,59 @@ var AccountRotationProcessor = class {
 		return { retry: true };
 	}
 	/**
-	* The request's pack cascade, computed once from the session's pack and
-	* cached in processor state. Truncated at the first pack that lacks the
-	* session mode's model — mirroring getDynamicModel's truncation — so the
-	* cascade never promises a hop core's fallback array cannot make. The
-	* position advances per hop, so a second hop in the same turn reports B→C
-	* even though the session modelId still points at pack A (stickiness lands
-	* TUI-side only after the part renders). Returns null when the session has
-	* no active pack or the pack has no fallback chain.
+	* Resolve the request's host-supplied model route once and cache the reachable
+	* prefix in processor state. Resolution mirrors getDynamicModel so a hop is
+	* never announced for an entry core cannot reach.
 	*/
-	async getPackCascade(args) {
-		if (args.state.packCascade !== void 0) return args.state.packCascade ?? null;
-		const controller = args.requestContext?.get("controller");
-		const modelId = controller?.session?.modelId;
-		if (typeof modelId !== "string" || modelId.length === 0) {
-			args.state.packCascade = null;
+	async getModelRouteCascade(args) {
+		if (args.state.modelRouteCascade !== void 0) return args.state.modelRouteCascade ?? null;
+		const controller = getRoutingController(args);
+		const state = controller?.getState?.();
+		const route = (state?.modelRoute)?.entries;
+		const pending = state?.mastracodePendingModelFallback;
+		const startIndex = pending && typeof pending.toEntryId === "string" && (pending.threadId === void 0 || pending.threadId === controller?.threadId) ? route?.findIndex((entry) => entry.id === pending.toEntryId) : route?.findIndex((entry) => entry.modelId === controller?.session?.modelId);
+		if (!route || startIndex === void 0 || startIndex < 0 || route.length - startIndex < 2) {
+			args.state.modelRouteCascade = null;
 			return null;
 		}
-		const modeId = typeof controller?.session?.modeId === "string" && controller.session.modeId.length > 0 ? controller.session.modeId : "build";
-		const settings = loadSettings(this.options.settingsPath);
-		const packs = listResolvableModePacks(settings);
-		const controllerState = controller?.getState?.();
-		const statePackId = controllerState?.activeModelPackId ?? settings.models.activeModelPackId;
-		const activePack = findModePackForModel(settings, packs, modelId, modeId, typeof statePackId === "string" ? statePackId : void 0);
-		const chain = activePack ? resolveModePackFallbackChain(settings.models.packFallbacks ?? {}, activePack.id, settings.customModelPacks) : [];
-		if (chain.length < 2) {
-			args.state.packCascade = null;
-			return null;
-		}
-		const resolvedPacks = [];
-		const models = {};
-		for (const packId of chain) {
-			const pack = packs.find((candidate) => candidate.id === packId);
-			const packModels = pack ? resolveModePackModels(settings, pack) : {};
-			if (resolvedPacks.length > 0) {
-				const entryModelId = packModels[modeId];
-				if (!entryModelId) break;
-				try {
-					resolveModel(entryModelId, {
-						thinkingLevel: resolveRequestThinkingLevel({
-							state: { thinkingLevel: controllerState?.thinkingLevel },
-							session: { modeId }
-						}, this.options.settingsPath),
-						remapForCodexOAuth: true,
-						requestContext: args.requestContext
-					});
-				} catch {
-					break;
-				}
+		const thinkingLevel = resolveRequestThinkingLevel({
+			state: { thinkingLevel: state?.thinkingLevel },
+			session: { modeId: typeof controller?.session?.modeId === "string" ? controller.session.modeId : "build" }
+		}, this.options.settingsPath);
+		const entries = [];
+		for (const entry of route.slice(startIndex)) {
+			if (typeof entry.id !== "string" || entry.id.length === 0 || typeof entry.modelId !== "string" || entry.modelId.length === 0) break;
+			if (entries.length > 0) try {
+				resolveModel(entry.modelId, {
+					thinkingLevel,
+					remapForCodexOAuth: true,
+					requestContext: args.requestContext
+				});
+			} catch {
+				break;
 			}
-			resolvedPacks.push({
-				packId,
-				label: pack?.name ?? packId
+			entries.push({
+				id: entry.id,
+				label: typeof entry.label === "string" && entry.label.length > 0 ? entry.label : entry.id,
+				modelId: entry.modelId,
+				...typeof entry.accountId === "string" ? { accountId: entry.accountId } : {}
 			});
-			models[packId] = packModels;
 		}
-		if (resolvedPacks.length < 2) {
-			args.state.packCascade = null;
+		if (entries.length < 2) {
+			args.state.modelRouteCascade = null;
 			return null;
 		}
 		const cascade = {
-			packs: resolvedPacks,
-			models,
-			modeId,
+			entries,
 			position: 0
 		};
-		args.state.packCascade = cascade;
+		args.state.modelRouteCascade = cascade;
 		return cascade;
 	}
 	/**
-	* Q14 gate: 400/unknown/unattributable errors never hop packs. Core's
+	* Q14 gate: 400/unknown/unattributable errors never advance routes. Core's
 	* fallback array advances on ANY thrown error except TripWire
-	* (llm-execution-step.ts), so when the session's pack has a chain and the
+	* (llm-execution-step.ts), so when the session route has another entry and the
 	* current entry is non-last, a bare `retry: false` would silently hop on an
 	* error class the user excluded from hop triggers. TripWire is the only
 	* no-advance escape: the runner rethrows it and the fallback loop declines
@@ -525,77 +482,71 @@ var AccountRotationProcessor = class {
 	* plain `retry: false` surface the error exactly as before.
 	*/
 	async gateChainHop(args, error) {
-		const cascade = await this.getPackCascade(args);
+		const cascade = await this.getModelRouteCascade(args);
 		if (!cascade) return;
-		if (cascade.position >= cascade.packs.length - 1) return;
+		if (cascade.position >= cascade.entries.length - 1) return;
 		throw new TripWire(error instanceof Error ? error.message : String(error), {}, this.id);
 	}
-	/**
-	* Emit the pack-fallback part when a configured chain has a next pack and
-	* queue the thread stickiness trigger. Core's fallback array does the hop
-	* itself on `retry: false`; this only announces it. The cascade is
-	* truncated exactly like getDynamicModel's chain (missing mode model or
-	* unresolvable model), so an announced hop is always one core can make;
-	* the toModelId guard stays as defense against a stale cache.
-	*/
-	async emitPackFallbackPart(args, reason) {
-		const cascade = await this.getPackCascade(args);
+	/** Announce and persist the next model-route hop before core advances. */
+	async emitModelFallbackPart(args, reason) {
+		const cascade = await this.getModelRouteCascade(args);
 		if (!cascade) return;
-		const from = cascade.packs[cascade.position];
-		const to = cascade.packs[cascade.position + 1];
+		const from = cascade.entries[cascade.position];
+		const to = cascade.entries[cascade.position + 1];
 		if (!from || !to) return;
-		const toModelId = cascade.models[to.packId]?.[cascade.modeId];
-		if (!toModelId) return;
 		const controller = args.requestContext?.get("controller");
 		const at = (/* @__PURE__ */ new Date()).toISOString();
 		const threadId = typeof controller?.threadId === "string" ? controller.threadId : void 0;
 		const pending = {
-			fromPackId: from.packId,
-			toPackId: to.packId,
-			toModelId,
+			fromEntryId: from.id,
+			toEntryId: to.id,
+			toModelId: to.modelId,
 			...threadId ? { threadId } : {},
 			reason,
 			at
 		};
 		await controller?.setThreadSetting?.({
-			key: PACK_FALLBACK_STATE_KEY,
+			key: MODEL_FALLBACK_STATE_KEY,
 			value: pending
 		});
 		const data = {
-			from,
-			to,
+			from: {
+				entryId: from.id,
+				label: from.label
+			},
+			to: {
+				entryId: to.id,
+				label: to.label
+			},
 			reason,
 			at
 		};
 		try {
 			await args.writer?.custom({
-				type: PACK_FALLBACK_PART_TYPE,
+				type: MODEL_FALLBACK_PART_TYPE,
 				data
 			});
 		} catch (error) {
 			await controller?.setThreadSetting?.({
-				key: PACK_FALLBACK_STATE_KEY,
+				key: MODEL_FALLBACK_STATE_KEY,
 				value: void 0
 			});
 			throw error;
 		}
-		await controller?.setState?.({ [PACK_FALLBACK_STATE_KEY]: pending });
+		await controller?.setState?.({ [MODEL_FALLBACK_STATE_KEY]: pending });
 		args.state.startNoticeEmitted = false;
-		const targetRoute = resolveAccountRoute(args, this.options.settingsPath, {
-			packId: to.packId,
-			modelId: toModelId
-		});
-		if (targetRoute) await applyPreferredAccountRoute(args, resolveCredentialStore(args.requestContext) ?? this.options.credentialStore, this.options.settingsPath, targetRoute).catch(() => void 0);
+		const targetRoute = resolveAccountRoute(args, to);
+		if (targetRoute) await applyPreferredAccountRoute(args, resolveCredentialStore(args.requestContext) ?? this.options.credentialStore, targetRoute).catch(() => void 0);
 		controller?.emitEvent?.({
 			type: "info",
-			message: packFallbackNoticeText(data)
+			message: modelFallbackNoticeText(data)
 		});
 		cascade.position++;
 	}
 	/**
 	* Pool done for this request: every instance recorded in the tried-set and
 	* a `to: null` part emitted. Returns `retry: false` so core's fallback
-	* array can hop to the next pack (announced by `emitPackFallbackPart`).
+	* array can hop to the next route entry (announced by `emitModelFallbackPart`).
 	* Silent on the account part when the provider has no registry at all —
 	* there are no accounts to declare unavailable, but the hop still applies.
 	*/
@@ -603,7 +554,7 @@ var AccountRotationProcessor = class {
 		const store = resolveCredentialStore(args.requestContext) ?? this.options.credentialStore;
 		const accounts = store.listAccounts?.(providerId) ?? [];
 		if (accounts.length === 0) {
-			await this.emitPackFallbackPart(args, reason);
+			await this.emitModelFallbackPart(args, reason);
 			return { retry: false };
 		}
 		const tried = getTriedInstances(args.state);
@@ -620,7 +571,7 @@ var AccountRotationProcessor = class {
 			at: (/* @__PURE__ */ new Date()).toISOString(),
 			...exclusive ? { exclusive: true } : {}
 		});
-		await this.emitPackFallbackPart(args, reason);
+		await this.emitModelFallbackPart(args, reason);
 		return { retry: false };
 	}
 };
@@ -642,9 +593,9 @@ var AccountStartNoticeProcessor = class {
 	async processInput(args) {
 		if (args.state.startNoticeEmitted) return args.messageList;
 		const store = resolveCredentialStore(args.requestContext) ?? this.options.credentialStore;
-		const route = resolveAccountRoute(args, this.options.settingsPath);
+		const route = resolveAccountRoute(args);
 		if (route) {
-			if (await applyPreferredAccountRoute(args, store, this.options.settingsPath, route) || getRouteTargetAccountId(this.options.settingsPath, route) !== void 0) {
+			if (await applyPreferredAccountRoute(args, store, route) || getRouteTargetAccountId(route) !== void 0) {
 				args.state.startNoticeEmitted = true;
 				return args.messageList;
 			}
@@ -671,6 +622,6 @@ var AccountStartNoticeProcessor = class {
 	}
 };
 //#endregion
-export { ACCOUNT_SWITCH_PART_TYPE, AccountRotationProcessor, AccountStartNoticeProcessor, PACK_FALLBACK_PART_TYPE, PACK_FALLBACK_STATE_KEY, PROVIDER_DISPLAY_NAMES, accountSwitchNoticeText, classifyRotationError, isAccountSwitchReason, isPackFallbackReason, packFallbackNoticeText, providerFromError, providerFromModelId };
+export { ACCOUNT_SWITCH_PART_TYPE, AccountRotationProcessor, AccountStartNoticeProcessor, MODEL_FALLBACK_PART_TYPE, MODEL_FALLBACK_STATE_KEY, PROVIDER_DISPLAY_NAMES, accountSwitchNoticeText, classifyRotationError, isAccountSwitchReason, isModelFallbackReason, modelFallbackNoticeText, providerFromError, providerFromModelId };
 
 //# sourceMappingURL=account-rotation-processor.js.map