cartethyia 2.7.2 → 2.7.4

package/src/providers/integrations/buddy/buddy-media.ts

@@ -108,7 +108,7 @@ export async function buddyGenerateImage(
   context: ProviderDispatchContext,
 ): Promise<ImageGenerationOutcome> {
   const model = modelOf(body, candidate);
-  if (model.length === 0) throw new GatewayError("invalid_request", 400, "model is required");
+  if (model.length === 0) throw new GatewayError("invalid_request", 400, "model is required (request {requestId}). Check the shape of what you sent — then resend 🪞");
   const prompt = imagePrompt(body);
   if (config.imageGenerationPath !== undefined) {
     const requestBody: Record<string, unknown> = { model, prompt };
@@ -134,28 +134,28 @@ export async function buddyGenerateImage(
       release();
     }
     if (!isRecord(responseBody)) {
-      throw new GatewayError("platform_unavailable", 502, "CodeBuddy image generation returned an invalid response", {}, "upstream");
+      throw new GatewayError("platform_unavailable", 502, "CodeBuddy image generation returned an invalid response (request {requestId}). The upstream came back empty-handed — retry 🌙", {}, "upstream");
     }
     const providerError = buddyErrorOf(responseBody);
     if (providerError !== undefined) {
-      throw new GatewayError("platform_unavailable", 502, providerError, {}, "upstream");
+      throw new GatewayError("platform_unavailable", 502, `${providerError} (request {requestId}). The upstream came back empty-handed — retry 🌙`, {}, "upstream");
     }
     if (responseBody.code !== undefined && responseBody.code !== 0 && responseBody.code !== "0") {
       const message =
         typeof responseBody.msg === "string" && responseBody.msg.trim().length > 0
           ? responseBody.msg.trim()
           : `CodeBuddy image generation failed with code ${String(responseBody.code)}`;
-      throw new GatewayError("platform_unavailable", 502, message, {}, "upstream");
+      throw new GatewayError("platform_unavailable", 502, `${message} (request {requestId}). The upstream came back empty-handed — retry 🌙`, {}, "upstream");
     }
     if (!isRecord(responseBody.data)) {
-      throw new GatewayError("platform_unavailable", 502, "CodeBuddy image generation returned no image data", {}, "upstream");
+      throw new GatewayError("platform_unavailable", 502, "CodeBuddy image generation returned no image data (request {requestId}). The upstream came back empty-handed — retry 🌙", {}, "upstream");
     }
     const result = responseBody.data;
     if (!Array.isArray(result.data) || result.data.some((image) => !isRecord(image))) {
-      throw new GatewayError("platform_unavailable", 502, "CodeBuddy image generation returned malformed image data", {}, "upstream");
+      throw new GatewayError("platform_unavailable", 502, "CodeBuddy image generation returned malformed image data (request {requestId}). The upstream came back empty-handed — retry 🌙", {}, "upstream");
     }
     if (result.data.length === 0) {
-      throw new GatewayError("platform_unavailable", 502, "CodeBuddy image generation returned no images", {}, "upstream");
+      throw new GatewayError("platform_unavailable", 502, "CodeBuddy image generation returned no images (request {requestId}). The upstream came back empty-handed — retry 🌙", {}, "upstream");
     }
     return {
       ...(typeof result.created === "number" ? { created: result.created } : {}),
@@ -173,7 +173,11 @@ export async function buddyGenerateImage(
   buddyPrePayloadCommon(payload, undefined, "intl", context);
   const messages = payload["messages"];
   if (Array.isArray(messages)) {
-    applyBuddySystemPrompt(messages as Array<Record<string, unknown>>, config.systemPrompt);
+    applyBuddySystemPrompt(
+      messages as Array<Record<string, unknown>>,
+      config.systemPrompt,
+      context?.tenant_system_prompt,
+    );
   }
   const headers: Record<string, string> = {
     "content-type": "application/json",
@@ -213,7 +217,7 @@ export async function buddyGenerateImage(
   if (!contentType.includes("text/event-stream")) {
     const parsed: unknown = await response.json().catch(() => null);
     const message = buddyErrorOf(parsed) ?? "CodeBuddy image generation returned a non-stream body";
-    throw new GatewayError("platform_unavailable", 502, message, {}, "upstream");
+    throw new GatewayError("platform_unavailable", 502, `${message} (request {requestId}). The upstream came back empty-handed — retry 🌙`, {}, "upstream");
   }
   let content = "";
   for await (const event of decodeSseEvents(response.body, { signal: context.abort_signal })) {
@@ -228,7 +232,7 @@ export async function buddyGenerateImage(
     if (!isRecord(parsed)) continue;
     if (isRecord(parsed.error)) {
       const message = isRecord(parsed.error) && typeof parsed.error.message === "string" ? parsed.error.message : "CodeBuddy image generation failed";
-      throw new GatewayError("platform_unavailable", 502, message, {}, "upstream");
+      throw new GatewayError("platform_unavailable", 502, `${message} (request {requestId}). The upstream came back empty-handed — retry 🌙`, {}, "upstream");
     }
     const choices = parsed.choices;
     if (!Array.isArray(choices) || !isRecord(choices[0])) continue;
@@ -240,7 +244,7 @@ export async function buddyGenerateImage(
     throw new GatewayError(
       "platform_unavailable",
       502,
-      "CodeBuddy image generation returned no image in the chat stream",
+      "CodeBuddy image generation returned no image in the chat stream (request {requestId}). The upstream came back empty-handed — retry 🌙",
       {},
       "upstream",
     );
@@ -314,7 +318,7 @@ export async function buddyGenerateVideo(
   context: ProviderDispatchContext,
 ): Promise<Record<string, unknown>> {
   const model = modelOf(body, candidate);
-  if (model.length === 0) throw new GatewayError("invalid_request", 400, "model is required");
+  if (model.length === 0) throw new GatewayError("invalid_request", 400, "model is required (request {requestId}). Check the shape of what you sent — then resend 🪞");
   const prompt = imagePrompt(body);
   const submitBody: Record<string, unknown> = { model, prompt };
   if (typeof body.n === "number" && Number.isFinite(body.n)) submitBody["n"] = Math.max(1, Math.floor(body.n));
@@ -350,14 +354,14 @@ export async function buddyGenerateVideo(
     if (url !== undefined) return { data: [{ url }] };
     // Otherwise cb refused (HTTP 200 error envelope) — surface its own reason.
     const message = buddyErrorOf(submitted) ?? "CodeBuddy video submit returned no task id";
-    throw new GatewayError("platform_unavailable", 502, message, {}, "upstream");
+    throw new GatewayError("platform_unavailable", 502, `${message} (request {requestId}). The upstream came back empty-handed — retry 🌙`, {}, "upstream");
   }
   // Poll the sibling task endpoint until the clip is ready.
   const taskPath = `${submitUrl.replace(/\/+$/, "")}/${taskId}`;
   const deadline = Date.now() + VIDEO_POLL_TIMEOUT_MS;
   for (;;) {
     if (context.abort_signal?.aborted) {
-      throw new GatewayError("transport_closed", 499, "video generation aborted");
+      throw new GatewayError("transport_closed", 499, "video generation aborted (request {requestId}). Send it again whenever ready 🙃");
     }
     const lifecycle = createUpstreamDeadlineLifecycle(context);
     let statusRes: Response;
@@ -370,7 +374,7 @@ export async function buddyGenerateVideo(
     } catch (error: unknown) {
       const abortError = abortGatewayError(lifecycle, error, context.abort_signal);
       if (abortError) throw abortError;
-      throw new GatewayError("platform_unavailable", 502, `CodeBuddy video status unreachable: ${error instanceof Error ? error.message : String(error)}`, {}, "upstream");
+      throw new GatewayError("platform_unavailable", 502, `CodeBuddy video status unreachable (request {requestId}): ${error instanceof Error ? error.message : String(error)}. The connection ghosted us — come back in a moment 👻`, {}, "upstream");
     } finally {
       lifecycle.release();
     }
@@ -382,10 +386,10 @@ export async function buddyGenerateVideo(
     if (url !== undefined) return { data: [{ url }], task_id: taskId };
     const status = videoStatusOf(payload);
     if (status !== undefined && !VIDEO_PENDING.has(status)) {
-      throw new GatewayError("platform_unavailable", 502, `CodeBuddy video task ended in state "${status}" with no clip`, {}, "upstream");
+      throw new GatewayError("platform_unavailable", 502, `CodeBuddy video task ended in state "${status}" with no clip (request {requestId}). The upstream came back empty-handed — retry 🌙`, {}, "upstream");
     }
     if (Date.now() > deadline) {
-      throw new GatewayError("platform_unavailable", 504, `CodeBuddy video task ${taskId} did not finish within ${VIDEO_POLL_TIMEOUT_MS}ms`, {}, "upstream");
+      throw new GatewayError("platform_unavailable", 504, `CodeBuddy video task ${taskId} did not finish within ${VIDEO_POLL_TIMEOUT_MS}ms (request {requestId}). Some things just take longer 🐢`, {}, "upstream");
     }
     await new Promise((resolve) => setTimeout(resolve, VIDEO_POLL_INTERVAL_MS));
   }

package/src/providers/integrations/buddy/codebuddy/provider.ts

@@ -81,10 +81,14 @@ function codeBuddyIntlPrePayload(
     typeof rawModel === "string" && rawModel.length > 0
       ? rawModel
       : candidate.model_id;
-  if (!source) throw new GatewayError("invalid_request", 400, "CodeBuddy model is required");
+  if (!source) throw new GatewayError("invalid_request", 400, "CodeBuddy model is required (request {requestId}). Check the shape of what you sent — then resend 🪞");
   const messages = payload["messages"];
   if (Array.isArray(messages)) {
-    applyBuddySystemPrompt(messages as Array<Record<string, unknown>>, CODEBUDDY_SYSTEM_PROMPT);
+    applyBuddySystemPrompt(
+      messages as Array<Record<string, unknown>>,
+      CODEBUDDY_SYSTEM_PROMPT,
+      context?.tenant_system_prompt,
+    );
   }
   normalizeBuddyToolNames(payload);
   injectBuddyParallelToolCalls(payload, request);

package/src/providers/integrations/buddy/workbuddy/provider.ts

@@ -134,11 +134,15 @@ export function workbuddyPrePayload(
   const rawModel = payload["model"];
   const source =
     typeof rawModel === "string" && rawModel.length > 0 ? rawModel : candidate.model_id;
-  if (!source) throw new GatewayError("invalid_request", 400, "WorkBuddy model is required");
+  if (!source) throw new GatewayError("invalid_request", 400, "WorkBuddy model is required (request {requestId}). Check the shape of what you sent — then resend 🪞");
   const messages = payload["messages"];
   if (Array.isArray(messages)) {
     const normalizedMessages = messages as Array<Record<string, unknown>>;
-    applyBuddySystemPrompt(normalizedMessages, WORKBUDDY_SYSTEM_PROMPT);
+    applyBuddySystemPrompt(
+      normalizedMessages,
+      WORKBUDDY_SYSTEM_PROMPT,
+      context?.tenant_system_prompt,
+    );
     restoreHistoricalToolDefinitions(payload, normalizedMessages);
   }
   normalizeBuddyToolNames(payload);

package/src/providers/integrations/claude/claude-betas.ts

@@ -67,7 +67,7 @@ export const ANTHROPIC_BETA_CAPABILITIES: Readonly<Record<string, readonly strin
 const BETA_TOKEN = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
 
 function invalidBeta(message: string, value: unknown): GatewayError {
-  return new GatewayError("invalid_request", 400, message, { field: "anthropic-beta", value });
+  return new GatewayError("invalid_request", 400, `${message} (request {requestId}). Check the shape of what you sent — then resend 🪞`, { field: "anthropic-beta", value });
 }
 
 /**

package/src/providers/integrations/claude/claude-credentials.ts

@@ -10,7 +10,7 @@ function invalidHeader(
   message: string,
   details: Readonly<Record<string, unknown>> = {},
 ): GatewayError {
-  return new GatewayError("invalid_request", 400, message, details);
+  return new GatewayError("invalid_request", 400, `${message} (request {requestId}). Check the shape of what you sent — then resend 🪞`, details);
 }
 
 function decodeSecret(secret: Uint8Array | undefined): string | undefined {

package/src/providers/integrations/claude/claude-slow-lane-retry.ts

@@ -96,5 +96,5 @@ export function planSlowLaneRetry(
 
 /** Typed error for a caller-aborted wait, so it is never read as a failure. */
 export function slowLaneAborted(): GatewayError {
-  return new GatewayError("transport_closed", 499, "Aborted during slow-lane capacity wait");
+  return new GatewayError("transport_closed", 499, "The request was cancelled during the slow-lane capacity wait (request {requestId}). Send it again whenever ready 🙃");
 }

package/src/providers/integrations/claude/claude.ts

@@ -61,6 +61,7 @@ import {
   refusalCreditToken,
   sharedFallbackCreditCache,
 } from "./fallback-credit";
+import { assertCredentialKind, assertWireFamily } from "../../provider-contracts";
 import type { ProviderDispatchTarget, ProviderAdapter, ProviderDispatchContext } from "../../provider-contracts";
 import { defineModel } from "../../provider-model-definition";
 import type { ModelDefinition } from "../../provider-model-definition";
@@ -185,21 +186,13 @@ export class ClaudeAdapter implements ProviderAdapter {
     context: ProviderDispatchContext,
   ): AsyncIterable<CanonicalEvent> {
     if (candidate.wire_family !== "messages") {
-      throw new GatewayError(
-        "capability_unsupported",
-        400,
-        "claude supports messages only",
-      );
+      assertWireFamily(candidate, "messages", "claude");
     }
     if (
       context.credential.credential_kind !== "oauth" &&
       context.credential.credential_kind !== "scoped_access_token"
     ) {
-      throw new GatewayError(
-        "invalid_request",
-        400,
-        `claude: the assistant OAuth credential required (got credential_kind=${context.credential.credential_kind})`,
-      );
+      assertCredentialKind(context.credential, ["oauth", "scoped_access_token"], "claude");
     }
     const customHeaders = filterClaudeCustomHeaders({
       ...this.customHeaders,

package/src/providers/integrations/cline/cline.ts

@@ -8,6 +8,7 @@ import { completeRequiredSchema, isRecord } from "../../../protocol/codecs";
 import { providerBaseUrl } from "../../provider-metadata";
 import { getCachedModelDiscovery } from "../../operations/model-discovery-cache";
 import { defineModel } from "../../provider-model-definition";
+import { clineReasoningReplayPrepares } from "../buddy/buddy-chat-shared";
 import { clinePlatform, clinePlatformVersion } from "../../operations/cli-platform";
 import {
   getClineCliVersion,
@@ -133,6 +134,12 @@ function clinePrePayload(
     ? messages
     : [{ role: "system", content: "You are a helpful assistant." }, ...messages];
 
+  // 1.5) DeepSeek-replay backfill: Cline resells thinking models (deepseek,
+  // reflection/beam) whose upstream rejects the whole history when any prior
+  // assistant turn lacks `reasoning_content`. Same wire as OpenRouter/Hermes/
+  // Kilo, so the shared helper runs here too — it only mirrors a real trace.
+  for (const prepare of clineReasoningReplayPrepares) prepare(payload);
+
   // 2) Materialize deepseek-v4-flash non-stream quirk
   const model = typeof payload["model"] === "string" ? (payload["model"] as string) : candidate.model_id;
   const needsMaterialize = !request.stream && model.includes("deepseek-v4-flash");
@@ -143,7 +150,7 @@ function clinePrePayload(
     const cur = typeof payload["max_tokens"] === "number" ? (payload["max_tokens"] as number) : 0;
     payload["max_tokens"] = Math.max(cur, 256);
     // keep GatewayError reachable
-    if (!model) throw new GatewayError("invalid_request", 400, "Cline model is required");
+    if (!model) throw new GatewayError("invalid_request", 400, "Cline model is required (request {requestId}). Check the shape of what you sent — then resend 🪞");
   }
 }
 

package/src/providers/integrations/cloudflareai/cloudflareai.ts

@@ -16,6 +16,7 @@
  *    protocol at the `/anthropic` path suffix, including `thinking_delta`
  *    blocks, so the Messages leg is built directly.
  */
+import { assertWireFamily } from "../../provider-contracts";
 import type {
   ProviderAdapter,
   ProviderDispatchContext,
@@ -57,7 +58,7 @@ function cloudflareEnvelope(context: ProviderDispatchContext): {
 } {
   const secret = context.credential.secret;
   if (secret === undefined || secret.length === 0) {
-    throw new GatewayError("invalid_request", 400, "cloudflareai: credential is missing a secret value");
+    throw new GatewayError("invalid_request", 400, "cloudflareai: credential is missing a secret value (request {requestId}). Wrong key, right door — check the credential 🔑");
   }
   let envelope: ReturnType<typeof decodeCloudflareAiGatewayCredential>;
   try {
@@ -66,7 +67,7 @@ function cloudflareEnvelope(context: ProviderDispatchContext): {
     throw new GatewayError(
       "invalid_request",
       400,
-      `cloudflareai: ${error instanceof Error ? error.message : "stored credential is not a Cloudflare envelope"}`,
+      `cloudflareai: ${error instanceof Error ? error.message : "stored credential is not a Cloudflare envelope"} (request {requestId}). Wrong key, right door — check the credential 🔑`,
     );
   }
   return { token: envelope.token, baseUrl: cloudflareBaseUrl(envelope.accountId, envelope.gatewayId) };
@@ -93,11 +94,7 @@ class CloudflareAiGatewayAdapter implements ProviderAdapter {
     context: ProviderDispatchContext,
   ): AsyncIterable<CanonicalEvent> {
     if (candidate.wire_family !== "messages") {
-      throw new GatewayError(
-        "capability_unsupported",
-        400,
-        `cloudflareai supports messages only, got ${candidate.wire_family}`,
-      );
+      assertWireFamily(candidate, "messages", "cloudflareai");
     }
     const { token, baseUrl } = cloudflareEnvelope(context);
     const outbound = buildClaudeMessagesRequest({

package/src/providers/integrations/codex/codex-errors.ts

@@ -167,7 +167,7 @@ export async function mapCodexErrorResponse(res: Response): Promise<never> {
   throw new GatewayError(
     classification.code,
     classification.status,
-    friendlyMessage ?? sanitized,
+    `${friendlyMessage ?? sanitized} (request {requestId}). The upstream came back empty-handed — retry 🌙`,
     details,
     classification.origin,
   );

package/src/providers/integrations/codex/codex.ts

@@ -22,7 +22,7 @@
  * OpenAI-compatible factory's reach — stays bespoke, never re-audit.
  */
 import type { CanonicalEvent, CanonicalRequest } from "../../../protocol/canonical-model";
-import { GatewayError, capabilityUnsupported } from "../../../protocol/gateway-error";
+import { GatewayError } from "../../../protocol/gateway-error";
 import { getCodexVersion } from "../../operations/client-versions";
 import { buildCodexUserAgent } from "../../operations/cli-platform";
 import { randomUUID } from "node:crypto";
@@ -54,6 +54,7 @@ export function _setCodexRateLimitSleepForTesting(
 function sleep(ms: number, signal: AbortSignal): Promise<void> {
   return rateLimitSleep(ms, signal);
 }
+import { assertWireFamily } from "../../provider-contracts";
 import type { ImageGenerationOutcome, ProviderDispatchTarget, ProviderAdapter, ProviderDispatchContext, ResolvedCredential, WebSearchOutcome, WebSearchResult } from "../../provider-contracts";
 import type { FetchLike } from "../../quota/quota-contracts";
 import { boundedUpstreamArray, boundedUpstreamNumber, sanitizeUpstreamLabel } from "../../provider-sanitize";
@@ -199,7 +200,7 @@ export function assertCodexOAuthCredential(
     throw new GatewayError(
       "invalid_request",
       400,
-      `codex: ChatGPT OAuth credential required (got credential_kind=${credential.credential_kind})`,
+      `codex: ChatGPT OAuth credential required (got credential_kind=${credential.credential_kind}) (request {requestId}). Wrong key, right door — check the credential 🔑`,
     );
   }
 }
@@ -361,7 +362,7 @@ function authHeadersForCodex(
     throw new GatewayError(
       "invalid_request",
       400,
-      "codex: OAuth credential is missing a bearer token",
+      "codex: OAuth credential is missing a bearer token (request {requestId}). Wrong key, right door — check the credential 🔑",
     );
   }
   const token = new TextDecoder().decode(credential.secret);
@@ -748,7 +749,7 @@ export function createCodexAdapter(
       context: ProviderDispatchContext,
     ): Promise<WebSearchOutcome> {
       const query = typeof body.query === "string" ? body.query.trim() : "";
-      if (!query) throw new GatewayError("invalid_request", 400, "search query is required");
+      if (!query) throw new GatewayError("invalid_request", 400, "search query is required (request {requestId}). Check the shape of what you sent — then resend 🪞");
       const requested = typeof body.model === "string" ? body.model.trim() : "";
       const model = requested.length > 0 && requested !== "codex" ? requested : CODEX_SEARCH_DEFAULT_MODEL;
       const request: CanonicalRequest = {
@@ -779,7 +780,7 @@ export function createCodexAdapter(
       }
       const results = normalizeCodexSearchCitations(citations, answerText);
       if (results.length === 0)
-        throw new GatewayError("platform_unavailable", 502, "Codex search returned no citations");
+        throw new GatewayError("platform_unavailable", 502, "Codex search returned no citations (request {requestId}). The upstream came back empty-handed — retry 🌙");
       const rawMax = body.max_results;
       const maxResults =
         typeof rawMax === "number" && Number.isFinite(rawMax)
@@ -796,7 +797,7 @@ export function createCodexAdapter(
       const prompt = imagePrompt(body);
       const requested =
         candidate.model_id.length > 0 ? candidate.model_id : typeof body.model === "string" ? body.model : "";
-      if (requested.length === 0) throw new GatewayError("invalid_request", 400, "model is required");
+      if (requested.length === 0) throw new GatewayError("invalid_request", 400, "model is required (request {requestId}). Check the shape of what you sent — then resend 🪞");
       // A `-image` id is the chat model with the suffix removed. Dedicated
       // image tools still need a chat carrier, and the account's visible 5.6
       // models are the current ones.
@@ -868,7 +869,7 @@ export function createCodexAdapter(
           try {
             parsed = JSON.parse(data);
           } catch {
-            throw new GatewayError("platform_unavailable", 502, "Codex image stream returned malformed JSON", {}, "upstream");
+            throw new GatewayError("platform_unavailable", 502, "Codex image stream returned malformed JSON (request {requestId}). The upstream came back empty-handed — retry 🌙", {}, "upstream");
           }
           if (isRecord(parsed) && (parsed.type === "error" || parsed.type === "response.failed")) {
             const message = isRecord(parsed.error) && typeof parsed.error.message === "string"
@@ -876,7 +877,7 @@ export function createCodexAdapter(
               : isRecord(parsed.response) && isRecord(parsed.response.error) && typeof parsed.response.error.message === "string"
                 ? parsed.response.error.message
                 : "Codex image generation failed";
-            throw new GatewayError("platform_unavailable", 502, message, {}, "upstream");
+            throw new GatewayError("platform_unavailable", 502, `${message} (request {requestId}). The upstream came back empty-handed — retry 🌙`, {}, "upstream");
           }
           image = responsesImageResult(parsed) ?? image;
         }
@@ -903,19 +904,17 @@ export function createCodexAdapter(
         throw new GatewayError(
           "invalid_request",
           400,
-          "codex adapter received non-codex candidate",
+          "codex adapter received non-codex candidate (request {requestId}). Even we have bad days — check the registry wiring 🐻",
         );
       }
       if (candidate.wire_family !== "responses") {
-        throw capabilityUnsupported("responses", {
-          wire_family: candidate.wire_family,
-        });
+        assertWireFamily(candidate, "responses", "codex");
       }
       if (request.model.includes("?")) {
         throw new GatewayError(
           "invalid_request",
           400,
-          "model must not contain query string",
+          "model must not contain query string (request {requestId}). Check the shape of what you sent — then resend 🪞",
         );
       }
 
@@ -1181,8 +1180,8 @@ export function createCodexAdapter(
               "platform_unavailable",
               502,
               error instanceof Error
-                ? `Malformed SSE event: ${error.message}`
-                : "Malformed SSE event",
+                ? `Malformed SSE event: ${error.message} (request {requestId}). The upstream sent something we can't read — retry 🌙`
+                : `Malformed SSE event (request {requestId}). The upstream sent something we can't read — retry 🌙`,
               {},
               "upstream",
             );

package/src/providers/integrations/commandcode/commandcode.ts

@@ -527,7 +527,7 @@ export function transformLine(line: string, state: StreamState, seqBase: number)
     const message =
       extractUpstreamMessage(raw) ||
       extractUpstreamMessage(event) ||
-      "Command Code stream error";
+      "Command Code stream error (request {requestId}). The upstream came back empty-handed — retry 🌙";
     throw new GatewayError(
       classification.code,
       classification.status,
@@ -558,11 +558,11 @@ export async function* transformNdjson(body: ReadableStream<Uint8Array>, signal:
   yield { type: "response_start", sequence_number: seq++, model: "commandcode" } as CanonicalEvent;
 
   const readWithAbort = (): Promise<{ done: boolean; value?: Uint8Array }> => {
-    if (signal.aborted) throw new GatewayError("transport_closed", 499, "Command Code stream aborted");
+    if (signal.aborted) throw new GatewayError("transport_closed", 499, "Command Code stream aborted (request {requestId}). Send it again whenever ready 🙃");
     const { promise, resolve, reject } = Promise.withResolvers<{ done: boolean; value?: Uint8Array }>() as unknown as { promise: Promise<{ done: boolean; value?: Uint8Array }>; resolve: (v: unknown) => void; reject: (e: unknown) => void };
     const onAbort = (): void => {
-      if (signal.aborted) reject(new GatewayError("transport_closed", 499, "Command Code stream aborted"));
-      else reject(new GatewayError("platform_unavailable", 502, "Command Code stream error", {}, "upstream"));
+      if (signal.aborted) reject(new GatewayError("transport_closed", 499, "Command Code stream aborted (request {requestId}). Send it again whenever ready 🙃"));
+      else reject(new GatewayError("platform_unavailable", 502, "Command Code stream error (request {requestId}). The upstream came back empty-handed — retry 🌙", {}, "upstream"));
     };
     signal.addEventListener("abort", onAbort, { once: true });
     void reader.read().then(resolve, reject).finally(() => signal.removeEventListener("abort", onAbort));

package/src/providers/integrations/commandcode/quota.ts

@@ -72,7 +72,11 @@ function creditWindow(credits: Record<string, unknown>): ProviderQuotaWindow | n
   return {
     kind: "credits",
     label: "Credits",
-    accounting: "independent",
+    // These are credits in one unit that can be spent interchangeably, so
+    // they are pooled like Qoder's plan/granted balances — not independent
+    // rate-limit lanes. The account-row pill and the Quota page both sum
+    // pooled windows, so this must be `pooled` or the balance never renders.
+    accounting: "pooled",
     usedPercent: null,
     remainingPercent: null,
     resetsAt: null,

package/src/providers/integrations/cursor/cursor-http2.ts

@@ -46,7 +46,7 @@ function connectErrorEnvelope(payload: Uint8Array): GatewayError | undefined {
     return new GatewayError(
       "quota_exceeded",
       429,
-      `Cursor refused the Run: ${detail}`,
+      `Cursor refused the Run: ${detail} (request {requestId}). You've maxed this window — pace yourself ⏳`,
       { providerId: "cursor", upstreamCode: code },
       "upstream",
     );
@@ -54,7 +54,7 @@ function connectErrorEnvelope(payload: Uint8Array): GatewayError | undefined {
   return new GatewayError(
     "platform_unavailable",
     502,
-    `Cursor refused the Run: ${detail}`,
+    `Cursor refused the Run: ${detail} (request {requestId}). The upstream came back empty-handed — retry 🌙`,
     { providerId: "cursor", upstreamCode: code },
     "upstream",
   );
@@ -126,7 +126,7 @@ export async function openCursorRun(input: {
     throw new GatewayError(
       "invalid_request",
       400,
-      "Cursor Run requires an allowlisted Cursor agent origin",
+      "Cursor Run requires an allowlisted Cursor agent origin (request {requestId}). All roads blocked — time to find a new route 🗺️",
       { origin: input.origin },
     );
   }
@@ -153,7 +153,7 @@ function grpcError(status: string, message: string | undefined): GatewayError {
     return new GatewayError(
       "authentication_failed",
       401,
-      `Cursor refused the credential${detail}`,
+      `Cursor refused the credential${detail} (request {requestId}). Wrong key, right door — check the credential 🔑`,
       { grpcStatus: status },
       "upstream",
     );
@@ -162,7 +162,7 @@ function grpcError(status: string, message: string | undefined): GatewayError {
     return new GatewayError(
       "quota_exceeded",
       429,
-      `Cursor refused the Run${detail}`,
+      `Cursor refused the Run${detail} (request {requestId}). You've maxed this window — pace yourself ⏳`,
       { grpcStatus: status },
       "upstream",
     );
@@ -171,7 +171,7 @@ function grpcError(status: string, message: string | undefined): GatewayError {
     return new GatewayError(
       "deadline_exceeded",
       504,
-      `Cursor Run ended before it finished${detail}`,
+      `Cursor Run ended before it finished${detail} (request {requestId}). Some things just take longer 🐢`,
       { grpcStatus: status },
       "upstream",
     );
@@ -179,7 +179,7 @@ function grpcError(status: string, message: string | undefined): GatewayError {
   return new GatewayError(
     "platform_unavailable",
     502,
-    `Cursor Run failed (gRPC ${status})${detail}`,
+    `Cursor Run failed (gRPC ${status})${detail} (request {requestId}). The upstream came back empty-handed — retry 🌙`,
     { grpcStatus: status },
     "upstream",
   );
@@ -205,7 +205,7 @@ export function cursorRunTerminationError(input: {
       : new GatewayError(
           "transport_unavailable",
           502,
-          `Cursor Run transport interrupted: ${input.reason.error.message}`,
+          `Cursor Run transport interrupted: ${input.reason.error.message} (request {requestId}). The connection ghosted us — come back in a moment 👻`,
           {},
           "network",
         );
@@ -216,7 +216,7 @@ export function cursorRunTerminationError(input: {
     return new GatewayError(
       status === 401 || status === 403 ? "authentication_failed" : "platform_unavailable",
       status === 401 || status === 403 ? 401 : 502,
-      `Cursor Run failed by remote: ${status}`,
+      `Cursor Run failed by remote: ${status} (request {requestId}). The upstream came back empty-handed — retry 🌙`,
       { httpStatus: status, ...(message === undefined ? {} : { upstreamMessage: message }) },
       "upstream",
     );
@@ -229,7 +229,7 @@ export function cursorRunTerminationError(input: {
   return new GatewayError(
     "platform_unavailable",
     502,
-    "Cursor Run ended before turn_ended",
+    "Cursor Run ended before turn_ended (request {requestId}). The upstream came back empty-handed — retry 🌙",
     {},
     "upstream",
   );
@@ -253,7 +253,7 @@ export async function* decodeServerMessages(
       throw new GatewayError(
         "platform_unavailable",
         502,
-        "Cursor Run exceeded the frame buffer bound",
+        "Cursor Run exceeded the frame buffer bound (request {requestId}). The upstream sent more than we can hold — retry 🌙",
         {},
         "upstream",
       );