@agent-native/core 0.216.0 → 0.218.0

package/dist/usage/actions/get-usage-metrics.js

@@ -17,7 +17,7 @@ function resolveAppSelection(app, appId) {
     return app;
 }
 export default defineAction({
-    description: 'Reports this workspace\'s own agent/LLM usage (Settings › Usage) for members of this organization only; it does NOT cover usage, credits, or activity of external customers, accounts, companies, or product usage, which belong to the app that owns that data (see <relevant-apps>, or search with describe-workspace-apps). Returns lookback totals, the daily trend (dailyBy feature, app, model and surface), top features, models, apps, chats and people, tool calls per day, and recent prompts, across every app unless app names one. Members see only their own usage; scope "workspace" (everyone in the organization) is for owners and admins. billing.unit identifies Builder.io credits, estimated dollars, mixed billing, or unknown.',
+    description: "Reports this workspace's own agent/LLM usage (Settings › Usage) for members of this organization only; it does NOT cover usage, credits, or activity of external customers, accounts, companies, or product usage, use this app's own customer or billing actions for those, or the app that owns that data (see <relevant-apps>, or search with describe-workspace-apps). Returns lookback totals, the daily trend (dailyBy feature, app, model and surface), top features, models, apps, chats and people, tool calls per day, and recent prompts, across every app unless app names one. Members see only their own usage; scope \"workspace\" (everyone in the organization) is for owners and admins. billing.unit identifies Builder.io credits, estimated dollars, mixed billing, or unknown.",
     http: { method: "GET" },
     schema: z.object({
         sinceDays: z.coerce.number().int().min(1).max(365).default(30),
@@ -56,10 +56,10 @@ export default defineAction({
                 ownerEmail: ctx.userEmail,
                 orgId: ctx.orgId,
             }))) {
-                fail("Only organization owners and admins can look up another person's usage with get-usage-metrics. Usage, credits, or activity for customers, accounts, or companies belongs to the app that owns that data (see <relevant-apps> or run describe-workspace-apps with a query).", { errorCode: "usage_user_lookup_forbidden", statusCode: 403 });
+                fail(`get-usage-metrics cannot answer this. For a teammate in this organization, only owners and admins can look up their usage. For a customer or other external user, get-usage-metrics has no data: use this app's own customer or billing actions if it has any, or find the app that owns that data with describe-workspace-apps query="<what you need>" and delegate with call-agent.`, { errorCode: "usage_user_lookup_forbidden", statusCode: 403 });
             }
             if (!(await isOrgMember(ctx.orgId, userEmail))) {
-                fail(`${userEmail} is not a member of this organization. get-usage-metrics only covers this workspace's own agent usage; usage, credits, or activity for customers, accounts, or companies belongs to the app that owns that data (see <relevant-apps> or run describe-workspace-apps with a query).`, { errorCode: "usage_user_not_org_member", statusCode: 404 });
+                fail(`${userEmail} is not a member of this organization, so get-usage-metrics has no data on them. For a customer's or account's usage or credits, use this app's own customer or billing actions if it has any, or find the app that owns that data with describe-workspace-apps query="<what you need>" and delegate with call-agent.`, { errorCode: "usage_user_not_org_member", statusCode: 404 });
             }
         }
         const selection = resolveAppSelection(app, appId);

package/docs/content/components.mdx

@@ -696,24 +696,25 @@ function WorkspaceResources() {
 
 ## Other Public UI {#other-ui}
 
-| Area           | APIs                                                                           | Import path                                |
-| -------------- | ------------------------------------------------------------------------------ | ------------------------------------------ |
-| Agent page     | `<AgentTabsPage>`                                                              | `@agent-native/toolkit/app/agent-page`     |
-| Blocks UI      | `BlockView`, `SchemaBlockEditor`, `BlockRegistryProvider`                      | `@agent-native/toolkit/app/blocks`         |
-| Canvas         | `DrawOverlay`, `CanvasCommentPins`                                             | `@agent-native/toolkit/canvas-annotations` |
-| Chat history   | `ChatHistoryList`, `ChatHistoryRail`                                           | `@agent-native/toolkit/chat-history`       |
-| Data grid      | `<DataGrid>`                                                                   | `@agent-native/toolkit/data-grid`          |
-| Dashboard      | `DataTable`, `DateRangePicker`, `GenericChartPanel`, `MetricCard`, `StatsCard` | `@agent-native/toolkit/dashboard`          |
-| Sharing        | `<ShareButton>`, `<ShareDialog>`                                               | `@agent-native/toolkit/app/sharing`        |
-| Sharing UI     | `<VisibilityBadge>`                                                            | `@agent-native/toolkit/sharing`            |
-| Notifications  | `<NotificationsBell>`                                                          | `@agent-native/toolkit/app/notifications`  |
-| Progress       | `<RunsTray>`                                                                   | `@agent-native/toolkit/app/progress`       |
-| Run registry   | Run types and server registry functions                                        | `@agent-native/core/progress`              |
-| Onboarding     | `useOnboarding()`, onboarding panel hooks                                      | `@agent-native/core/client/onboarding`     |
-| Observability  | `<ObservabilityDashboard>`, `<ThumbsFeedback>`                                 | `@agent-native/toolkit/app/observability`  |
-| Resources UI   | `<ResourcesPanel>`, `<ResourceTree>`, `<ResourceEditor>`                       | `@agent-native/toolkit/app/resources`      |
-| Resource hooks | Resource data hooks                                                            | `@agent-native/core/client/resources`      |
-| Rich editor    | `<SharedRichEditor>`, slash commands, block node hooks                         | `@agent-native/toolkit/editor`             |
+| Area            | APIs                                                                           | Import path                                        |
+| --------------- | ------------------------------------------------------------------------------ | -------------------------------------------------- |
+| Agent page      | `<AgentTabsPage>`                                                              | `@agent-native/toolkit/app/agent-page`             |
+| Blocks UI       | `BlockView`, `SchemaBlockEditor`, `BlockRegistryProvider`                      | `@agent-native/toolkit/app/blocks`                 |
+| Canvas          | `DrawOverlay`, `CanvasCommentPins`                                             | `@agent-native/toolkit/canvas-annotations`         |
+| Chat history    | `ChatHistoryList`, `ChatHistoryRail`                                           | `@agent-native/toolkit/chat-history`               |
+| Owned chat rail | `useOwnershipChatHistory()`, `OwnershipChatHistoryRail`                        | `@agent-native/toolkit/app/chat/ownership-history` |
+| Data grid       | `<DataGrid>`                                                                   | `@agent-native/toolkit/data-grid`                  |
+| Dashboard       | `DataTable`, `DateRangePicker`, `GenericChartPanel`, `MetricCard`, `StatsCard` | `@agent-native/toolkit/dashboard`                  |
+| Sharing         | `<ShareButton>`, `<ShareDialog>`                                               | `@agent-native/toolkit/app/sharing`                |
+| Sharing UI      | `<VisibilityBadge>`                                                            | `@agent-native/toolkit/sharing`                    |
+| Notifications   | `<NotificationsBell>`                                                          | `@agent-native/toolkit/app/notifications`          |
+| Progress        | `<RunsTray>`                                                                   | `@agent-native/toolkit/app/progress`               |
+| Run registry    | Run types and server registry functions                                        | `@agent-native/core/progress`                      |
+| Onboarding      | `useOnboarding()`, onboarding panel hooks                                      | `@agent-native/core/client/onboarding`             |
+| Observability   | `<ObservabilityDashboard>`, `<ThumbsFeedback>`                                 | `@agent-native/toolkit/app/observability`          |
+| Resources UI    | `<ResourcesPanel>`, `<ResourceTree>`, `<ResourceEditor>`                       | `@agent-native/toolkit/app/resources`              |
+| Resource hooks  | Resource data hooks                                                            | `@agent-native/core/client/resources`              |
+| Rich editor     | `<SharedRichEditor>`, slash commands, block node hooks                         | `@agent-native/toolkit/editor`                     |
 
 ## One-Off Text Completion {#one-off-text-completion}
 

package/docs/content/deployment-environment-variables.mdx

@@ -20,7 +20,7 @@ hosting behavior.
 | `APP_URL`                                   | Optional canonical public origin. Checked ahead of `BETTER_AUTH_URL` when resolving the A2A JWT audience, the OAuth public origin, self-dispatch webhook targets, and generated resource links. Set it explicitly on preview/staging deploys where the request host is unreliable.                                                                                      |
 | `AGENT_PROD_CODE_EXECUTION`                 | Optional production code-execution mode: `off` (default), `sandboxed`, or `trusted`. See [Production Code Execution](/docs/actions-agent-tools#production-code-execution).                                                                                                                                                                                              |
 | `AGENT_NATIVE_SSR_CACHE`                    | Deployment-wide SSR shell cache policy: unset/`on` keeps the default hard-cache, `off` sends `no-store`, or a duration such as `30s` / `5m` sets a shorter freshness. See [SSR Caching](/docs/ssr-caching).                                                                                                                                                             |
-| `AGENT_NATIVE_HEAD_SCRIPT_SRC`              | Optional HTTPS URL of a script loaded with `defer` in the `<head>` of every server-rendered page. Use it for deployment-specific tooling such as an internal feedback widget, without changing app source. Non-HTTPS URLs fail config validation.                                                                                                                       |
+| `AGENT_NATIVE_HEAD_SCRIPT_SRC`              | Optional HTTPS URL of a script added to the `<head>` of every server-rendered page. Where the consent banner shows, it waits for analytics consent, like Google Analytics. Use it for deployment-specific tooling such as an internal feedback widget, without changing app source. Non-HTTPS URLs fail config validation.                                              |
 | `AGENT_NATIVE_ENABLE_KEEP_WARM`             | Opt into the Netlify keep-warm scheduled function. Unset by default. See [Keep-warm](/docs/netlify#netlify-keep-warm).                                                                                                                                                                                                                                                  |
 | `AGENT_NATIVE_DISABLE_KEEP_WARM`            | Compatibility kill switch for the Netlify keep-warm scheduled function. See [Keep-warm](/docs/netlify#netlify-keep-warm).                                                                                                                                                                                                                                               |
 | `AGENT_NATIVE_KEEP_WARM_SCHEDULE`           | Override the keep-warm cadence with a 5-field cron expression (default `* * * * *` when enabled). An unparseable value fails the build. See [Keep-warm](/docs/netlify#netlify-keep-warm).                                                                                                                                                                               |

package/docs/content/environment-variables.mdx

@@ -95,7 +95,7 @@ public app behavior, use the config paths above instead.
 | `ACCESS_TOKEN` / `ACCESS_TOKENS`               | Static bearer fallback for MCP and Connect clients.                                                                                                                            | One token or a delimited token list; these are not browser auth.                                                        |
 | `AGENT_PROD_CODE_EXECUTION`                    | Production code-execution policy.                                                                                                                                              | `off`, `sandboxed`, or `trusted`. See [Production Code Execution](/docs/actions-agent-tools#production-code-execution). |
 | `AGENT_NATIVE_SSR_CACHE`                       | Deployment-wide public SSR shell cache policy.                                                                                                                                 | Unset/`on`, `off`, or a duration such as `30s` or `5m`. See [SSR Caching](/docs/ssr-caching).                           |
-| `AGENT_NATIVE_HEAD_SCRIPT_SRC`                 | Extra script injected into every server-rendered page head with `defer`.                                                                                                       | An absolute `https://` URL; non-HTTPS values fail config validation.                                                    |
+| `AGENT_NATIVE_HEAD_SCRIPT_SRC`                 | Extra script added to every server-rendered page head. Where the consent banner shows, it waits for analytics consent, like Google Analytics.                                  | An absolute `https://` URL; non-HTTPS values fail config validation.                                                    |
 | `AGENT_NATIVE_ENABLE_KEEP_WARM`                | Opts into the Netlify keep-warm scheduled function; unset by default.                                                                                                          | `1`; see [Keep-warm](/docs/netlify#netlify-keep-warm).                                                                  |
 | `AGENT_NATIVE_DISABLE_KEEP_WARM`               | Compatibility kill switch for the Netlify keep-warm scheduled function.                                                                                                        | `1`; see [Keep-warm](/docs/netlify#netlify-keep-warm).                                                                  |
 | `AGENT_NATIVE_KEEP_WARM_SCHEDULE`              | Keep-warm cadence override when enabled.                                                                                                                                       | A 5-field cron expression such as `*/5 * * * *`; an unparseable value fails the build.                                  |

package/docs/content/sharing.mdx

@@ -194,6 +194,10 @@ const shared = useChatThreadList({ ownership: "shared", pageSize: 50 });
 
 A failed request sets `error` and keeps the rows already loaded. It never looks like an empty list. `<ShareButton>` and `<ShareDialog>` refresh mounted chat lists after they save. If you change a chat's sharing some other way, call `notifyChatThreadsUpdated()` so mounted lists refetch.
 
+For a ready-made sidebar that combines owned chats, shared chats, and eligible started drafts, import `useOwnershipChatHistory()` and `OwnershipChatHistoryRail` from `@agent-native/toolkit/app/chat/ownership-history`. The adapter keeps owner and access-basis details on shared rows, pages each section independently, and retains rows and local optimistic changes when a refresh fails. Its mutation callbacks return `Promise<boolean>`, allowing the app to navigate only after a write succeeds. See [Sharing Kit](/docs/toolkit-sharing#shared-chat-history) for an example.
+
+An active empty draft remains selectable and runnable while its first save is pending. Until persistence is confirmed, hide pin, rename, and archive actions, and the adapter rejects calls to those callbacks. `ownDraftRows` supplies persistence provenance for owned drafts, while confirmed owned rows from the server list keep their normal actions. For custom `OwnDraftRow` values, set optional `persisted?: boolean` to `true` only for a confirmed persisted server row owned by the current user. Do not infer persistence from message count or active ID. Role, privacy, and whether the active draft is empty remain separate facts.
+
 ## Same model, agent and UI {#agent-and-ui}
 
 The framework auto-mounts these actions in every template — the agent calls them as tools, and the UI calls them through `useActionQuery` / `useActionMutation`:

package/docs/content/toolkit-sharing.mdx

@@ -138,66 +138,46 @@ tokens that back agent-readable public surfaces.
 
 ## Shared chat history {#shared-chat-history}
 
-`@agent-native/toolkit/chat-history` renders the chat sidebar. Core supplies the
-rows and Toolkit renders them, so an app can show My chats and Shared with you
-as separate sections. See [Sharing & Privacy](/docs/sharing#shared-chats) for
-the `ownership` filter and the `ownerEmail` and `accessBasis` fields.
-
-`<ChatHistoryRail>` accepts `sections` as well as a flat `items` list. Each
-section previews five rows and has its own **Show all** and **Show less**
-control, loading, error, and empty states, and optional load-more:
+`@agent-native/toolkit/chat-history` provides the presentational rail. For an app sidebar backed by Core chat ownership and lifecycle behavior, use the focused adapter at `@agent-native/toolkit/app/chat/ownership-history`:
 
 ```tsx
-import { ChatHistoryRail } from "@agent-native/toolkit/chat-history";
-import { useChatThreadList } from "@agent-native/core/client";
-
-const mine = useChatThreadList({ ownership: "mine" });
-const shared = useChatThreadList({ ownership: "shared" });
+import {
+  ownDraftRows,
+  OwnershipChatHistoryRail,
+  useOwnershipChatHistory,
+} from "@agent-native/toolkit/app/chat/ownership-history";
+import { useChatThreads } from "@agent-native/core/client/agent-chat";
+
+const { threads, isNewThread, pinThread, renameThread, archiveThread } =
+  useChatThreads(undefined, CHAT_STORAGE_KEY, null, { autoCreate: false });
+
+const history = useOwnershipChatHistory({
+  apiUrl,
+  scope: { type: "workspace", id: workspaceId },
+  activeId: activeThreadId,
+  pinned: true,
+  localMineRows: ownDraftRows({ threads, isNewThread }),
+  mutations: {
+    pin: pinThread,
+    rename: renameThread,
+    archive: archiveThread,
+  },
+});
 
-<ChatHistoryRail
+<OwnershipChatHistoryRail
+  {...history}
+  activeId={activeThreadId}
   onNewChat={startChat}
-  railLabels={{
-    newChat: t("newChat"),
-    showMore: t("showMore"),
-    showLess: t("showLess"),
-    sections: {
-      showAll: t("showAll"),
-      showLess: t("showLess"),
-      loadMore: t("loadMore"),
-      loadingMore: t("loadingMore"),
-      retry: t("retry"),
-    },
-  }}
-  sections={[
-    { id: "mine", label: t("myChats"), items: toItems(mine.threads) },
-    {
-      id: "shared",
-      label: t("sharedWithYou"),
-      items: toItems(shared.threads),
-      hasMore: shared.hasMore,
-      loadingMore: shared.loadingMore,
-      onLoadMore: shared.loadMore,
-      loading: shared.loading,
-      error: shared.error ? t("loadFailed") : undefined,
-      onRetry: shared.refresh,
-    },
-  ]}
+  onSelect={selectThread}
+  showNewChat={false}
 />;
 ```
 
-With `sections`, `railLabels.sections` is required and has no defaults. Pass
-`showAll`, `showLess`, `loadMore`, `loadingMore`, and `retry` as translated text,
-and override them per section with `section.labels` when needed.
+`useOwnershipChatHistory()` requests owned and shared rows from Core before paging. It keeps owner and access basis on shared rows. When pinned grouping is enabled with `pinned: true`, it separates pinned chats from the viewer's other owned chats. Started drafts are not inferred automatically. If the app has local lifecycle data, pass `localMineRows: ownDraftRows({ threads, isNewThread })` to include started drafts proven to belong to the current user. The rail previews five rows in each section, supports Show all and independent paging, and keeps loaded rows visible when a section request fails. Retry preserves local changes until a successful authoritative refresh can reconcile them.
 
-Show all reveals the rows already loaded. When the server has more, a disclosed
-section also offers Load more. A failed load shows above the rows that already
-loaded, so it never reads as an empty section.
+The adapter supplies localized section labels. `railLabels` may override `newChat`, `showMore`, or `showLess` individually. `onNewChat` and `onSelect` are required. Pass `activeId` to both the hook and rail. Mutation callbacks return `Promise<boolean>` so failed writes can roll back without navigating away from the active chat.
 
-Rows can show who owns a chat and why the viewer can see it. Set `ownerLabel`,
-`accessLabel`, and `accessBasis` on a `ChatHistoryItem`. The app passes
-translated text, because the Toolkit list ships none. Shared rows should show a
-direct grant over organization access when both apply, which is how Core
-reports `accessBasis`.
+For custom layouts, use `chatThreadToHistoryItem()` to convert a Core row and `ownDraftRows()` to derive eligible started drafts. `ChatHistoryRail` remains available when an app already owns its data and lifecycle logic. See [Sharing & Privacy](/docs/sharing#shared-chats) for ownership filters and access fields.
 
 ## What's next
 

package/migration-manifest.json

@@ -3330,7 +3330,7 @@
       "to": "@agent-native/core/client/sharing",
       "symbols": {
         "VisibilityBadge": {
-          "to": "@agent-native/toolkit/sharing"
+          "to": "@agent-native/toolkit/app/sharing"
         },
         "ShareButton": {
           "to": "@agent-native/toolkit/app/sharing"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.216.0",
+  "version": "0.218.0",
   "description": "The agentic application framework for building autonomous agents with intuitive UIs",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -552,6 +552,7 @@
     "./client/onboarding/first-run-registry": "./dist/client/onboarding/first-run-registry.js",
     "./client/onboarding/first-run-status": "./dist/client/onboarding/first-run-status.js",
     "./client/onboarding/use-onboarding": "./dist/client/onboarding/use-onboarding.js",
+    "./client/onboarding/use-onboarding-checklist": "./dist/client/onboarding/use-onboarding-checklist.js",
     "./client/onboarding/use-preview-mode": "./dist/client/onboarding/use-preview-mode.js",
     "./client/org/hooks": "./dist/client/org/hooks.js",
     "./client/resources/mcp-connection-resume": "./dist/client/resources/mcp-connection-resume.js",
@@ -601,6 +602,7 @@
     "./notifications/types": "./dist/notifications/types.js",
     "./observability/types": "./dist/observability/types.js",
     "./onboarding/types": "./dist/onboarding/types.js",
+    "./onboarding/status": "./dist/onboarding/status.js",
     "./onboarding/workspace-services": "./dist/onboarding/workspace-services.js",
     "./onboarding/app-profile-data": "./dist/onboarding/app-profile-data.js",
     "./org/app-roles": "./dist/org/app-roles.js",
@@ -728,8 +730,8 @@
     "yaml": "^2.9.0",
     "yjs": "^13.6.33",
     "zod": "^4.3.6",
-    "@agent-native/agentkit": "^0.216.0",
-    "@agent-native/recap-cli": "^0.5.85"
+    "@agent-native/recap-cli": "^0.5.87",
+    "@agent-native/agentkit": "^0.218.0"
   },
   "devDependencies": {
     "@ai-sdk/anthropic": "^3.0.71",

package/src/templates/builder-code-starter/template-layer.json

@@ -9,6 +9,7 @@
     "app/components/layout/AgentInspector.test.tsx",
     "app/components/layout/AgentInspector.tsx",
     "app/components/layout/Header.tsx",
+    "app/components/layout/Sidebar.spec.tsx",
     "app/components/layout/Sidebar.tsx",
     "app/i18n",
     "app/i18n-data.ts",

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

@@ -1,3 +1,4 @@
+import { appPath } from "@agent-native/core/client/api-path";
 import { useT } from "@agent-native/core/client/i18n";
 import {
   navigateWithAgentChatViewTransition,
@@ -5,14 +6,15 @@ import {
   useChatThreads,
   type ChatThreadSummary,
 } from "@agent-native/toolkit/app/chat/agentkit-chat/rail";
+import {
+  ownDraftRows,
+  OwnershipChatHistoryRail,
+  useOwnershipChatHistory,
+  type OwnDraftRow,
+} from "@agent-native/toolkit/app/chat/ownership-history";
 import { OrgSwitcher } from "@agent-native/toolkit/app/org";
 import { openCommandMenu } from "@agent-native/toolkit/app/shared";
 import { AgentNativeIcon } from "@agent-native/toolkit/app/shared/AgentNativeIcon";
-import {
-  ChatHistoryList,
-  type ChatHistoryItem,
-  type ChatHistorySection,
-} from "@agent-native/toolkit/chat-history/ChatHistoryList";
 import {
   IconApps,
   IconClock,
@@ -25,7 +27,7 @@ import {
   IconPin,
   IconSearch,
 } from "@tabler/icons-react";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Link, useLocation, useNavigate } from "react-router";
 import { toast } from "sonner";
 
@@ -41,7 +43,6 @@ import {
 } from "@/components/ui/tooltip";
 import { APP_TITLE } from "@/lib/app-config";
 import { chatThreadPath, HOME_PATH, threadIdFromPath } from "@/lib/chat-paths";
-import { visibleChatThreads } from "@/lib/sidebar-thread-state";
 import { cn } from "@/lib/utils";
 
 const CHAT_STORAGE_KEY = "chat";
@@ -53,11 +54,9 @@ interface SidebarProps {
   onCollapsedChange?: (collapsed: boolean) => void;
 }
 
-function threadTitle(thread: ChatThreadSummary, untitledLabel: string) {
-  return thread.title || untitledLabel;
-}
-
-function threadUpdatedAt(thread: ChatThreadSummary) {
+function threadUpdatedAt(
+  thread: Pick<ChatThreadSummary, "createdAt" | "updatedAt">,
+) {
   return Number.isFinite(thread.updatedAt)
     ? thread.updatedAt
     : Number.isFinite(thread.createdAt)
@@ -65,14 +64,6 @@ function threadUpdatedAt(thread: ChatThreadSummary) {
       : 0;
 }
 
-function compareRecentThreads(a: ChatThreadSummary, b: ChatThreadSummary) {
-  return threadUpdatedAt(b) - threadUpdatedAt(a);
-}
-
-function comparePinnedThreads(a: ChatThreadSummary, b: ChatThreadSummary) {
-  return (b.pinnedAt ?? 0) - (a.pinnedAt ?? 0);
-}
-
 function formatRelativeTime(timestamp: number) {
   const elapsed = timestamp - Date.now();
   const intervals = [
@@ -106,7 +97,10 @@ function ThreadHistoryTitle({
   title,
   running,
 }: {
-  thread: ChatThreadSummary;
+  thread: OwnDraftRow &
+    Partial<
+      Pick<ChatThreadSummary, "preview" | "scope" | "source" | "pinnedAt">
+    >;
   title: string;
   running: boolean;
 }) {
@@ -287,7 +281,7 @@ function ChatThreadsSection({ collapsed }: { collapsed: boolean }) {
     pinThread,
     archiveThread,
     renameThread,
-    refreshThreads,
+    isNewThread,
   } = useChatThreads(undefined, CHAT_STORAGE_KEY, undefined, {
     autoCreate: false,
     restoreActiveThread: false,
@@ -295,66 +289,46 @@ function ChatThreadsSection({ collapsed }: { collapsed: boolean }) {
   const { workingThreadIds, observedThreadStarts } =
     useAgentChatRunningThreads();
 
-  const visibleThreads = useMemo(
-    () => visibleChatThreads(threads, observedThreadStarts),
-    [observedThreadStarts, threads],
-  );
-  const displayedActiveThreadId =
-    threadIdFromPath(location.pathname) ??
-    activeThreadId ??
-    persistedActiveThreadId();
-
-  const historySections = useMemo<ChatHistorySection[]>(() => {
-    const untitledLabel = t("chat.untitledChat");
-    const toItem = (thread: ChatThreadSummary): ChatHistoryItem => {
-      const title = threadTitle(thread, untitledLabel);
+  const localMineRows = ownDraftRows({
+    threads,
+    isNewThread,
+    observedThreadStarts,
+  });
+  const history = useOwnershipChatHistory({
+    getThreadUrl: (threadId) => appPath(chatThreadPath(threadId)),
+    activeId:
+      threadIdFromPath(location.pathname) ??
+      activeThreadId ??
+      persistedActiveThreadId(),
+    localMineRows,
+    pinned: { label: t("chat.pinned") },
+    mutations: {
+      pin: pinThread,
+      rename: renameThread,
+      archive: archiveThread,
+    },
+    onMutationFailed: (kind) => {
+      if (kind === "archive") toast.error(t("chat.archiveFailed"));
+      if (kind === "rename") toast.error(t("chat.renameFailed"));
+    },
+    decorateItem: (item, row) => {
+      const title = row.title || row.preview || t("chat.untitledChat");
       return {
-        id: thread.id,
+        ...item,
         title: (
           <ThreadHistoryTitle
-            thread={thread}
+            thread={row}
             title={title}
-            running={workingThreadIds.has(thread.id)}
+            running={workingThreadIds.has(row.id)}
           />
         ),
-        titleText: title,
-        pinned: Boolean(thread.pinnedAt),
       };
-    };
-    const pinned = visibleThreads
-      .filter((thread) => Boolean(thread.pinnedAt))
-      .sort(comparePinnedThreads)
-      .map(toItem);
-    const recent = visibleThreads
-      .filter((thread) => !thread.pinnedAt)
-      .sort(compareRecentThreads)
-      .slice(0, 30)
-      .map(toItem);
-
-    return [
-      { id: "pinned", label: t("chat.pinned"), items: pinned },
-      { id: "recents", label: t("chat.recents"), items: recent },
-    ];
-  }, [t, visibleThreads, workingThreadIds]);
-
-  useEffect(() => {
-    const refresh = () => refreshThreads();
-    const handleRunning = (event: Event) => {
-      const detail = (event as CustomEvent).detail as
-        | { isRunning?: unknown }
-        | undefined;
-      if (typeof detail?.isRunning === "boolean") refreshThreads();
-    };
-
-    window.addEventListener("agent-chat:threads-updated", refresh);
-    window.addEventListener("agentNative.chatRunning", handleRunning);
-    window.addEventListener("focus", refresh);
-    return () => {
-      window.removeEventListener("agent-chat:threads-updated", refresh);
-      window.removeEventListener("agentNative.chatRunning", handleRunning);
-      window.removeEventListener("focus", refresh);
-    };
-  }, [refreshThreads]);
+    },
+  });
+  const displayedActiveThreadId =
+    threadIdFromPath(location.pathname) ??
+    activeThreadId ??
+    persistedActiveThreadId();
 
   function openThread(threadId: string, options?: { isNew?: boolean }) {
     switchThread(threadId);
@@ -382,23 +356,6 @@ function ChatThreadsSection({ collapsed }: { collapsed: boolean }) {
     if (threadId) openThread(threadId, { isNew: true });
   }
 
-  async function handleArchiveThread(threadId: string) {
-    const wasActive =
-      threadId === activeThreadId || threadId === persistedActiveThreadId();
-    const archived = await archiveThread(threadId);
-    if (!archived) {
-      toast.error(t("chat.archiveFailed"));
-      return;
-    }
-    if (wasActive) await handleNewChat();
-  }
-
-  function handleRenameThread(threadId: string, title: string) {
-    void renameThread(threadId, title).then((renamed) => {
-      if (!renamed) toast.error(t("chat.renameFailed"));
-    });
-  }
-
   const newChatButton = (
     <button
       type="button"
@@ -430,17 +387,20 @@ function ChatThreadsSection({ collapsed }: { collapsed: boolean }) {
   return (
     <div className="flex min-h-0 flex-1 flex-col">
       <div className="px-2 pb-3">{newChatButton}</div>
-      <ChatHistoryList
-        sections={historySections}
+      <OwnershipChatHistoryRail
+        {...history}
+        onNewChat={() => void handleNewChat()}
+        showNewChat={false}
         activeId={displayedActiveThreadId}
         onSelect={openThread}
-        onTogglePin={(threadId) => {
-          const thread = visibleThreads.find((item) => item.id === threadId);
-          if (thread) void pinThread(threadId, !thread.pinnedAt);
+        onDelete={async (threadId) => {
+          const wasActive =
+            threadId === activeThreadId ||
+            threadId === persistedActiveThreadId();
+          const archived = await history.listProps.onDelete?.(threadId);
+          if (archived && wasActive) await handleNewChat();
         }}
-        onRename={handleRenameThread}
         renameMaxLength={160}
-        onDelete={(threadId) => void handleArchiveThread(threadId)}
         labels={{
           options: (item) =>
             t("chat.optionsFor", { title: item.titleText ?? "" }),
@@ -451,8 +411,9 @@ function ChatThreadsSection({ collapsed }: { collapsed: boolean }) {
           unpin: t("chat.unpinChat"),
           delete: t("chat.archiveChat"),
         }}
-        variant="rail"
-        emptyLabel={null}
+        railLabels={{
+          newChat: t("chat.newChat"),
+        }}
         className="chat-sidebar-history min-h-0 flex-1"
         listClassName="pb-4"
       />

package/dist/templates/chat/app/lib/sidebar-thread-state.ts

@@ -1,29 +0,0 @@
-import type { ChatThreadSummary } from "@agent-native/toolkit/app/chat/agentkit-chat/index";
-
-export function visibleChatThreads(
-  threads: ChatThreadSummary[],
-  observedThreadStarts: ReadonlyMap<string, number>,
-): ChatThreadSummary[] {
-  const knownIds = new Set(threads.map((thread) => thread.id));
-  const optimistic: ChatThreadSummary[] = [...observedThreadStarts].flatMap(
-    ([id, startedAt]) =>
-      knownIds.has(id)
-        ? []
-        : [
-            {
-              id,
-              title: "",
-              preview: "",
-              messageCount: 0,
-              createdAt: startedAt,
-              updatedAt: startedAt,
-              scope: null,
-            },
-          ],
-  );
-  return [...threads, ...optimistic].filter(
-    (thread) =>
-      !thread.archivedAt &&
-      (thread.messageCount > 0 || observedThreadStarts.has(thread.id)),
-  );
-}

package/src/templates/chat/app/lib/sidebar-thread-state.ts

@@ -1,29 +0,0 @@
-import type { ChatThreadSummary } from "@agent-native/toolkit/app/chat/agentkit-chat/index";
-
-export function visibleChatThreads(
-  threads: ChatThreadSummary[],
-  observedThreadStarts: ReadonlyMap<string, number>,
-): ChatThreadSummary[] {
-  const knownIds = new Set(threads.map((thread) => thread.id));
-  const optimistic: ChatThreadSummary[] = [...observedThreadStarts].flatMap(
-    ([id, startedAt]) =>
-      knownIds.has(id)
-        ? []
-        : [
-            {
-              id,
-              title: "",
-              preview: "",
-              messageCount: 0,
-              createdAt: startedAt,
-              updatedAt: startedAt,
-              scope: null,
-            },
-          ],
-  );
-  return [...threads, ...optimistic].filter(
-    (thread) =>
-      !thread.archivedAt &&
-      (thread.messageCount > 0 || observedThreadStarts.has(thread.id)),
-  );
-}