@tutti-os/agent-gui 0.0.49 → 0.0.50

package/dist/index.js

@@ -22,7 +22,7 @@ import {
 import {
   AgentInteractivePromptSurface,
   approvalOptionDisplayLabel
-} from "./chunk-A2EN24OI.js";
+} from "./chunk-FS26J46N.js";
 import {
   PLAN_IMPLEMENTATION_ACTION_FEEDBACK,
   PLAN_IMPLEMENTATION_ACTION_IMPLEMENT,
@@ -41,17 +41,20 @@ import {
   resolveAgentGUIExplicitConversationTitle,
   resolveAgentGUIProviderDisplayLabel,
   resolveAgentGUIProviderIdentity
-} from "./chunk-TTDBLIQ3.js";
+} from "./chunk-DPG2J7N5.js";
 import {
   AgentConversationFlow,
   Button,
   agentRichTextContentToPromptText,
+  attachSubAgentLanesToConversationVM,
+  buildSubAgentLanesByCallId,
   buildWorkspaceAgentSessionDetailViewModel,
   createAgentRichTextInputExtensions,
   editorToPromptText,
   getAppErrorCode,
   labelForProviderSkill,
   openAgentEnvPanel,
+  partitionSubAgentTimelineItems,
   plainTextToAgentRichTextDoc,
   plainTextToAgentRichTextInlineContent,
   projectAgentConversationVM,
@@ -60,13 +63,13 @@ import {
   skillTriggerForPrefix,
   toLocalShortDateTime,
   useProjectedAgentConversation
-} from "./chunk-XRJZCEOX.js";
+} from "./chunk-RPXRNKU5.js";
 import {
   AgentMessageMarkdown,
   ZoomableImage,
   cn,
   resolveWorkspaceLinkAction
-} from "./chunk-RJR2OZ6T.js";
+} from "./chunk-VKP5ZW5O.js";
 import {
   AGENT_MENTION_FILTER_TAB_ORDER,
   AgentFileMentionPalette,
@@ -74,7 +77,7 @@ import {
   DEFAULT_AGENT_MENTION_FILTER,
   agentMentionItemKey,
   preloadAgentMentionBrowse
-} from "./chunk-5HJWT6YN.js";
+} from "./chunk-BQVYICR7.js";
 import {
   WORKSPACE_AGENT_ACTIVITY_RUNTIME_SESSION_ORIGIN,
   buildWorkspaceAgentActivityListViewModel,
@@ -84,13 +87,13 @@ import {
   isWorkspaceAgentUntitledTask,
   mergeWorkspaceAgentActivityDurableAndOverlayMessages,
   selectWorkspaceAgentActivityOverlayMessages
-} from "./chunk-Q3MOU4CD.js";
+} from "./chunk-ARCM7YB2.js";
 import {
   MANAGED_AGENT_ICON_FALLBACK_URL,
   MANAGED_AGENT_ICON_URLS,
   Spinner,
   normalizeManagedAgentProvider
-} from "./chunk-AYEYXKLF.js";
+} from "./chunk-HDBKB5RA.js";
 import {
   resolveWorkspaceAgentSessionSortTimeUnixMs
 } from "./chunk-IBIMGLCD.js";
@@ -102,7 +105,7 @@ import {
   mentionItemToAttrs,
   normalizeAgentSessionMentionTitle,
   parseMentionItemFromHref
-} from "./chunk-6KQHNUR5.js";
+} from "./chunk-UUY5VEK4.js";
 import "./chunk-Y35GDLP2.js";
 import "./chunk-LUGELG5V.js";
 import {
@@ -118,7 +121,7 @@ import {
   useAgentHostApi,
   useOptionalAgentActivityRuntime,
   useOptionalAgentHostApi
-} from "./chunk-U6JWW45G.js";
+} from "./chunk-66EQ6EQO.js";
 import "./chunk-TYGL25EL.js";
 import "./chunk-PJP5BUU6.js";
 import {
@@ -134,8 +137,8 @@ import {
   agentGuiI18nResources,
   translate,
   useTranslation
-} from "./chunk-77UR4G7P.js";
-import "./chunk-K6SRLYC3.js";
+} from "./chunk-Y7ZVTWMZ.js";
+import "./chunk-ZTSS2NU2.js";
 
 // shared/agentActivitySnapshotProjection.ts
 import {
@@ -2549,8 +2552,14 @@ function buildAgentGUIConversationModels({
   if (!detail) {
     return { conversation: null, detail: null };
   }
+  const subAgentLanesByCallId = buildSubAgentLanesByCallId(
+    partitionSubAgentTimelineItems(timelineItems)
+  );
   return {
-    conversation: projectAgentConversationVM(detail, { avoidGroupingEdits }),
+    conversation: attachSubAgentLanesToConversationVM(
+      projectAgentConversationVM(detail, { avoidGroupingEdits }),
+      subAgentLanesByCallId
+    ),
     detail
   };
 }
@@ -22249,7 +22258,7 @@ function groupConversations(conversations, labels, userProjects = [], options =
   }
   groups.push(
     ...[...projectGroups.values()].sort(
-      (left, right) => left.sectionOrder - right.sectionOrder || right.projectUpdatedAtUnixMs - left.projectUpdatedAtUnixMs || left.projectOrder - right.projectOrder || left.label.localeCompare(right.label) || left.id.localeCompare(right.id)
+      (left, right) => left.sectionOrder - right.sectionOrder || Number(right.items.length > 0) - Number(left.items.length > 0) || right.projectUpdatedAtUnixMs - left.projectUpdatedAtUnixMs || left.projectOrder - right.projectOrder || left.label.localeCompare(right.label) || left.id.localeCompare(right.id)
     ).map(
       ({
         projectOrder: _projectOrder,
@@ -23005,9 +23014,11 @@ function AgentGUINodeView({
                 AgentGUIConversationRailStorePane,
                 {
                   conversations: viewModel.conversations,
+                  provider: viewModel.data.provider,
                   store: conversationRailStore,
                   storeState: conversationRailStoreState,
-                  userProjects: viewModel.userProjects
+                  userProjects: viewModel.userProjects,
+                  workspaceId: viewModel.workspaceId
                 }
               )
             }
@@ -23294,13 +23305,15 @@ var AgentGUIDetailPane = memo(function AgentGUIDetailPane2({
       thinkingLabel: labels.thinkingLabel,
       toolCallsLabel: labels.toolCallsLabel,
       processing: labels.processing,
-      turnSummary: labels.turnSummary
+      turnSummary: labels.turnSummary,
+      userMessageLocator: labels.userMessageLocator
     }),
     [
       labels.processing,
       labels.thinkingLabel,
       labels.toolCallsLabel,
-      labels.turnSummary
+      labels.turnSummary,
+      labels.userMessageLocator
     ]
   );
   const conversationFlowEmpty = useMemo10(
@@ -24430,9 +24443,11 @@ function agentGUIConversationRailStoreSnapshotsEqual(current, next) {
 var AgentGUIConversationRailStorePane = memo(
   function AgentGUIConversationRailStorePane2({
     conversations,
+    provider,
     store,
     storeState: _storeState,
-    userProjects
+    userProjects,
+    workspaceId
   }) {
     "use memo";
     const state = useSnapshot(store);
@@ -24441,7 +24456,9 @@ var AgentGUIConversationRailStorePane = memo(
       {
         ...state,
         conversations,
-        userProjects
+        provider,
+        userProjects,
+        workspaceId
       }
     );
   }
@@ -24453,6 +24470,47 @@ function normalizeConversationRailProjectPath(path) {
   }
   return normalized.replace(/\/+$/, "") || "/";
 }
+function buildRailSessionGroupProjects({
+  groups,
+  userProjects
+}) {
+  const userProjectByPath = new Map(
+    userProjects.map((project) => [
+      normalizeConversationRailProjectPath(project.path),
+      project
+    ])
+  );
+  const groupProjectPaths = /* @__PURE__ */ new Set();
+  const groupProjects = [];
+  for (const group of groups) {
+    const normalizedPath = normalizeConversationRailProjectPath(group.cwd);
+    if (!normalizedPath || groupProjectPaths.has(normalizedPath)) {
+      continue;
+    }
+    groupProjectPaths.add(normalizedPath);
+    const existingProject = userProjectByPath.get(normalizedPath);
+    groupProjects.push({
+      ...existingProject ?? {
+        id: `agent-session-group:${normalizedPath}`,
+        label: labelFromProjectPath(normalizedPath),
+        path: group.cwd
+      },
+      lastUsedAtUnixMs: group.latestSessionUpdatedAtUnixMs,
+      updatedAtUnixMs: group.latestSessionUpdatedAtUnixMs
+    });
+  }
+  const emptyUserProjects = userProjects.filter(
+    (project) => !groupProjectPaths.has(normalizeConversationRailProjectPath(project.path))
+  );
+  return [...groupProjects, ...emptyUserProjects];
+}
+function labelFromProjectPath(path) {
+  const normalized = normalizeConversationRailProjectPath(path);
+  if (!normalized || normalized === "/") {
+    return path || "/";
+  }
+  return normalized.split("/").filter(Boolean).at(-1) ?? normalized;
+}
 function stabilizeConversationSections(previous, next) {
   if (!previous) {
     return [...next];
@@ -24486,6 +24544,37 @@ function stabilizeConversationSections(previous, next) {
   });
   return changed ? stable : previous;
 }
+function mergeRefreshedRailSessionGroups(current, refreshed) {
+  const currentByCwd = new Map(current.map((group) => [group.cwd, group]));
+  return refreshed.map((group) => {
+    const existing = currentByCwd.get(group.cwd);
+    if (!existing || existing.sessions.length <= group.sessions.length) {
+      return group;
+    }
+    const sessionIds = new Set(
+      group.sessions.map((session) => session.agentSessionId)
+    );
+    const sessions = [...group.sessions];
+    for (const session of existing.sessions) {
+      if (sessions.length >= group.sessionCount) {
+        break;
+      }
+      if (sessionIds.has(session.agentSessionId)) {
+        continue;
+      }
+      sessionIds.add(session.agentSessionId);
+      sessions.push(session);
+    }
+    const preservedLoadedPages = sessions.length > group.sessions.length;
+    const hasMore = preservedLoadedPages ? existing.hasMore && sessions.length < group.sessionCount : group.hasMore;
+    return {
+      ...group,
+      hasMore,
+      nextCursor: hasMore ? preservedLoadedPages ? existing.nextCursor : group.nextCursor : void 0,
+      sessions
+    };
+  });
+}
 function stabilizeConversationSectionItems(previous, next) {
   if (previous.length !== next.length) {
     const previousById = /* @__PURE__ */ new Map();
@@ -24525,6 +24614,8 @@ function conversationProjectsRenderEqual2(left, right) {
 var AgentGUIConversationRailPane = memo(
   function AgentGUIConversationRailPane2({
     conversations,
+    provider,
+    workspaceId,
     userProjects,
     activeConversationId,
     pendingDeleteConversationId,
@@ -24555,7 +24646,21 @@ var AgentGUIConversationRailPane = memo(
     onConfirmDeleteConversation
   }) {
     "use memo";
+    const agentActivityRuntime = useAgentActivityRuntime();
     const [conversationQuery, setConversationQuery] = useState11("");
+    const [searchConversations, setSearchConversations] = useState11([]);
+    const [searchConversationQuery, setSearchConversationQuery] = useState11("");
+    const [searchHasMore, setSearchHasMore] = useState11(false);
+    const [searchNextCursor, setSearchNextCursor] = useState11(
+      null
+    );
+    const [
+      isLoadingMoreSearchConversations,
+      setIsLoadingMoreSearchConversations
+    ] = useState11(false);
+    const [railSessionGroups, setRailSessionGroups] = useState11([]);
+    const [activeConversationOverlay, setActiveConversationOverlay] = useState11(null);
+    const [loadingMoreSectionIds, setLoadingMoreSectionIds] = useState11(() => /* @__PURE__ */ new Set());
     const [collapsedProjectSectionIds, setCollapsedProjectSectionIds] = useState11(() => /* @__PURE__ */ new Set());
     const [currentTimeMs, setCurrentTimeMs] = useState11(() => Date.now());
     const [pendingProjectAction, setPendingProjectAction] = useState11(null);
@@ -24565,6 +24670,7 @@ var AgentGUIConversationRailPane = memo(
       /* @__PURE__ */ new Map()
     );
     const groupedConversationsRef = useRef12(null);
+    const wasDeletingConversationRef = useRef12(false);
     useEffect12(() => {
       const timer = window.setInterval(() => {
         setCurrentTimeMs(Date.now());
@@ -24573,25 +24679,217 @@ var AgentGUIConversationRailPane = memo(
         window.clearInterval(timer);
       };
     }, []);
+    const trimmedConversationQuery = conversationQuery.trim();
+    const hasConversationQuery = trimmedConversationQuery.length > 0;
+    const hasRuntimeGroupSource = !previewMode && Boolean(agentActivityRuntime.listSessionGroups);
+    const conversationIdentityKey = useMemo10(
+      () => conversations.map((conversation) => conversation.id).join("|"),
+      [conversations]
+    );
+    const railSessionGroupProjects = useMemo10(
+      () => buildRailSessionGroupProjects({
+        groups: railSessionGroups,
+        userProjects
+      }),
+      [railSessionGroups, userProjects]
+    );
+    const defaultRailGroupConversations = useMemo10(() => {
+      const freshConversationById = new Map(
+        conversations.map((conversation) => [conversation.id, conversation])
+      );
+      return buildAgentGUIConversationSummaries({
+        provider,
+        snapshot: {
+          composerOptionsByProvider: {},
+          presences: [],
+          sessionMessagesById: {},
+          sessions: railSessionGroups.flatMap((group) => group.sessions),
+          workspaceId
+        },
+        userProjects: railSessionGroupProjects
+      }).map(
+        (conversation) => freshConversationById.get(conversation.id) ?? conversation
+      );
+    }, [
+      conversations,
+      provider,
+      railSessionGroupProjects,
+      railSessionGroups,
+      workspaceId
+    ]);
+    const defaultRailSourceConversations = useMemo10(() => {
+      const source = hasRuntimeGroupSource ? defaultRailGroupConversations : conversations;
+      if (!activeConversationOverlay || source.some((item) => item.id === activeConversationOverlay.id)) {
+        return source;
+      }
+      return [...source, activeConversationOverlay];
+    }, [
+      activeConversationOverlay,
+      conversations,
+      defaultRailGroupConversations,
+      hasRuntimeGroupSource
+    ]);
+    const effectiveSearchConversations = searchConversationQuery === trimmedConversationQuery ? searchConversations : [];
+    const railSourceConversations = hasConversationQuery ? effectiveSearchConversations : defaultRailSourceConversations;
+    const runtimeSearchSessions = agentActivityRuntime.searchSessions;
+    useEffect12(() => {
+      if (!activeConversationOverlay || activeConversationOverlay.id !== activeConversationId) {
+        return;
+      }
+      if (defaultRailGroupConversations.some(
+        (item) => item.id === activeConversationOverlay.id
+      )) {
+        setActiveConversationOverlay(null);
+      }
+    }, [
+      activeConversationId,
+      activeConversationOverlay,
+      defaultRailGroupConversations
+    ]);
+    useEffect12(() => {
+      if (!hasConversationQuery) {
+        setSearchConversationQuery("");
+        setSearchConversations([]);
+        setSearchHasMore(false);
+        setSearchNextCursor(null);
+        return;
+      }
+      if (!runtimeSearchSessions) {
+        return;
+      }
+      let disposed = false;
+      const timer = window.setTimeout(() => {
+        void runtimeSearchSessions({
+          limit: 100,
+          query: trimmedConversationQuery,
+          workspaceId
+        }).then((result) => {
+          if (disposed) {
+            return;
+          }
+          setSearchConversationQuery(trimmedConversationQuery);
+          setSearchConversations(
+            buildAgentGUIConversationSummaries({
+              provider,
+              snapshot: {
+                composerOptionsByProvider: {},
+                presences: [],
+                sessionMessagesById: {},
+                sessions: result.sessions,
+                workspaceId: result.workspaceId
+              },
+              userProjects
+            })
+          );
+          setSearchHasMore(result.hasMore);
+          setSearchNextCursor(result.nextCursor ?? null);
+        }).catch(() => {
+          if (!disposed) {
+            setSearchConversationQuery(trimmedConversationQuery);
+            setSearchConversations([]);
+            setSearchHasMore(false);
+            setSearchNextCursor(null);
+          }
+        });
+      }, 150);
+      return () => {
+        disposed = true;
+        window.clearTimeout(timer);
+      };
+    }, [
+      hasConversationQuery,
+      provider,
+      runtimeSearchSessions,
+      trimmedConversationQuery,
+      userProjects,
+      workspaceId
+    ]);
+    useEffect12(() => {
+      if (!hasConversationQuery || runtimeSearchSessions) {
+        return;
+      }
+      setSearchConversationQuery(trimmedConversationQuery);
+      setSearchConversations(
+        conversations.filter(
+          (candidate) => conversationPlainTitle(candidate, labels, uiLanguage).toLowerCase().includes(trimmedConversationQuery.toLowerCase())
+        )
+      );
+      setSearchHasMore(false);
+      setSearchNextCursor(null);
+    }, [
+      conversations,
+      hasConversationQuery,
+      labels,
+      runtimeSearchSessions,
+      trimmedConversationQuery,
+      uiLanguage
+    ]);
+    useEffect12(() => {
+      if (!agentActivityRuntime.listSessionGroups || previewMode) {
+        setRailSessionGroups([]);
+        return;
+      }
+      let disposed = false;
+      const isDeletingNow = isDeletingConversation || isDeletingProjectConversations;
+      const resetLoadedGroups = wasDeletingConversationRef.current && !isDeletingNow;
+      wasDeletingConversationRef.current = isDeletingNow;
+      void agentActivityRuntime.listSessionGroups({
+        sessionLimit: AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE,
+        visibleOnly: true,
+        workspaceId
+      }).then((result) => {
+        if (!disposed) {
+          setRailSessionGroups(
+            (current) => resetLoadedGroups ? result.groups : mergeRefreshedRailSessionGroups(current, result.groups)
+          );
+        }
+      }).catch(() => {
+        if (!disposed) {
+          setRailSessionGroups([]);
+        }
+      });
+      return () => {
+        disposed = true;
+      };
+    }, [
+      agentActivityRuntime,
+      conversationIdentityKey,
+      isDeletingConversation,
+      isDeletingProjectConversations,
+      previewMode,
+      workspaceId
+    ]);
+    const groupingProjects = hasConversationQuery ? [] : hasRuntimeGroupSource ? railSessionGroupProjects : userProjects;
+    const showEmptyConversationSection = useMemo10(
+      () => !hasConversationQuery && (hasRuntimeGroupSource ? railSessionGroups.some((group) => !group.cwd.trim()) : !conversations.some(
+        (conversation) => conversation.project == null
+      )),
+      [
+        conversations,
+        hasConversationQuery,
+        hasRuntimeGroupSource,
+        railSessionGroups
+      ]
+    );
     const filteredConversationResult = useMemo10(() => {
       const startedAtMs = agentGuiPerfNowMs();
-      const query = conversationQuery.trim().toLowerCase();
-      const items = !query ? conversations : conversations.filter(
+      const query = trimmedConversationQuery.toLowerCase();
+      const items = !query ? railSourceConversations : railSourceConversations.filter(
         (candidate) => conversationPlainTitle(candidate, labels, uiLanguage).toLowerCase().includes(query)
       );
       return {
         items,
         filterMs: roundAgentGuiPerfMs(agentGuiPerfNowMs() - startedAtMs)
       };
-    }, [conversationQuery, conversations, labels, uiLanguage]);
+    }, [labels, railSourceConversations, trimmedConversationQuery, uiLanguage]);
     const filteredConversations = filteredConversationResult.items;
     const groupedConversationResult = useMemo10(() => {
       const startedAtMs = agentGuiPerfNowMs();
       const rawGroups = groupConversations(
         filteredConversations,
         labels,
-        conversationQuery.trim() ? [] : userProjects,
-        { includeEmptyConversations: !conversationQuery.trim() }
+        groupingProjects,
+        { includeEmptyConversations: showEmptyConversationSection }
       );
       const groups = stabilizeConversationSections(
         groupedConversationsRef.current,
@@ -24602,7 +24900,12 @@ var AgentGUIConversationRailPane = memo(
         groups,
         groupMs: roundAgentGuiPerfMs(agentGuiPerfNowMs() - startedAtMs)
       };
-    }, [conversationQuery, filteredConversations, labels, userProjects]);
+    }, [
+      filteredConversations,
+      groupingProjects,
+      labels,
+      showEmptyConversationSection
+    ]);
     const groupedConversations = groupedConversationResult.groups;
     const toggleProjectSectionCollapsed = useCallback10((sectionId) => {
       setCollapsedProjectSectionIds((current) => {
@@ -24623,17 +24926,140 @@ var AgentGUIConversationRailPane = memo(
     );
     const projectConversationCountsByPath = useMemo10(() => {
       const counts = /* @__PURE__ */ new Map();
+      const pathsFromGroups = /* @__PURE__ */ new Set();
+      for (const group of railSessionGroups) {
+        const normalizedPath = normalizeConversationRailProjectPath(group.cwd);
+        if (!normalizedPath) {
+          continue;
+        }
+        counts.set(normalizedPath, group.sessionCount);
+        pathsFromGroups.add(normalizedPath);
+      }
       for (const conversation of conversations) {
         const normalizedPath = normalizeConversationRailProjectPath(
           conversation.project?.path
         );
-        if (!normalizedPath) {
+        if (!normalizedPath || pathsFromGroups.has(normalizedPath)) {
           continue;
         }
         counts.set(normalizedPath, (counts.get(normalizedPath) ?? 0) + 1);
       }
       return counts;
-    }, [conversations]);
+    }, [conversations, railSessionGroups]);
+    const railSessionGroupBySectionId = useMemo10(() => {
+      const groupsBySectionId = /* @__PURE__ */ new Map();
+      for (const group of railSessionGroups) {
+        const normalizedPath = normalizeConversationRailProjectPath(group.cwd);
+        groupsBySectionId.set(
+          normalizedPath ? `project:${normalizedPath}` : "conversations",
+          group
+        );
+      }
+      return groupsBySectionId;
+    }, [railSessionGroups]);
+    const loadMoreSectionConversations = useCallback10(
+      (sectionId) => {
+        const group = railSessionGroupBySectionId.get(sectionId);
+        const listSessionsPage = agentActivityRuntime.listSessionsPage;
+        if (!group?.hasMore || !group.nextCursor || !listSessionsPage) {
+          return;
+        }
+        setLoadingMoreSectionIds((current) => {
+          if (current.has(sectionId)) {
+            return current;
+          }
+          const next = new Set(current);
+          next.add(sectionId);
+          return next;
+        });
+        void listSessionsPage({
+          cursor: group.nextCursor,
+          cwd: group.cwd,
+          limit: AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE,
+          visibleOnly: true,
+          workspaceId
+        }).then((page) => {
+          setRailSessionGroups(
+            (current) => current.map((candidate) => {
+              if (candidate.cwd !== group.cwd) {
+                return candidate;
+              }
+              const sessionIds = new Set(
+                candidate.sessions.map((session) => session.agentSessionId)
+              );
+              const nextSessions = [...candidate.sessions];
+              for (const session of page.sessions) {
+                if (!sessionIds.has(session.agentSessionId)) {
+                  sessionIds.add(session.agentSessionId);
+                  nextSessions.push(session);
+                }
+              }
+              return {
+                ...candidate,
+                hasMore: page.hasMore,
+                nextCursor: page.nextCursor,
+                sessions: nextSessions
+              };
+            })
+          );
+        }).finally(() => {
+          setLoadingMoreSectionIds((current) => {
+            if (!current.has(sectionId)) {
+              return current;
+            }
+            const next = new Set(current);
+            next.delete(sectionId);
+            return next;
+          });
+        });
+      },
+      [agentActivityRuntime, railSessionGroupBySectionId, workspaceId]
+    );
+    const loadMoreSearchConversations = useCallback10(() => {
+      const searchSessions = agentActivityRuntime.searchSessions;
+      if (!searchSessions || !searchHasMore || !searchNextCursor || isLoadingMoreSearchConversations) {
+        return;
+      }
+      setIsLoadingMoreSearchConversations(true);
+      void searchSessions({
+        cursor: searchNextCursor,
+        limit: 100,
+        query: trimmedConversationQuery,
+        workspaceId
+      }).then((result) => {
+        const nextConversations = buildAgentGUIConversationSummaries({
+          provider,
+          snapshot: {
+            composerOptionsByProvider: {},
+            presences: [],
+            sessionMessagesById: {},
+            sessions: result.sessions,
+            workspaceId: result.workspaceId
+          },
+          userProjects
+        });
+        setSearchConversations((current) => {
+          const currentIds = new Set(current.map((item) => item.id));
+          return [
+            ...current,
+            ...nextConversations.filter((item) => !currentIds.has(item.id))
+          ];
+        });
+        setSearchHasMore(result.hasMore);
+        setSearchNextCursor(result.nextCursor ?? null);
+      }).finally(() => {
+        setIsLoadingMoreSearchConversations(false);
+      });
+    }, [
+      agentActivityRuntime,
+      isLoadingMoreSearchConversations,
+      provider,
+      searchHasMore,
+      searchNextCursor,
+      trimmedConversationQuery,
+      userProjects,
+      workspaceId
+    ]);
     const registerConversationItemElement = useCallback10(
       (itemId, element) => {
         if (element) {
@@ -24644,6 +25070,46 @@ var AgentGUIConversationRailPane = memo(
       },
       []
     );
+    const handleSelectConversation = useCallback10(
+      (agentSessionId) => {
+        const normalizedAgentSessionId = agentSessionId.trim();
+        if (!normalizedAgentSessionId) {
+          return;
+        }
+        const isLoadedConversation = conversations.some(
+          (conversation) => conversation.id === normalizedAgentSessionId
+        );
+        if (!hasConversationQuery || isLoadedConversation) {
+          onSelectConversation(normalizedAgentSessionId);
+          return;
+        }
+        void agentActivityRuntime.getSession(workspaceId, normalizedAgentSessionId).then((session) => {
+          const [overlay] = buildAgentGUIConversationSummaries({
+            provider,
+            snapshot: {
+              composerOptionsByProvider: {},
+              presences: [],
+              sessionMessagesById: {},
+              sessions: [session],
+              workspaceId
+            },
+            userProjects: railSessionGroupProjects
+          });
+          setActiveConversationOverlay(overlay ?? null);
+          onSelectConversation(normalizedAgentSessionId);
+        }).catch(() => {
+        });
+      },
+      [
+        agentActivityRuntime,
+        conversations,
+        hasConversationQuery,
+        onSelectConversation,
+        provider,
+        railSessionGroupProjects,
+        workspaceId
+      ]
+    );
     useLayoutEffect4(() => {
       if (!activeConversationId) {
         return;
@@ -24726,6 +25192,9 @@ var AgentGUIConversationRailPane = memo(
                 const showProjectRailHeader = !conversationQuery.trim() && section.kind !== "pinned" && (sectionIndex === 0 || groupedConversations[sectionIndex - 1]?.kind === "pinned");
                 const isSectionCollapsed = isProjectSection && collapsedProjectSectionIds.has(section.id);
                 const projectConversationCount = normalizedProjectPath ? projectConversationCountsByPath.get(normalizedProjectPath) ?? 0 : 0;
+                const sectionSessionGroup = railSessionGroupBySectionId.get(
+                  section.id
+                );
                 return /* @__PURE__ */ jsxs17(Fragment7, { children: [
                   showProjectRailHeader ? /* @__PURE__ */ jsx31(
                     AgentGUIProjectRailHeader,
@@ -24742,11 +25211,13 @@ var AgentGUIConversationRailPane = memo(
                       createConversationDisabled,
                       currentTimeMs,
                       isDeletingConversation,
+                      isLoadingMoreConversations: hasConversationQuery ? isLoadingMoreSearchConversations : loadingMoreSectionIds.has(section.id),
                       isSectionCollapsed,
                       labels,
                       pendingDeleteConversationId,
                       previewMode,
                       projectConversationCount,
+                      sectionHasMore: hasConversationQuery ? searchHasMore : Boolean(sectionSessionGroup?.hasMore),
                       projectLabel,
                       projectPath,
                       registerItemElement: registerConversationItemElement,
@@ -24756,11 +25227,12 @@ var AgentGUIConversationRailPane = memo(
                       onConfirmDeleteConversation,
                       onCreateConversation,
                       onRequestDeleteConversation,
-                      onSelectConversation,
+                      onSelectConversation: handleSelectConversation,
                       setPendingProjectAction,
                       onToggleConversationPinned,
                       onOpenProjectFiles,
                       onOpenConversationWindow,
+                      onLoadMoreConversations: hasConversationQuery ? loadMoreSearchConversations : loadMoreSectionConversations,
                       onToggleProjectSectionCollapsed: toggleProjectSectionCollapsed
                     }
                   )
@@ -24890,6 +25362,8 @@ var AgentGUIConversationRailSection = memo(
     pendingDeleteConversationId,
     previewMode,
     isDeletingConversation,
+    isLoadingMoreConversations,
+    sectionHasMore,
     createConversationDisabled,
     currentTimeMs,
     labels,
@@ -24898,6 +25372,7 @@ var AgentGUIConversationRailSection = memo(
     onCreateConversation,
     onToggleProjectSectionCollapsed,
     onSelectConversation,
+    onLoadMoreConversations,
     setPendingProjectAction,
     onToggleConversationPinned,
     onOpenProjectFiles,
@@ -24913,16 +25388,29 @@ var AgentGUIConversationRailSection = memo(
     );
     const visibleItemCount = isSectionCollapsed ? 0 : Math.min(visibleItemLimit, section.items.length);
     const visibleItems = isSectionCollapsed ? [] : section.items.slice(0, visibleItemCount);
-    const canShowMore = !isSectionCollapsed && visibleItemCount < section.items.length;
+    const canShowMore = !isSectionCollapsed && (visibleItemCount < section.items.length || sectionHasMore);
     const canShowLess = !isSectionCollapsed && visibleItemCount > AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE;
     const showMoreConversations = useCallback10(() => {
+      if (visibleItemCount >= section.items.length && sectionHasMore) {
+        onLoadMoreConversations(section.id);
+        setVisibleItemLimit(
+          (current) => current + AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE
+        );
+        return;
+      }
       setVisibleItemLimit(
         (current) => Math.min(
           section.items.length,
           current + AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE
         )
       );
-    }, [section.items.length]);
+    }, [
+      onLoadMoreConversations,
+      section.id,
+      section.items.length,
+      sectionHasMore,
+      visibleItemCount
+    ]);
     const showLessConversations = useCallback10(() => {
       setVisibleItemLimit(AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE);
     }, []);
@@ -25215,6 +25703,7 @@ var AgentGUIConversationRailSection = memo(
                     {
                       type: "button",
                       className: AgentGUINode_styles_default.conversationSectionPaginationButton,
+                      disabled: isLoadingMoreConversations,
                       onClick: showMoreConversations,
                       children: labels.showMoreConversations
                     }
@@ -26639,6 +27128,7 @@ var AgentGUINode = memo2(function AgentGUINode2({
       goalClearHint: t("agentHost.agentGui.goalClearHint"),
       processing: t("agentHost.agentGui.processing"),
       turnSummary: t("agentHost.agentGui.turnSummary"),
+      userMessageLocator: t("agentHost.agentGui.userMessageLocator"),
       planLead: t("agentHost.agentGui.planLead"),
       planModes: [
         {