@agent-native/core 0.217.0 → 0.218.0

package/dist/automation/index.d.ts

@@ -139,8 +139,8 @@ export declare function createAutomationCallbackHandler(runtime: AutomationRunti
     duplicate?: undefined;
     eventId?: undefined;
 } | {
+    error?: undefined;
     accepted: boolean;
     duplicate: boolean;
     eventId: string;
-    error?: undefined;
 }>;

package/dist/client/agent-chat/index.d.ts

@@ -19,7 +19,7 @@ export { AGENT_NATIVE_MCP_APP_HOST_MESSAGE_TYPES, getMcpAppHostContext, initiali
 export { buildDynamicAgentSuggestions, dedupeSuggestions, mergeAgentSuggestions, normalizeAgentDynamicSuggestionsConfig, useAgentDynamicSuggestions, useAgentDynamicSuggestionsResult, type AgentDynamicSuggestionContext, type AgentDynamicSuggestionsConfig, type AgentDynamicSuggestionsOption, } from "../dynamic-suggestions.js";
 export { clearChatStorage } from "../chat/storage.js";
 export { isAssistantChatHistoryVersion, coerceAssistantChatHistoryDate, type AssistantChatHistoryDate, type AssistantChatHistoryVersion, } from "../chat/assistant-chat-history-version.js";
-export { ChatThreadListConfigError, useChatThreadList, type UseChatThreadListOptions, type UseChatThreadListResult, } from "../use-chat-thread-list.js";
+export { ChatThreadListConfigError, useChatThreadList, type UseChatThreadListOptions, type UseChatThreadListResult, type ChatThreadListRefreshOutcome, } from "../use-chat-thread-list.js";
 export { ChatThreadListError, fetchChatThreadListPage, notifyChatThreadsUpdated, useChatThreads, type ChatThreadAccessBasis, type ChatThreadListPage, type ChatThreadListRow, type ChatThreadListPageRequest, type ChatThreadOwnership, type ChatThreadVisibility, type ChatThreadScope, type ChatThreadSnapshot, type ChatThreadSummary, type ChatThreadData, type ChatThreadShareLink, type ChatThreadShareState, type UseChatThreadsOptions, } from "../use-chat-threads.js";
 export { type AgentCallProgress, type ContentPart, } from "../sse-event-processor.js";
 export { useRunStuckDetection, useAbortRun, type RunStuckState, type UseRunStuckDetectionOptions, } from "../use-run-stuck-detection.js";

package/dist/client/use-chat-thread-list.d.ts

@@ -16,6 +16,7 @@ export interface UseChatThreadListOptions {
     refreshOnThreadUpdates?: boolean;
     apiUrl?: string;
 }
+export type ChatThreadListRefreshOutcome = "success" | "error" | "superseded" | "disabled";
 export interface UseChatThreadListResult {
     threads: ChatThreadListRow[];
     /** True until the first page of the current list settles. */
@@ -27,6 +28,8 @@ export interface UseChatThreadListResult {
     hasMore: boolean;
     loadMore: () => Promise<void>;
     refresh: () => Promise<void>;
+    /** Reports whether this invocation applied the complete refreshed window. */
+    refreshWithResult: () => Promise<ChatThreadListRefreshOutcome>;
 }
 /** `pageSize` is not an integer between 1 and the server's page cap. */
 export declare class ChatThreadListConfigError extends Error {

package/dist/client/use-chat-thread-list.js

@@ -116,7 +116,7 @@ export function useChatThreadList(options) {
     // rows and offset already on screen untouched.
     const replace = useCallback(async (window) => {
         if (!session.active)
-            return;
+            return "superseded";
         const requestId = ++session.requestId;
         const isCurrent = () => session.active && requestId === session.requestId;
         session.inFlight = "replace";
@@ -131,7 +131,7 @@ export function useChatThreadList(options) {
                     limit: Math.min(CHAT_THREADS_MAX_PAGE_SIZE, window - consumed),
                 });
                 if (!isCurrent())
-                    return;
+                    return "superseded";
                 for (const thread of page.threads) {
                     if (!rows.has(thread.id))
                         rows.set(thread.id, thread);
@@ -142,11 +142,13 @@ export function useChatThreadList(options) {
             session.nextOffset = consumed;
             session.hasMore = more;
             update({ threads: [...rows.values()], hasMore: more, error: null });
+            return "success";
         }
         catch (failure) {
             if (!isCurrent())
-                return;
+                return "superseded";
             update({ error: asError(failure) });
+            return "error";
         }
         finally {
             if (isCurrent()) {
@@ -155,13 +157,18 @@ export function useChatThreadList(options) {
             }
         }
     }, [request, session, update]);
-    const refresh = useCallback(async () => {
+    const refreshWithResult = useCallback(async () => {
+        if (!session.active)
+            return "superseded";
         if (!enabled)
-            return;
+            return "disabled";
         // Reload every row already on screen so a mutation does not collapse a
         // list the person has paged through.
-        await replace(Math.max(pageSize, session.nextOffset));
+        return replace(Math.max(pageSize, session.nextOffset));
     }, [enabled, pageSize, replace, session]);
+    const refresh = useCallback(async () => {
+        await refreshWithResult();
+    }, [refreshWithResult]);
     const loadMore = useCallback(async () => {
         if (!session.active || session.inFlight || !session.hasMore)
             return;
@@ -216,5 +223,14 @@ export function useChatThreadList(options) {
         return () => window.removeEventListener(CHAT_THREADS_UPDATED_EVENT, onUpdated);
     }, [enabled, refresh, refreshOnThreadUpdates]);
     const { threads, loading, loadingMore, error, hasMore } = state;
-    return { threads, loading, loadingMore, error, hasMore, loadMore, refresh };
+    return {
+        threads,
+        loading,
+        loadingMore,
+        error,
+        hasMore,
+        loadMore,
+        refresh,
+        refreshWithResult,
+    };
 }

package/dist/collab/routes.d.ts

@@ -16,9 +16,9 @@ export declare const postCollabUpdate: import("h3").EventHandlerWithFetch<import
     error: string;
     ok?: undefined;
 } | {
+    error?: undefined;
     liveCopy: "derived" | "not_derived" | "unchanged";
     liveCopyReason?: string;
-    error?: undefined;
     ok: boolean;
 } | {
     error?: undefined;

package/dist/collab/struct-routes.d.ts

@@ -1,6 +1,6 @@
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/jobs/actions/manage-recurring-job.d.ts

@@ -13,10 +13,10 @@ declare const _default: import("../../action.js").ActionDefinition<{
     enabled?: undefined;
     nextRun?: undefined;
 } | {
+    deleted?: undefined;
     resourceId: string;
     name: string;
     enabled: boolean;
     nextRun: string;
-    deleted?: undefined;
 }>;
 export default _default;

package/dist/notifications/routes.d.ts

@@ -1,13 +1,13 @@
 export declare function createNotificationsHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<"" | import("./types.js").Notification[] | {
     count: number;
     updated?: undefined;
-    ok?: undefined;
     error?: undefined;
+    ok?: undefined;
 } | {
     count?: undefined;
     updated: number;
-    ok?: undefined;
     error?: undefined;
+    ok?: undefined;
 } | {
     count?: undefined;
     updated?: undefined;
@@ -16,6 +16,6 @@ export declare function createNotificationsHandler(): import("h3").EventHandlerW
 } | {
     count?: undefined;
     updated?: undefined;
-    ok: boolean;
     error?: undefined;
+    ok: boolean;
 }>>;

package/dist/observability/routes.d.ts

@@ -33,27 +33,27 @@ export declare function createObservabilityHandler(): import("h3").EventHandlerW
     summary?: undefined;
     spans?: undefined;
 } | {
+    error?: undefined;
     ok?: undefined;
     message?: undefined;
     summary: import("./types.js").TraceSummary;
     spans: import("./types.js").TraceSpan[];
-    error?: undefined;
 } | {
+    error?: undefined;
     ok?: undefined;
     message?: undefined;
     summary?: undefined;
     spans?: undefined;
     traceMissing: true;
     id: string;
-    error?: undefined;
 } | {
+    error?: undefined;
     ok?: undefined;
     message?: undefined;
     summary?: undefined;
     spans?: undefined;
     traceMissing?: undefined;
     id: string;
-    error?: undefined;
 } | {
     ok?: undefined;
     message?: undefined;
@@ -61,9 +61,9 @@ export declare function createObservabilityHandler(): import("h3").EventHandlerW
     spans?: undefined;
     error: any;
 } | {
+    error?: undefined;
     message?: undefined;
     summary?: undefined;
     spans?: undefined;
     ok: boolean;
-    error?: undefined;
 }>>;

package/dist/secrets/routes.d.ts

@@ -57,39 +57,39 @@ export declare function createWriteSecretHandler(): import("h3").EventHandlerWit
 } | {
     error: string;
     errorCode?: undefined;
-    status?: undefined;
     ok?: undefined;
+    status?: undefined;
 } | {
     error: string;
     errorCode: string;
-    status?: undefined;
     ok?: undefined;
+    status?: undefined;
 } | {
+    error?: undefined;
     errorCode?: undefined;
     ok: boolean;
     status: string;
-    error?: undefined;
 } | {
+    ok?: undefined;
     error: string;
     removed?: undefined;
-    ok?: undefined;
 } | {
+    error?: undefined;
     ok: boolean;
     removed: boolean;
-    error?: undefined;
 }>>;
 export declare function createTestSecretHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
+    ok?: undefined;
     error: string;
     note?: undefined;
-    ok?: undefined;
 } | {
+    error?: undefined;
     ok: boolean;
     note?: undefined;
-    error?: undefined;
 } | {
+    error?: undefined;
     ok: boolean;
     note: string;
-    error?: undefined;
 } | {
     note?: undefined;
     ok: boolean;
@@ -117,11 +117,11 @@ export declare function createAdHocSecretHandler(): import("h3").EventHandlerWit
 } | {
     error: string;
 } | {
+    error?: undefined;
     ok: boolean;
     key: string;
-    error?: undefined;
 } | {
+    error?: undefined;
     ok: boolean;
     removed: boolean;
-    error?: undefined;
 }>>;

package/dist/server/agent-engine-api-key-route.d.ts

@@ -67,12 +67,12 @@ export declare function createAgentEngineApiKeyHandler(): import("h3").EventHand
     code: any;
 } | {
     errorCode?: undefined;
+    error?: undefined;
     code?: undefined;
     ok: boolean;
     key: string;
     baseUrlKey?: string;
     scope: AgentEngineApiKeyScope;
     defaultModel?: import("./agent-engine-default-model-route.js").SavedKeyDefaultModelOutcome;
-    error?: undefined;
 }>>;
 export {};

package/dist/server/agent-engine-default-model-route.d.ts

@@ -16,9 +16,9 @@ export declare function createAgentEngineDisconnectHandler(): import("h3").Event
     error: any;
     scope?: undefined;
 } | {
-    error?: undefined;
     ok: boolean;
     scope: "org" | "user";
+    error?: undefined;
 }>>;
 export interface DefaultModelSelectionRequest {
     engine: string;

package/dist/server/agent-engine-ollama-models-route.d.ts

@@ -1,9 +1,9 @@
 export declare function createAgentEngineOllamaModelsHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
+    ok?: undefined;
     error: string;
     models?: undefined;
-    ok?: undefined;
 } | {
+    error?: undefined;
     ok: boolean;
     models: string[];
-    error?: undefined;
 }>>;

package/dist/server/core-routes-plugin.d.ts

@@ -588,8 +588,8 @@ export declare function createPublicRemoteAgentsHandler(discover?: PublicAgentDi
     error: string;
     agents?: undefined;
 } | {
-    agents: Omit<import("./agent-discovery.js").DiscoveredAgent, "auth" | "kind">[];
     error?: undefined;
+    agents: Omit<import("./agent-discovery.js").DiscoveredAgent, "auth" | "kind">[];
 }>>;
 export declare function getBuilderConnectErrorDisposition(error: unknown, connectAttemptId: string | null): "correlated" | "legacy" | null;
 export declare function getBuilderConnectErrorKey(ownerEmail: string, connectAttemptId?: string | null): string;

package/dist/server/realtime-token.d.ts

@@ -54,8 +54,8 @@ export declare function createRealtimeTokenHandler(): import("h3").EventHandlerW
     expiresAt?: undefined;
     ttlSeconds?: undefined;
 } | {
-    error?: undefined;
     token: string;
     expiresAt: string;
     ttlSeconds: number;
+    error?: undefined;
 }>>;

package/dist/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/dist/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/triggers/actions/manage-automation.d.ts

@@ -67,6 +67,7 @@ declare const _default: import("../../action.js").ActionDefinition<{
     triggerType: "event" | "manual" | "schedule" | "webhook";
     body: string;
 }, {
+    deleted?: undefined;
     created: boolean;
     resourceId: string;
     name: string;
@@ -87,12 +88,13 @@ declare const _default: import("../../action.js").ActionDefinition<{
     executionCwd: string;
     mcpTools: string[];
     webhookPath: string;
-    deleted?: undefined;
     updated?: undefined;
     changed?: undefined;
     previouslyEnabled?: undefined;
     requestedEnabled?: undefined;
 } | {
+    enabled?: undefined;
+    nextRun?: undefined;
     created?: undefined;
     deleted: boolean;
     resourceId: string;
@@ -105,8 +107,6 @@ declare const _default: import("../../action.js").ActionDefinition<{
     timezone?: undefined;
     condition?: undefined;
     body?: undefined;
-    enabled?: undefined;
-    nextRun?: undefined;
     createdBy?: undefined;
     model?: undefined;
     reasoningEffort?: undefined;
@@ -119,8 +119,8 @@ declare const _default: import("../../action.js").ActionDefinition<{
     requestedEnabled?: undefined;
     webhookPath?: undefined;
 } | {
-    created?: undefined;
     deleted?: undefined;
+    created?: undefined;
     updated: boolean;
     resourceId: string;
     name: string;

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/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.217.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": {
@@ -730,8 +730,8 @@
     "yaml": "^2.9.0",
     "yjs": "^13.6.33",
     "zod": "^4.3.6",
-    "@agent-native/agentkit": "^0.217.0",
-    "@agent-native/recap-cli": "^0.5.86"
+    "@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)),
-  );
-}