@agent-native/core 0.107.0 → 0.107.1

package/corpus/templates/analytics/app/pages/adhoc/sql-dashboard/SqlChartCard.tsx

@@ -67,6 +67,7 @@ interface SqlChartCardProps {
   isDragSource?: boolean;
   selectedForChat?: boolean;
   onSelectForChat?: (options?: SelectDashboardPanelOptions) => void;
+  extensionContext?: Record<string, unknown> | null;
 }
 
 const PanelDragHandle = memo(function PanelDragHandle({
@@ -122,6 +123,7 @@ export function SqlChartCard({
   isDragSource = false,
   selectedForChat = false,
   onSelectForChat,
+  extensionContext,
 }: SqlChartCardProps) {
   const t = useT();
   const queryClient = useQueryClient();
@@ -346,6 +348,7 @@ export function SqlChartCard({
             panel={panel}
             resolvedSql={resolvedSql}
             loadData
+            extensionContext={extensionContext}
           />
         )}
         <div className="absolute right-1 top-1 flex items-center gap-1 opacity-0 group-hover:opacity-100">
@@ -435,6 +438,7 @@ export function SqlChartCard({
                   panel={panel}
                   resolvedSql={resolvedSql}
                   loadData
+                  extensionContext={extensionContext}
                 />
               </ChartFillHeight>
             </div>
@@ -616,6 +620,7 @@ export function SqlChartCard({
             resolvedSql={resolvedSql}
             loadData={shouldLoadData}
             onExportCsvChange={handleExportCsvChange}
+            extensionContext={extensionContext}
           />
         </CardContent>
       </Card>
@@ -627,7 +632,12 @@ export function SqlChartCard({
           </DialogHeader>
           <div className="flex min-h-0 flex-1 flex-col overflow-auto">
             <ChartFillHeight>
-              <SqlChart panel={panel} resolvedSql={resolvedSql} loadData />
+              <SqlChart
+                panel={panel}
+                resolvedSql={resolvedSql}
+                loadData
+                extensionContext={extensionContext}
+              />
             </ChartFillHeight>
           </div>
         </DialogContent>

package/corpus/templates/analytics/app/pages/adhoc/sql-dashboard/extension-slot.ts

@@ -0,0 +1,11 @@
+/**
+ * Stable extension-point name for a dashboard box. The dashboard and panel ids
+ * are encoded independently so arbitrary saved ids cannot collapse into one
+ * slot or add path separators to the slots API.
+ */
+export function dashboardExtensionSlotId(
+  dashboardId: string,
+  panelId: string,
+): string {
+  return `analytics.dashboard.${encodeURIComponent(dashboardId)}.panel.${encodeURIComponent(panelId)}`;
+}

package/corpus/templates/analytics/app/pages/adhoc/sql-dashboard/index.tsx

@@ -142,6 +142,7 @@ import {
   resolveFilterVars,
 } from "./DashboardFilterBar";
 import { EmailReportDialog } from "./EmailReportDialog";
+import { dashboardExtensionSlotId } from "./extension-slot";
 import { interpolate } from "./interpolate";
 import { serializePanelSql } from "./panel-sql";
 import { AddPanelPopover, PanelEditorDialog } from "./PanelEditorDialog";
@@ -271,6 +272,7 @@ const PanelCell = memo(function PanelCell({
   onRemovePanel,
   onEditPanel,
   onSavePanel,
+  dashboardExtensionContext,
 }: {
   panel: SqlPanel;
   vars: Record<string, string>;
@@ -286,6 +288,7 @@ const PanelCell = memo(function PanelCell({
   onRemovePanel: (panelId: string) => void;
   onEditPanel: (panel: SqlPanel) => void;
   onSavePanel: (panel: SqlPanel) => Promise<void>;
+  dashboardExtensionContext: Record<string, unknown>;
 }) {
   const resolved = useMemo(
     () =>
@@ -366,6 +369,23 @@ const PanelCell = memo(function PanelCell({
         isDragSource={isDragSource}
         selectedForChat={selectedForChat}
         onSelectForChat={handleSelectForChat}
+        extensionContext={
+          panel.chartType === "extension"
+            ? {
+                ...dashboardExtensionContext,
+                panel: {
+                  id: panel.id,
+                  title: panel.title,
+                  slotId:
+                    panel.config?.extensionSlotId ??
+                    dashboardExtensionSlotId(
+                      String(dashboardExtensionContext.dashboardId),
+                      panel.id,
+                    ),
+                },
+              }
+            : undefined
+        }
       />
     </div>
   );
@@ -1966,6 +1986,13 @@ export default function SqlDashboardPage() {
                                 onRemovePanel={removePanel}
                                 onEditPanel={openEditPanel}
                                 onSavePanel={handleSavePanel}
+                                dashboardExtensionContext={{
+                                  dashboardId,
+                                  dashboardName: dashboard.name,
+                                  dashboardDescription:
+                                    dashboard.description ?? null,
+                                  filters: vars,
+                                }}
                               />
                               <DashboardDropLine
                                 slot={{

package/corpus/templates/analytics/app/pages/adhoc/sql-dashboard/types.ts

@@ -99,8 +99,14 @@ export interface SqlPanelConfig {
   /**
    * Extension panels only (`chartType: "extension"`): id of the extension to
    * render inline as a sandboxed iframe instead of running the SQL pipeline.
+   * Kept for dashboards saved before slot-backed dashboard boxes.
    */
   extensionId?: string;
+  /**
+   * Extension panels only: a named extension-point slot. The dashboard renders
+   * its installed extensions as this panel's box and supplies dashboard context.
+   */
+  extensionSlotId?: string;
 }
 
 export interface SqlPanel {

package/corpus/templates/analytics/changelog/2026-07-17-dashboard-extension-boxes.md

@@ -0,0 +1,6 @@
+---
+type: added
+date: 2026-07-17
+---
+
+Dashboards can now host installed extensions as contextual, slot-backed boxes.

package/corpus/templates/analytics/server/lib/agent-readable-resource-context.ts

@@ -64,6 +64,14 @@ function panelSummaries(config: Record<string, unknown>) {
         typeof panelConfig.description === "string"
           ? panelConfig.description
           : undefined,
+      extensionId:
+        typeof panelConfig.extensionId === "string"
+          ? panelConfig.extensionId
+          : undefined,
+      extensionSlotId:
+        typeof panelConfig.extensionSlotId === "string"
+          ? panelConfig.extensionSlotId
+          : undefined,
     };
   });
 }

package/corpus/templates/analytics/server/plugins/agent-chat.ts

@@ -704,6 +704,7 @@ export default createAgentChatPlugin({
       analyticsSourceGuidanceOpening() +
       "DASHBOARD CREATION RULE — You may create dashboards, analyses, SQL panels, or other resources only when the user explicitly asks you to (e.g. 'build me a dashboard for...', 'create a new analysis', 'add a chart for...'). Never create any resource proactively during research, trend analysis, or answering questions. If you think a dashboard would be useful, suggest it and wait for explicit confirmation before creating anything. Never add new items to the sidebar or modify existing dashboards without an explicit user directive. " +
       "DASHBOARD MUTATION RULE — For dashboard edits, default to `mutate-dashboard` with the typed `dashboard.*` script API so the main payload is a string and avoids native-array serialization traps. It can move panels by id, edit titles/SQL/config, insert, duplicate, remove, and patch dashboard fields in one atomic save. The script API is constrained: no variables/imports/loops/functions, only JSON-compatible arguments on documented dashboard methods. Do not count shifting `/panels/<index>` positions for ordinary dashboard edits unless the user specifically asks for low-level JSON-pointer operations. " +
+      'DASHBOARD EXTENSION BOX RULE — Analytics dashboards support extension boxes. Insert `chartType: "extension"` panels with `config.extensionSlotId` set to `analytics.dashboard.<dashboard-id>.panel.<panel-id>`, then call `add-extension-slot-target` and `install-extension` with that same id. The install is per-user; the extension box stays on the shared dashboard and receives dashboard/panel/current-filter context. Use `get-sql-dashboard` panel summaries to inspect an existing box; `config.extensionId` is only the legacy direct-embed format. ' +
       "EXTENSION DATA-REPAIR RULE — When fixing data in an existing extension-backed dashboard or migrated surface such as Risk Meeting, inspect the current dashboard and extension first, then use `update-extension` `patches`/`edits` that change only the data-loading seam. Preserve the existing layout, CSS, copy, and interactions; never reconstruct the full HTML body for a data-only fix. Full-body replacement is blocked unless `allowFullReplacement=true`, which is reserved for an explicit visual rewrite or a complete replacement body supplied by the user. If a focused edit fails, change the target instead of retrying identical arguments. " +
       'FIRST-PARTY DASHBOARD TIME RULE — AI-generated `source: "first-party"` panels are dashboard-time-bound by default: set `config.timeScope` to `dashboard` and include a matching dashboard time predicate. `{{timeRange}}` requires a matching `filters` entry with `id: "timeRange"` and `type: "select"`; `{{<id>Start}}`/`{{<id>End}}` require a matching `type: "date-range"` filter with that id. Allowed `timeScope` values are `dashboard`, `fixed-window`, `cohort-history`, and `all-time`; use `all-time` only when the user requests full available history and put all-time, lifetime, or historical in the title or description. Server validation rejects unbound first-party SQL. ' +
       "DASHBOARD READ RULE — `get-sql-dashboard` is compact by default: use its `panels` summaries plus `layout.panelOrder`, `layout.firstPanelIds`, and `layout.groups[].rows[].rowNumber/panelIds` for orientation and verification. Pass `includeConfig: true` only when you truly need full panel SQL/config. " +

package/corpus/templates/assets/changelog/2026-07-17-the-agent-chat-sidebar-stays-closed-until-you-open-it-or-sta.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-17
+---
+
+The agent chat sidebar stays closed until you open it or start a chat handoff.

package/corpus/templates/brain/app/hooks/use-navigation-state.ts

@@ -1,6 +1,7 @@
 import {
   appBasePath,
   appPath,
+  isAgentChatHomeHandoffActive,
   markAgentChatHomeHandoff,
   useAgentRouteState,
 } from "@agent-native/core/client";
@@ -106,7 +107,11 @@ export function useNavigationState() {
       return `${path}${params.size ? `?${params.toString()}` : ""}`;
     },
     onNavigate: (_command, path) => {
-      if (location.pathname === "/" && pathnameFromPath(path) !== "/") {
+      if (
+        location.pathname === "/" &&
+        pathnameFromPath(path) !== "/" &&
+        isAgentChatHomeHandoffActive("brain")
+      ) {
         markAgentChatHomeHandoff("brain");
       }
     },

package/corpus/templates/brain/changelog/2026-07-17-the-agent-chat-sidebar-stays-closed-until-you-open-it-or-sta.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-17
+---
+
+The agent chat sidebar stays closed until you open it or start a chat handoff.

package/corpus/templates/calendar/app/components/layout/AppLayout.tsx

@@ -390,7 +390,7 @@ export function AppLayout({ children }: AppLayoutProps) {
             />
             <AgentSidebar
               position="right"
-              defaultOpen
+              defaultOpen={false}
               emptyStateText={t("agentSidebar.emptyState")}
               agentPageHref="/agent"
               suggestions={[

package/corpus/templates/calendar/changelog/2026-07-17-the-agent-chat-sidebar-stays-closed-until-you-open-it-or-sta.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-17
+---
+
+The agent chat sidebar stays closed until you open it or start a chat handoff.

package/corpus/templates/chat/app/hooks/use-navigation-state.ts

@@ -1,5 +1,6 @@
 import {
   appBasePath,
+  isAgentChatHomeHandoffActive,
   appPath,
   markAgentChatHomeHandoff,
   useAgentRouteState,
@@ -34,7 +35,9 @@ export function useNavigationState() {
         isChatPath(location.pathname) &&
         !isChatPath(pathnameFromPath(path))
       ) {
-        markAgentChatHomeHandoff("chat");
+        if (isAgentChatHomeHandoffActive("chat")) {
+          markAgentChatHomeHandoff("chat");
+        }
       }
     },
   });

package/corpus/templates/chat/changelog/2026-07-17-the-agent-chat-sidebar-stays-closed-until-you-open-it-or-sta.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-17
+---
+
+The agent chat sidebar stays closed until you open it or start a chat handoff.

package/corpus/templates/clips/app/components/library/library-layout.tsx

@@ -559,7 +559,7 @@ export function LibraryLayout({ children }: LibraryLayoutProps) {
 
       <AgentSidebar
         position="right"
-        defaultOpen={!isMobile}
+        defaultOpen={false}
         emptyStateText={t("navigation.agentEmptyState")}
         suggestions={[
           t("navigation.agentSuggestionSummary"),

package/corpus/templates/clips/changelog/2026-07-17-the-agent-chat-sidebar-stays-closed-until-you-open-it-or-sta.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-17
+---
+
+The agent chat sidebar stays closed until you open it or start a chat handoff.

package/corpus/templates/content/actions/_content-space-access.ts

@@ -1,9 +1,25 @@
 import { getDbExec } from "@agent-native/core/db";
+import { table, text } from "@agent-native/core/db/schema";
 import { getRequestUserEmail } from "@agent-native/core/server/request-context";
-import { eq } from "drizzle-orm";
+import { and, eq, sql } from "drizzle-orm";
 
 import { getDb, schema } from "../server/db/index.js";
 
+// Keep these lightweight table references local. Importing the public org
+// barrel also initializes auth's long-lived cleanup timer, which breaks test
+// suites that intentionally drain fake timers.
+const organizations = table("organizations", {
+  id: text("id").primaryKey(),
+  name: text("name").notNull(),
+  createdBy: text("created_by").notNull(),
+});
+
+const orgMembers = table("org_members", {
+  orgId: text("org_id").notNull(),
+  email: text("email").notNull(),
+  role: text("role").notNull(),
+});
+
 export type ContentSpaceRole = "viewer" | "editor" | "owner";
 
 export type ContentSpaceAccess = {
@@ -21,7 +37,32 @@ export function normalizeContentSpaceEmail(email: string): string {
 export async function getContentOrganizationMembership(
   orgId: string,
   userEmail: string,
+  options: { db?: any } = {},
 ): Promise<{ role: string; name: string; createdBy: string } | null> {
+  if (options.db) {
+    const [row] = await options.db
+      .select({
+        role: orgMembers.role,
+        name: organizations.name,
+        createdBy: organizations.createdBy,
+      })
+      .from(orgMembers)
+      .innerJoin(organizations, eq(organizations.id, orgMembers.orgId))
+      .where(
+        and(
+          eq(orgMembers.orgId, orgId),
+          sql`LOWER(${orgMembers.email}) = ${normalizeContentSpaceEmail(userEmail)}`,
+        ),
+      )
+      .limit(1);
+    return row
+      ? {
+          role: String(row.role ?? "member").toLowerCase(),
+          name: row.name,
+          createdBy: row.createdBy,
+        }
+      : null;
+  }
   const result = await getDbExec().execute({
     sql: `SELECT m.role AS role, o.name AS name, o.created_by AS "createdBy"
           FROM org_members m
@@ -90,11 +131,12 @@ export async function listContentOrganizationMemberships(userEmail: string) {
 export async function resolveContentSpaceAccess(
   spaceId: string,
   requiredRole: "viewer" | "editor" = "viewer",
+  options: { db?: any } = {},
 ): Promise<ContentSpaceAccess> {
   const userEmail = getRequestUserEmail();
   if (!userEmail) throw new Error("no authenticated user");
   const normalizedUserEmail = normalizeContentSpaceEmail(userEmail);
-  const [space] = await getDb()
+  const [space] = await (options.db ?? getDb())
     .select()
     .from(schema.contentSpaces)
     .where(eq(schema.contentSpaces.id, spaceId));
@@ -115,6 +157,7 @@ export async function resolveContentSpaceAccess(
   const membership = await getContentOrganizationMembership(
     space.orgId,
     normalizedUserEmail,
+    options,
   );
   if (!membership)
     throw new Error(`Not authorized for Content space "${spaceId}"`);

package/corpus/templates/content/actions/create-content-database.ts

@@ -5,7 +5,13 @@ import {
   getRequestOrgId,
   getRequestUserEmail,
 } from "@agent-native/core/server/request-context";
-import { assertAccess, type ShareRole } from "@agent-native/core/sharing";
+import {
+  accessFilter,
+  assertAccess,
+  currentAccess,
+  ForbiddenError,
+  type ShareRole,
+} from "@agent-native/core/sharing";
 import { and, eq, sql } from "drizzle-orm";
 import { z } from "zod";
 
@@ -158,9 +164,34 @@ export async function resolveContentDatabaseSpace(
   return spaceId;
 }
 
+async function assertDocumentEditorAccess(db: any, documentId: string) {
+  const [document] = await db
+    .select()
+    .from(schema.documents)
+    .where(
+      and(
+        eq(schema.documents.id, documentId),
+        accessFilter(
+          schema.documents,
+          schema.documentShares,
+          currentAccess(),
+          "editor",
+        ),
+      ),
+    );
+  if (!document) {
+    throw new ForbiddenError(`No editor access to document ${documentId}`);
+  }
+  return document;
+}
+
 export async function createContentDatabaseRecord(
   args: CreateDatabaseRequest,
-  options: { db?: any; spaceId?: string } = {},
+  options: {
+    db?: any;
+    spaceId?: string;
+    resolveSpaceAccess?: typeof resolveContentSpaceAccess;
+  } = {},
 ): Promise<string> {
   const db = options.db ?? getDb();
   const now = new Date().toISOString();
@@ -178,8 +209,7 @@ export async function createContentDatabaseRecord(
   }> = [];
 
   if (documentId) {
-    const access = await assertAccess("document", documentId, "editor");
-    const document = access.resource;
+    const document = await assertDocumentEditorAccess(db, documentId);
     ownerEmail = document.ownerEmail as string;
     orgId = (document.orgId as string | null) ?? null;
     spaceId = (document.spaceId as string | null) ?? spaceId;
@@ -230,8 +260,7 @@ export async function createContentDatabaseRecord(
     let hideFromSearch = 0;
 
     if (parentId) {
-      const parentAccess = await assertAccess("document", parentId, "editor");
-      const parent = parentAccess.resource;
+      const parent = await assertDocumentEditorAccess(db, parentId);
       ownerEmail = parent.ownerEmail as string;
       orgId = (parent.orgId as string | null) ?? null;
       spaceId = (parent.spaceId as string | null) ?? spaceId;
@@ -257,7 +286,12 @@ export async function createContentDatabaseRecord(
           "A top-level database requires a resolved Content space",
         );
       }
-      const spaceAccess = await resolveContentSpaceAccess(spaceId, "editor");
+      const spaceAccess = await (
+        options.resolveSpaceAccess ?? resolveContentSpaceAccess
+      )(spaceId, "editor", { db });
+      if (spaceAccess.space.id !== spaceId) {
+        throw new Error("Resolved Content space does not match the request");
+      }
       ownerEmail = getRequestUserEmail() ?? ownerEmail;
       orgId = spaceAccess.space.orgId;
       visibility = orgId ? "org" : "private";

package/corpus/templates/content/app/components/layout/Layout.tsx

@@ -189,7 +189,7 @@ export function Layout({ children }: LayoutProps) {
         )}
         <AgentSidebar
           position="right"
-          defaultOpen={!isMobile && !isNarrowDesktop}
+          defaultOpen={false}
           agentPageHref="/agent"
           emptyStateText={t("chat.emptyState")}
           suggestions={[

package/corpus/templates/content/app/root.tsx

@@ -479,15 +479,6 @@ function PublicAgentShell({ children }: { children: React.ReactNode }) {
 
   useEffect(() => setMounted(true), []);
 
-  useEffect(() => {
-    if (!mounted) return;
-    if (!window.matchMedia("(min-width: 768px)").matches) return;
-    const id = window.setTimeout(() => {
-      window.dispatchEvent(new Event("agent-panel:open"));
-    }, 0);
-    return () => window.clearTimeout(id);
-  }, [mounted]);
-
   const content = <>{children}</>;
 
   if (!mounted) {
@@ -503,7 +494,7 @@ function PublicAgentShell({ children }: { children: React.ReactNode }) {
   return (
     <AgentSidebar
       position="right"
-      defaultOpen
+      defaultOpen={false}
       defaultSidebarWidth={420}
       emptyStateText={t("chat.publicEmptyState")}
       suggestions={[

package/corpus/templates/content/changelog/2026-07-17-creating-a-database-now-completes-reliably-in-hosted-workspa.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-17
+---
+
+Creating a database now completes reliably in hosted workspaces

package/corpus/templates/content/changelog/2026-07-17-the-agent-chat-sidebar-stays-closed-until-you-open-it-or-sta.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-17
+---
+
+The agent chat sidebar stays closed until you open it or start a chat handoff.

package/corpus/templates/dispatch/app/hooks/use-navigation-state.ts

@@ -1,6 +1,7 @@
 import {
   appBasePath,
   appPath,
+  isAgentChatHomeHandoffActive,
   markAgentChatHomeHandoff,
   useAgentRouteState,
 } from "@agent-native/core/client";
@@ -54,7 +55,9 @@ export function useNavigationState(extensions?: DispatchExtensionConfig) {
         routerPath(location.pathname) === "/chat" &&
         pathnameFromPath(path) !== "/chat"
       ) {
-        markAgentChatHomeHandoff("dispatch");
+        if (isAgentChatHomeHandoffActive("dispatch")) {
+          markAgentChatHomeHandoff("dispatch");
+        }
       }
     },
   });

package/corpus/templates/dispatch/changelog/2026-07-17-the-agent-chat-sidebar-stays-closed-until-you-open-it-or-sta.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-17
+---
+
+The agent chat sidebar stays closed until you open it or start a chat handoff.

package/corpus/templates/forms/app/components/layout/Layout.tsx

@@ -51,8 +51,6 @@ export function Layout({ children }: LayoutProps) {
     if (!formId) return null;
     return { type: "form" as const, id: formId };
   }, [location.pathname]);
-  const sidebarScope = chatHomeHandoffActive ? null : formScope;
-
   if (BARE_ROUTES.has(location.pathname)) {
     return <>{children}</>;
   }
@@ -89,7 +87,7 @@ export function Layout({ children }: LayoutProps) {
           <AgentSidebar
             position="right"
             agentPageHref="/agent"
-            defaultOpen
+            defaultOpen={false}
             chatViewTransition
             storageKey="forms"
             browserTabId={TAB_ID}
@@ -101,7 +99,7 @@ export function Layout({ children }: LayoutProps) {
               t("agent.suggestionSubmissions"),
               t("agent.suggestionExport"),
             ]}
-            scope={sidebarScope}
+            scope={formScope}
           >
             <div className="flex h-full flex-1 flex-col overflow-hidden">
               {showHeader ? <Header /> : null}

package/corpus/templates/forms/app/components/ui/popover.tsx

@@ -1 +1,25 @@
-export * from "@agent-native/toolkit/ui/popover";
+import {
+  Popover,
+  PopoverAnchor,
+  PopoverContent as ToolkitPopoverContent,
+  PopoverTrigger,
+} from "@agent-native/toolkit/ui/popover";
+import * as React from "react";
+
+import { cn } from "@/lib/utils";
+
+const PopoverContent = React.forwardRef<
+  React.ElementRef<typeof ToolkitPopoverContent>,
+  React.ComponentPropsWithoutRef<typeof ToolkitPopoverContent>
+>(({ className, collisionPadding = 16, ...props }, ref) => (
+  <ToolkitPopoverContent
+    ref={ref}
+    collisionPadding={collisionPadding}
+    className={cn("max-w-[calc(100vw-2rem)]", className)}
+    {...props}
+  />
+));
+
+PopoverContent.displayName = ToolkitPopoverContent.displayName;
+
+export { Popover, PopoverAnchor, PopoverContent, PopoverTrigger };

package/corpus/templates/forms/app/hooks/use-navigation-state.ts

@@ -1,5 +1,6 @@
 import {
   appBasePath,
+  isAgentChatHomeHandoffActive,
   markAgentChatHomeHandoff,
   useAgentRouteState,
 } from "@agent-native/core/client";
@@ -131,7 +132,11 @@ export function useNavigationState() {
     navigateOptions: { flushSync: true, replace: true },
     onNavigate: (_command, path) => {
       void prewarmFormsRoutePath(path);
-      if (location.pathname === "/ask" && path !== "/ask") {
+      if (
+        location.pathname === "/ask" &&
+        path !== "/ask" &&
+        isAgentChatHomeHandoffActive("forms")
+      ) {
         markAgentChatHomeHandoff("forms");
       }
     },

package/corpus/templates/forms/app/pages/FormBuilderPage.tsx

@@ -359,10 +359,19 @@ export function FormBuilderPage() {
             <Skeleton className="h-8 w-20 rounded-md" />
           </div>
         </div>
-        {/* Body: builder + properties */}
-        <div className="flex flex-1 overflow-hidden">
-          <div className="flex-1 overflow-auto p-4 sm:p-6">
-            <div className="max-w-2xl mx-auto space-y-4">
+        {/* Tabs */}
+        <div className="border-b border-border px-2 sm:px-4 py-2 shrink-0 overflow-hidden">
+          <div className="flex w-max items-center gap-1 rounded-lg bg-muted/40 p-1">
+            <Skeleton className="h-8 w-12 rounded-md" />
+            <Skeleton className="h-8 w-16 rounded-md" />
+            <Skeleton className="h-8 w-16 rounded-md" />
+            <Skeleton className="h-8 w-24 rounded-md" />
+          </div>
+        </div>
+        {/* Body: builder */}
+        <div className="flex flex-1 overflow-hidden relative">
+          <div className="flex-1 overflow-auto bg-muted/30">
+            <div className="max-w-2xl mx-auto py-4 sm:py-8 px-3 sm:px-4 space-y-4">
               <Skeleton className="h-8 w-2/3" />
               <Skeleton className="h-4 w-1/2" />
               <div className="space-y-3 pt-4">
@@ -378,12 +387,6 @@ export function FormBuilderPage() {
               </div>
             </div>
           </div>
-          <div className="hidden lg:block w-72 border-s border-border p-4 space-y-4">
-            <Skeleton className="h-4 w-32" />
-            <Skeleton className="h-9 w-full" />
-            <Skeleton className="h-9 w-full" />
-            <Skeleton className="h-9 w-full" />
-          </div>
         </div>
       </div>
     );

package/corpus/templates/forms/app/root.tsx

@@ -8,6 +8,7 @@ import {
   useCommandMenuShortcut,
   getThemeInitScript,
   configureTracking,
+  isAgentChatHomeHandoffActive,
   markAgentChatHomeHandoff,
   navigateWithAgentChatViewTransition,
   setClientAppState,
@@ -199,7 +200,11 @@ function OpenLinkInterceptor() {
       if (!path) return;
 
       event.preventDefault();
-      if (location.pathname === "/ask" && path !== "/ask") {
+      if (
+        location.pathname === "/ask" &&
+        path !== "/ask" &&
+        isAgentChatHomeHandoffActive("forms")
+      ) {
         markAgentChatHomeHandoff("forms");
       }
       navigateWithAgentChatViewTransition(navigate, path);