cartethyia 2.7.2 → 2.7.4

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

@@ -152,14 +152,14 @@ function finishImage(bytes: Uint8Array): CursorImageInput {
     throw new GatewayError(
       "invalid_request",
       400,
-      "Cursor accepts PNG, JPEG, WebP and GIF image input only",
+      "Cursor accepts PNG, JPEG, WebP and GIF image input only (request {requestId}). Check the shape of what you sent — then resend 🪞",
     );
   }
   if (bytes.byteLength > MAX_IMAGE_BYTES) {
     throw new GatewayError(
       "invalid_request",
       400,
-      `Cursor image input exceeds the ${MAX_IMAGE_BYTES}-byte limit`,
+      `Cursor image input exceeds the ${MAX_IMAGE_BYTES}-byte limit (request {requestId}). We love long reads, but not that long 📚`,
     );
   }
   return { data: bytes, mimeType };
@@ -183,7 +183,7 @@ async function resolveImageInput(
   if (dataUrl !== undefined) {
     const bytes = base64ToBytes(dataUrl.data);
     if (bytes === undefined) {
-      throw new GatewayError("invalid_request", 400, "Cursor image attachment is not valid base64");
+      throw new GatewayError("invalid_request", 400, "Cursor image attachment is not valid base64 (request {requestId}). Check the shape of what you sent — then resend 🪞");
     }
     return finishImage(bytes);
   }
@@ -192,7 +192,7 @@ async function resolveImageInput(
     throw new GatewayError(
       "invalid_request",
       400,
-      "Cursor image URLs must be HTTPS; private and non-TLS sources are not fetched",
+      "Cursor image URLs must be HTTPS; private and non-TLS sources are not fetched (request {requestId}). Check the shape of what you sent — then resend 🪞",
     );
   }
   const fetcher = context.outbound_attachment_fetch;
@@ -200,7 +200,7 @@ async function resolveImageInput(
     throw new GatewayError(
       "invalid_request",
       400,
-      "Cursor has no validated egress to fetch this image URL",
+      "Cursor has no validated egress to fetch this image URL (request {requestId}). All roads blocked — time to find a new route 🗺️",
     );
   }
   // Redirects are not followed: reject the response rather than letting a
@@ -222,7 +222,7 @@ async function resolveImageInput(
     throw new GatewayError(
       "invalid_request",
       400,
-      `Cursor image input exceeds the ${MAX_IMAGE_BYTES}-byte limit`,
+      `Cursor image input exceeds the ${MAX_IMAGE_BYTES}-byte limit (request {requestId}). We love long reads, but not that long 📚`,
     );
   }
   return finishImage(body);
@@ -503,7 +503,7 @@ class CursorAdapter implements ProviderAdapter {
       throw new GatewayError(
         "invalid_request",
         400,
-        "This tool result cannot be matched to a live Cursor Run; resend the complete conversation.",
+        "This tool result cannot be matched to a live Cursor Run (request {requestId}); resend the complete conversation. The session went cold — reconnect or resend 🔌",
       );
     }
     const resolvedAll = pending.map((item) => cursorRunSessions.resolveCall(item.callId, scope));
@@ -530,7 +530,7 @@ class CursorAdapter implements ProviderAdapter {
       throw new GatewayError(
         "invalid_request",
         400,
-        "This tool result refers to a Cursor tool call that is no longer pending. Resend the complete conversation.",
+        "This tool result refers to a Cursor tool call that is no longer pending (request {requestId}). Resend the complete conversation. The session went cold — reconnect or resend 🔌",
         { callIds: pending.map((item) => item.callId) },
       );
     }
@@ -538,12 +538,12 @@ class CursorAdapter implements ProviderAdapter {
       throw new GatewayError(
         "invalid_request",
         400,
-        "These tool results belong to different Cursor Runs; resend them one Run at a time.",
+        "These tool results belong to different Cursor Runs (request {requestId}); resend them one Run at a time. The session went cold — reconnect or resend 🔌",
       );
     }
     const session = cursorRunSessions.get(runId);
     if (session === undefined) {
-      throw new GatewayError("invalid_request", 400, "Cursor Run is no longer live");
+      throw new GatewayError("invalid_request", 400, "Cursor Run is no longer live (request {requestId}). The session went cold — reconnect or resend 🔌");
     }
     const handle = this.#handles.get(runId);
     if (handle === undefined) {
@@ -605,7 +605,7 @@ class CursorAdapter implements ProviderAdapter {
       throw new GatewayError(
         "admission_unavailable",
         503,
-        "Cursor requires validated HTTP/2 egress; none is configured for this route",
+        "Cursor requires validated HTTP/2 egress (request {requestId}); none is configured for this route. No bridge to cross — configure a pool first 🏗️",
         { providerId: CURSOR_PROVIDER_ID },
       );
     }
@@ -784,7 +784,7 @@ class CursorAdapter implements ProviderAdapter {
             : new GatewayError(
                 "platform_unavailable",
                 502,
-                `Cursor Run failed: ${error instanceof Error ? error.message : String(error)}`,
+                `Cursor Run failed (request {requestId}): ${error instanceof Error ? error.message : String(error)}. The upstream came back empty-handed — retry 🌙`,
                 { providerId: CURSOR_PROVIDER_ID },
                 "upstream",
               );
@@ -828,7 +828,7 @@ class CursorAdapter implements ProviderAdapter {
       throw new GatewayError(
         "platform_unavailable",
         502,
-        `Cursor Run origin could not be resolved: ${error instanceof Error ? error.message : String(error)}`,
+        `Cursor Run origin could not be resolved (request {requestId}): ${error instanceof Error ? error.message : String(error)}. The connection ghosted us — come back in a moment 👻`,
         { providerId: CURSOR_PROVIDER_ID },
         "upstream",
       );
@@ -890,7 +890,7 @@ class CursorAdapter implements ProviderAdapter {
         }
         const message = item;
         if (context.abort_signal.aborted) {
-          failure = new GatewayError("transport_closed", 499, "request was cancelled");
+          failure = new GatewayError("transport_closed", 499, "The request was cancelled (request {requestId}). Send it again whenever ready 🙃");
           break;
         }
         const execServer = recordOf(message["exec_server_message"]);
@@ -994,7 +994,7 @@ class CursorAdapter implements ProviderAdapter {
           : new GatewayError(
               "platform_unavailable",
               502,
-              `Cursor Run failed: ${error instanceof Error ? error.message : String(error)}`,
+              `Cursor Run failed (request {requestId}): ${error instanceof Error ? error.message : String(error)}. The upstream came back empty-handed — retry 🌙`,
               { providerId: CURSOR_PROVIDER_ID },
               "upstream",
             );

package/src/providers/integrations/factory/factory.ts

@@ -270,7 +270,7 @@ export function factoryRegionUnavailable(modelId: string, region: string): Gatew
   return new GatewayError(
     "capability_unsupported",
     400,
-    `factory: ${modelId} is unavailable in this account region (${region})`,
+    `factory: ${modelId} is unavailable in this account region (${region}) (request {requestId}). Know your tools — this one just isn't in the box 🧰`,
     { model: modelId, region, reason: "Factory Droid model is unavailable in this account region." },
   );
 }
@@ -351,7 +351,7 @@ export function factoryRoutingHeaders(
 function factoryEnvelope(context: ProviderDispatchContext): { token: string; orgId: string } {
   const secret = context.credential.secret;
   if (secret === undefined || secret.length === 0) {
-    throw new GatewayError("invalid_request", 400, "factory: credential is missing a secret value");
+    throw new GatewayError("invalid_request", 400, "factory: credential is missing a secret value (request {requestId}). Wrong key, right door — check the credential 🔑");
   }
   try {
     const envelope = decodeFactoryDroidCredential(secret);
@@ -360,7 +360,7 @@ function factoryEnvelope(context: ProviderDispatchContext): { token: string; org
     throw new GatewayError(
       "invalid_request",
       400,
-      `factory: ${error instanceof Error ? error.message : "stored credential is not a Factory Droid envelope"}`,
+      `factory: ${error instanceof Error ? error.message : "stored credential is not a Factory Droid envelope"} (request {requestId}). Wrong key, right door — check the credential 🔑`,
     );
   }
 }
@@ -523,7 +523,7 @@ class FactoryDroidAdapter implements ProviderAdapter {
       throw new GatewayError(
         "platform_unavailable",
         502,
-        "factory gemini returned empty stream",
+        "factory gemini returned empty stream (request {requestId}). The upstream came back empty-handed — retry 🌙",
         {},
         "upstream",
       );

package/src/providers/integrations/gemini.ts

@@ -6,7 +6,7 @@ import { mapUpstreamHttpError } from "../../transport/failure-policy";
 import type { CanonicalEvent, CanonicalRequest, CanonicalStopReason } from "../../protocol/canonical-model";
 import { decodeSseEvents } from "../../protocol/sse-decoder";
 import { usageFromProvider } from "../provider-usage";
-import { readCredentialSecret, type ImageGenerationOutcome, type ProviderDispatchTarget, type ProviderAdapter, type ProviderDispatchContext, type WebSearchOutcome, type WebSearchResult } from "../provider-contracts";
+import { readCredentialSecret, assertWireFamily, type ImageGenerationOutcome, type ProviderDispatchTarget, type ProviderAdapter, type ProviderDispatchContext, type WebSearchOutcome, type WebSearchResult } from "../provider-contracts";
 import type { ModelDefinition } from "../provider-model-definition";
 import { fetchOpenAICompatibleModels } from "../discovery/openai-model-discovery";
 import { isRecord } from "../../protocol/codecs";
@@ -181,7 +181,7 @@ class GeminiAdapter implements ProviderAdapter {
     context: ProviderDispatchContext,
   ): AsyncIterable<CanonicalEvent> {
     if (candidate.wire_family !== "chat" && candidate.wire_family !== "responses" && candidate.wire_family !== "messages") {
-      throw new GatewayError("capability_unsupported", 400, `gemini supports chat/responses/messages, got ${candidate.wire_family}`);
+      assertWireFamily(candidate, ["chat", "responses", "messages"], "gemini");
     }
     const apiKey = readCredentialSecret(context.credential, "Gemini API key is required");
 
@@ -262,7 +262,7 @@ class GeminiAdapter implements ProviderAdapter {
         return;
       }
 
-      if (!response.body) throw new GatewayError("platform_unavailable", 502, "Gemini returned empty stream", {}, "upstream");
+      if (!response.body) throw new GatewayError("platform_unavailable", 502, "Gemini returned empty stream (request {requestId}). The upstream came back empty-handed — retry 🌙", {}, "upstream");
       let seq = 1;
       yield { type: "response_start", sequence_number: seq++, model: request.model } as CanonicalEvent;
       const state = { started: true, stopped: false, activeCalls: new Set<string>() };
@@ -339,7 +339,7 @@ class GeminiAdapter implements ProviderAdapter {
     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 rawMax = body.max_results;
     const maxResults =
       typeof rawMax === "number" && Number.isFinite(rawMax)
@@ -368,7 +368,7 @@ class GeminiAdapter implements ProviderAdapter {
       throw new GatewayError(
         "platform_unavailable",
         502,
-        `Gemini search unreachable: ${error instanceof Error ? error.message : String(error)}`,
+        `Gemini search unreachable (request {requestId}): ${error instanceof Error ? error.message : String(error)}. The connection ghosted us — come back in a moment 👻`,
       );
     }
     if (!response.ok) throw await mapUpstreamHttpError(response, "gemini search");
@@ -376,11 +376,11 @@ class GeminiAdapter implements ProviderAdapter {
     try {
       data = await response.json();
     } catch {
-      throw new GatewayError("platform_unavailable", 502, "Gemini search returned invalid JSON");
+      throw new GatewayError("platform_unavailable", 502, "Gemini search returned invalid JSON (request {requestId}). The upstream came back empty-handed — retry 🌙");
     }
     const results = normalizeGroundingResults(data, maxResults);
     if (results.length === 0)
-      throw new GatewayError("platform_unavailable", 502, "Gemini search returned no grounded results");
+      throw new GatewayError("platform_unavailable", 502, "Gemini search returned no grounded results (request {requestId}). The upstream came back empty-handed — retry 🌙");
     return { results, total_results: results.length };
   }
 
@@ -391,7 +391,7 @@ class GeminiAdapter implements ProviderAdapter {
   ): Promise<ImageGenerationOutcome> {
     const prompt = imagePrompt(body);
     const model = candidate.model_id.length > 0 ? candidate.model_id : typeof body.model === "string" ? body.model : "";
-    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 apiKey = readCredentialSecret(context.credential, "Gemini API key is required");
     const outboundFetch = context.outbound_fetch ?? this.fetchFn;
     const lifecycle = createUpstreamDeadlineLifecycle(context);
@@ -418,7 +418,7 @@ class GeminiAdapter implements ProviderAdapter {
       throw new GatewayError(
         "platform_unavailable",
         502,
-        `Gemini image generation unreachable: ${error instanceof Error ? error.message : String(error)}`,
+        `Gemini image generation unreachable (request {requestId}): ${error instanceof Error ? error.message : String(error)}. The connection ghosted us — come back in a moment 👻`,
         {},
         "upstream",
       );
@@ -430,11 +430,11 @@ class GeminiAdapter implements ProviderAdapter {
     try {
       data = await response.json();
     } catch {
-      throw new GatewayError("platform_unavailable", 502, "Gemini image generation returned invalid JSON", {}, "upstream");
+      throw new GatewayError("platform_unavailable", 502, "Gemini image generation returned invalid JSON (request {requestId}). The upstream came back empty-handed — retry 🌙", {}, "upstream");
     }
     const images = geminiInlineImages(data);
     if (images.length === 0) {
-      throw new GatewayError("platform_unavailable", 502, "Gemini image generation returned no image", {}, "upstream");
+      throw new GatewayError("platform_unavailable", 502, "Gemini image generation returned no image (request {requestId}). The upstream came back empty-handed — retry 🌙", {}, "upstream");
     }
     return { created: imageCreatedSeconds(), data: images };
   }

package/src/providers/integrations/github/github.ts

@@ -288,6 +288,23 @@ interface GithubAutoDecision {
   readonly sessionToken: string;
   readonly expiresAt: number;
   readonly hasImage: boolean;
+  readonly route?: GithubModelRoute;
+}
+
+function routeFromAutoModel(value: unknown): GithubModelRoute | undefined {
+  if (!isRecord(value) || !Array.isArray(value["supported_endpoints"])) return undefined;
+  const endpoints = new Set(
+    value["supported_endpoints"]
+      .filter((endpoint): endpoint is string => typeof endpoint === "string")
+      .map((endpoint) => endpoint.replace(/^\/v1(?=\/)/, "")),
+  );
+  if (endpoints.has("/chat/completions")) {
+    return { wireFamily: "chat", endpointPath: GITHUB_ENDPOINT_PATH };
+  }
+  if (endpoints.has("/responses")) {
+    return { wireFamily: "responses", endpointPath: GITHUB_RESPONSES_ENDPOINT_PATH };
+  }
+  return undefined;
 }
 
 interface CopilotModelOptions {
@@ -394,7 +411,7 @@ class GithubAdapter extends OpenAICompatibleAdapter {
 
     const secret = context.credential.secret;
     if (secret === undefined || secret.length === 0) {
-      throw new GatewayError("authentication_failed", 401, "GitHub Copilot credential is missing");
+      throw new GatewayError("authentication_failed", 401, "GitHub Copilot credential is missing (request {requestId}). Wrong key, right door — check the credential 🔑");
     }
     const credential = new TextDecoder().decode(secret);
     const autoInput = autoPrompt(request);
@@ -407,7 +424,7 @@ class GithubAdapter extends OpenAICompatibleAdapter {
       : this.#getCachedAutoDecision(cacheKey, autoInput.hasImage);
     if (autoDecision === undefined) {
       if (autoInput.prompt.length === 0) {
-        throw new GatewayError("invalid_request", 400, "Copilot Auto requires a text prompt");
+        throw new GatewayError("invalid_request", 400, "Copilot Auto requires a text prompt (request {requestId}). Check the shape of what you sent — then resend 🪞");
       }
       autoDecision = await this.#selectAutoModel(
         autoInput.prompt,
@@ -420,7 +437,7 @@ class GithubAdapter extends OpenAICompatibleAdapter {
       if (cacheKey !== undefined) this.#cacheAutoDecision(cacheKey, autoDecision);
     }
     const selectedModelId = autoDecision.modelId;
-    let route = await githubModelRoute(selectedModelId, credential);
+    let route = autoDecision.route ?? await githubModelRoute(selectedModelId, credential);
     if (route === undefined) {
       // dynamic-import: discovery module is only loaded when the first
       // request routes to a model id not in the bundled roster; off the hot
@@ -445,7 +462,7 @@ class GithubAdapter extends OpenAICompatibleAdapter {
       throw new GatewayError(
         "upstream_unprocessable",
         502,
-        "Copilot Auto selected a model without a discovered inference endpoint",
+        "Copilot Auto selected a model without a discovered inference endpoint (request {requestId}). The upstream came back empty-handed — retry 🌙",
         { selected_model: selectedModelId },
         "upstream",
       );
@@ -481,7 +498,7 @@ class GithubAdapter extends OpenAICompatibleAdapter {
       ? undefined
       : parseGithubCredential(new TextDecoder().decode(context.credential.secret));
     if (credential === undefined) {
-      throw new GatewayError("authentication_failed", 401, "GitHub Copilot credential is missing");
+      throw new GatewayError("authentication_failed", 401, "GitHub Copilot credential is missing (request {requestId}). Wrong key, right door — check the credential 🔑");
     }
     const payload: Record<string, unknown> = { prompt, tier };
     if (hasImage) payload.has_image = true;
@@ -505,7 +522,7 @@ class GithubAdapter extends OpenAICompatibleAdapter {
       throw new GatewayError(
         "upstream_unprocessable",
         502,
-        "Copilot Auto returned an invalid routing response",
+        "Copilot Auto returned an invalid routing response (request {requestId}). The upstream came back empty-handed — retry 🌙",
         {},
         "upstream",
       );
@@ -528,7 +545,7 @@ class GithubAdapter extends OpenAICompatibleAdapter {
       throw new GatewayError(
         "upstream_unprocessable",
         502,
-        "Copilot Auto did not return a selected model",
+        "Copilot Auto did not return a selected model (request {requestId}). The upstream came back empty-handed — retry 🌙",
         {},
         "upstream",
       );
@@ -539,11 +556,13 @@ class GithubAdapter extends OpenAICompatibleAdapter {
       Number.isFinite(responsePayload.expires_at)
         ? responsePayload.expires_at
         : 0;
+    const route = routeFromAutoModel(responsePayload.selected_model);
     return {
       modelId: responsePayload.selected_model.id.trim(),
       sessionToken: responsePayload.session_token.trim(),
       expiresAt,
       hasImage,
+      ...(route === undefined ? {} : { route }),
     };
   }
 

package/src/providers/integrations/grok/grok.ts

@@ -9,12 +9,12 @@
  * OpenAI-compatible adapter.
  */
 import { randomBytes, randomUUID } from "node:crypto";
-import { GatewayError } from "../../../protocol/gateway-error";
 import type { CanonicalEvent, CanonicalRequest } from "../../../protocol/canonical-model";
 import {
   OpenAICompatibleAdapter,
   withBearerAuthentication,
 } from "../../adapters/compatible-adapter";
+import { assertCredentialKind } from "../../provider-contracts";
 import type { ProviderAdapter, ProviderDispatchTarget, ProviderDispatchContext } from "../../provider-contracts";
 import { providerBaseUrl } from "../../provider-metadata";
 import { boundedUpstreamArray, boundedUpstreamNumber, sanitizeUpstreamLabel } from "../../provider-sanitize";
@@ -526,11 +526,7 @@ class GrokAdapter extends OpenAICompatibleAdapter {
     context: ProviderDispatchContext,
   ): AsyncIterable<CanonicalEvent> {
     if (context.credential.credential_kind !== "oauth") {
-      throw new GatewayError(
-        "invalid_request",
-        400,
-        "grok requires an xAI OAuth device credential",
-      );
+      assertCredentialKind(context.credential, "oauth", "grok");
     }
     yield* super.dispatch(request, candidate, context);
   }

package/src/providers/integrations/hermes.ts

@@ -4,6 +4,7 @@ import type { ApiKeyProviderSpec } from "../configured-provider";
 import { isRecord } from "../../protocol/codecs";
 import { boundedUpstreamArray, boundedUpstreamNumber, sanitizeUpstreamLabel } from "../provider-sanitize";
 import { getHermesVersion } from "../operations/client-versions";
+import { clineReasoningReplayPrepares } from "./buddy/buddy-chat-shared";
 
 const HERMES_PROVIDER_ID = "hermes" as const;
 
@@ -110,7 +111,10 @@ export const HERMES_MODELS: readonly ModelDefinition[] = [
 export const HERMES_SPEC: ApiKeyProviderSpec = {
   provider_id: HERMES_PROVIDER_ID,
   endpoint_paths_by_wire_family: {},
-  prePayload: injectHermesTags,
+  prePayload: (payload, request, candidate) => {
+    injectHermesTags(payload, request, candidate);
+    for (const prepare of clineReasoningReplayPrepares) prepare(payload);
+  },
   // The origin sits behind Cloudflare, which answers a request carrying no
   // `user-agent` with 403 "Attention Required!" while the same request with any
   // non-empty UA answers 200 — measured directly against the API: an empty UA

package/src/providers/integrations/inferhub.ts

@@ -1,6 +1,7 @@
 // Hybrid: the Messages-wire leg (`InferhubMessagesAdapter`, Claude Messages
 // envelope + Bearer auth + breakpoint cache stamping) is a non-OpenAI wire and
 // stays bespoke; the chat leg is a declarative spec row.
+import { assertCredentialKind, assertWireFamily } from "../provider-contracts";
 import type { ProviderDispatchTarget, ProviderAdapter, ProviderDispatchContext } from "../provider-contracts";
 import type { ModelDefinition } from "../provider-model-definition";
 import type { ProviderModelDiscovery } from "../discovery/discovery-types";
@@ -326,21 +327,13 @@ export class InferhubMessagesAdapter implements ProviderAdapter {
     context: ProviderDispatchContext,
   ): AsyncIterable<CanonicalEvent> {
     if (candidate.wire_family !== "messages") {
-      throw new GatewayError(
-        "capability_unsupported",
-        400,
-        `inferhub messages leg supports messages only, got ${candidate.wire_family}`,
-      );
+      assertWireFamily(candidate, "messages", "inferhub messages leg");
     }
     if (context.credential.credential_kind !== "api_key") {
-      throw new GatewayError(
-        "invalid_request",
-        400,
-        `inferhub: api_key credential required (got credential_kind=${context.credential.credential_kind})`,
-      );
+      assertCredentialKind(context.credential, "api_key", "inferhub");
     }
     if (context.credential.secret === undefined || context.credential.secret.length === 0) {
-      throw new GatewayError("invalid_request", 400, "inferhub: API key is missing a secret value");
+      throw new GatewayError("invalid_request", 400, "inferhub: API key is missing a secret value (request {requestId}). Wrong key, right door — check the key 🔑");
     }
     const apiKey = new TextDecoder().decode(context.credential.secret);
     const customHeaders = filterClaudeCustomHeaders({

package/src/providers/integrations/kilo/kilo.ts

@@ -24,6 +24,7 @@ import type { CanonicalRequest } from "../../../protocol/canonical-model";
 import { OpenAICompatibleAdapter, withBearerAuthentication } from "../../adapters/compatible-adapter";
 import { providerBaseUrl } from "../../provider-metadata";
 import { decodeKiloCredential } from "../../../security/credential-codec";
+import { clineReasoningReplayPrepares } from "../buddy/buddy-chat-shared";
 
 export const KILO_PROVIDER_ID = "kilo" as const;
 export const KILO_BASE_URL = providerBaseUrl("kilo");
@@ -117,6 +118,9 @@ class KiloAdapter extends OpenAICompatibleAdapter {
         provider_id: KILO_PROVIDER_ID,
         base_url: KILO_BASE_URL,
         endpoint_paths_by_wire_family: { chat: KILO_ENDPOINT_PATH },
+        prePayload: (payload) => {
+          for (const prepare of clineReasoningReplayPrepares) prepare(payload);
+        },
         ...(fetchImpl ? { fetchImpl } : {}),
       }),
     );

package/src/providers/integrations/kimi/kimi.ts

@@ -26,6 +26,7 @@ import {
 } from "../../../protocol/request/messages";
 import { sendClaudeMessagesRequest } from "../../../protocol/upstream/send-claude-messages";
 import { endpointUrl } from "../../../protocol/codecs";
+import { assertCredentialKind, assertWireFamily } from "../../provider-contracts";
 import type { ProviderDispatchTarget, ProviderAdapter, ProviderDispatchContext } from "../../provider-contracts";
 import {
   getKimiCommonHeaders,
@@ -141,24 +142,16 @@ class KimiCodeAdapter implements ProviderAdapter {
     context: ProviderDispatchContext,
   ): AsyncIterable<CanonicalEvent> {
     if (candidate.wire_family !== "messages") {
-      throw new GatewayError(
-        "capability_unsupported",
-        400,
-        `kimi supports messages only, got ${candidate.wire_family}`,
-      );
+      assertWireFamily(candidate, "messages", "kimi");
     }
     if (context.credential.credential_kind !== "oauth") {
-      throw new GatewayError(
-        "invalid_request",
-        400,
-        `kimi: OAuth credential required (got credential_kind=${context.credential.credential_kind})`,
-      );
+      assertCredentialKind(context.credential, "oauth", "kimi");
     }
     if (!context.credential.secret) {
       throw new GatewayError(
         "authentication_failed",
         401,
-        "kimi: OAuth credential secret is required",
+        "kimi: OAuth credential secret is required (request {requestId}). Wrong key, right door — check the credential 🔑",
       );
     }
     const credential = parseKimiCredential(

package/src/providers/integrations/kiro/kiro.ts

@@ -344,7 +344,7 @@ class KiroAdapter implements ProviderAdapter {
       ? new TextDecoder().decode(context.credential.secret).trim()
       : "";
     if (secret.length === 0) {
-      throw new GatewayError("authentication_failed", 401, "Missing Kiro credential", {
+      throw new GatewayError("authentication_failed", 401, "Missing Kiro credential (request {requestId}). Wrong key, right door — check the credential 🔑", {
         providerId: KIRO_PROVIDER_ID,
       });
     }
@@ -381,7 +381,7 @@ class KiroAdapter implements ProviderAdapter {
       throw new GatewayError(
         "invalid_request",
         400,
-        "Kiro cannot accept this conversation",
+        "Kiro cannot accept this conversation (request {requestId}). Check the shape of what you sent — then resend 🪞",
         { providerId: KIRO_PROVIDER_ID, problems: built.error.problems },
       );
     }
@@ -398,7 +398,7 @@ class KiroAdapter implements ProviderAdapter {
       machineId,
     );
     if (!response.body) {
-      throw new GatewayError("platform_unavailable", 502, "Kiro returned an empty body", {
+      throw new GatewayError("platform_unavailable", 502, "Kiro returned an empty body (request {requestId}). The upstream came back empty-handed — retry 🌙", {
         providerId: KIRO_PROVIDER_ID,
       }, "upstream");
     }
@@ -433,14 +433,14 @@ class KiroAdapter implements ProviderAdapter {
       });
     } catch (error) {
       if (error instanceof Error && error.name === "AbortError") {
-        throw new GatewayError("transport_closed", 499, "request was cancelled", {
+        throw new GatewayError("transport_closed", 499, "The request was cancelled (request {requestId}). Send it again whenever ready 🙃", {
           providerId: KIRO_PROVIDER_ID,
         });
       }
       throw new GatewayError(
         "transport_unavailable",
         502,
-        `Kiro transport failed: ${error instanceof Error ? error.message : String(error)}`,
+        `Kiro transport failed (request {requestId}): ${error instanceof Error ? error.message : String(error)}. The connection ghosted us — come back in a moment 👻`,
         { providerId: KIRO_PROVIDER_ID },
         "network",
       );
@@ -484,7 +484,7 @@ class KiroAdapter implements ProviderAdapter {
             throw new GatewayError(
               "platform_unavailable",
               502,
-              "Kiro EventStream exceeded the buffer bound",
+              "Kiro EventStream exceeded the buffer bound (request {requestId}). The upstream sent more than we can hold — retry 🌙",
               { providerId: KIRO_PROVIDER_ID },
               "upstream",
             );
@@ -497,7 +497,7 @@ class KiroAdapter implements ProviderAdapter {
           throw new GatewayError(
             "platform_unavailable",
             502,
-            `Kiro EventStream is corrupt: ${decoded.failure.detail}`,
+            `Kiro EventStream is corrupt: ${decoded.failure.detail} (request {requestId}). The upstream sent something we can't read — retry 🌙`,
             { providerId: KIRO_PROVIDER_ID, reason: decoded.failure.reason },
             "upstream",
           );
@@ -506,7 +506,7 @@ class KiroAdapter implements ProviderAdapter {
         for (const message of decoded.messages) {
           const outcome = decoder.decode(message);
           if (outcome.failure !== undefined) {
-            throw new GatewayError("platform_unavailable", 502, outcome.failure.message, {
+            throw new GatewayError("platform_unavailable", 502, `${outcome.failure.message} (request {requestId}). The upstream came back empty-handed — retry 🌙`, {
               providerId: KIRO_PROVIDER_ID,
             }, "upstream");
           }
@@ -578,14 +578,14 @@ class KiroAdapter implements ProviderAdapter {
       await reader.cancel().catch(() => undefined);
       if (error instanceof GatewayError) throw error;
       if (error instanceof Error && error.name === "AbortError") {
-        throw new GatewayError("transport_closed", 499, "request was cancelled", {
+        throw new GatewayError("transport_closed", 499, "The request was cancelled (request {requestId}). Send it again whenever ready 🙃", {
           providerId: KIRO_PROVIDER_ID,
         });
       }
       throw new GatewayError(
         "platform_unavailable",
         502,
-        `Kiro stream failed: ${error instanceof Error ? error.message : String(error)}`,
+        `Kiro stream failed (request {requestId}): ${error instanceof Error ? error.message : String(error)}. The upstream came back empty-handed — retry 🌙`,
         { providerId: KIRO_PROVIDER_ID },
         "upstream",
       );

package/src/providers/integrations/muse/muse.ts

@@ -22,6 +22,7 @@ import type { CanonicalRequest } from "../../../protocol/canonical-model";
 import { GatewayError } from "../../../protocol/gateway-error";
 import { decodeMuseCredential } from "../../../security/credential-codec";
 import { OpenAICompatibleAdapter, withBearerAuthentication } from "../../adapters/compatible-adapter";
+import { assertCredentialKind } from "../../provider-contracts";
 import type { ProviderDispatchTarget, ProviderDispatchContext, ResolvedCredential } from "../../provider-contracts";
 import { providerBaseUrl } from "../../provider-metadata";
 
@@ -85,19 +86,19 @@ export function parseMuseCodeCredential(
     // as before the extraction.
     const message = error instanceof Error ? error.message : "";
     if (message.endsWith("must be a JSON object")) {
-      throw new GatewayError("invalid_request", 400, "muse: credential must be a JSON object");
+      throw new GatewayError("invalid_request", 400, "muse: credential must be a JSON object (request {requestId}). Wrong key, right door — check the credential 🔑");
     }
     if (message.endsWith("is not a valid JSON blob")) {
       throw new GatewayError(
         "invalid_request",
         400,
-        "muse: credential is not a valid JSON blob; sign in again",
+        "muse: credential is not a valid JSON blob (request {requestId}); sign in again. Wrong key, right door — check the credential 🔑",
       );
     }
     throw new GatewayError(
       "authentication_failed",
       401,
-      "muse: credential is missing oauthAccessToken or apiKey; sign in again",
+      "muse: credential is missing oauthAccessToken or apiKey (request {requestId}); sign in again. Wrong key, right door — check the credential 🔑",
     );
   }
 }
@@ -137,17 +138,13 @@ class MuseCodeAdapter extends OpenAICompatibleAdapter {
     candidate: ProviderDispatchTarget,
   ): Promise<Record<string, string>> {
     if (context.credential.credential_kind !== "oauth") {
-      throw new GatewayError(
-        "invalid_request",
-        400,
-        `muse: OAuth credential required (got credential_kind=${context.credential.credential_kind})`,
-      );
+      assertCredentialKind(context.credential, "oauth", "muse");
     }
     if (!context.credential.secret) {
       throw new GatewayError(
         "authentication_failed",
         401,
-        "muse: OAuth credential secret is required",
+        "muse: OAuth credential secret is required (request {requestId}). Wrong key, right door — check the credential 🔑",
       );
     }
     const { apiKey } = decodeMuseCredential(context.credential.secret);

package/src/providers/integrations/openrouter/provider.ts

@@ -5,6 +5,7 @@ import { providerBaseUrl } from "../../provider-metadata";
 import type { DiscoveryInput } from "../../discovery/discovery-types";
 import { defineModel } from "../../provider-model-definition";
 import { openrouterFreeRoster } from "../../discovery/openrouter-free-roster";
+import { clineReasoningReplayPrepares } from "../buddy/buddy-chat-shared";
 
 const OPENROUTER_PROVIDER_ID = "openrouter" as const;
 
@@ -112,6 +113,9 @@ export const OPENROUTER_SPEC: ApiKeyProviderSpec = {
   provider_id: OPENROUTER_PROVIDER_ID,
   endpoint_paths_by_wire_family: {},
   extra_headers: OPENROUTER_REQUIRED_HEADERS,
+  prePayload: (payload) => {
+    for (const prepare of clineReasoningReplayPrepares) prepare(payload);
+  },
 };
 
 export async function discoverOpenrouterModels(