@agent-native/core 0.96.0 → 0.98.0

package/corpus/core/src/client/extensions/ExtensionsSidebarSection.tsx

@@ -11,6 +11,7 @@ import {
   IconTool,
   IconEye,
   IconEyeOff,
+  IconHelpCircle,
 } from "@tabler/icons-react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useState, useCallback, useMemo } from "react";
@@ -62,6 +63,7 @@ import {
   extensionPopularityOf,
   useExtensionPopularity,
 } from "./extension-popularity.js";
+import { ExtensionQueryErrorState } from "./ExtensionQueryErrorState.js";
 
 interface Extension {
   id: string;
@@ -114,6 +116,7 @@ type ExtensionsCopy = {
   delete: string;
   showLess: string;
   showMore: string;
+  loadError: string;
 };
 
 const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
@@ -149,6 +152,7 @@ const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
     delete: "Delete",
     showLess: "show less",
     showMore: "show more",
+    loadError: "Couldn't load extensions.",
   },
   "zh-CN": {
     title: "扩展",
@@ -181,6 +185,7 @@ const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
     delete: "删除",
     showLess: "收起",
     showMore: "显示更多",
+    loadError: "无法加载扩展。",
   },
   "zh-TW": {
     title: "擴充功能",
@@ -214,6 +219,7 @@ const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
     delete: "刪除",
     showLess: "顯示較少",
     showMore: "顯示更多",
+    loadError: "無法載入擴充功能。",
   },
   "es-ES": {
     title: "Extensiones",
@@ -247,6 +253,7 @@ const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
     delete: "Eliminar",
     showLess: "mostrar menos",
     showMore: "mostrar más",
+    loadError: "No se pudieron cargar las extensiones.",
   },
   "fr-FR": {
     title: "Extensions",
@@ -280,6 +287,7 @@ const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
     delete: "Supprimer",
     showLess: "afficher moins",
     showMore: "afficher plus",
+    loadError: "Impossible de charger les extensions.",
   },
   "de-DE": {
     title: "Erweiterungen",
@@ -313,6 +321,7 @@ const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
     delete: "Löschen",
     showLess: "weniger anzeigen",
     showMore: "mehr anzeigen",
+    loadError: "Erweiterungen konnten nicht geladen werden.",
   },
   "ja-JP": {
     title: "拡張機能",
@@ -346,6 +355,7 @@ const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
     delete: "削除",
     showLess: "少なく表示",
     showMore: "さらに表示",
+    loadError: "拡張機能を読み込めませんでした。",
   },
   "ko-KR": {
     title: "확장",
@@ -379,6 +389,7 @@ const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
     delete: "삭제",
     showLess: "덜 보기",
     showMore: "더 보기",
+    loadError: "확장 프로그램을 불러올 수 없습니다.",
   },
   "pt-BR": {
     title: "Extensões",
@@ -412,6 +423,7 @@ const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
     delete: "Excluir",
     showLess: "mostrar menos",
     showMore: "mostrar mais",
+    loadError: "Não foi possível carregar as extensões.",
   },
   "hi-IN": {
     title: "एक्सटेंशन",
@@ -445,6 +457,7 @@ const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
     delete: "हटाएं",
     showLess: "कम दिखाएं",
     showMore: "और दिखाएं",
+    loadError: "एक्सटेंशन लोड नहीं हो सके।",
   },
   "ar-SA": {
     title: "الإضافات",
@@ -478,6 +491,7 @@ const EXTENSIONS_COPY: Record<LocaleCode, ExtensionsCopy> = {
     delete: "حذف",
     showLess: "إظهار أقل",
     showMore: "إظهار المزيد",
+    loadError: "تعذر تحميل الإضافات.",
   },
 };
 
@@ -567,7 +581,7 @@ function ExtensionSortMenu({
           <DropdownMenuTrigger asChild>
             <button
               type="button"
-              className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-muted-foreground/45 opacity-0 transition-all hover:bg-accent hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring group-hover/extensions-section:opacity-100"
+              className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-muted-foreground/45 opacity-0 transition-[opacity,color,background-color] hover:bg-accent hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring group-hover/extensions-section:opacity-100"
               aria-label={copy.sortOptions}
             >
               <IconFilter className="h-3.5 w-3.5" />
@@ -638,7 +652,7 @@ export function ExtensionsSidebarSection() {
   const [showAllExtensions, setShowAllExtensions] = useState(false);
   const [showGloballyHidden, setShowGloballyHidden] = useState(false);
 
-  const { data: extensions, isLoading } = useQuery<Extension[]>({
+  const extensionsQuery = useQuery<Extension[]>({
     queryKey: ["extensions", { includeGloballyHidden: showGloballyHidden }],
     queryFn: async () => {
       const res = await fetch(
@@ -648,10 +662,11 @@ export function ExtensionsSidebarSection() {
             : "/_agent-native/extensions",
         ),
       );
-      if (!res.ok) return [];
+      if (!res.ok) throw new Error(`Failed to load extensions (${res.status})`);
       return res.json();
     },
   });
+  const extensions = extensionsQuery.data;
 
   const toggleFavorite = useCallback((id: string) => {
     setFavoriteIds((prev) => {
@@ -870,7 +885,7 @@ export function ExtensionsSidebarSection() {
       <div className="relative min-w-0 py-1">
         <div
           className={cn(
-            "group/extensions-section relative flex w-full min-w-0 items-center rounded-md text-sm font-medium transition-all hover:text-primary",
+            "group/extensions-section relative flex w-full min-w-0 items-center rounded-md text-sm font-medium transition-[opacity,color,background-color] hover:text-primary",
             location.pathname.startsWith("/extensions")
               ? "text-sidebar-accent-foreground"
               : "text-muted-foreground hover:bg-sidebar-accent/50",
@@ -940,7 +955,7 @@ export function ExtensionsSidebarSection() {
               <PopoverTrigger asChild>
                 <button
                   type="button"
-                  className="pointer-events-none inline-flex h-6 w-6 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 opacity-0 transition-all hover:bg-accent hover:text-accent-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring group-hover/extensions-section:pointer-events-auto group-hover/extensions-section:opacity-100 group-focus-within/extensions-section:pointer-events-auto group-focus-within/extensions-section:opacity-100 data-[state=open]:pointer-events-auto data-[state=open]:opacity-100"
+                  className="pointer-events-none inline-flex h-6 w-6 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 opacity-0 transition-[opacity,color,background-color] hover:bg-accent hover:text-accent-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring group-hover/extensions-section:pointer-events-auto group-hover/extensions-section:opacity-100 group-focus-within/extensions-section:pointer-events-auto group-focus-within/extensions-section:opacity-100 data-[state=open]:pointer-events-auto data-[state=open]:opacity-100"
                   aria-label={copy.newExtension}
                 >
                   <IconPlus className="h-3.5 w-3.5" />
@@ -950,11 +965,27 @@ export function ExtensionsSidebarSection() {
                 side="right"
                 align="start"
                 collisionPadding={8}
-                className="relative z-[360] w-[min(420px,calc(100vw-16px))] p-3"
+                className="relative z-[360] w-[min(420px,calc(100vw-16px))] px-2 pb-2 pt-3"
               >
-                <p className="px-1 pb-2 text-sm font-semibold text-foreground">
-                  {copy.newExtension}
-                </p>
+                <div className="flex items-center justify-between gap-2 ps-1 pb-2">
+                  <p className="text-sm font-semibold text-foreground">
+                    {copy.newExtension}
+                  </p>
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <a
+                        href="https://agent-native.com/docs/extensions"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="inline-flex size-6 shrink-0 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                        aria-label={copy.learnMore}
+                      >
+                        <IconHelpCircle className="size-4" />
+                      </a>
+                    </TooltipTrigger>
+                    <TooltipContent>{copy.learnMore}</TooltipContent>
+                  </Tooltip>
+                </div>
                 <PromptComposer
                   autoFocus
                   placeholder={copy.createPlaceholder}
@@ -981,7 +1012,7 @@ export function ExtensionsSidebarSection() {
         </div>
 
         {extensionsOpen &&
-          (isLoading ? (
+          (extensionsQuery.isLoading ? (
             <div className="min-w-0 space-y-0.5 px-0.5">
               {[1, 2, 3].map((i) => (
                 <div
@@ -995,6 +1026,13 @@ export function ExtensionsSidebarSection() {
                 </div>
               ))}
             </div>
+          ) : extensionsQuery.isError ? (
+            <ExtensionQueryErrorState
+              compact
+              message={copy.loadError}
+              onRetry={() => void extensionsQuery.refetch()}
+              retrying={extensionsQuery.isFetching}
+            />
           ) : sortedTools.length === 0 ? null : (
             <div className="min-w-0 space-y-0.5 px-0.5">
               {visibleTools.map((extension) => {
@@ -1054,7 +1092,7 @@ export function ExtensionsSidebarSection() {
                             setDraggingId(null);
                             setDragOverId(null);
                           }}
-                          className="-ml-2 cursor-grab rounded p-0.5 text-muted-foreground/30 opacity-0 transition-colors hover:text-muted-foreground/70 active:cursor-grabbing group-hover/extension:opacity-100 group-focus-within/extension:opacity-100"
+                          className="-ml-2 cursor-grab rounded p-0.5 text-muted-foreground/30 opacity-0 transition-[opacity,color] hover:text-muted-foreground/70 active:cursor-grabbing group-hover/extension:opacity-100 group-focus-within/extension:opacity-100"
                           aria-label={copy.reorder(extension.name)}
                         >
                           <IconGripVertical className="h-3 w-3" />

package/corpus/core/src/client/index.ts

@@ -1,8 +1,6 @@
-import { stripAuthRedirectParamFromUrl } from "./auth-redirect-url.js";
 import { installRouteChunkRecovery } from "./route-chunk-recovery.js";
 
 installRouteChunkRecovery();
-stripAuthRedirectParamFromUrl();
 
 export { getBrowserTabId } from "./browser-tab-id.js";
 
@@ -690,17 +688,6 @@ export {
   type SettingsTabItem,
   type SettingsTabsPageProps,
 } from "./settings/index.js";
-// Deprecated — use AgentSidebar + AgentToggleButton instead
-export {
-  ProductionAgentPanel,
-  type ProductionAgentPanelProps,
-} from "./ProductionAgentPanel.js";
-export {
-  useProductionAgent,
-  type ProductionAgentMessage,
-  type UseProductionAgentOptions,
-  type UseProductionAgentResult,
-} from "./useProductionAgent.js";
 export { Turnstile, type TurnstileProps } from "./Turnstile.js";
 export {
   OpenSourceBadge,

package/corpus/core/src/client/progress/RunsTray.tsx

@@ -249,7 +249,11 @@ export function RunsTray({
               >
                 <TriggerIcon
                   size={triggerVariant === "pill" ? 14 : 18}
-                  className={cn(triggerTone, activeCount > 0 && "animate-spin")}
+                  className={cn(
+                    triggerTone,
+                    activeCount > 0 &&
+                      "animate-spin motion-reduce:animate-none",
+                  )}
                   aria-hidden
                 />
                 {triggerVariant === "pill" ? (
@@ -559,14 +563,17 @@ function RunRow({
           {run.percent != null ? (
             <div
               className={cn(
-                "h-full transition-all",
+                "h-full origin-left transition-transform duration-200 ease-[var(--ease-collapse)]",
                 run.status === "failed"
                   ? "bg-destructive"
                   : run.status === "cancelled"
                     ? "bg-muted-foreground/50"
                     : "bg-primary",
               )}
-              style={{ width: `${run.percent}%` }}
+              style={{
+                transform: `scaleX(${run.percent / 100})`,
+                width: "100%",
+              }}
             />
           ) : (
             <div className="h-full w-1/3 animate-pulse bg-primary/60" />

package/corpus/core/src/client/settings/SettingsTabsPage.tsx

@@ -133,6 +133,13 @@ function resolveTabId(
   const normalized = normalizeTabId(value);
   if (!normalized) return null;
   if (tabs.some((tab) => tab.id === normalized)) return normalized;
+  const section = normalized.split(":", 1)[0];
+  const owner = tabs.find((tab) =>
+    tab.searchEntries?.some(
+      (entry) => normalizeTabId(entry.hash ?? entry.id) === section,
+    ),
+  );
+  if (owner) return owner.id;
   if (
     normalized === "organization" ||
     normalized === "org" ||

package/corpus/core/src/client/settings/useBuilderStatus.ts

@@ -158,6 +158,8 @@ export interface BuilderConnectStartOptions {
 
 export interface BuilderConnectFlow {
   configured: boolean;
+  /** True after at least one successful `/builder/status` response. */
+  statusResolved: boolean;
   /**
    * True when the deploy has BUILDER_PRIVATE_KEY set as a fallback. Connect
    * is still available so users can override the fallback with their own
@@ -548,6 +550,7 @@ export function useBuilderConnectFlow(
   const [connecting, setConnecting] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [hasFetchedStatus, setHasFetchedStatus] = useState(false);
+  const [statusResolved, setStatusResolved] = useState(false);
   const [statusConnectUrl, setStatusConnectUrl] = useState<string | null>(null);
   // When statusConnectUrl was last fetched. The server signs the embedded
   // _an_connect token with a 10-minute TTL; using an older URL fails the
@@ -609,6 +612,7 @@ export function useBuilderConnectFlow(
       setConnecting(false);
       setError(null);
       setHasFetchedStatus(false);
+      setStatusResolved(false);
       setStatusConnectUrl(null);
       statusConnectUrlAtRef.current = null;
       stopPoll();
@@ -624,6 +628,7 @@ export function useBuilderConnectFlow(
       // stop waiting after we've tried, regardless of network outcome.
       setHasFetchedStatus(true);
       if (!s) return;
+      setStatusResolved(true);
       setConfigured(!!s.configured);
       setEnvManaged(!!s.envManaged);
       setBuilderEnabled(!!s.builderEnabled);
@@ -1019,6 +1024,7 @@ export function useBuilderConnectFlow(
 
   return {
     configured,
+    statusResolved,
     envManaged,
     builderEnabled,
     orgName,

package/corpus/core/src/client/tool-cells/EditCell.tsx

@@ -17,6 +17,7 @@ import {
 } from "@tabler/icons-react";
 import { memo, useMemo, useState } from "react";
 
+import { AnimatedCollapse } from "../chat/tool-call-display.js";
 import { cn } from "../utils.js";
 
 export interface EditCellMeta {
@@ -279,22 +280,24 @@ export function EditCell({ meta, isRunning }: EditCellProps) {
       </button>
 
       {/* Diff body */}
-      {expanded && hasDiff && (
-        <div className="border-t border-border/40 bg-background">
-          <DiffView lines={diff} maxLines={maxCollapsed} />
-          {hiddenLines > 0 && (
-            <div className="border-t border-border/40 px-3 py-1 text-[11px] text-muted-foreground">
-              <button
-                type="button"
-                className="cursor-pointer underline hover:text-foreground"
-                onClick={() => setShowAll(true)}
-              >
-                Show {hiddenLines} more lines
-              </button>
-            </div>
-          )}
-        </div>
-      )}
+      <AnimatedCollapse open={expanded && hasDiff}>
+        {hasDiff && (
+          <div className="border-t border-border/40 bg-background">
+            <DiffView lines={diff} maxLines={maxCollapsed} />
+            {hiddenLines > 0 && (
+              <div className="border-t border-border/40 px-3 py-1 text-[11px] text-muted-foreground">
+                <button
+                  type="button"
+                  className="cursor-pointer underline hover:text-foreground"
+                  onClick={() => setShowAll(true)}
+                >
+                  Show {hiddenLines} more lines
+                </button>
+              </div>
+            )}
+          </div>
+        )}
+      </AnimatedCollapse>
     </div>
   );
 }

package/corpus/core/src/client/tool-cells/FilesChangedSummary.tsx

@@ -7,6 +7,7 @@
 import { IconFiles } from "@tabler/icons-react";
 import { memo, useMemo, useState } from "react";
 
+import { AnimatedCollapse } from "../chat/tool-call-display.js";
 import type { ContentPart } from "../sse-event-processor.js";
 import { cn } from "../utils.js";
 import { EditCell } from "./EditCell.js";
@@ -174,29 +175,31 @@ export const FilesChangedSummary = memo(function FilesChangedSummary({
               </span>
             </button>
 
-            {isExpanded && part.type === "tool-call" && part.structuredMeta && (
-              <div className="pl-4">
-                {entry.kind === "edit" ? (
-                  <EditCell
-                    meta={
-                      part.structuredMeta as unknown as Parameters<
-                        typeof EditCell
-                      >[0]["meta"]
-                    }
-                    isRunning={false}
-                  />
-                ) : (
-                  <WriteCell
-                    meta={
-                      part.structuredMeta as unknown as Parameters<
-                        typeof WriteCell
-                      >[0]["meta"]
-                    }
-                    isRunning={false}
-                  />
-                )}
-              </div>
-            )}
+            <AnimatedCollapse open={isExpanded}>
+              {part.type === "tool-call" && part.structuredMeta && (
+                <div className="pl-4">
+                  {entry.kind === "edit" ? (
+                    <EditCell
+                      meta={
+                        part.structuredMeta as unknown as Parameters<
+                          typeof EditCell
+                        >[0]["meta"]
+                      }
+                      isRunning={false}
+                    />
+                  ) : (
+                    <WriteCell
+                      meta={
+                        part.structuredMeta as unknown as Parameters<
+                          typeof WriteCell
+                        >[0]["meta"]
+                      }
+                      isRunning={false}
+                    />
+                  )}
+                </div>
+              )}
+            </AnimatedCollapse>
           </div>
         );
       })}

package/corpus/core/src/client/tool-cells/WriteCell.tsx

@@ -9,6 +9,7 @@ import {
 } from "@tabler/icons-react";
 import { memo, useState } from "react";
 
+import { AnimatedCollapse } from "../chat/tool-call-display.js";
 import { cn } from "../utils.js";
 
 export interface WriteCellMeta {
@@ -121,22 +122,24 @@ export function WriteCell({ meta, isRunning }: WriteCellProps) {
       </button>
 
       {/* Content body */}
-      {expanded && hasContent && meta.content && (
-        <div className="border-t border-border/40 bg-background">
-          <FileContentView content={meta.content} maxLines={maxCollapsed} />
-          {hiddenLines > 0 && (
-            <div className="border-t border-border/40 px-3 py-1 text-[11px] text-muted-foreground">
-              <button
-                type="button"
-                className="cursor-pointer underline hover:text-foreground"
-                onClick={() => setShowAll(true)}
-              >
-                Show {hiddenLines} more lines
-              </button>
-            </div>
-          )}
-        </div>
-      )}
+      <AnimatedCollapse open={expanded && hasContent}>
+        {meta.content && (
+          <div className="border-t border-border/40 bg-background">
+            <FileContentView content={meta.content} maxLines={maxCollapsed} />
+            {hiddenLines > 0 && (
+              <div className="border-t border-border/40 px-3 py-1 text-[11px] text-muted-foreground">
+                <button
+                  type="button"
+                  className="cursor-pointer underline hover:text-foreground"
+                  onClick={() => setShowAll(true)}
+                >
+                  Show {hiddenLines} more lines
+                </button>
+              </div>
+            )}
+          </div>
+        )}
+      </AnimatedCollapse>
     </div>
   );
 }

package/corpus/core/src/client/visual-style-controls.tsx

@@ -336,7 +336,7 @@ export function VisualSwatchControl({
             aria-label={option.label}
             onClick={() => onChange(option.value)}
             className={cn(
-              "size-5 cursor-pointer rounded-md border border-border/70 transition-all hover:scale-105 hover:border-foreground/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+              "size-5 cursor-pointer rounded-md border border-border/70 transition-[transform,border-color] hover:scale-105 hover:border-foreground/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
               value === option.value &&
                 "border-foreground/70 ring-2 ring-foreground/40 ring-offset-1 ring-offset-card",
             )}

package/corpus/core/src/deploy/build.ts

@@ -763,6 +763,7 @@ export function generateWorkerEntry(
 import { H3, defineEventHandler, readBody, toResponse } from "h3";
 ${includeReactRouterSsr ? 'import { createRequestHandler } from "react-router";' : ""}
 ${includeReactRouterSsr ? 'import * as serverBuild from "./server-build.js";' : ""}
+${includeReactRouterSsr ? `import { runWithRequestContext } from "${EDGE_SERVER_ENTRYPOINT}";` : ""}
 
 function normalizeAppBasePath(value) {
   if (!value || value === "/") return "";
@@ -984,20 +985,25 @@ function isSsrHtmlOrDataResponse(headers, status, pathname) {
 /**
  * Apply the SSR cache policy to the response headers.
  *
- * Unannotated SSR HTML and React Router .data responses share a public
- * stale-while-revalidate cache policy. Preserve an explicit route policy,
- * though: token-gated and personalized routes can opt out with private or
- * no-store policies.
+ * SSR HTML and React Router .data responses are one impersonal public shell.
+ * Always overwrite route cache hints so generated edge workers cannot drift
+ * from the canonical Nitro/Netlify handler or send normal pages to origin.
  */
 function applyDefaultSsrCacheHeader(headers, status, pathname) {
   if (!isSsrHtmlOrDataResponse(headers, status, pathname)) return;
-  // React Router marks every .data response as no-cache, but those loader
-  // payloads are safe to cache at the shared edge. Preserve only explicit
-  // private/no-store policies, which token-gated and personalized routes use
-  // to opt out of shared caching.
-  const cacheControl = headers.get("cache-control")?.toLowerCase() ?? "";
-  if (cacheControl.includes("private") || cacheControl.includes("no-store")) {
-    return;
+
+  headers.delete("set-cookie");
+  const vary = headers.get("vary");
+  if (vary) {
+    const publicVary = vary
+      .split(",")
+      .map((value) => value.trim())
+      .filter((value) => {
+        const normalized = value.toLowerCase();
+        return normalized && normalized !== "*" && normalized !== "cookie" && normalized !== "authorization";
+      });
+    if (publicVary.length > 0) headers.set("vary", publicVary.join(", "));
+    else headers.delete("vary");
   }
 
   headers.set("cache-control", DEFAULT_SSR_CACHE_CONTROL);
@@ -1096,6 +1102,13 @@ function requestWithPathname(request, pathname) {
   return new Request(url, request);
 }
 
+function requestForAnonymousSsr(request) {
+  const headers = new Headers(request.headers);
+  headers.delete("cookie");
+  headers.delete("authorization");
+  return new Request(request, { headers });
+}
+
 function isStaticAppShellRequest(request) {
   if (request.method !== "GET" && request.method !== "HEAD") return false;
   const p = stripAppBasePath(new URL(request.url).pathname);
@@ -1214,10 +1227,14 @@ ${
     ) {
       return new Response(null, { status: 404 });
     }
-    const request = requestWithPathname(event.req, p);
+    const request = requestForAnonymousSsr(requestWithPathname(event.req, p));
+    const anonymousContext = { userEmail: undefined, orgId: undefined };
     if (event.req.method === "HEAD") {
       const getRequest = requestWithMethod(request, "GET");
-      const response = await rrHandler(getRequest);
+      const response = await runWithRequestContext(
+        anonymousContext,
+        () => rrHandler(getRequest)
+      );
       return rewriteMountedResponse(
         new Response(null, {
           status: response.status,
@@ -1229,7 +1246,12 @@ ${
         getRequest
       );
     }
-    return rewriteMountedResponse(await rrHandler(request), basePath, p, request);
+    return rewriteMountedResponse(
+      await runWithRequestContext(anonymousContext, () => rrHandler(request)),
+      basePath,
+      p,
+      request
+    );
   }));`
     : ""
 }