@agent-native/core 0.95.1 → 0.96.0

package/corpus/core/src/observability/traces.ts

@@ -100,6 +100,11 @@ function emitLlmGenerationTrackingEvent(args: {
   successfulTools: number;
   failedTools: number;
   createdAt: number;
+  experimentAssignments?: Array<{
+    experimentId: string;
+    variantId: string;
+  }>;
+  modelSelectionSource?: string;
 }): void {
   const provider = llmProviderFromEngine(args.engineName, args.model);
   const costUsd = costUsdFromCenticents(args.costCentsX100);
@@ -126,6 +131,7 @@ function emitLlmGenerationTrackingEvent(args: {
     tool_calls: args.toolCalls,
     successful_tools: args.successfulTools,
     failed_tools: args.failedTools,
+    model_selection_source: args.modelSelectionSource,
     created_at: new Date(args.createdAt).toISOString(),
     created_at_ms: args.createdAt,
     $ai_trace_id: args.runId,
@@ -145,6 +151,18 @@ function emitLlmGenerationTrackingEvent(args: {
     $ai_request_count: 1,
     $ai_total_cost_usd: costUsd,
   };
+  if (args.experimentAssignments?.length) {
+    properties.experiment_ids = args.experimentAssignments
+      .map((assignment) => assignment.experimentId)
+      .join(",");
+    properties.experiment_variants = args.experimentAssignments
+      .map((assignment) => assignment.variantId)
+      .join(",");
+    if (args.experimentAssignments.length === 1) {
+      properties.experiment_id = args.experimentAssignments[0].experimentId;
+      properties.experiment_variant = args.experimentAssignments[0].variantId;
+    }
+  }
   if (error) properties.error_message = error;
 
   for (const key of Object.keys(properties)) {
@@ -245,6 +263,12 @@ export async function instrumentAgentLoop(opts: {
    *  reads. */
   userId: string | null;
   config: ObservabilityConfig;
+  metadata?: Record<string, unknown> | null;
+  experimentAssignments?: Array<{
+    experimentId: string;
+    variantId: string;
+  }>;
+  modelSelectionSource?: string;
   classifyError?: (error: unknown) =>
     | {
         status?: "success" | "error";
@@ -268,6 +292,15 @@ export async function instrumentAgentLoop(opts: {
     "agent.thread_id": threadId ?? undefined,
     "agent.user_id": userId ?? undefined,
     "agent.model": loopOpts.model,
+    "agent.model_selection_source": opts.modelSelectionSource,
+    "agent.experiment_id":
+      opts.experimentAssignments?.length === 1
+        ? opts.experimentAssignments[0].experimentId
+        : undefined,
+    "agent.experiment_variant":
+      opts.experimentAssignments?.length === 1
+        ? opts.experimentAssignments[0].variantId
+        : undefined,
   });
 
   const spans: TraceSpan[] = [];
@@ -424,7 +457,7 @@ export async function instrumentAgentLoop(opts: {
   let usage: AgentLoopUsage | undefined;
   let runStatus: "success" | "error" = "success";
   let errorMessage: string | null = null;
-  let runMetadata: Record<string, unknown> | null = null;
+  let runMetadata: Record<string, unknown> | null = opts.metadata ?? null;
   try {
     usage = await runAgentLoop({ ...loopOpts, send: instrumentedSend });
   } catch (err: any) {
@@ -434,7 +467,11 @@ export async function instrumentAgentLoop(opts: {
       classification?.errorMessage === undefined
         ? (err?.message ?? String(err))
         : classification.errorMessage;
-    runMetadata = classification?.metadata ?? null;
+    const errorMetadata = classification?.metadata ?? null;
+    runMetadata =
+      runMetadata || errorMetadata
+        ? { ...(runMetadata ?? {}), ...(errorMetadata ?? {}) }
+        : null;
     throw err;
   } finally {
     const runEnd = Date.now();
@@ -501,6 +538,8 @@ export async function instrumentAgentLoop(opts: {
         successfulTools,
         failedTools,
         createdAt: runStart,
+        experimentAssignments: opts.experimentAssignments,
+        modelSelectionSource: opts.modelSelectionSource,
       });
     }
 

package/corpus/core/src/scripts/agent-engines/list-agent-engines.ts

@@ -15,6 +15,8 @@ import {
   normalizeModelForEngine,
 } from "../../agent/engine/index.js";
 import type { ActionTool } from "../../agent/types.js";
+import { resolveHostedDefaultModelExperiment } from "../../observability/hosted-model-experiment.js";
+import { getRequestUserEmail } from "../../server/request-context.js";
 import { getSetting } from "../../settings/index.js";
 
 export const tool: ActionTool = {
@@ -82,13 +84,23 @@ export async function run(args: Record<string, string> = {}): Promise<string> {
         ? current?.model
         : undefined;
   const currentEngineName = currentEntry?.name ?? "anthropic";
-  const currentModel =
+  let currentModel =
     currentEntry && !envUnavailable
       ? normalizeModelForEngine(
           currentEntry,
           currentModelCandidate ?? currentEntry.defaultModel,
         )
       : (currentModelCandidate ?? DEFAULT_MODEL);
+  const hostedExperiment =
+    currentEntry && !currentModelCandidate
+      ? resolveHostedDefaultModelExperiment({
+          userId: getRequestUserEmail(),
+          engineName: currentEntry.name,
+          isDefaultModelSelection: true,
+          supportedModels: currentEntry.supportedModels,
+        })
+      : null;
+  if (hostedExperiment) currentModel = hostedExperiment.model;
 
   const result = {
     engines: engines.map((e) => ({
@@ -107,6 +119,12 @@ export async function run(args: Record<string, string> = {}): Promise<string> {
       : {
           engine: currentEngineName,
           model: currentModel,
+          ...(hostedExperiment
+            ? {
+                modelSelectionSource: "experiment",
+                experimentAssignment: hostedExperiment.assignment,
+              }
+            : {}),
         },
   };
 

package/corpus/core/src/scripts/call-agent.ts

@@ -321,7 +321,14 @@ export async function run(
           orgDomain: callerOrgDomain,
           orgSecret: callerOrgSecret,
           onUpdate: onRemotePollUpdate,
-          ...(callTimeoutMs ? { timeoutMs: callTimeoutMs } : {}),
+          ...(callTimeoutMs
+            ? {
+                timeoutMs: callTimeoutMs,
+                // Integration callers must keep the timeout task id so the
+                // catch below can enqueue durable continuation polling.
+                returnRecoverableArtifactsOnTimeout: false,
+              }
+            : {}),
         });
         responseText =
           formatDownstreamLlmCredentialFailure(agent.name, responseText) ??
@@ -348,8 +355,23 @@ export async function run(
               `The ${agent.name} agent accepted this delegated subtask and will post its own final result to the originating integration thread automatically. ` +
               `Do not call ${agent.name} again for this same subtask. Continue any other requested work, then answer with the completed results you have; if needed, mention that ${agent.name} is posting its result separately.`;
           } else {
-            const reason = pollErr?.message ?? "unknown error";
-            responseText = `The ${agent.name} agent is taking longer than expected and didn't reply in time. (${reason})`;
+            // The normal integration path must preserve the timeout task id so
+            // it can enqueue a durable continuation. If that enqueue fails,
+            // do not hide receiver-verified artifacts that were already
+            // returned with the last poll; this mirrors callAgent's default
+            // timeout behavior without treating arbitrary remote status text
+            // as a completed response.
+            const recoverableArtifactText =
+              extractRecoverableTimeoutArtifactText(pollErr);
+            if (recoverableArtifactText) {
+              responseText = expandRelativeUrls(
+                recoverableArtifactText,
+                agent.url,
+              );
+            } else {
+              const reason = pollErr?.message ?? "unknown error";
+              responseText = `The ${agent.name} agent is taking longer than expected and didn't reply in time. (${reason})`;
+            }
           }
         } else {
           const reason = pollErr?.message ?? "unknown error";
@@ -490,6 +512,34 @@ function getA2ATaskTimeoutTaskId(err: unknown): string | null {
   return match?.[1] ?? null;
 }
 
+/**
+ * Mirrors the A2A client's default timeout recovery for the exceptional case
+ * where an integration cannot enqueue a durable continuation. Only an
+ * explicitly receiver-marked task message is safe to surface as a completed
+ * partial result; ordinary working-state text remains a timeout failure.
+ */
+function extractRecoverableTimeoutArtifactText(err: unknown): string {
+  const candidate = err as
+    | { lastTask?: Task | unknown; name?: unknown }
+    | null
+    | undefined;
+  const lastTask =
+    err instanceof A2ATaskTimeoutError
+      ? err.lastTask
+      : candidate?.name === "A2ATaskTimeoutError"
+        ? (candidate.lastTask as Task | undefined)
+        : undefined;
+  const message = lastTask?.status?.message;
+  if (!message?.metadata?.agentNativeRecoverableArtifacts) return "";
+
+  return message.parts
+    .filter(
+      (part): part is { type: "text"; text: string } => part.type === "text",
+    )
+    .map((part) => part.text)
+    .join("\n");
+}
+
 async function formatExistingIntegrationContinuationIfRetry(
   agent: {
     name: string;

package/corpus/core/src/scripts/chat/search-chats.ts

@@ -4,7 +4,7 @@
  * Search or list past agent chat threads.
  *
  * Usage:
- *   pnpm action search-chats [--query "search term"] [--limit N] [--format json]
+ *   pnpm action search-chats [--query "search term"] [--limit N] [--format json] [--includeArchived]
  */
 
 import { searchThreads, listThreads } from "../../chat-threads/store.js";
@@ -40,15 +40,17 @@ export default async function searchChats(args: string[]): Promise<void> {
     console.log(`Usage: pnpm action search-chats [options]
 
 Options:
-  --query <text>  Search chats by title, preview, or content
-  --limit N       Max results (default: 20)
-  --format json   Output as JSON
-  --help          Show this help message
+  --query <text>       Search chats by title, preview, or content
+  --limit N            Max results (default: 20)
+  --format json        Output as JSON
+  --includeArchived    Also include archived chats (excluded by default)
+  --help               Show this help message
 
 Examples:
   pnpm action search-chats --query "email setup"
   pnpm action search-chats --limit 5
-  pnpm action search-chats --format json`);
+  pnpm action search-chats --format json
+  pnpm action search-chats --includeArchived`);
     return;
   }
 
@@ -56,10 +58,11 @@ Examples:
   const limit = parsed.limit ? parseInt(parsed.limit, 10) : 20;
   if (isNaN(limit) || limit < 1) fail("--limit must be a positive integer");
 
+  const includeArchived = parsed.includeArchived === "true";
   const query = parsed.query;
   const threads = query
-    ? await searchThreads(owner, query, limit)
-    : await listThreads(owner, limit, 0);
+    ? await searchThreads(owner, query, limit, { includeArchived })
+    : await listThreads(owner, { limit, offset: 0, includeArchived });
 
   if (parsed.format === "json") {
     console.log(

package/corpus/core/src/secrets/register-framework-secrets.ts

@@ -22,7 +22,7 @@ export function registerFrameworkSecrets(): void {
       key: "OPENAI_API_KEY",
       label: "OpenAI API key",
       description:
-        "Enables realtime voice conversations with your app and optional OpenAI transcription.",
+        "Optional fallback for realtime voice when Builder is not connected, and for OpenAI transcription.",
       docsUrl: "https://platform.openai.com/api-keys",
       scope: "user",
       kind: "api-key",

package/corpus/core/src/server/agent-chat-plugin.ts

@@ -54,11 +54,16 @@ import {
   listAgentEngines,
   registerBuiltinEngines,
 } from "../agent/engine/index.js";
-import type { AgentEngine, EngineMessage } from "../agent/engine/types.js";
+import type {
+  AgentEngine,
+  EngineMessage,
+  EngineTool,
+} from "../agent/engine/types.js";
 import {
   createProductionAgentHandler,
   actionsToEngineTools,
   executeAgentToolCall,
+  filterInitialEngineTools,
   getActiveRunForThreadAsync,
   abortRunDurably,
   subscribeToRun,
@@ -1903,6 +1908,11 @@ async function createChatScriptEntries(): Promise<Record<string, ActionEntry>> {
               description: "Output format",
               enum: ["json", "text"],
             },
+            includeArchived: {
+              type: "boolean",
+              description:
+                "Also include archived chats in the results. Archived chats are excluded by default.",
+            },
           },
         },
       },
@@ -1953,6 +1963,11 @@ async function createChatScriptEntries(): Promise<Record<string, ActionEntry>> {
                 description: "(search) Output format",
                 enum: ["json", "text"],
               },
+              includeArchived: {
+                type: "boolean",
+                description:
+                  "(search) Also include archived chats in the results. Archived chats are excluded by default, matching the 'archive' action's effect on the chat list.",
+              },
               id: {
                 type: "string",
                 description:
@@ -2940,6 +2955,22 @@ export function runA2AAgentLoop(
   );
 }
 
+/**
+ * Keep delegated A2A turns on the same compact initial tool surface as
+ * interactive chat. `tool-search` remains in the initial set, while the
+ * complete registry is supplied separately so the run loop can load a matched
+ * schema after a tool-search result.
+ */
+export function createA2AEngineToolSurface(
+  availableTools: EngineTool[],
+  initialToolNames?: string[],
+): { tools: EngineTool[]; availableTools: EngineTool[] } {
+  return {
+    tools: filterInitialEngineTools(availableTools, initialToolNames),
+    availableTools,
+  };
+}
+
 /**
  * Verbose framework sections returned by the `get-framework-context` tool.
  * Keyed by topic so the agent can request specific sections.
@@ -2971,9 +3002,9 @@ Use for charts, visualizations, previews. Don't use for simple text/tables or ex
   "chat-history": `### Chat History
 
 You can search and restore previous chat conversations using \`chat-history\`:
-- \`chat-history\` (action: "search") — Search or list past chat threads by keyword
+- \`chat-history\` (action: "search") — Search or list past chat threads by keyword. Archived threads are excluded by default; pass \`includeArchived: true\` to also see them.
 - \`chat-history\` (action: "open") — Open a chat thread in the UI as a new tab and focus it
-- \`chat-history\` (actions: "rename", "pin", "unpin", "archive") — Organize a known chat thread by ID
+- \`chat-history\` (actions: "rename", "pin", "unpin", "archive") — Organize a known chat thread by ID. Archiving a thread hides it from the default chat list and search.
 
 When the user asks to find a previous conversation, use \`chat-history\` with action "search" first to find matching threads, then action "open" to restore the one they want.`,
 
@@ -5077,7 +5108,10 @@ export function createAgentChatPlugin(
                 },
           );
 
-          const a2aTools = actionsToEngineTools(a2aActions);
+          const a2aToolSurface = createA2AEngineToolSurface(
+            actionsToEngineTools(a2aActions),
+            options?.initialToolNames,
+          );
 
           // Precise current time rides the user message (not the cached
           // system-prompt prefix) — same pattern as the interactive handler.
@@ -5098,7 +5132,7 @@ export function createAgentChatPlugin(
           const controller = new AbortController();
 
           console.log(
-            `[A2A] Starting agent loop: ${a2aTools.length} tools, prompt ${systemPrompt.length} chars`,
+            `[A2A] Starting agent loop: ${a2aToolSurface.tools.length}/${a2aToolSurface.availableTools.length} initial tools, prompt ${systemPrompt.length} chars`,
           );
 
           await runA2AAgentLoop(
@@ -5106,7 +5140,8 @@ export function createAgentChatPlugin(
               engine: a2aEngine,
               model,
               systemPrompt,
-              tools: a2aTools,
+              tools: a2aToolSurface.tools,
+              availableTools: a2aToolSurface.availableTools,
               messages: a2aMessages,
               actions: a2aActions,
               send: (event) => {

package/corpus/core/src/server/core-routes-plugin.ts

@@ -298,6 +298,7 @@ const BUILDER_WAITLIST_USE_CASES = new Set([
   BUILDER_WAITLIST_DEFAULT_USE_CASE,
   "design_publish_app",
   "docs_build_online_waitlist",
+  "docs_edit_online_waitlist",
 ]);
 const BUILDER_WAITLIST_FORM_TIMEOUT_MS = 8000;
 const BUILDER_WAITLIST_TEXT_LIMIT = 4000;
@@ -320,6 +321,7 @@ export interface BuilderWaitlistBody {
   appUrl?: unknown;
   pageUrl?: unknown;
   source?: unknown;
+  template?: unknown;
   useCase?: unknown;
 }
 
@@ -352,6 +354,13 @@ function normalizeBuilderWaitlistUseCase(value: unknown): string {
     : BUILDER_WAITLIST_DEFAULT_USE_CASE;
 }
 
+function normalizeBuilderWaitlistTemplate(value: unknown): string | undefined {
+  const template = cleanBuilderWaitlistText(value, 100);
+  return template && /^[a-z0-9][a-z0-9-]{0,99}$/.test(template)
+    ? template
+    : undefined;
+}
+
 function isValidWaitlistEmail(email: string): boolean {
   return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
 }
@@ -506,6 +515,7 @@ export function buildBuilderWaitlistFormPayload(
     getOrigin(event);
   const source =
     cleanBuilderWaitlistText(body.source, 100) ?? BUILDER_WAITLIST_FORM_SOURCE;
+  const template = normalizeBuilderWaitlistTemplate(body.template);
   const useCase = normalizeBuilderWaitlistUseCase(body.useCase);
 
   return {
@@ -515,6 +525,7 @@ export function buildBuilderWaitlistFormPayload(
       appUrl,
       prompt: cleanBuilderWaitlistText(body.prompt),
       source,
+      template,
       useCase,
     },
     _hp: "",
@@ -522,6 +533,7 @@ export function buildBuilderWaitlistFormPayload(
       submitterEmail: sessionEmail,
       pageUrl: appUrl,
       source,
+      template,
       useCase,
     },
   };
@@ -2021,6 +2033,7 @@ export function createCoreRoutesPlugin(
             body,
           );
           const waitlistSource = waitlistPayload.data.source;
+          const waitlistTemplate = waitlistPayload.data.template;
           const waitlistUseCase = waitlistPayload.data.useCase;
           let formSubmission: { submitted: boolean; formId?: string };
           try {
@@ -2039,6 +2052,7 @@ export function createCoreRoutesPlugin(
                   err instanceof Error ? err.message : "unknown_waitlist_error",
                 source: waitlistSource,
                 stage: "waitlist",
+                template: waitlistTemplate ?? null,
                 useCase: waitlistUseCase,
               },
             );
@@ -2057,6 +2071,7 @@ export function createCoreRoutesPlugin(
               formSubmitted: formSubmission.submitted,
               source: waitlistSource,
               stage: "waitlist",
+              template: waitlistTemplate ?? null,
               useCase: waitlistUseCase,
             },
           );

package/corpus/core/src/server/realtime-voice.ts

@@ -8,6 +8,7 @@ import {
   type H3Event,
 } from "h3";
 
+import { getBuilderGatewayRequestHeaders } from "../agent/engine/builder-gateway-headers.js";
 import {
   actionsToEngineTools,
   type ActionEntry,
@@ -18,7 +19,11 @@ import {
   sanitizeToolErrorValue,
 } from "../agent/tool-error-redaction.js";
 import { getSession } from "./auth.js";
-import { resolveSecret } from "./credential-provider.js";
+import {
+  getBuilderGatewayBaseUrl,
+  resolveBuilderCredentials,
+  resolveSecret,
+} from "./credential-provider.js";
 import { getH3App } from "./framework-request-handler.js";
 import { runWithRequestContext } from "./request-context.js";
 
@@ -336,12 +341,20 @@ function createSessionHandler(
           : undefined,
       },
       async () => {
-        const apiKey = (await resolveSecret("OPENAI_API_KEY"))?.trim();
-        if (!apiKey) {
-          setResponseStatus(event, 400);
+        const builderCredentials = await resolveBuilderCredentials();
+        const builderConfigured = Boolean(
+          builderCredentials.privateKey?.trim() &&
+          builderCredentials.publicKey?.trim(),
+        );
+        const apiKey = builderConfigured
+          ? null
+          : (await resolveSecret("OPENAI_API_KEY"))?.trim();
+        if (!builderConfigured && !apiKey) {
+          setResponseStatus(event, 409);
           return {
             error:
-              "Configure OPENAI_API_KEY in Settings to use realtime voice.",
+              "Connect Builder or configure an OpenAI API key to use realtime voice.",
+            code: "realtime_voice_setup_required",
           };
         }
 
@@ -369,39 +382,73 @@ function createSessionHandler(
           tool_choice: "auto",
         };
 
-        const form = new FormData();
-        form.set("sdp", sdp);
-        form.set("session", JSON.stringify(session));
-
         let upstream: Response;
         try {
-          upstream = await fetch(OPENAI_REALTIME_CALLS_URL, {
-            method: "POST",
-            headers: {
-              Authorization: `Bearer ${apiKey}`,
-              "OpenAI-Safety-Identifier": await realtimeVoiceSafetyIdentifier(
-                auth.userEmail,
-              ),
-            },
-            body: form,
-          });
+          if (builderConfigured) {
+            const gatewayUrl = new URL(
+              "realtime/calls",
+              getBuilderGatewayBaseUrl().endsWith("/")
+                ? getBuilderGatewayBaseUrl()
+                : `${getBuilderGatewayBaseUrl()}/`,
+            );
+            gatewayUrl.searchParams.set(
+              "apiKey",
+              builderCredentials.publicKey!.trim(),
+            );
+            upstream = await fetch(gatewayUrl.toString(), {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/json",
+                Authorization: `Bearer ${builderCredentials.privateKey!.trim()}`,
+                "x-builder-api-key": builderCredentials.publicKey!.trim(),
+                ...getBuilderGatewayRequestHeaders(),
+                ...(builderCredentials.userId
+                  ? { "x-builder-user-id": builderCredentials.userId }
+                  : {}),
+              },
+              body: JSON.stringify({ sdp, session }),
+            });
+          } else {
+            const form = new FormData();
+            form.set("sdp", sdp);
+            form.set("session", JSON.stringify(session));
+            upstream = await fetch(OPENAI_REALTIME_CALLS_URL, {
+              method: "POST",
+              headers: {
+                Authorization: `Bearer ${apiKey}`,
+                "OpenAI-Safety-Identifier": await realtimeVoiceSafetyIdentifier(
+                  auth.userEmail,
+                ),
+              },
+              body: form,
+            });
+          }
         } catch {
           setResponseStatus(event, 502);
-          return { error: "Could not reach the OpenAI Realtime API" };
+          return {
+            error: builderConfigured
+              ? "Could not reach the Builder realtime voice gateway"
+              : "Could not reach the OpenAI Realtime API",
+          };
         }
 
         if (!upstream.ok) {
-          const detail = await safeOpenAiErrorDetail(upstream, apiKey);
-          setResponseStatus(event, 502);
+          const detail = await safeOpenAiErrorDetail(
+            upstream,
+            builderConfigured ? builderCredentials.privateKey! : apiKey!,
+          );
+          setResponseStatus(event, builderConfigured ? upstream.status : 502);
           return {
-            error: `OpenAI rejected the realtime session (${upstream.status})${detail ? `: ${detail}` : ""}`,
+            error: `${builderConfigured ? "Builder" : "OpenAI"} rejected the realtime session (${upstream.status})${detail ? `: ${detail}` : ""}`,
           };
         }
 
         const answerSdp = await upstream.text().catch(() => "");
         if (!answerSdp.trim()) {
           setResponseStatus(event, 502);
-          return { error: "OpenAI returned an empty realtime session answer" };
+          return {
+            error: `${builderConfigured ? "Builder" : "OpenAI"} returned an empty realtime session answer`,
+          };
         }
 
         setResponseStatus(event, upstream.status);

package/corpus/core/src/server/voice-providers-status.ts

@@ -22,7 +22,7 @@ import {
 import { getOrgContext } from "../org/context.js";
 import { getSession } from "./auth.js";
 import {
-  resolveHasBuilderPrivateKey,
+  resolveHasCompleteBuilderConnection,
   resolveSecret,
 } from "./credential-provider.js";
 import { resolveGoogleRealtimeCredentials } from "./google-realtime-session.js";
@@ -90,8 +90,9 @@ export function createVoiceProvidersStatusHandler() {
     let builder = false;
     try {
       builder =
-        (await withRequestContext(() => resolveHasBuilderPrivateKey())) ===
-        true;
+        (await withRequestContext(() =>
+          resolveHasCompleteBuilderConnection(),
+        )) === true;
     } catch {
       builder = false;
     }

package/corpus/core/src/shared/cache-control.ts

@@ -1,21 +1,15 @@
 export const DEFAULT_SSR_CACHE_CONTROL = "public, max-age=0, must-revalidate";
 
 export const DEFAULT_SSR_CDN_CACHE_CONTROL =
-  "public, s-maxage=3600, stale-while-revalidate=604800, stale-if-error=3600";
+  "public, s-maxage=600, stale-while-revalidate=604800, stale-if-error=3600";
 
 export const DEFAULT_SSR_NETLIFY_CDN_CACHE_CONTROL =
-  "public, durable, s-maxage=3600, stale-while-revalidate=604800, stale-if-error=3600";
-
-// React Router data requests can select a subset of route loaders with
-// `?_routes=...`. Ignore every other query parameter (UTM tags, click ids,
-// and similar tracking noise) so they cannot fragment Netlify's SSR cache.
-export const DEFAULT_SSR_NETLIFY_VARY = "query=_routes";
+  "public, durable, s-maxage=600, stale-while-revalidate=604800, stale-if-error=3600";
 
 export const DEFAULT_SSR_CACHE_HEADERS = {
   "cache-control": DEFAULT_SSR_CACHE_CONTROL,
   "cdn-cache-control": DEFAULT_SSR_CDN_CACHE_CONTROL,
   "netlify-cdn-cache-control": DEFAULT_SSR_NETLIFY_CDN_CACHE_CONTROL,
-  "netlify-vary": DEFAULT_SSR_NETLIFY_VARY,
 } as const;
 
 export const DEFAULT_SPECULATION_RULES_PATH =

package/corpus/core/src/styles/agent-native.css

@@ -25,6 +25,7 @@
 @import "./agent-conversation.css";
 @import "./rich-markdown-editor.css";
 @import "./blocks.css";
+@import "./chat-history-list.css";
 
 /* Scan @agent-native/core's compiled client output for Tailwind classes.
    Path is resolved relative to THIS file. After build, this CSS lives at