@agent-native/core 0.86.1 → 0.88.0

package/corpus/templates/analytics/server/lib/session-replay-agent-context.ts

@@ -1,12 +1,14 @@
 import {
+  buildAgentAccessApiUrl,
+  buildAgentAccessUrl,
+  createScopedAgentAccessGrant,
   getRequestContext,
-  signShortLivedToken,
-  verifyShortLivedToken,
+  verifyScopedAgentAccessToken,
 } from "@agent-native/core/server";
 
 import {
   SESSION_REPLAY_AGENT_ACCESS_PARAM,
-  sessionReplayAgentAccessTokenResourceId,
+  SESSION_REPLAY_AGENT_ACCESS_TOKEN_PREFIX,
 } from "../../shared/session-replay-agent-access.js";
 import {
   isFailedSessionReplayNetworkStatus,
@@ -70,17 +72,6 @@ function appOrigin(explicitOrigin?: string): string {
   }
 }
 
-function absoluteUrl(path: string, origin?: string): string {
-  return `${appOrigin(origin)}${appBasePath()}${path}`;
-}
-
-function appendAgentToken(path: string, token: string): string {
-  const sep = path.includes("?") ? "&" : "?";
-  return `${path}${sep}${SESSION_REPLAY_AGENT_ACCESS_PARAM}=${encodeURIComponent(
-    token,
-  )}`;
-}
-
 function replayStartedAt(events: AgentReplayEvent[]): number {
   const first = events.find((event) =>
     Number.isFinite(Number(event.timestamp)),
@@ -616,10 +607,10 @@ export function verifySessionReplayAgentAccess(
   recordingId: string,
   token: string,
 ): boolean {
-  return verifyShortLivedToken(
-    token,
-    sessionReplayAgentAccessTokenResourceId(recordingId),
-  ).ok;
+  return verifyScopedAgentAccessToken(token, {
+    resourceKind: SESSION_REPLAY_AGENT_ACCESS_TOKEN_PREFIX,
+    resourceId: recordingId,
+  }).ok;
 }
 
 export async function createSessionReplayAgentLink({
@@ -632,31 +623,32 @@ export async function createSessionReplayAgentLink({
   origin?: string;
 }) {
   const recording = await getSessionReplaySummary(recordingId, scope);
-  const token = signShortLivedToken({
-    resourceId: sessionReplayAgentAccessTokenResourceId(recording.id),
+  const grant = createScopedAgentAccessGrant({
+    resourceKind: SESSION_REPLAY_AGENT_ACCESS_TOKEN_PREFIX,
+    resourceId: recording.id,
     viewerEmail: scope.userEmail,
     ttlSeconds: SESSION_REPLAY_AGENT_ACCESS_TTL_SECONDS,
   });
-  const expiresAt = new Date(
-    Date.now() + SESSION_REPLAY_AGENT_ACCESS_TTL_SECONDS * 1000,
-  ).toISOString();
-  const sessionPath = appendAgentToken(
-    `/sessions/${encodeURIComponent(recording.id)}`,
-    token,
-  );
-  const contextPath = appendAgentToken(
-    `/api/session-replay/agent-context.json?id=${encodeURIComponent(
-      recording.id,
-    )}`,
-    token,
-  );
+  const resolvedOrigin = appOrigin(origin);
+  const basePath = appBasePath();
 
   return {
     recordingId: recording.id,
-    url: absoluteUrl(sessionPath, origin),
-    contextUrl: absoluteUrl(contextPath, origin),
-    expiresAt,
-    ttlSeconds: SESSION_REPLAY_AGENT_ACCESS_TTL_SECONDS,
+    url: buildAgentAccessUrl({
+      path: `/sessions/${encodeURIComponent(recording.id)}`,
+      origin: resolvedOrigin,
+      basePath,
+      token: grant.token,
+    }),
+    contextUrl: buildAgentAccessApiUrl({
+      endpoint: "/api/session-replay/agent-context.json",
+      resourceId: recording.id,
+      origin: resolvedOrigin,
+      basePath,
+      token: grant.token,
+    }),
+    expiresAt: grant.expiresAt,
+    ttlSeconds: grant.ttlSeconds,
   };
 }
 
@@ -679,28 +671,36 @@ export async function buildSessionReplayAgentContext({
   }
 
   const recording = await getSessionReplayTokenizedSummary(recordingId);
-  const contextPath = appendAgentToken(
-    `/api/session-replay/agent-context.json?id=${encodeURIComponent(
-      recording.id,
-    )}`,
+  const resolvedOrigin = appOrigin(origin);
+  const basePath = appBasePath();
+  const contextUrl = buildAgentAccessApiUrl({
+    endpoint: "/api/session-replay/agent-context.json",
+    resourceId: recording.id,
+    origin: resolvedOrigin,
+    basePath,
     token,
-  );
-  const eventsPath = appendAgentToken(
-    `/api/session-replay/agent-events.json?id=${encodeURIComponent(
-      recording.id,
-    )}&limit=10000`,
+  });
+  const eventsUrl = buildAgentAccessApiUrl({
+    endpoint: "/api/session-replay/agent-events.json",
+    resourceId: recording.id,
+    origin: resolvedOrigin,
+    basePath,
     token,
-  );
-  const diagnosticsPath = appendAgentToken(
-    `/api/session-replay/agent-diagnostics.json?id=${encodeURIComponent(
-      recording.id,
-    )}`,
+    extraParams: [["limit", 10000]],
+  });
+  const diagnosticsUrl = buildAgentAccessApiUrl({
+    endpoint: "/api/session-replay/agent-diagnostics.json",
+    resourceId: recording.id,
+    origin: resolvedOrigin,
+    basePath,
     token,
-  );
-  const pagePath = appendAgentToken(
-    `/sessions/${encodeURIComponent(recording.id)}`,
+  });
+  const pageUrl = buildAgentAccessUrl({
+    path: `/sessions/${encodeURIComponent(recording.id)}`,
+    origin: resolvedOrigin,
+    basePath,
     token,
-  );
+  });
 
   const eventsResponse = includeTimeline
     ? await getSessionReplayTokenizedEvents(recording.id, { limit: 10000 })
@@ -735,16 +735,16 @@ export async function buildSessionReplayAgentContext({
     ],
     recording: compactSessionRecordingSummary(recording),
     apis: {
-      page: { method: "GET", url: absoluteUrl(pagePath, origin) },
-      context: { method: "GET", url: absoluteUrl(contextPath, origin) },
+      page: { method: "GET", url: pageUrl },
+      context: { method: "GET", url: contextUrl },
       events: {
         method: "GET",
-        url: absoluteUrl(eventsPath, origin),
+        url: eventsUrl,
         note: "Returns bounded sanitized replay events; storage/provider URLs stay private.",
       },
       diagnostics: {
         method: "GET",
-        url: absoluteUrl(diagnosticsPath, origin),
+        url: diagnosticsUrl,
         note: "Returns bounded console/network diagnostics. Params: kind=console|network|all, level=log|info|warn|error|debug, limit (default 200, max 500), offset (page with N-entry skip), fromMs/toMs (inclusive offsetMs window around a timeline marker). offset/fromMs/toMs force strictly chronological pagination for full enumeration; totals reflect the filtered population and hasMore/truncated show whether more entries remain.",
       },
     },

package/corpus/templates/analytics/server/routes/[...page].get.ts

@@ -1,4 +1,9 @@
+import { AGENT_ACCESS_PARAM } from "@agent-native/core/server";
 import { createH3SSRHandler } from "@agent-native/core/server/ssr-handler";
+import {
+  buildAgentReadableResourceDiscovery,
+  renderAgentReadableResourceDiscoveryScript,
+} from "@agent-native/core/shared";
 import {
   defineEventHandler,
   getQuery,
@@ -6,6 +11,10 @@ import {
   setResponseHeader,
 } from "h3";
 
+import {
+  ANALYTICS_ANALYSIS_AGENT_CONTEXT_ENDPOINT,
+  ANALYTICS_DASHBOARD_AGENT_CONTEXT_ENDPOINT,
+} from "../../shared/resource-agent-access.js";
 import {
   buildSessionReplayAgentContext,
   safeJsonForHtml,
@@ -43,36 +52,92 @@ function sessionRecordingIdFromPath(pathname: string): string | null {
   }
 }
 
+function analyticsResourceFromPath(
+  pathname: string,
+): { type: "dashboard" | "analysis"; id: string } | null {
+  const stripped = stripAppBasePath(pathname);
+  const dashboard = stripped.match(/^\/dashboards\/([^/]+)\/?$/);
+  const analysis = stripped.match(/^\/analyses\/([^/]+)\/?$/);
+  const type = dashboard ? "dashboard" : analysis ? "analysis" : null;
+  const rawId = dashboard?.[1] ?? analysis?.[1];
+  if (!type || !rawId) return null;
+  try {
+    return { type, id: decodeURIComponent(rawId) };
+  } catch {
+    return { type, id: rawId };
+  }
+}
+
 function queryString(value: unknown): string {
   if (typeof value === "string") return value;
   if (Array.isArray(value) && typeof value[0] === "string") return value[0];
   return "";
 }
 
-async function buildAgentDiscoveryScript(event: any): Promise<string | null> {
+interface AgentDiscoveryInjection {
+  script: string;
+  privateResponse: boolean;
+}
+
+async function buildAgentDiscoveryScript(
+  event: any,
+): Promise<AgentDiscoveryInjection | null> {
   const requestUrl = getRequestURL(event);
   const recordingId = sessionRecordingIdFromPath(requestUrl.pathname);
-  if (!recordingId) return null;
-
   const query = getQuery(event);
-  const token = queryString(query[SESSION_REPLAY_AGENT_ACCESS_PARAM]);
-  if (!token) return null;
-
-  const context = await buildSessionReplayAgentContext({
-    recordingId,
-    token,
-    origin: requestUrl.origin,
-    includeTimeline: false,
-  }).catch(() => null);
-  if (!context) return null;
-
-  return `<script type="application/agent-native+json" id="analytics-session-replay-agent-context">${safeJsonForHtml(
-    context,
-  )}</script>`;
+  if (recordingId) {
+    const token = queryString(query[SESSION_REPLAY_AGENT_ACCESS_PARAM]);
+    if (!token) return null;
+
+    const context = await buildSessionReplayAgentContext({
+      recordingId,
+      token,
+      origin: requestUrl.origin,
+      includeTimeline: false,
+    }).catch(() => null);
+    if (!context) return null;
+
+    return {
+      script: `<script type="application/agent-native+json" id="analytics-session-replay-agent-context">${safeJsonForHtml(
+        context,
+      )}</script>`,
+      privateResponse: true,
+    };
+  }
+
+  const resource = analyticsResourceFromPath(requestUrl.pathname);
+  if (!resource) return null;
+
+  const token = queryString(query[AGENT_ACCESS_PARAM]);
+  const isDashboard = resource.type === "dashboard";
+  return {
+    script: renderAgentReadableResourceDiscoveryScript(
+      buildAgentReadableResourceDiscovery({
+        resourceType: isDashboard ? "dashboard" : "analysis",
+        resourceId: resource.id,
+        path: `/${isDashboard ? "dashboards" : "analyses"}/${encodeURIComponent(resource.id)}`,
+        contextEndpoint: isDashboard
+          ? ANALYTICS_DASHBOARD_AGENT_CONTEXT_ENDPOINT
+          : ANALYTICS_ANALYSIS_AGENT_CONTEXT_ENDPOINT,
+        origin: requestUrl.origin,
+        basePath: configuredAppBasePath(),
+        token,
+        instructions:
+          "Use contextUrl to read this Analytics artifact as structured JSON. Token links are read-only and do not grant edit access.",
+      }),
+      {
+        id: isDashboard
+          ? "analytics-dashboard-agent-context"
+          : "analytics-analysis-agent-context",
+      },
+    ),
+    privateResponse: Boolean(token),
+  };
 }
 
 function injectAgentDiscovery(html: string, script: string): string {
-  if (html.includes('id="analytics-session-replay-agent-context"')) {
+  const scriptId = script.match(/\sid="([^"]+)"/)?.[1];
+  if (scriptId && html.includes(`id="${scriptId}"`)) {
     return html;
   }
   if (html.includes("</head>")) {
@@ -86,8 +151,8 @@ function injectAgentDiscovery(html: string, script: string): string {
 
 export default defineEventHandler(async (event) => {
   const response = (await ssrHandler(event)) as Response;
-  const script = await buildAgentDiscoveryScript(event);
-  if (!script) return response;
+  const discovery = await buildAgentDiscoveryScript(event);
+  if (!discovery) return response;
 
   const contentType = response.headers.get("content-type") ?? "";
   if (!contentType.includes("text/html")) return response;
@@ -95,12 +160,14 @@ export default defineEventHandler(async (event) => {
   const html = await response.text();
   const headers = new Headers(response.headers);
   headers.delete("content-length");
-  headers.set("Cache-Control", "private, max-age=0, no-store");
-  headers.set("Referrer-Policy", "no-referrer");
-  setResponseHeader(event, "Cache-Control", "private, max-age=0, no-store");
-  setResponseHeader(event, "Referrer-Policy", "no-referrer");
+  if (discovery.privateResponse) {
+    headers.set("Cache-Control", "private, max-age=0, no-store");
+    headers.set("Referrer-Policy", "no-referrer");
+    setResponseHeader(event, "Cache-Control", "private, max-age=0, no-store");
+    setResponseHeader(event, "Referrer-Policy", "no-referrer");
+  }
 
-  return new Response(injectAgentDiscovery(html, script), {
+  return new Response(injectAgentDiscovery(html, discovery.script), {
     status: response.status,
     statusText: response.statusText,
     headers,

package/corpus/templates/analytics/server/routes/api/analysis-agent-context.json.get.ts

@@ -0,0 +1,94 @@
+import {
+  AGENT_ACCESS_PARAM,
+  verifyScopedAgentAccessToken,
+} from "@agent-native/core/server";
+import { eq } from "drizzle-orm";
+import {
+  defineEventHandler,
+  getQuery,
+  setResponseHeader,
+  setResponseStatus,
+} from "h3";
+
+import { ANALYTICS_ANALYSIS_AGENT_RESOURCE_KIND } from "../../../shared/resource-agent-access.js";
+import { getDb, schema } from "../../db/index.js";
+import { buildAnalysisAgentContext } from "../../lib/agent-readable-resource-context.js";
+import type { AnalysisRecord } from "../../lib/dashboards-store.js";
+
+function queryString(value: unknown): string {
+  if (typeof value === "string") return value;
+  if (Array.isArray(value) && typeof value[0] === "string") return value[0];
+  return "";
+}
+
+function parseJson<T>(value: unknown, fallback: T): T {
+  if (typeof value !== "string") return fallback;
+  try {
+    return JSON.parse(value) as T;
+  } catch {
+    return fallback;
+  }
+}
+
+function rowToAnalysis(row: any): AnalysisRecord {
+  return {
+    id: row.id,
+    name: row.name,
+    description: row.description,
+    question: row.question,
+    instructions: row.instructions,
+    dataSources: parseJson<string[]>(row.dataSources, []),
+    resultMarkdown: row.resultMarkdown,
+    resultData: row.resultData
+      ? parseJson<Record<string, unknown> | null>(row.resultData, null)
+      : null,
+    author: row.author ?? null,
+    ownerEmail: row.ownerEmail,
+    orgId: row.orgId ?? null,
+    visibility: row.visibility,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+    hiddenAt: row.hiddenAt ?? null,
+    hiddenBy: row.hiddenBy ?? null,
+  };
+}
+
+export default defineEventHandler(async (event) => {
+  setResponseHeader(event, "Cache-Control", "no-store");
+  setResponseHeader(event, "Referrer-Policy", "no-referrer");
+  setResponseHeader(event, "X-Content-Type-Options", "nosniff");
+
+  const query = getQuery(event);
+  const id = queryString(query.id);
+  if (!id) {
+    setResponseStatus(event, 400);
+    return { error: "Analysis id is required" };
+  }
+
+  const token = queryString(query[AGENT_ACCESS_PARAM]);
+  const db = getDb() as any;
+  // guard:allow-unscoped -- this endpoint returns analysis context only when the analysis is public or an analysis-scoped agent_access token verifies for this id.
+  const [row] = await db
+    .select()
+    .from(schema.analyses)
+    .where(eq(schema.analyses.id, id))
+    .limit(1);
+
+  if (!row) {
+    setResponseStatus(event, 404);
+    return { error: "Analysis not found" };
+  }
+
+  const tokenAccess = token
+    ? verifyScopedAgentAccessToken(token, {
+        resourceKind: ANALYTICS_ANALYSIS_AGENT_RESOURCE_KIND,
+        resourceId: id,
+      }).ok
+    : false;
+  if (row.visibility !== "public" && !tokenAccess) {
+    setResponseStatus(event, 403);
+    return { error: "Invalid or expired agent access token" };
+  }
+
+  return buildAnalysisAgentContext(rowToAnalysis(row));
+});

package/corpus/templates/analytics/server/routes/api/dashboard-agent-context.json.get.ts

@@ -0,0 +1,109 @@
+import {
+  AGENT_ACCESS_PARAM,
+  verifyScopedAgentAccessToken,
+} from "@agent-native/core/server";
+import { eq } from "drizzle-orm";
+import {
+  defineEventHandler,
+  getQuery,
+  setResponseHeader,
+  setResponseStatus,
+} from "h3";
+
+import { ANALYTICS_DASHBOARD_AGENT_RESOURCE_KIND } from "../../../shared/resource-agent-access.js";
+import { getDb, schema } from "../../db/index.js";
+import {
+  buildDashboardAgentContext,
+  buildDashboardSeedAgentContext,
+} from "../../lib/agent-readable-resource-context.js";
+import { loadDashboardSeed } from "../../lib/dashboard-seeds.js";
+import type { DashboardRecord } from "../../lib/dashboards-store.js";
+
+function queryString(value: unknown): string {
+  if (typeof value === "string") return value;
+  if (Array.isArray(value) && typeof value[0] === "string") return value[0];
+  return "";
+}
+
+function parseJsonObject(value: unknown): Record<string, unknown> {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value as Record<string, unknown>;
+  }
+  if (typeof value !== "string") return {};
+  try {
+    const parsed = JSON.parse(value);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+      ? (parsed as Record<string, unknown>)
+      : {};
+  } catch {
+    return {};
+  }
+}
+
+function rowToDashboard(row: any): DashboardRecord {
+  return {
+    id: row.id,
+    kind: row.kind,
+    title: row.title,
+    config: parseJsonObject(row.config),
+    ownerEmail: row.ownerEmail,
+    orgId: row.orgId ?? null,
+    visibility: row.visibility,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+    archivedAt: row.archivedAt ?? null,
+    hiddenAt: row.hiddenAt ?? null,
+    hiddenBy: row.hiddenBy ?? null,
+  };
+}
+
+export default defineEventHandler(async (event) => {
+  setResponseHeader(event, "Cache-Control", "no-store");
+  setResponseHeader(event, "Referrer-Policy", "no-referrer");
+  setResponseHeader(event, "X-Content-Type-Options", "nosniff");
+
+  const query = getQuery(event);
+  const id = queryString(query.id);
+  if (!id) {
+    setResponseStatus(event, 400);
+    return { error: "Dashboard id is required" };
+  }
+
+  const token = queryString(query[AGENT_ACCESS_PARAM]);
+  const tokenAccess = token
+    ? verifyScopedAgentAccessToken(token, {
+        resourceKind: ANALYTICS_DASHBOARD_AGENT_RESOURCE_KIND,
+        resourceId: id,
+      }).ok
+    : false;
+  const db = getDb() as any;
+  // guard:allow-unscoped -- this endpoint returns dashboard context only when the dashboard is public or a dashboard-scoped agent_access token verifies for this id.
+  const [row] = await db
+    .select()
+    .from(schema.dashboards)
+    .where(eq(schema.dashboards.id, id))
+    .limit(1);
+
+  const seed = row ? null : loadDashboardSeed(id);
+  if (!row && seed) {
+    if (!tokenAccess) {
+      setResponseStatus(event, 403);
+      return { error: "Invalid or expired agent access token" };
+    }
+    return buildDashboardSeedAgentContext(id, seed, { includeConfig: true });
+  }
+
+  if (!row) {
+    setResponseStatus(event, 404);
+    return { error: "Dashboard not found" };
+  }
+
+  if (row.visibility !== "public" && !tokenAccess) {
+    setResponseStatus(event, 403);
+    return { error: "Invalid or expired agent access token" };
+  }
+
+  return buildDashboardAgentContext(rowToDashboard(row), {
+    includeConfig: true,
+  });
+});

package/corpus/templates/analytics/shared/resource-agent-access.ts

@@ -0,0 +1,6 @@
+export const ANALYTICS_DASHBOARD_AGENT_RESOURCE_KIND = "analytics:dashboard";
+export const ANALYTICS_ANALYSIS_AGENT_RESOURCE_KIND = "analytics:analysis";
+export const ANALYTICS_DASHBOARD_AGENT_CONTEXT_ENDPOINT =
+  "/api/dashboard-agent-context.json";
+export const ANALYTICS_ANALYSIS_AGENT_CONTEXT_ENDPOINT =
+  "/api/analysis-agent-context.json";

package/corpus/templates/analytics/shared/session-replay-agent-access.ts

@@ -1,10 +1,21 @@
-export const SESSION_REPLAY_AGENT_ACCESS_PARAM = "agent_access";
+import {
+  AGENT_ACCESS_PARAM,
+  scopedAgentAccessResourceId,
+} from "@agent-native/core/shared";
 
-const SESSION_REPLAY_AGENT_ACCESS_TOKEN_PREFIX =
+export const SESSION_REPLAY_AGENT_ACCESS_PARAM =
+  AGENT_ACCESS_PARAM || "agent_access";
+export const SESSION_REPLAY_AGENT_ACCESS_TOKEN_PREFIX =
   "analytics-session-replay-agent-context";
 
 export function sessionReplayAgentAccessTokenResourceId(
   recordingId: string,
 ): string {
-  return `${SESSION_REPLAY_AGENT_ACCESS_TOKEN_PREFIX}:${recordingId}`;
+  if (typeof scopedAgentAccessResourceId !== "function") {
+    return `${SESSION_REPLAY_AGENT_ACCESS_TOKEN_PREFIX}:${recordingId}`;
+  }
+  return scopedAgentAccessResourceId(
+    SESSION_REPLAY_AGENT_ACCESS_TOKEN_PREFIX,
+    recordingId,
+  );
 }

package/corpus/templates/assets/app/components/create/RecentDraftsSection.tsx

@@ -1,10 +1,9 @@
 import { useActionQuery, useT } from "@agent-native/core/client";
+import { Button } from "@agent-native/toolkit/ui/button";
+import { Skeleton } from "@agent-native/toolkit/ui/skeleton";
 import { IconArrowUpRight, IconPhoto } from "@tabler/icons-react";
 import { Link } from "react-router";
 
-import { Button } from "@/components/ui/button";
-import { Skeleton } from "@/components/ui/skeleton";
-
 type DraftAsset = {
   id: string;
   title?: string | null;

package/corpus/templates/assets/app/components/generation/GenerationResults.tsx

@@ -5,11 +5,6 @@ import {
   useActionQuery,
   useT,
 } from "@agent-native/core/client";
-import { IconMessageCircle, IconPhoto, IconTrash } from "@tabler/icons-react";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useEffect, useMemo, useRef, useState } from "react";
-import { toast } from "sonner";
-
 import {
   AlertDialog,
   AlertDialogAction,
@@ -19,10 +14,15 @@ import {
   AlertDialogFooter,
   AlertDialogHeader,
   AlertDialogTitle,
-} from "@/components/ui/alert-dialog";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Spinner } from "@/components/ui/spinner";
+} from "@agent-native/toolkit/ui/alert-dialog";
+import { Badge } from "@agent-native/toolkit/ui/badge";
+import { Button } from "@agent-native/toolkit/ui/button";
+import { Spinner } from "@agent-native/toolkit/ui/spinner";
+import { IconMessageCircle, IconPhoto, IconTrash } from "@tabler/icons-react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { toast } from "sonner";
+
 import { assetPreviewSources } from "@/lib/asset-preview-sources";
 
 import type {

package/corpus/templates/assets/app/components/layout/Header.tsx

@@ -3,10 +3,12 @@ import {
   useActionQuery,
   useT,
 } from "@agent-native/core/client";
+import {
+  useHeaderTitle,
+  useHeaderActions,
+} from "@agent-native/toolkit/app-shell";
 import { useLocation } from "react-router";
 
-import { useHeaderTitle, useHeaderActions } from "./HeaderActions";
-
 const pageTitleKeys: Record<string, string> = {
   "/": "navigation.create",
   "/library": "navigation.library",

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

@@ -13,6 +13,7 @@ import {
   EMBED_MODE_QUERY_PARAM,
   EMBED_TOKEN_QUERY_PARAM,
 } from "@agent-native/core/shared";
+import { HeaderActionsProvider } from "@agent-native/toolkit/app-shell";
 import { IconMenu2 } from "@tabler/icons-react";
 import { useState, useEffect } from "react";
 import { useLocation, useNavigate } from "react-router";
@@ -24,7 +25,6 @@ import { ASSETS_CHAT_STORAGE_KEY } from "@/lib/chat";
 import { cn } from "@/lib/utils";
 
 import { Header } from "./Header";
-import { HeaderActionsProvider } from "./HeaderActions";
 import { Sidebar } from "./Sidebar";
 
 interface LayoutProps {

package/corpus/templates/assets/app/components/layout/PageShell.tsx

@@ -1,14 +1,13 @@
-import { IconInfoCircle } from "@tabler/icons-react";
-import { type ReactNode } from "react";
-
+import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
 import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
+} from "@agent-native/toolkit/ui/tooltip";
+import { IconInfoCircle } from "@tabler/icons-react";
+import { type ReactNode } from "react";
 
-import { useSetPageTitle } from "./HeaderActions";
+import { cn } from "@/lib/utils";
 
 export function PageShell({
   title,