@to11ai/sdk 1.1.0 → 2.0.0-rc.2

package/src/prompts/cache.ts

@@ -1,4 +1,4 @@
-import type { FetchedPrompt, ResolvedPrompt } from "./types";
+import type { RenderedPrompt } from "./types";
 
 export interface CacheConfig {
 	/** Time-to-live in seconds. Default: 300 (5 minutes) */
@@ -8,18 +8,17 @@ export interface CacheConfig {
 }
 
 /**
- * The cache stores either a legacy `resolve()` result or an enriched
- * `fetch()` result. Both are JSON-cloneable; the cache is shape-agnostic.
+ * The cache stores enriched `render()` results, which are JSON-cloneable.
  */
-export type CacheableResolved = ResolvedPrompt | FetchedPrompt;
+export type CacheableRendered = RenderedPrompt;
 
 interface CacheEntry {
-	value: CacheableResolved;
+	value: CacheableRendered;
 	expiresAt: number;
 }
 
 /**
- * Build a canonical cache key for a resolve() call.
+ * Build a canonical base cache key from project/slug/labels/variables.
  *
  * - projectId is included to prevent cross-project cache collisions: a single
  *   PromptResource can serve multiple projects, so the same slug+labels must
@@ -44,7 +43,7 @@ export function buildCacheKey(
 }
 
 /**
- * Build a cache key for an env-aware `fetch()` call.
+ * Build a cache key for an env-aware `render()` call.
  *
  * Folds in `env` and `subject` ON TOP of the base
  * project/slug/labels/variables key so two calls that differ only by
@@ -58,18 +57,15 @@ export function buildCacheKey(
  * caches as the same deterministic variant on repeat (D8); the
  * weighted-no-subject bypass is handled in the resource, not here.
  */
-export function buildFetchCacheKey(
+export function buildRenderCacheKey(
 	projectId: string,
 	slug: string,
 	env: string,
 	subject?: string,
 	variables?: Record<string, unknown>,
-	developerRole?: string,
 ): string {
 	const base = buildCacheKey(projectId, slug, [env], variables);
-	// `developerRole` partitions the cache; coalesce the default so omitted and
-	// `"user"` (the documented default) share one entry, not two.
-	return `fetch|${base}|${JSON.stringify(env)}|${JSON.stringify(subject ?? null)}|${JSON.stringify(developerRole ?? "user")}`;
+	return `render|${base}|${JSON.stringify(env)}|${JSON.stringify(subject ?? null)}`;
 }
 
 function sortObjectKeys(obj: unknown): unknown {
@@ -83,7 +79,7 @@ function sortObjectKeys(obj: unknown): unknown {
 }
 
 /**
- * In-memory LRU cache for ResolvedPrompt objects.
+ * In-memory LRU cache for RenderedPrompt objects.
  *
  * Uses a Map (insertion-ordered) as the backing store. On every access, the
  * entry is deleted and re-inserted to maintain LRU order — oldest entries sit
@@ -100,7 +96,7 @@ export class PromptCache {
 		this.store = new Map();
 	}
 
-	get(key: string): CacheableResolved | undefined {
+	get(key: string): CacheableRendered | undefined {
 		const entry = this.store.get(key);
 		if (!entry) return undefined;
 
@@ -116,7 +112,7 @@ export class PromptCache {
 		return entry.value;
 	}
 
-	set(key: string, value: CacheableResolved): void {
+	set(key: string, value: CacheableRendered): void {
 		// maxEntries: 0 (or negative) means caching is disabled — drop the entry.
 		if (this.maxEntries <= 0) {
 			return;

package/src/prompts/resource.ts

@@ -3,7 +3,13 @@ import { EnvNotFoundError, To11aiNetworkError } from "../errors";
 import { zResolvedPrompt } from "../generated/zod.gen";
 import type { ApiEnvelope, Transport } from "../transport";
 import type { CacheConfig } from "./cache";
-import { buildCacheKey, buildFetchCacheKey, PromptCache } from "./cache";
+import { buildRenderCacheKey, PromptCache } from "./cache";
+import type {
+	AnthropicRenderedPrompt,
+	OpenAiRenderedPrompt,
+	RenderResult,
+} from "./shape";
+import { shapePrompt } from "./shape";
 import type {
 	ArchivePromptInput,
 	ArchivePromptResult,
@@ -15,8 +21,6 @@ import type {
 	CreatePromptVersionResult,
 	DeleteProjectPromptLabelInput,
 	DeleteProjectPromptLabelResult,
-	FetchedPrompt,
-	FetchPromptOptions,
 	GetProjectPromptLabelInput,
 	GetProjectPromptLabelResult,
 	GetPromptInput,
@@ -40,10 +44,11 @@ import type {
 	PaginatedResult,
 	RenderedChatMessage,
 	RenderedPrompt,
+	RenderFormat,
+	RenderOptions,
 	ResolvedPrompt,
 	ResolvedPromptEnvelope,
-	ResolvePromptInput,
-	ResolvePromptResult,
+	UnknownRoleMode,
 	UpdateProjectPromptLabelInput,
 	UpdateProjectPromptLabelResult,
 	UpdatePromptInput,
@@ -66,8 +71,6 @@ export type {
 	CreatePromptVersionResult,
 	DeleteProjectPromptLabelInput,
 	DeleteProjectPromptLabelResult,
-	FetchedPrompt,
-	FetchPromptOptions,
 	GetProjectPromptLabelInput,
 	GetProjectPromptLabelResult,
 	GetPromptInput,
@@ -101,32 +104,22 @@ export type {
 	PromptVersion,
 	RenderedChatMessage,
 	RenderedPrompt,
+	RenderFormat,
+	RenderOptions,
 	ResolvedPrompt,
 	ResolvedPromptEnvelope,
 	ResolvedToolCall,
 	ResolvedToolDefinition,
-	ResolvePromptInput,
-	ResolvePromptResult,
 	RowError,
 	TextChatMessage,
 	TextChatRole,
+	UnknownRoleMode,
 	UpdateProjectPromptLabelInput,
 	UpdateProjectPromptLabelResult,
 	UpdatePromptInput,
 	UpdatePromptResult,
 } from "./types";
 
-const zResolvedPromptLegacy = zResolvedPrompt.pick({
-	promptId: true,
-	versionId: true,
-	version: true,
-	labels: true,
-	contentHash: true,
-	rendered: true,
-	tools: true,
-	toolChoice: true,
-});
-
 const zResolvedPromptEnvelope = zResolvedPrompt
 	.partial({ releaseId: true })
 	.extend({ strategy: z.enum(["single", "weighted"]).optional() });
@@ -143,22 +136,28 @@ function getProjectPromptsPath(projectId: string): string {
 }
 
 /**
- * Project a server `rendered` payload into the `messages` array of the R5
- * `FetchedPrompt` (D5):
- *   - `format: "chat"` → the message array directly.
- *   - `format: "text"` → a single synthesized `{ role: "user", content }`.
+ * Project a server `rendered` payload into the enriched result's `messages`.
+ *
+ * Prompts resolve as chat blocks. The deprecated `text` format is no longer a
+ * first-class case: a non-chat payload throws rather than being silently
+ * coerced (a text prompt is sugar for a single-block chat and is being removed
+ * from the API).
  */
-function renderedToMessages(rendered: RenderedPrompt): RenderedChatMessage[] {
-	if (rendered.format === "chat") {
-		return rendered.messages;
+function renderedToMessages(
+	rendered: ResolvedPrompt["rendered"],
+): RenderedChatMessage[] {
+	if (rendered.format !== "chat") {
+		throw new Error(
+			"[to11ai/sdk] Unsupported non-chat prompt format; author the prompt as chat blocks.",
+		);
 	}
-	return [{ role: "user", content: rendered.text }];
+	return rendered.messages;
 }
 
 /**
- * Normalize the server resolve envelope into the enriched R5 `FetchedPrompt`.
+ * Normalize the server resolve envelope into the enriched `RenderedPrompt`.
  *
- * - `messages` is synthesized from `rendered` via the D5 projection.
+ * - `messages` is derived from the `rendered` chat payload.
  * - `releaseId` is ALWAYS a key: a string when the server sends one, else
  *   explicit `null` (R5 `string | null`).
  * - `variantName` is present IFF the server sent one (i.e. weighted release);
@@ -167,9 +166,10 @@ function renderedToMessages(rendered: RenderedPrompt): RenderedChatMessage[] {
  */
 function normalizeResolvedEnvelope(
 	raw: ResolvedPrompt | ResolvedPromptEnvelope,
-): FetchedPrompt {
+	slug: string,
+): RenderedPrompt {
 	const provenance = raw as ResolvedPromptEnvelope;
-	const result: FetchedPrompt = {
+	const result: RenderedPrompt = {
 		messages: renderedToMessages(raw.rendered),
 		version: raw.version,
 		releaseId: provenance.releaseId ?? null,
@@ -177,8 +177,12 @@ function normalizeResolvedEnvelope(
 		promptId: raw.promptId,
 		versionId: raw.versionId,
 		contentHash: raw.contentHash,
-		labels: raw.labels,
-		rendered: raw.rendered,
+		label: raw.label,
+		// The requested slug — the API resolve envelope does not echo it, so it
+		// is threaded from the `render()` input (TO11-2727). Surfaced as
+		// `x-to11-prompt-slug` for trace readability.
+		slug,
+		modelConfig: provenance.modelConfig,
 	};
 	// `tools` is present IFF the resolved version declares tool definitions; the
 	// wire may send `null` (or omit it) — normalize both to absent so callers
@@ -208,20 +212,26 @@ function normalizeResolvedEnvelope(
 }
 
 /**
- * Lift a caller-supplied offline `fallback` into the enriched `FetchedPrompt`
- * shape (D7), so `fetch()` returns an identical shape on the online and
- * offline paths. An already-enriched `FetchedPrompt` is returned as-is; a
- * legacy `ResolvedPrompt` is lifted (messages synthesized; `releaseId` → its
- * own value or explicit `null`; `blockRenderRecord` → `{}`; `variantName`
- * stays absent).
+ * Lift a caller-supplied offline `fallback` into the returned shape (D7), so
+ * `render()` returns an identical shape on the online and offline paths. The
+ * fallback's own slug is preferred, falling back to the `render()` input when it
+ * carries none, so `x-to11-prompt-slug` is still emitted.
  */
-function liftFallbackToFetched(
-	fallback: ResolvedPrompt | FetchedPrompt,
-): FetchedPrompt {
-	if ("messages" in fallback) {
-		return structuredClone(fallback);
+function liftFallbackToRendered(
+	fallback: RenderedPrompt,
+	slug: string,
+): RenderedPrompt {
+	// Defensive: `fallback` is typed `RenderedPrompt`, but an untyped JS caller,
+	// an `as` cast, or a persisted pre-2.0 `resolve()` result could pass the old
+	// `ResolvedPrompt` shape (no top-level `messages`). Fail loudly rather than
+	// return a malformed result with `undefined` messages.
+	if (!Array.isArray((fallback as { messages?: unknown }).messages)) {
+		throw new Error(
+			"[to11ai/sdk] `fallback` must be a RenderedPrompt (as returned by render()); the legacy resolve() shape is no longer supported.",
+		);
 	}
-	return normalizeResolvedEnvelope(fallback);
+	// `||` (not `??`) so an empty-string slug also falls through to the input.
+	return { ...structuredClone(fallback), slug: fallback.slug || slug };
 }
 
 function getProjectPromptPath(projectId: string, promptId: string): string {
@@ -261,34 +271,48 @@ function buildLabelEventsQuery(input: ListLabelEventsInput): string {
 }
 
 /**
- * Init-time config for the env-aware `fetch()` surface (TO11-980 / S9).
+ * Init-time config for the env-aware `render()` surface (TO11-980 / S9).
  *
  * `projectId` and `env` come from `createClient`. `projectId` is required for
- * `fetch()` (it builds the project-scoped resolve path); `env` is the default
- * serving environment inherited by every `fetch(slug)` call.
+ * `render()` (it builds the project-scoped resolve path); `env` is the default
+ * serving environment inherited by every `render(slug)` call.
  */
 export interface PromptResourceConfig {
-	/** Project the client is bound to. Required for `fetch()`; validated at createClient. */
+	/** Project the client is bound to. Required for `render()`; validated at createClient. */
 	projectId?: string;
-	/** Default serving env for `fetch()`. Validated against ENV_SLUG_REGEX at createClient. */
+	/** Default serving env for `render()`. Validated against ENV_SLUG_REGEX at createClient. */
 	env?: string;
+	/** Default provider shape for `render()` output. Per-call override allowed. */
+	format?: RenderFormat;
+	/**
+	 * Default unknown-role policy for `render({ format })` output conversion.
+	 * Per-call override allowed; defaults to `"drop"`.
+	 */
+	onUnknownRole?: UnknownRoleMode;
 }
 
-export class PromptResource {
+export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	private readonly transport: Transport;
 	private readonly cache: PromptCache;
 	private readonly projectId: string | undefined;
 	private readonly env: string | undefined;
+	private readonly format: RenderFormat | undefined;
+	private readonly onUnknownRole: UnknownRoleMode | undefined;
 
 	constructor(
 		transport: Transport,
 		cacheConfig?: CacheConfig,
-		config?: PromptResourceConfig,
+		// `format` is bound to the class generic `F` (not the wider `RenderFormat`)
+		// so the constructed default shape cannot disagree with what `render()`'s
+		// return type (`RenderResult<F>`) promises.
+		config?: Omit<PromptResourceConfig, "format"> & { format?: F },
 	) {
 		this.transport = transport;
 		this.cache = new PromptCache(cacheConfig);
 		this.projectId = config?.projectId;
 		this.env = config?.env;
+		this.format = config?.format;
+		this.onUnknownRole = config?.onUnknownRole;
 	}
 
 	// ─── Create ──────────────────────────────────────────────────────────────
@@ -436,35 +460,64 @@ export class PromptResource {
 		return unwrap(envelope);
 	}
 
-	// ─── Fetch (env-aware resolution, TO11-980 / S9) ──────────────────────────
+	// ─── Render (env-aware resolution + format shaping, TO11-980 / TO11-2691) ──
+
+	/**
+	 * Resolve and (optionally) shape a prompt for the client's configured
+	 * `projectId` + `env`, in one control-plane request. With a `format` (per
+	 * call or inherited from the client) the result is provider-shaped
+	 * `{ messages, config, metadata }`; without one it is the neutral
+	 * `RenderedPrompt`. Resolves by the client's configured `env`.
+	 *
+	 * @example Render an OpenAI-shaped prompt and send it through the gateway
+	 * const prompt = await to11.prompts.render("weather-concierge", {
+	 *   variables: { city: "NYC" },
+	 * });
+	 * const res = await openai.chat.completions.create(
+	 *   { ...prompt.config, messages: prompt.messages },
+	 *   { headers: to11.turn().headers(prompt) },
+	 * );
+	 */
+	async render(
+		slug: string,
+		options: RenderOptions & { format: "openai" },
+	): Promise<OpenAiRenderedPrompt>;
+	async render(
+		slug: string,
+		options: RenderOptions & { format: "anthropic" },
+	): Promise<AnthropicRenderedPrompt>;
+	async render(slug: string, options?: RenderOptions): Promise<RenderResult<F>>;
+	async render(
+		slug: string,
+		options: RenderOptions = {},
+	): Promise<RenderedPrompt | OpenAiRenderedPrompt | AnthropicRenderedPrompt> {
+		const rendered = await this.resolveToRendered(slug, options);
+		return shapePrompt(rendered, options.format ?? this.format, {
+			onUnknownRole: options.onUnknownRole ?? this.onUnknownRole,
+		});
+	}
 
 	/**
-	 * Resolve a prompt for the client's configured `projectId` + `env`
-	 * (Style-A). The ergonomic slug-first surface: env is configured once at
-	 * `createClient` and inherited here, with an optional per-call override.
+	 * Env-aware resolution → neutral `RenderedPrompt`. Carries the resolve /
+	 * cache / offline-fallback logic; `render()` is the public shaping surface.
 	 *
-	 * - **env→label wire mapping (correction #3):** the resolve route is
-	 *   label-based (`/v1/projects/:projectId/prompts:resolve`, body
-	 *   `labels[]`); it does NOT accept a top-level `env` field. The resolved
-	 *   env slug (lowercase-kebab — a valid label name) is therefore sent as
-	 *   the single resolution label: body `{ slug, labels: [env], subject?,
-	 *   variables? }`.
+	 * - **env→label wire mapping:** the resolve route is label-based
+	 *   (`/v1/projects/:projectId/prompts:resolve`, body `labels[]`); the
+	 *   resolved env slug is sent as the single resolution label.
 	 * - **No silent fallback (R4):** if no env is resolvable (none at init AND
-	 *   none per call) this throws `EnvNotFoundError` (`reason.source =
-	 *   "missing"`) CLIENT-side, eagerly, before any transport call.
+	 *   none per call) this throws `EnvNotFoundError` CLIENT-side, eagerly,
+	 *   before any transport call.
 	 * - **Cache (D8):** caches `single`-strategy releases and weighted releases
 	 *   WITH a `subject`; BYPASSES the cache for weighted releases with NO
 	 *   `subject` (a uniform-random assignment must not be pinned for the TTL).
-	 *
-	 * Prefer this over the deprecated `resolve()`.
 	 */
-	async fetch(
+	private async resolveToRendered(
 		slug: string,
-		options: FetchPromptOptions = {},
-	): Promise<FetchedPrompt> {
+		options: RenderOptions = {},
+	): Promise<RenderedPrompt> {
 		if (this.projectId === undefined || this.projectId.trim() === "") {
 			throw new Error(
-				"[to11ai/sdk] `prompts.fetch()` requires a `projectId` on the client — pass it to createClient({ projectId, ... }).",
+				"[to11ai/sdk] `prompts.render()` requires a `projectId` on the client — pass it to createClient({ projectId, ... }).",
 			);
 		}
 
@@ -486,35 +539,25 @@ export class PromptResource {
 			);
 		}
 
-		const {
-			subject,
-			variables,
-			cache: useCache = true,
-			fallback,
-			developerRole,
-		} = options;
+		const { subject, variables, cache: useCache = true, fallback } = options;
 
-		const cacheKey = buildFetchCacheKey(
+		const cacheKey = buildRenderCacheKey(
 			this.projectId,
 			slug,
 			env,
 			subject,
 			variables,
-			developerRole,
 		);
 
 		if (useCache) {
 			const cached = this.cache.get(cacheKey);
-			// Only enriched (fetch) entries are valid hits here; the fetch key
-			// namespace ("fetch|…") never collides with the legacy resolve key.
-			if (cached && "messages" in cached) return structuredClone(cached);
+			if (cached) return structuredClone(cached);
 		}
 
 		// env→label mapping: the env slug is the single resolution label.
 		const body: Record<string, unknown> = { slug, labels: [env] };
 		if (subject !== undefined) body.subject = subject;
 		if (variables !== undefined) body.variables = variables;
-		if (developerRole !== undefined) body.developerRole = developerRole;
 
 		try {
 			const envelope = await this.transport.request<ResolvedPromptEnvelope>(
@@ -527,7 +570,7 @@ export class PromptResource {
 				},
 			);
 			const raw = unwrap(envelope);
-			const result = normalizeResolvedEnvelope(raw);
+			const result = normalizeResolvedEnvelope(raw, slug);
 
 			// D8: bypass the cache for a weighted release with NO subject —
 			// caching a uniform-random assignment would pin one variant for the
@@ -552,63 +595,7 @@ export class PromptResource {
 			// client-eager throw already happened above the try, so there is no
 			// network error to trigger it on the env-missing path.
 			if (err instanceof To11aiNetworkError && fallback !== undefined) {
-				return liftFallbackToFetched(fallback);
-			}
-			throw err;
-		}
-	}
-
-	// ─── Resolve ──────────────────────────────────────────────────────────────
-
-	/**
-	 * @deprecated Use {@link PromptResource.fetch | `prompts.fetch(slug,
-	 * options?)`} instead. `resolve()` is env-agnostic (no `env` / `subject`,
-	 * no enriched release/variant provenance, no typed-env errors)
-	 * and is retained only for back-compat. It is NOT subject to the R4
-	 * no-silent-fallback env gate (it has no env concept). New code should
-	 * configure `projectId` + `env` at `createClient` and call `fetch()`.
-	 */
-	async resolve(input: ResolvePromptInput): Promise<ResolvePromptResult> {
-		const {
-			projectId,
-			slug,
-			labels,
-			variables,
-			cache: useCache = true,
-			fallback,
-		} = input;
-
-		const cacheKey = buildCacheKey(projectId, slug, labels, variables);
-
-		if (useCache) {
-			const cached = this.cache.get(cacheKey);
-			// The legacy resolve key namespace only ever stores ResolvedPrompt
-			// entries (the fetch namespace is "fetch|…"); the `messages` guard
-			// keeps the static return type as ResolvedPrompt.
-			if (cached && !("messages" in cached)) return structuredClone(cached);
-		}
-
-		try {
-			const envelope = await this.transport.request<ResolvePromptResult>(
-				"POST",
-				`${getProjectPromptsPath(projectId)}:resolve`,
-				{
-					body: { slug, labels, variables },
-					decode: (data) =>
-						zResolvedPromptLegacy.parse(data) as ResolvePromptResult,
-				},
-			);
-			const result = unwrap(envelope);
-
-			if (useCache) {
-				this.cache.set(cacheKey, structuredClone(result));
-			}
-
-			return result;
-		} catch (err) {
-			// If network error and we have a fallback, serve it
-			if (err instanceof To11aiNetworkError && fallback !== undefined) {
-				return fallback;
+				return liftFallbackToRendered(fallback, slug);
 			}
 			throw err;
 		}

package/src/prompts/shape.ts

@@ -0,0 +1,152 @@
+/**
+ * Format-at-load shaping: turn a neutral `RenderedPrompt` into a provider-shaped
+ * `{ messages, config, metadata }` result the caller spreads into their own
+ * provider `create()` call. Header-only — this only reshapes data, it never
+ * sends a request. See docs/product-specs/2026-07-14-to11-2691-sdk-simpler-setup.md.
+ */
+
+import {
+	type AnthropicMessage,
+	type AnthropicTool,
+	type AnthropicToolChoice,
+	type ConvertMessagesOptions,
+	type OpenAIChatMessage,
+	type OpenAITool,
+	type OpenAIToolChoice,
+	toAnthropicMessages,
+	toAnthropicSystem,
+	toAnthropicToolChoice,
+	toAnthropicTools,
+	toOpenAIMessages,
+	toOpenAIToolChoice,
+	toOpenAITools,
+} from "../gateway";
+import type { RenderedPrompt, RenderFormat } from "./types";
+
+/** Model params passed through verbatim from the resolved version's modelConfig. */
+export interface PromptConfig {
+	model?: string;
+	temperature?: number;
+	// Snake_case to match the stored modelConfig and the provider wire key
+	// (spread verbatim into e.g. OpenAI's `create()`), per TO11-2691.
+	max_tokens?: number;
+	/** Any additional stored model-config keys are passed through unchanged. */
+	[key: string]: unknown;
+}
+
+/** Prompt provenance for `turn.headers()` — kept apart from the request body. */
+export interface PromptMetadata {
+	promptId: string;
+	versionId: string;
+	version: number;
+	releaseId: string | null;
+	/** The single label the prompt resolved through (env slug today). */
+	label: string;
+	/** The prompt's human-readable slug — surfaced as `x-to11-prompt-slug`. */
+	slug: string;
+	variantName?: string;
+}
+
+/** OpenAI-shaped render result: spread `{ ...config, messages }` into create(). */
+export interface OpenAiRenderedPrompt {
+	messages: OpenAIChatMessage[];
+	config: PromptConfig;
+	metadata: PromptMetadata;
+	/** Authored tools, provider-shaped. Present only when the prompt declares tools. */
+	tools?: OpenAITool[];
+	/** Authored tool-choice directive. Present only when the prompt sets one. */
+	tool_choice?: OpenAIToolChoice;
+}
+
+/** Anthropic-shaped render result: system/developer folded into `system`. */
+export interface AnthropicRenderedPrompt {
+	/** Folded system/developer instruction text (Anthropic's top-level `system`). */
+	system?: string;
+	messages: AnthropicMessage[];
+	config: PromptConfig;
+	metadata: PromptMetadata;
+	/** Authored tools, provider-shaped. Present only when the prompt declares tools. */
+	tools?: AnthropicTool[];
+	/** Authored tool-choice directive. Present only when the prompt sets one. */
+	tool_choice?: AnthropicToolChoice;
+}
+
+/** The render return type for a given client/call format. */
+export type RenderResult<F extends RenderFormat | undefined> =
+	F extends "openai"
+		? OpenAiRenderedPrompt
+		: F extends "anthropic"
+			? AnthropicRenderedPrompt
+			: RenderedPrompt;
+
+function toPromptConfig(modelConfig: unknown): PromptConfig {
+	return modelConfig !== null && typeof modelConfig === "object"
+		? { ...(modelConfig as Record<string, unknown>) }
+		: {};
+}
+
+function toMetadata(prompt: RenderedPrompt): PromptMetadata {
+	const metadata: PromptMetadata = {
+		promptId: prompt.promptId,
+		versionId: prompt.versionId,
+		version: prompt.version,
+		releaseId: prompt.releaseId,
+		label: prompt.label,
+		slug: prompt.slug,
+	};
+	if (prompt.variantName !== undefined)
+		metadata.variantName = prompt.variantName;
+	return metadata;
+}
+
+export function shapeOpenAI(
+	prompt: RenderedPrompt,
+	options: ConvertMessagesOptions = {},
+): OpenAiRenderedPrompt {
+	const result: OpenAiRenderedPrompt = {
+		messages: toOpenAIMessages(prompt.messages, options),
+		config: toPromptConfig(prompt.modelConfig),
+		metadata: toMetadata(prompt),
+	};
+	// Carry authored tools so the spread-ready result is complete for
+	// tool-using prompts. Omit when empty/absent so we never send `tools: []`.
+	const tools = toOpenAITools(prompt.tools);
+	if (tools.length > 0) result.tools = tools;
+	const toolChoice = toOpenAIToolChoice(prompt.toolChoice);
+	if (toolChoice !== undefined) result.tool_choice = toolChoice;
+	return result;
+}
+
+export function shapeAnthropic(
+	prompt: RenderedPrompt,
+	options: ConvertMessagesOptions = {},
+): AnthropicRenderedPrompt {
+	const result: AnthropicRenderedPrompt = {
+		messages: toAnthropicMessages(prompt.messages, options),
+		config: toPromptConfig(prompt.modelConfig),
+		metadata: toMetadata(prompt),
+	};
+	const system = toAnthropicSystem(prompt.messages);
+	if (system !== undefined) result.system = system;
+	const tools = toAnthropicTools(prompt.tools);
+	if (tools.length > 0) result.tools = tools;
+	const toolChoice = toAnthropicToolChoice(prompt.toolChoice);
+	if (toolChoice !== undefined) result.tool_choice = toolChoice;
+	return result;
+}
+
+/** Shape a fetched prompt for `format`, or return it neutral when unset. */
+export function shapePrompt(
+	prompt: RenderedPrompt,
+	format: RenderFormat | undefined,
+	options: ConvertMessagesOptions = {},
+): RenderedPrompt | OpenAiRenderedPrompt | AnthropicRenderedPrompt {
+	switch (format) {
+		case "openai":
+			return shapeOpenAI(prompt, options);
+		case "anthropic":
+			return shapeAnthropic(prompt, options);
+		default:
+			return prompt;
+	}
+}