@agent-native/core 0.115.4 → 0.117.0

package/src/server/realtime-token.ts

@@ -0,0 +1,106 @@
+/**
+ * Realtime subscribe-token mint endpoint.
+ *
+ * `GET /_agent-native/realtime-token` — the one Netlify request per page load
+ * that the hosted Realtime Gateway path needs. The SSR HTML/`.data` shell is a
+ * single impersonal, CDN-cached document (`guard:ssr-cache-shell`), so a
+ * per-visitor token cannot be baked into the page; the client mints it here
+ * after load. Same-origin + session-gated; sessionless requests get 401.
+ *
+ * The signed token binds this app's Builder project id (the gateway channel)
+ * and carries the app's own end-user identity (`owner` = session email, `orgId`
+ * = framework org) — the exact tuple `recordChange` stamps onto `sync_events`
+ * and the gateway feeds to `canSeeChangeForUser`. It is signed with the app's
+ * per-project HMAC secret, injected as a reserved env var at provision time.
+ */
+
+import {
+  defineEventHandler,
+  getMethod,
+  type H3Event,
+  setResponseHeader,
+  setResponseStatus,
+} from "h3";
+
+import { getOrgContext } from "../org/context.js";
+import { getSession } from "./auth.js";
+import { resolveBuilderBranchProjectId } from "./builder-browser.js";
+import { runWithRequestContext } from "./request-context.js";
+import { isSameOriginRequest } from "./request-origin.js";
+import { signRealtimeSubscribeToken } from "./short-lived-token.js";
+
+/**
+ * Reserved env var holding the app's per-project HMAC secret. Injected by the
+ * Builder provisioning path (`SYSTEM_RESERVED_KEYS` + prod allowlist); see the
+ * Agent-Native Realtime Sync tech spec.
+ */
+export const REALTIME_HMAC_SECRET_ENV = "AGENT_NATIVE_REALTIME_HMAC_SECRET";
+
+/** Short TTL — validated at connect; the gateway rotates over the stream. */
+const REALTIME_TOKEN_TTL_SECONDS = 600;
+
+export function getRealtimeSigningSecret(): string | undefined {
+  return process.env[REALTIME_HMAC_SECRET_ENV]?.trim() || undefined;
+}
+
+export function createRealtimeTokenHandler() {
+  return defineEventHandler(async (event: H3Event) => {
+    // Identity-bearing token, valid ~10 min — never cacheable by the browser or
+    // any intermediary. Set once up front so every return path carries it.
+    setResponseHeader(event, "Cache-Control", "private, no-store");
+
+    if (getMethod(event) !== "GET") {
+      setResponseStatus(event, 405);
+      return { error: "Method not allowed" };
+    }
+    if (!isSameOriginRequest(event)) {
+      setResponseStatus(event, 403);
+      return { error: "Cross-origin request rejected" };
+    }
+
+    const session = await getSession(event).catch(() => null);
+    if (!session?.email) {
+      setResponseStatus(event, 401);
+      return { error: "Authentication required" };
+    }
+
+    const orgCtx = await getOrgContext(event).catch(() => null);
+    const requestContext = {
+      userEmail: session.email,
+      orgId: orgCtx?.orgId ?? session.orgId,
+    };
+
+    // The scoped-secret fallback inside resolveBuilderBranchProjectId reads the
+    // request-context ALS (resolveSecret -> getRequestUserEmail); without it the
+    // user/org/workspace scopes silently no-op and only env vars resolve. Wrap
+    // the resolution like google-realtime-session.ts does.
+    return runWithRequestContext(requestContext, async () => {
+      // Async resolver so hosted apps whose project id lives in a
+      // request-scoped app/org/workspace secret (not an env var) also work —
+      // the sync env-only lookup would 404 them and silently drop the gateway.
+      const projectId = await resolveBuilderBranchProjectId();
+      const secret = getRealtimeSigningSecret();
+      if (!projectId || !secret) {
+        // Hosted realtime isn't provisioned for this app. 404 lets the client
+        // fall back to the app's own /_agent-native/poll without treating it
+        // as an auth failure.
+        setResponseStatus(event, 404);
+        return { error: "Realtime gateway not configured" };
+      }
+
+      const token = signRealtimeSubscribeToken(
+        {
+          projectId,
+          owner: session.email,
+          orgId: requestContext.orgId,
+          ttlSeconds: REALTIME_TOKEN_TTL_SECONDS,
+        },
+        secret,
+      );
+      const expiresAt = new Date(
+        Date.now() + REALTIME_TOKEN_TTL_SECONDS * 1000,
+      ).toISOString();
+      return { token, expiresAt, ttlSeconds: REALTIME_TOKEN_TTL_SECONDS };
+    });
+  });
+}

package/src/server/sentry-config.ts

@@ -71,3 +71,43 @@ export function getSentryClientConfigScript(): string | null {
     "</script>",
   ].join("");
 }
+
+/**
+ * Hosted Realtime Gateway config for the client, or null for the in-process
+ * (local) transport. Values are env-derived and identical for every visitor,
+ * so this is safe inside the CDN-cached SSR shell (see `guard:ssr-cache-shell`).
+ * The per-user subscribe token is NOT here — it is minted client-side after
+ * load from `/_agent-native/realtime-token`.
+ */
+export function resolveRealtimeClientConfig(): {
+  transport: "hosted";
+  gatewayBaseUrl: string;
+} | null {
+  // Fail closed: emit hosted config only when BOTH the transport is hosted AND
+  // an explicit gateway URL is set. No production default — this ships into the
+  // CDN-cached shell served to every visitor, so a mis-set staging/preview/
+  // self-hosted env must stay on the local transport rather than silently
+  // point every browser at api.builder.io. This gating is mirrored byte-for-
+  // byte in the worker emitter in `deploy/build.ts` (kept in sync deliberately).
+  if (firstNonEmpty(process.env.AGENT_NATIVE_REALTIME_TRANSPORT) !== "hosted") {
+    return null;
+  }
+  const gatewayBaseUrl = firstNonEmpty(
+    process.env.AGENT_NATIVE_REALTIME_GATEWAY_URL,
+  );
+  if (!gatewayBaseUrl) return null;
+  return { transport: "hosted", gatewayBaseUrl };
+}
+
+export function getRealtimeClientConfigScript(): string | null {
+  const realtime = resolveRealtimeClientConfig();
+  if (!realtime) return null;
+
+  return [
+    "<script data-agent-native-realtime-config>",
+    "window.__AGENT_NATIVE_CONFIG__=Object.assign({},window.__AGENT_NATIVE_CONFIG__,",
+    JSON.stringify({ realtime }),
+    ");",
+    "</script>",
+  ].join("");
+}

package/src/server/short-lived-token.ts

@@ -168,3 +168,159 @@ export function verifyShortLivedToken(
 
   return { ok: true, viewerEmail: claims.viewerEmail };
 }
+
+// ── Realtime subscribe tokens ────────────────────────────────────────────────
+//
+// An identity-bearing extension of the same HMAC discipline, used by the hosted
+// Realtime Gateway. Differs from the media token above in three ways the gateway
+// depends on:
+//   1. It is signed with a caller-supplied PER-PROJECT key (the app's HMAC
+//      secret), not the single deployment-wide `getSigningKey()`. The app server
+//      mints with it; the gateway (a second issuer for stream rotation) verifies
+//      and re-mints with the same per-project key. A token minted for project A
+//      fails signature verification against project B's key.
+//   2. It carries authorization-bearing identity (`owner`/`orgId`) that the
+//      gateway feeds to `canSeeChangeForUser` — the media token's `viewerEmail`
+//      is audit-only by contract, so a new field is required, not repurposed.
+//   3. It binds `projectId` as the channel and stamps a `typ` discriminator, so
+//      it is verified against the connect channel and cannot be replayed as a
+//      media token (or vice-versa) even if keys ever overlapped.
+
+/** Payload `typ` discriminator for realtime subscribe tokens. */
+export const REALTIME_SUBSCRIBE_TOKEN_TYPE = "rt-subscribe";
+const DEFAULT_REALTIME_TTL_SECONDS = 600;
+
+/** Inputs for {@link signRealtimeSubscribeToken}. */
+export interface RealtimeSubscribeClaims {
+  /** Channel — one Neon project per app. Verified at connect, not just carried. */
+  projectId: string;
+  /**
+   * App end-user session email (NOT a Builder.io account — see the tech spec).
+   * Fed to `canSeeChangeForUser`. Present in v0.
+   */
+  owner?: string;
+  /** Framework org id for the app's end-user. */
+  orgId?: string;
+  /** Override default TTL (seconds). */
+  ttlSeconds?: number;
+}
+
+interface DecodedRealtimeClaims {
+  typ: string;
+  projectId: string;
+  owner?: string;
+  orgId?: string;
+  exp: number;
+}
+
+/**
+ * Result of {@link verifyRealtimeSubscribeToken}. On success it returns the
+ * identity claims the gateway uses to scope delivery.
+ */
+export type RealtimeVerifyResult =
+  | {
+      ok: true;
+      projectId: string;
+      owner?: string;
+      orgId?: string;
+      exp: number;
+    }
+  | { ok: false; reason: string };
+
+function hmacB64(payloadStr: string, key: string): string {
+  return base64UrlEncode(
+    crypto.createHmac("sha256", key).update(payloadStr).digest(),
+  );
+}
+
+function timingSafeEqualB64(sig: string, expected: string): boolean {
+  const sigBuf = Buffer.from(sig, "utf8");
+  const expBuf = Buffer.from(expected, "utf8");
+  if (sigBuf.length !== expBuf.length) {
+    crypto.timingSafeEqual(expBuf, expBuf); // burn ~equal cycles
+    return false;
+  }
+  return crypto.timingSafeEqual(sigBuf, expBuf);
+}
+
+/**
+ * Mint a realtime subscribe token for `claims.projectId`, signed with the
+ * app's per-project `key`. Safe to place on the connect query string (short
+ * TTL, single-purpose, channel-bound). Verified by
+ * {@link verifyRealtimeSubscribeToken} at connect.
+ */
+export function signRealtimeSubscribeToken(
+  claims: RealtimeSubscribeClaims,
+  key: string,
+): string {
+  if (!key) throw new Error("signRealtimeSubscribeToken requires a key");
+  // Fail closed: a token with neither owner nor orgId carries no authorization
+  // identity, so canSeeChangeForUser would only ever match global/unowned
+  // events. Every issuer (mint endpoint + the gateway's rotation re-mint) must
+  // supply at least one identity claim.
+  if (!claims.owner && !claims.orgId) {
+    throw new Error(
+      "signRealtimeSubscribeToken requires an owner or orgId claim",
+    );
+  }
+  const ttl = claims.ttlSeconds ?? DEFAULT_REALTIME_TTL_SECONDS;
+  const payload: DecodedRealtimeClaims = {
+    typ: REALTIME_SUBSCRIBE_TOKEN_TYPE,
+    projectId: claims.projectId,
+    exp: Math.floor(Date.now() / 1000) + ttl,
+  };
+  if (claims.owner) payload.owner = claims.owner;
+  if (claims.orgId) payload.orgId = claims.orgId;
+
+  const payloadStr = base64UrlEncode(JSON.stringify(payload));
+  return `${payloadStr}.${hmacB64(payloadStr, key)}`;
+}
+
+/**
+ * Verify a realtime subscribe token against the app's per-project `key` and the
+ * connect channel `projectId`. Returns the identity claims only when the shape,
+ * signature (constant-time), `typ`, `exp`, and `projectId` binding all hold.
+ */
+export function verifyRealtimeSubscribeToken(
+  token: string,
+  expected: { projectId: string; key: string },
+): RealtimeVerifyResult {
+  if (!expected.key) return { ok: false, reason: "no_key" };
+  if (typeof token !== "string" || !token.includes(".")) {
+    return { ok: false, reason: "malformed" };
+  }
+  const [payloadStr, sig] = token.split(".", 2);
+  if (!payloadStr || !sig) return { ok: false, reason: "malformed" };
+
+  if (!timingSafeEqualB64(sig, hmacB64(payloadStr, expected.key))) {
+    return { ok: false, reason: "bad_signature" };
+  }
+
+  let claims: DecodedRealtimeClaims;
+  try {
+    claims = JSON.parse(base64UrlDecode(payloadStr).toString("utf8"));
+  } catch {
+    return { ok: false, reason: "bad_payload" };
+  }
+
+  if (claims.typ !== REALTIME_SUBSCRIBE_TOKEN_TYPE) {
+    return { ok: false, reason: "wrong_type" };
+  }
+  if (typeof claims.exp !== "number") {
+    return { ok: false, reason: "bad_payload" };
+  }
+  if (claims.exp * 1000 < Date.now()) {
+    return { ok: false, reason: "expired" };
+  }
+  if (claims.projectId !== expected.projectId) {
+    return { ok: false, reason: "wrong_project" };
+  }
+
+  return {
+    ok: true,
+    projectId: claims.projectId,
+    owner: claims.owner,
+    orgId: claims.orgId,
+    exp: claims.exp,
+  };
+}

package/src/server/sse.ts

@@ -1,5 +1,20 @@
 import { defineEventHandler, createEventStream } from "h3";
 
+// Re-export the wire protocol so server consumers (the hosted Realtime Gateway
+// in ai-services) get the frame contract from the same `./server/sse` subpath.
+// The browser client imports it directly from `../realtime-protocol.js`.
+export {
+  buildHandshakeFrame,
+  parseHandshakeFrame,
+  parseTokenFrame,
+  REALTIME_CAP_NO_AWARENESS,
+  REALTIME_PROTOCOL_VERSION,
+  REALTIME_SSE_HANDSHAKE_EVENT,
+  REALTIME_SSE_TOKEN_EVENT,
+  type RealtimeHandshake,
+  type RealtimeTokenFrame,
+} from "../realtime-protocol.js";
+
 /** Any object with on/off methods (compatible with EventEmitter, TypedEventEmitter, etc.). */
 interface EventLike {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/server/ssr-handler.ts

@@ -37,7 +37,10 @@ import {
 } from "./app-base-path.js";
 import { captureError } from "./capture-error.js";
 import { runWithRequestContext } from "./request-context.js";
-import { getSentryClientConfigScript } from "./sentry-config.js";
+import {
+  getRealtimeClientConfigScript,
+  getSentryClientConfigScript,
+} from "./sentry-config.js";
 
 export {
   DEFAULT_SSR_CACHE_HEADERS,
@@ -342,7 +345,10 @@ async function rewriteMountedResponse(
   pathname: string,
   requestUrl: string,
 ): Promise<Response> {
-  const sentryClientConfigScript = getSentryClientConfigScript();
+  const clientConfigScript =
+    [getSentryClientConfigScript(), getRealtimeClientConfigScript()]
+      .filter(Boolean)
+      .join("") || null;
   const headers = new Headers(response.headers);
   applyDefaultSsrCacheHeader(headers, response.status, pathname);
   applyDefaultSpeculationRulesHeader(headers, response.status, basePath);
@@ -377,7 +383,7 @@ async function rewriteMountedResponse(
         prefixMountedHtml(html, basePath),
         defaultSocialImageUrl(requestUrl, basePath),
       ),
-      sentryClientConfigScript,
+      clientConfigScript,
     ),
     {
       status: response.status,

package/src/styles/agent-native.css

@@ -927,7 +927,35 @@
   display: inline-block;
 }
 
+.agent-tool-call {
+  position: relative;
+}
+
 @media (prefers-reduced-motion: no-preference) {
+  .agent-tool-call--entering {
+    animation: agent-tool-call-enter 220ms var(--ease-out-strong) both;
+  }
+
+  .agent-tool-call[data-active-tail="true"]::after {
+    position: absolute;
+    z-index: 1;
+    inset: 0 0 auto;
+    height: 2rem;
+    pointer-events: none;
+    content: "";
+    background: linear-gradient(
+      90deg,
+      transparent 0%,
+      transparent 38%,
+      hsl(var(--foreground) / 0.055) 50%,
+      transparent 62%,
+      transparent 100%
+    );
+    background-repeat: repeat;
+    background-size: 14rem 100%;
+    animation: agent-thinking-shine 2.6s linear infinite;
+  }
+
   @supports ((background-clip: text) or (-webkit-background-clip: text)) {
     .agent-thinking-indicator__text,
     .agent-running-shimmer {
@@ -960,6 +988,18 @@
     }
   }
 
+  @keyframes agent-tool-call-enter {
+    from {
+      opacity: 0;
+      transform: translateY(0.375rem);
+    }
+
+    to {
+      opacity: 1;
+      transform: translateY(0);
+    }
+  }
+
   @supports (view-transition-name: agent-native-chat) {
     .agent-native-chat-view-transition {
       contain: layout;

package/src/templates/chat/.agents/skills/agent-native-toolkit/SKILL.md

@@ -85,7 +85,10 @@ in the moment of agent use.
   approval, generative UI, progress, and screen-state exposure.
 - **Chat history kit**: presentational chat lists and recent-chat rails belong
   in Toolkit; Core keeps thread persistence, agent execution, transport, and
-  page-to-sidebar handoff. Apps inject routing, labels, and domain actions.
+  page-to-sidebar handoff. Use Toolkit's `ChatHistoryRail` for the standard
+  five-item sidebar preview and a footer row with New chat followed by an
+  ellipsis disclosure up to fifteen. Apps inject routing, labels, and domain
+  actions.
 - **Agent page kit**: the full-page `/agent` surface (`AgentTabsPage` from
   `@agent-native/core/client`) with Context, Files, Connections, Jobs, and
   Access tabs plus a Personal/Organization scope toggle. The canonical home

package/src/templates/chat/.agents/skills/real-time-sync/SKILL.md

@@ -72,7 +72,7 @@ The agent modifies data in SQL, but the UI runs in the browser. SSE bridges same
   });
   ```
 
-  `useDbSync` and every `subscribeSyncEvents` subscriber share one `EventSource` and one fallback poll loop per tab — this is how collaborative documents receive doc updates and cursor/awareness events.
+  `useDbSync` and every `subscribeSyncEvents` subscriber share one `EventSource` and one fallback poll loop per tab — this is how collaborative documents receive doc updates and cursor/awareness events. Hidden tabs keep that shared transport alive by default: SSE stays connected and active fallback polling relaxes to a 10-second floor (idle polling remains once per minute). Pass `pauseWhenHidden: true` only for a consumer that explicitly must stop all hidden-tab sync.
 
 ## Which sources to depend on
 

package/src/templates/chat/app/components/layout/Layout.tsx

@@ -60,6 +60,7 @@ export function Layout({ children }: LayoutProps) {
   useAgentChatHomeHandoffLinks({
     storageKey: "chat",
     isChatPath: (pathname) => pathname === "/" || pathname.startsWith("/chat/"),
+    requireActiveHandoff: false,
   });
 
   useEffect(() => {

package/src/templates/chat/app/components/layout/Sidebar.tsx

@@ -9,7 +9,7 @@ import { useT } from "@agent-native/core/client/i18n";
 import { OrgSwitcher } from "@agent-native/core/client/org";
 import { FeedbackButton } from "@agent-native/core/client/ui";
 import {
-  ChatHistoryList,
+  ChatHistoryRail,
   type ChatHistoryItem,
 } from "@agent-native/toolkit/chat-history";
 import {
@@ -17,7 +17,6 @@ import {
   IconLayoutSidebarLeftCollapse,
   IconLayoutSidebarLeftExpand,
   IconMessageCircle,
-  IconPlus,
   IconSettings,
 } from "@tabler/icons-react";
 import { useEffect, useMemo } from "react";
@@ -104,6 +103,12 @@ function persistedActiveThreadId() {
   }
 }
 
+function persistActiveThreadId(threadId: string) {
+  try {
+    localStorage.setItem(CHAT_ACTIVE_THREAD_KEY, threadId);
+  } catch {}
+}
+
 function threadIdFromPath(pathname: string) {
   const match = pathname.match(/^\/chat\/([^/]+)/);
   if (!match) return null;
@@ -142,7 +147,7 @@ function ChatThreadsSection() {
       threads
         .filter((thread) => thread.messageCount > 0 && !thread.archivedAt)
         .sort(compareThreads)
-        .slice(0, 12),
+        .slice(0, 15),
     [threads],
   );
   const displayedActiveThreadId =
@@ -184,6 +189,7 @@ function ChatThreadsSection() {
 
   function openThread(threadId: string, options?: { isNew?: boolean }) {
     switchThread(threadId);
+    persistActiveThreadId(threadId);
     navigateWithAgentChatViewTransition(
       navigate,
       options?.isNew ? "/" : chatThreadPath(threadId),
@@ -223,50 +229,35 @@ function ChatThreadsSection() {
 
   return (
     <div className="mt-2 border-s border-sidebar-border/70 ps-3">
-      <div className="mb-1 flex h-7 items-center gap-2 pe-1">
-        <div className="min-w-0 flex-1 text-xs font-medium text-sidebar-foreground/70">
-          {t("chat.chats")}
-        </div>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <button
-              type="button"
-              onClick={handleNewChat}
-              className="flex size-6 shrink-0 items-center justify-center rounded-md text-sidebar-foreground/65 transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
-              aria-label={t("chat.newChat")}
-            >
-              <IconPlus className="size-3.5" />
-            </button>
-          </TooltipTrigger>
-          <TooltipContent>{t("chat.newChat")}</TooltipContent>
-        </Tooltip>
-      </div>
-      {visibleThreads.length > 0 && (
-        <ChatHistoryList
-          items={chatItems}
-          activeId={displayedActiveThreadId}
-          onSelect={(threadId) => openThread(threadId)}
-          renameMaxLength={160}
-          onTogglePin={(threadId) => {
-            const thread = visibleThreads.find((item) => item.id === threadId);
-            if (thread) void pinThread(threadId, !thread.pinnedAt);
-          }}
-          onRename={handleRenameThread}
-          onDelete={(threadId) => void handleArchiveThread(threadId)}
-          labels={{
-            options: (item) =>
-              t("chat.optionsFor", { title: item.titleText ?? "" }),
-            renameInput: (item) =>
-              t("chat.renameThread", { title: item.titleText ?? "" }),
-            rename: t("chat.renameChat"),
-            pin: t("chat.pinChat"),
-            unpin: t("chat.unpinChat"),
-            delete: t("chat.archiveChat"),
-          }}
-          variant="rail"
-          className="min-w-0"
-        />
-      )}
+      <ChatHistoryRail
+        items={chatItems}
+        activeId={displayedActiveThreadId}
+        onSelect={(threadId) => openThread(threadId)}
+        onNewChat={() => void handleNewChat()}
+        railLabels={{
+          newChat: t("chat.newChat"),
+          showMore: t("chat.chats"),
+          showLess: t("chat.chats"),
+        }}
+        renameMaxLength={160}
+        onTogglePin={(threadId) => {
+          const thread = visibleThreads.find((item) => item.id === threadId);
+          if (thread) void pinThread(threadId, !thread.pinnedAt);
+        }}
+        onRename={handleRenameThread}
+        onDelete={(threadId) => void handleArchiveThread(threadId)}
+        labels={{
+          options: (item) =>
+            t("chat.optionsFor", { title: item.titleText ?? "" }),
+          renameInput: (item) =>
+            t("chat.renameThread", { title: item.titleText ?? "" }),
+          rename: t("chat.renameChat"),
+          pin: t("chat.pinChat"),
+          unpin: t("chat.unpinChat"),
+          delete: t("chat.archiveChat"),
+        }}
+        className="min-w-0"
+      />
     </div>
   );
 }
@@ -445,28 +436,13 @@ export function Sidebar({
           />
         </div>
 
-        <div
-          className={cn(
-            collapsed ? "flex justify-center px-1 py-1" : "px-3 py-2",
-          )}
-        >
-          <FeedbackButton
-            variant={collapsed ? "icon" : "sidebar"}
-            side="right"
-            align={collapsed ? "center" : "end"}
-          />
-        </div>
-
-        {collapseButton ? (
-          <div
-            className={cn(
-              collapsed
-                ? "flex justify-center px-1 py-1"
-                : "flex justify-end px-3 py-2",
-            )}
-          >
+        {!collapsed ? (
+          <div className="flex items-center justify-end gap-1 px-3 py-2">
+            <FeedbackButton className="min-w-0 flex-1" side="right" />
             {collapseButton}
           </div>
+        ) : collapseButton ? (
+          <div className="flex justify-center px-1 py-1">{collapseButton}</div>
         ) : null}
       </div>
     </aside>

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

@@ -1,7 +1,4 @@
-import {
-  isAgentChatHomeHandoffActive,
-  markAgentChatHomeHandoff,
-} from "@agent-native/core/client/agent-chat";
+import { markAgentChatHomeHandoff } from "@agent-native/core/client/agent-chat";
 import { appBasePath, appPath } from "@agent-native/core/client/api-path";
 import { useAgentRouteState } from "@agent-native/core/client/navigation";
 import { useLocation } from "react-router";
@@ -34,9 +31,7 @@ export function useNavigationState() {
         isChatPath(location.pathname) &&
         !isChatPath(pathnameFromPath(path))
       ) {
-        if (isAgentChatHomeHandoffActive("chat")) {
-          markAgentChatHomeHandoff("chat");
-        }
+        markAgentChatHomeHandoff("chat");
       }
     },
   });

package/src/templates/chat/app/routes/_index.tsx

@@ -36,6 +36,13 @@ export default function ChatRoute() {
   const { threadId } = useParams();
   const navigate = useNavigate();
   const t = useT();
+  const threadUrlSync = threadId
+    ? {
+        routeThreadId: threadId,
+        getPath: chatThreadPath,
+        navigate,
+      }
+    : undefined;
 
   useEffect(() => {
     function handleChatRunning(event: Event) {
@@ -56,11 +63,7 @@ export default function ChatRoute() {
         className="h-full"
         defaultMode="chat"
         storageKey="chat"
-        threadUrlSync={{
-          routeThreadId: threadId ?? null,
-          getPath: chatThreadPath,
-          navigate,
-        }}
+        threadUrlSync={threadUrlSync}
         browserTabId={TAB_ID}
         showHeader={false}
         showTabBar={false}

package/src/templates/chat/changelog/2026-07-22-compact-sidebar-footer.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-07-22
+---
+
+The sidebar footer now keeps Feedback and the collapse control on one compact row.

package/src/templates/chat/changelog/2026-07-22-full-page-chat-keeps-the-active-conversation-when-moving-to-.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-22
+---
+
+Full-page chat keeps the active conversation when moving to and from the sidebar.