@to11ai/sdk 2.0.0-rc.1 → 2.0.0-rc.3

package/src/generated/zod.gen.ts

@@ -236,7 +236,7 @@ export const zPrompt = z.object({
     id: z.string(),
     name: z.string().min(1).max(200),
     projectId: z.string(),
-    slug: z.string().min(1).max(200).regex(/^[a-z0-9-]+$/),
+    slug: z.string().min(1).max(128).regex(/^[a-z0-9-]+$/),
     status: z.enum(['active', 'archived']),
     tags: z.array(z.string()),
     updatedAt: z.iso.datetime()
@@ -7359,7 +7359,7 @@ export const zPromptsListPromptsResponse = z.object({
         latestVersion: z.number().nullable(),
         name: z.string().min(1).max(200),
         projectId: z.string(),
-        slug: z.string().min(1).max(200).regex(/^[a-z0-9-]+$/),
+        slug: z.string().min(1).max(128).regex(/^[a-z0-9-]+$/),
         status: z.enum(['active', 'archived']),
         tags: z.array(z.string()),
         updatedAt: z.iso.datetime()
@@ -7390,7 +7390,7 @@ export const zPromptsListPromptsResponse = z.object({
 export const zPromptsCreatePromptBody = z.object({
     description: z.string().nullish(),
     name: z.string().min(1).max(200),
-    slug: z.string().min(1).max(200).regex(/^[a-z0-9-]+$/),
+    slug: z.string().min(1).max(128).regex(/^[a-z0-9-]+$/),
     tags: z.array(z.string()).nullish()
 });
 

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
- * `render()` 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
@@ -58,7 +57,7 @@ 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,
@@ -66,7 +65,7 @@ export function buildFetchCacheKey(
 	variables?: Record<string, unknown>,
 ): string {
 	const base = buildCacheKey(projectId, slug, [env], variables);
-	return `fetch|${base}|${JSON.stringify(env)}|${JSON.stringify(subject ?? null)}`;
+	return `render|${base}|${JSON.stringify(env)}|${JSON.stringify(subject ?? null)}`;
 }
 
 function sortObjectKeys(obj: unknown): unknown {
@@ -80,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
@@ -97,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;
 
@@ -113,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,7 @@ 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,
@@ -21,8 +21,6 @@ import type {
 	CreatePromptVersionResult,
 	DeleteProjectPromptLabelInput,
 	DeleteProjectPromptLabelResult,
-	FetchedPrompt,
-	FetchPromptOptions,
 	GetProjectPromptLabelInput,
 	GetProjectPromptLabelResult,
 	GetPromptInput,
@@ -50,8 +48,6 @@ import type {
 	RenderOptions,
 	ResolvedPrompt,
 	ResolvedPromptEnvelope,
-	ResolvePromptInput,
-	ResolvePromptResult,
 	UnknownRoleMode,
 	UpdateProjectPromptLabelInput,
 	UpdateProjectPromptLabelResult,
@@ -75,8 +71,6 @@ export type {
 	CreatePromptVersionResult,
 	DeleteProjectPromptLabelInput,
 	DeleteProjectPromptLabelResult,
-	FetchedPrompt,
-	FetchPromptOptions,
 	GetProjectPromptLabelInput,
 	GetProjectPromptLabelResult,
 	GetPromptInput,
@@ -110,33 +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,
-	label: true,
-	contentHash: true,
-	rendered: true,
-	tools: true,
-	toolChoice: true,
-	modelConfig: true,
-});
-
 const zResolvedPromptEnvelope = zResolvedPrompt
 	.partial({ releaseId: true })
 	.extend({ strategy: z.enum(["single", "weighted"]).optional() });
@@ -153,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);
@@ -177,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,
@@ -188,7 +178,10 @@ function normalizeResolvedEnvelope(
 		versionId: raw.versionId,
 		contentHash: raw.contentHash,
 		label: raw.label,
-		rendered: raw.rendered,
+		// 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
@@ -219,20 +212,26 @@ function normalizeResolvedEnvelope(
 }
 
 /**
- * Lift a caller-supplied offline `fallback` into the enriched `FetchedPrompt`
- * shape (D7), so `render()` 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 {
@@ -316,10 +315,29 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 		this.onUnknownRole = config?.onUnknownRole;
 	}
 
+	/**
+	 * Resolve the project for a control-plane call: the per-call `projectId`
+	 * wins, else the client-bound one from `createClient({ projectId })`. Throws
+	 * if neither is set. Mirrors how `render()` resolves its project, so every
+	 * method honors the bound `projectId` and callers need not repeat it.
+	 */
+	private resolveProjectId(perCall?: string): string {
+		const projectId = perCall ?? this.projectId;
+		if (projectId === undefined || projectId.trim() === "") {
+			throw new Error(
+				"[to11ai/sdk] this call needs a `projectId` — pass it on the call or bind one via createClient({ projectId, ... }).",
+			);
+		}
+		// Trim so a whitespace-padded per-call id normalizes like the client-bound
+		// one (resolved via `pick()`), instead of reaching the wire untrimmed.
+		return projectId.trim();
+	}
+
 	// ─── Create ──────────────────────────────────────────────────────────────
 
 	async create(input: CreatePromptInput): Promise<CreatePromptResult> {
-		const { projectId, ...body } = input;
+		const { projectId: perCallProjectId, ...body } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope = await this.transport.request<CreatePromptResult>(
 			"POST",
 			getProjectPromptsPath(projectId),
@@ -331,9 +349,10 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	// ─── List ─────────────────────────────────────────────────────────────────
 
 	async list(
-		input: ListPromptsInput,
+		input: ListPromptsInput = {},
 	): Promise<PaginatedResult<ListPromptsResult>> {
-		const { projectId, ...queryRest } = input;
+		const { projectId: perCallProjectId, ...queryRest } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope = await this.transport.request<
 			| ListPromptsResult[]
 			| {
@@ -365,7 +384,8 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	// ─── Get ──────────────────────────────────────────────────────────────────
 
 	async get(input: GetPromptInput): Promise<GetPromptResult> {
-		const { projectId, promptId } = input;
+		const { projectId: perCallProjectId, promptId } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope = await this.transport.request<GetPromptResult>(
 			"GET",
 			getProjectPromptPath(projectId, promptId),
@@ -376,7 +396,8 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	// ─── Update ───────────────────────────────────────────────────────────────
 
 	async update(input: UpdatePromptInput): Promise<UpdatePromptResult> {
-		const { projectId, promptId, ...body } = input;
+		const { projectId: perCallProjectId, promptId, ...body } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope = await this.transport.request<UpdatePromptResult>(
 			"PATCH",
 			getProjectPromptPath(projectId, promptId),
@@ -388,7 +409,8 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	// ─── Archive ──────────────────────────────────────────────────────────────
 
 	async archive(input: ArchivePromptInput): Promise<ArchivePromptResult> {
-		const { projectId, promptId } = input;
+		const { projectId: perCallProjectId, promptId } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope = await this.transport.request<ArchivePromptResult>(
 			"DELETE",
 			getProjectPromptPath(projectId, promptId),
@@ -401,7 +423,8 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	async createVersion(
 		input: CreatePromptVersionInput,
 	): Promise<CreatePromptVersionResult> {
-		const { projectId, promptId, ...body } = input;
+		const { projectId: perCallProjectId, promptId, ...body } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope = await this.transport.request<CreatePromptVersionResult>(
 			"POST",
 			`${getProjectPromptPath(projectId, promptId)}/versions`,
@@ -415,7 +438,8 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	async listVersions(
 		input: ListPromptVersionsInput,
 	): Promise<ListPromptVersionsResult> {
-		const { projectId, promptId } = input;
+		const { projectId: perCallProjectId, promptId } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope = await this.transport.request<ListPromptVersionsResult>(
 			"GET",
 			`${getProjectPromptPath(projectId, promptId)}/versions`,
@@ -428,7 +452,8 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	async getVersion(
 		input: GetPromptVersionInput,
 	): Promise<GetPromptVersionResult> {
-		const { projectId, promptId, versionNumber } = input;
+		const { projectId: perCallProjectId, promptId, versionNumber } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope = await this.transport.request<GetPromptVersionResult>(
 			"GET",
 			`${getProjectPromptPath(projectId, promptId)}/versions/${encodeURIComponent(String(versionNumber))}`,
@@ -439,7 +464,8 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	// ─── Move Label ───────────────────────────────────────────────────────────
 
 	async moveLabel(input: MovePromptLabelInput): Promise<MovePromptLabelResult> {
-		const { projectId, promptId, label, ...body } = input;
+		const { projectId: perCallProjectId, promptId, label, ...body } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope = await this.transport.request<MovePromptLabelResult>(
 			"PUT",
 			`${getProjectPromptPath(projectId, promptId)}/labels/${encodeURIComponent(label)}`,
@@ -453,7 +479,8 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	async listLabels(
 		input: ListPromptLabelsInput,
 	): Promise<ListPromptLabelsResult> {
-		const { projectId, promptId } = input;
+		const { projectId: perCallProjectId, promptId } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope = await this.transport.request<ListPromptLabelsResult>(
 			"GET",
 			`${getProjectPromptPath(projectId, promptId)}/labels`,
@@ -468,8 +495,7 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	 * `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
-	 * `FetchedPrompt`. Resolves by the client's `env`; for label-addressed
-	 * resolution see {@link PromptResource.resolve | `resolve()`}.
+	 * `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", {
@@ -492,15 +518,15 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	async render(
 		slug: string,
 		options: RenderOptions = {},
-	): Promise<FetchedPrompt | OpenAiRenderedPrompt | AnthropicRenderedPrompt> {
-		const fetched = await this.resolveToFetched(slug, options);
-		return shapePrompt(fetched, options.format ?? this.format, {
+	): Promise<RenderedPrompt | OpenAiRenderedPrompt | AnthropicRenderedPrompt> {
+		const rendered = await this.resolveToRendered(slug, options);
+		return shapePrompt(rendered, options.format ?? this.format, {
 			onUnknownRole: options.onUnknownRole ?? this.onUnknownRole,
 		});
 	}
 
 	/**
-	 * Env-aware resolution → neutral `FetchedPrompt`. Carries the resolve /
+	 * Env-aware resolution → neutral `RenderedPrompt`. Carries the resolve /
 	 * cache / offline-fallback logic; `render()` is the public shaping surface.
 	 *
 	 * - **env→label wire mapping:** the resolve route is label-based
@@ -513,10 +539,10 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	 *   WITH a `subject`; BYPASSES the cache for weighted releases with NO
 	 *   `subject` (a uniform-random assignment must not be pinned for the TTL).
 	 */
-	private async resolveToFetched(
+	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.render()` requires a `projectId` on the client — pass it to createClient({ projectId, ... }).",
@@ -543,7 +569,7 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 
 		const { subject, variables, cache: useCache = true, fallback } = options;
 
-		const cacheKey = buildFetchCacheKey(
+		const cacheKey = buildRenderCacheKey(
 			this.projectId,
 			slug,
 			env,
@@ -553,9 +579,7 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 
 		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.
@@ -574,7 +598,7 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 				},
 			);
 			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
@@ -599,64 +623,7 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 			// 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 ──────────────────────────────────────────────────────────────
-
-	/**
-	 * Resolve a prompt by explicit `labels` for a given `projectId`, in one
-	 * control-plane request. This is the label-addressed counterpart to
-	 * {@link PromptResource.render | `render()`}, which resolves by the client's
-	 * configured `env`. Reach for `resolve()` when you address prompts by label
-	 * rather than by environment; it is env-agnostic, so it carries no `env` /
-	 * `subject`, no enriched release/variant provenance, and no typed-env errors,
-	 * and is not subject to the env-based no-silent-fallback gate.
-	 */
-	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;
 		}
@@ -672,9 +639,10 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	 * affordances). Gated on `prompt:read` server-side.
 	 */
 	async listProjectLabels(
-		input: ListProjectPromptLabelsInput,
+		input: ListProjectPromptLabelsInput = {},
 	): Promise<ListProjectPromptLabelsResult> {
-		const { projectId, includeArchived } = input;
+		const { projectId: perCallProjectId, includeArchived } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope =
 			await this.transport.request<ListProjectPromptLabelsResult>(
 				"GET",
@@ -696,7 +664,8 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	async createProjectLabel(
 		input: CreateProjectPromptLabelInput,
 	): Promise<CreateProjectPromptLabelResult> {
-		const { projectId, ...body } = input;
+		const { projectId: perCallProjectId, ...body } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const envelope =
 			await this.transport.request<CreateProjectPromptLabelResult>(
 				"POST",
@@ -709,9 +678,10 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	async getProjectLabel(
 		input: GetProjectPromptLabelInput,
 	): Promise<GetProjectPromptLabelResult> {
+		const projectId = this.resolveProjectId(input.projectId);
 		const envelope = await this.transport.request<GetProjectPromptLabelResult>(
 			"GET",
-			getProjectPromptLabelPath(input.projectId, input.label),
+			getProjectPromptLabelPath(projectId, input.label),
 		);
 		return unwrap(envelope);
 	}
@@ -727,7 +697,8 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	async updateProjectLabel(
 		input: UpdateProjectPromptLabelInput,
 	): Promise<UpdateProjectPromptLabelResult> {
-		const { projectId, label, ...rest } = input;
+		const { projectId: perCallProjectId, label, ...rest } = input;
+		const projectId = this.resolveProjectId(perCallProjectId);
 		const body: Record<string, unknown> = {};
 		if (rest.isDefault !== undefined) body.isDefault = rest.isDefault;
 		if (rest.description !== undefined) body.description = rest.description;
@@ -753,10 +724,11 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	async deleteProjectLabel(
 		input: DeleteProjectPromptLabelInput,
 	): Promise<DeleteProjectPromptLabelResult> {
+		const projectId = this.resolveProjectId(input.projectId);
 		const envelope =
 			await this.transport.request<DeleteProjectPromptLabelResult>(
 				"DELETE",
-				getProjectPromptLabelPath(input.projectId, input.label),
+				getProjectPromptLabelPath(projectId, input.label),
 			);
 		return unwrap(envelope);
 	}
@@ -775,7 +747,7 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 		const envelope =
 			await this.transport.request<ListProjectPromptLabelUsagesResult>(
 				"GET",
-				`${getProjectPromptLabelPath(input.projectId, input.label)}/usages`,
+				`${getProjectPromptLabelPath(this.resolveProjectId(input.projectId), input.label)}/usages`,
 			);
 		return unwrap(envelope);
 	}
@@ -800,7 +772,9 @@ export class PromptResource<F extends RenderFormat | undefined = undefined> {
 	async listLabelEvents(
 		input: ListLabelEventsInput,
 	): Promise<ListLabelEventsResult> {
-		const projectSeg = encodeURIComponent(input.projectId);
+		const projectSeg = encodeURIComponent(
+			this.resolveProjectId(input.projectId),
+		);
 		let path: string;
 		switch (input.scope) {
 			case "label":