From f8023bb0e873edaeb711cef77d75b41774e34808 Mon Sep 17 00:00:00 2001
From: Harshil Vasoya <harshil@truefoundry.com>
Date: Tue, 22 Sep 2026 15:57:52 +0530
Subject: [PATCH 1/4] fix: Add load recent sessions button in Agent sessions

---
 .changeset/calm-sessions-return.md            |  5 +++
 .../src/atoms/agent-details/AgentSessions.tsx | 18 ++++++++--
 .../src/atoms/agent-details/SessionsPage.tsx  | 20 ++++++++++-
 .../src/atoms/agent-details/types.ts          |  2 ++
 .../test/atoms/SessionsPage.test.tsx          | 33 +++++++++++++++++++
 5 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/calm-sessions-return.md

diff --git a/.changeset/calm-sessions-return.md b/.changeset/calm-sessions-return.md
new file mode 100644
index 000000000..bf6ac5e9c
--- /dev/null
+++ b/.changeset/calm-sessions-return.md
@@ -0,0 +1,5 @@
+---
+'@truefoundry/trueforge-ui': patch
+---
+
+Add an action to restore the recent 30-day session list from a timestamp-pinned session.
diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsx
index b951d5bb5..8774b8809 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsx
+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsx
@@ -41,7 +41,13 @@ function entrySourceType(entry: SessionListEntry): 'schedule' | undefined {
   return 'sourceType' in entry && Reflect.get(entry, 'sourceType') === 'schedule' ? 'schedule' : undefined;
 }
 
-export function AgentSessions({ agentId, startTimestamp, endTimestamp, shareView }: AgentSessionsProps) {
+export function AgentSessions({
+  agentId,
+  startTimestamp,
+  endTimestamp,
+  shareView,
+  onLoadRecentSessions,
+}: AgentSessionsProps) {
   const sessionsServer = useAgentSessionsServer();
   const chatServer = useServer();
   const toaster = useToasterOptional();
@@ -266,6 +272,7 @@ export function AgentSessions({ agentId, startTimestamp, endTimestamp, shareView
 
   const resumeProps =
     resumeHref != null ? { resumeHref, resumeLabel } : shell != null ? { onResume: handleResume, resumeLabel } : {};
+  const selectedCreatedAt = detailSession?.createdAt ?? selectedEntry?.createdAt;
 
   // Full empty only when nothing is selected — keep the detail pane for deep-linked sessionIds
   // (filters/time range can empty the list while share state still points at a session).
@@ -293,6 +300,13 @@ export function AgentSessions({ agentId, startTimestamp, endTimestamp, shareView
     >
       <Panel id="agent-sessions-list" defaultSize="35%" minSize="20%" maxSize="50%">
         <aside className="flex h-full min-h-0 w-full flex-col bg-sidebar-bg">
+          {onLoadRecentSessions != null ? (
+            <div className="flex shrink-0 justify-center border-b border-border p-3">
+              <Button.Secondary type="button" size="small" onClick={onLoadRecentSessions}>
+                Load recent sessions
+              </Button.Secondary>
+            </div>
+          ) : null}
           <div ref={setListEl} className="scrollbar-none min-h-0 flex-1 overflow-y-auto">
             {listLoading ? (
               <div className="space-y-2 p-3" role="status" aria-label="Loading sessions">
@@ -379,7 +393,7 @@ export function AgentSessions({ agentId, startTimestamp, endTimestamp, shareView
                 title={selectedTitle}
                 sessionId={selectedSessionId}
                 agentId={agentId}
-                createdAt={detailSession?.createdAt ?? selectedEntry?.createdAt}
+                createdAt={selectedCreatedAt}
                 view={shareView}
                 onClose={clearSelectedSession}
                 canResume={canResume}
diff --git a/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx b/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx
index 931688895..0f568ff45 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx
+++ b/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Suspense, useEffect, useMemo, useState } from 'react';
+import { Suspense, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { useSessionShareSearch } from '../../hooks/useSessionShareSearch.js';
 import { useOptionalAgentSessionsServer } from '../../server/ServerContext.js';
@@ -9,6 +9,7 @@ import {
   defaultSessionTimeRange,
   readSessionShareSearch,
   resolveSessionTimeRange,
+  SESSION_SHARE_CHANGE_EVENT,
   type SessionTimeRange,
 } from '../../utils/sessionShareUrl.js';
 import { PageHeader } from '../PageHeader.js';
@@ -26,6 +27,10 @@ export function SessionsPage() {
   const [timeRange, setTimeRange] = useState<SessionTimeRange>(
     () => readSessionShareSearch(window.location.search).timeRange ?? defaultSessionTimeRange(),
   );
+  const [showLoadRecentSessions, setShowLoadRecentSessions] = useState(() => {
+    const share = readSessionShareSearch(window.location.search);
+    return share.sessionId != null && share.timeRange != null && share.timeRange.timeWindowMs == null;
+  });
 
   useEffect(() => {
     const share = readSessionShareSearch(window.location.search);
@@ -47,9 +52,21 @@ export function SessionsPage() {
     return () => window.removeEventListener('popstate', syncFilters);
   }, []);
 
+  useEffect(() => {
+    const hideLoadRecentSessions = () => setShowLoadRecentSessions(false);
+    window.addEventListener(SESSION_SHARE_CHANGE_EVENT, hideLoadRecentSessions);
+    return () => window.removeEventListener(SESSION_SHARE_CHANGE_EVENT, hideLoadRecentSessions);
+  }, []);
+
   // Resolve relative presets only when the filter changes. Unrelated query
   // updates (such as selecting a session) must not shift/refetch the list.
   const resolved = useMemo(() => resolveSessionTimeRange(timeRange), [timeRange]);
+  const loadRecentSessions = useCallback(() => {
+    const recentRange = defaultSessionTimeRange();
+    setShowLoadRecentSessions(false);
+    setTimeRange(recentRange);
+    updateShareSearch({ timeRange: recentRange, sessionId: null, view: 'sessions' });
+  }, [updateShareSearch]);
 
   return (
     <div className="flex h-full min-h-0 w-full flex-col bg-primary-bg">
@@ -86,6 +103,7 @@ export function SessionsPage() {
               startTimestamp={new Date(resolved.startTs).toISOString()}
               endTimestamp={new Date(resolved.endTs).toISOString()}
               shareView="sessions"
+              {...(showLoadRecentSessions ? { onLoadRecentSessions: loadRecentSessions } : {})}
             />
           </Suspense>
         )}
diff --git a/packages/trueforge-ui/src/atoms/agent-details/types.ts b/packages/trueforge-ui/src/atoms/agent-details/types.ts
index 04b463fed..1cc8af7e7 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/types.ts
+++ b/packages/trueforge-ui/src/atoms/agent-details/types.ts
@@ -18,6 +18,8 @@ export type AgentSessionsProps = {
   endTimestamp?: string;
   /** When `sessions`, selection writes `view=sessions` and pins `s_sts`/`s_ets`. */
   shareView?: 'sessions' | null;
+  /** Restores the rolling recent-session window from a URL-loaded session. */
+  onLoadRecentSessions?: () => void;
 };
 
 export type AgentSessionListRowProps = {
diff --git a/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx b/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
index 0350033d3..97e220038 100644
--- a/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
+++ b/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
@@ -241,6 +241,39 @@ describe('SessionsPage', () => {
     expect(resizer).toHaveClass('w-0');
     expect(resizer.querySelector('.w-px')).toBeInTheDocument();
     expect(screen.getByRole('heading', { name: 'Named session' })).toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: 'Load recent sessions' })).not.toBeInTheDocument();
+  });
+
+  it('loads the recent 30-day window from a timestamp-pinned session and clears its selection', async () => {
+    const now = Date.parse('2026-01-31T00:10:00.000Z');
+    vi.spyOn(Date, 'now').mockReturnValue(now);
+    const createdAtMs = Date.parse(namedRow.createdAt);
+    window.history.replaceState(
+      null,
+      '',
+      `/?view=sessions&sessionId=sess-1&s_sts=${String(createdAtMs - SESSION_TIME_BUFFER_MS)}&s_ets=${String(createdAtMs + SESSION_TIME_BUFFER_MS)}`,
+    );
+    const { listSessions } = renderPage();
+
+    const loadRecentButton = await screen.findByRole('button', { name: 'Load recent sessions' });
+    expect(loadRecentButton.closest('aside')).not.toBeNull();
+    fireEvent.click(loadRecentButton);
+
+    await waitFor(() => {
+      expect(listSessions).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          startTimestamp: new Date(now - DEFAULT_SESSION_TIME_WINDOW_MS).toISOString(),
+          endTimestamp: new Date(now).toISOString(),
+        }),
+      );
+    });
+    const params = new URLSearchParams(window.location.search);
+    expect(params.get('sessionId')).toBeNull();
+    expect(params.get('s_tw')).toBe(String(DEFAULT_SESSION_TIME_WINDOW_MS));
+    expect(params.get('s_sts')).toBeNull();
+    expect(params.get('s_ets')).toBeNull();
+    expect(screen.getByText('Select a session to view details')).toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: 'Load recent sessions' })).not.toBeInTheDocument();
   });
 
   it('deletes only after the confirmation dialog is accepted', async () => {

From 4640c59387322a2bad7d835ee7c21cf5709b173f Mon Sep 17 00:00:00 2001
From: Harshil Vasoya <harshil@truefoundry.com>
Date: Tue, 22 Sep 2026 16:19:47 +0530
Subject: [PATCH 2/4] refactor: Update session handling logic in SessionsPage
 component

---
 .../src/atoms/agent-details/SessionsPage.tsx   | 18 ++++++------------
 .../test/atoms/SessionsPage.test.tsx           | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx b/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx
index 0f568ff45..8ba6ff77c 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx
+++ b/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx
@@ -9,7 +9,7 @@ import {
   defaultSessionTimeRange,
   readSessionShareSearch,
   resolveSessionTimeRange,
-  SESSION_SHARE_CHANGE_EVENT,
+  SESSION_TIME_BUFFER_MS,
   type SessionTimeRange,
 } from '../../utils/sessionShareUrl.js';
 import { PageHeader } from '../PageHeader.js';
@@ -27,10 +27,6 @@ export function SessionsPage() {
   const [timeRange, setTimeRange] = useState<SessionTimeRange>(
     () => readSessionShareSearch(window.location.search).timeRange ?? defaultSessionTimeRange(),
   );
-  const [showLoadRecentSessions, setShowLoadRecentSessions] = useState(() => {
-    const share = readSessionShareSearch(window.location.search);
-    return share.sessionId != null && share.timeRange != null && share.timeRange.timeWindowMs == null;
-  });
 
   useEffect(() => {
     const share = readSessionShareSearch(window.location.search);
@@ -52,18 +48,16 @@ export function SessionsPage() {
     return () => window.removeEventListener('popstate', syncFilters);
   }, []);
 
-  useEffect(() => {
-    const hideLoadRecentSessions = () => setShowLoadRecentSessions(false);
-    window.addEventListener(SESSION_SHARE_CHANGE_EVENT, hideLoadRecentSessions);
-    return () => window.removeEventListener(SESSION_SHARE_CHANGE_EVENT, hideLoadRecentSessions);
-  }, []);
-
   // Resolve relative presets only when the filter changes. Unrelated query
   // updates (such as selecting a session) must not shift/refetch the list.
   const resolved = useMemo(() => resolveSessionTimeRange(timeRange), [timeRange]);
+  const timeRangeDurationMs = timeRange.endTs - timeRange.startTs;
+  const showLoadRecentSessions =
+    timeRange.timeWindowMs == null &&
+    timeRangeDurationMs > 0 &&
+    timeRangeDurationMs <= 2 * SESSION_TIME_BUFFER_MS;
   const loadRecentSessions = useCallback(() => {
     const recentRange = defaultSessionTimeRange();
-    setShowLoadRecentSessions(false);
     setTimeRange(recentRange);
     updateShareSearch({ timeRange: recentRange, sessionId: null, view: 'sessions' });
   }, [updateShareSearch]);
diff --git a/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx b/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
index 97e220038..de78f7c92 100644
--- a/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
+++ b/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
@@ -257,6 +257,8 @@ describe('SessionsPage', () => {
 
     const loadRecentButton = await screen.findByRole('button', { name: 'Load recent sessions' });
     expect(loadRecentButton.closest('aside')).not.toBeNull();
+    fireEvent.click(screen.getByRole('button', { name: 'Close session details' }));
+    expect(screen.getByRole('button', { name: 'Load recent sessions' })).toBeInTheDocument();
     fireEvent.click(loadRecentButton);
 
     await waitFor(() => {
@@ -276,6 +278,22 @@ describe('SessionsPage', () => {
     expect(screen.queryByRole('button', { name: 'Load recent sessions' })).not.toBeInTheDocument();
   });
 
+  it('keeps the recent-sessions action while the narrow list range remains active', async () => {
+    const createdAtMs = Date.parse(namedRow.createdAt);
+    window.history.replaceState(
+      null,
+      '',
+      `/?view=sessions&sessionId=sess-1&s_sts=${String(createdAtMs - SESSION_TIME_BUFFER_MS)}&s_ets=${String(createdAtMs + SESSION_TIME_BUFFER_MS)}`,
+    );
+    renderPage();
+
+    expect(await screen.findByRole('button', { name: 'Load recent sessions' })).toBeInTheDocument();
+    const row = screen.getByText('Draft session');
+    fireEvent.click(row.closest('button') ?? row);
+
+    expect(screen.getByRole('button', { name: 'Load recent sessions' })).toBeInTheDocument();
+  });
+
   it('deletes only after the confirmation dialog is accepted', async () => {
     const deleteSession = vi.fn(async () => undefined);
     renderPage({ deleteSession });

From cd21768b4e0b73530a1a3dcdab390697b95cbdfc Mon Sep 17 00:00:00 2001
From: Harshil Vasoya <harshil@truefoundry.com>
Date: Tue, 22 Sep 2026 16:21:01 +0530
Subject: [PATCH 3/4] refactor: Simplify condition for showing recent sessions
 in SessionsPage component

---
 .../trueforge-ui/src/atoms/agent-details/SessionsPage.tsx     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx b/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx
index 8ba6ff77c..c2bbf28ea 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx
+++ b/packages/trueforge-ui/src/atoms/agent-details/SessionsPage.tsx
@@ -53,9 +53,7 @@ export function SessionsPage() {
   const resolved = useMemo(() => resolveSessionTimeRange(timeRange), [timeRange]);
   const timeRangeDurationMs = timeRange.endTs - timeRange.startTs;
   const showLoadRecentSessions =
-    timeRange.timeWindowMs == null &&
-    timeRangeDurationMs > 0 &&
-    timeRangeDurationMs <= 2 * SESSION_TIME_BUFFER_MS;
+    timeRange.timeWindowMs == null && timeRangeDurationMs > 0 && timeRangeDurationMs <= 2 * SESSION_TIME_BUFFER_MS;
   const loadRecentSessions = useCallback(() => {
     const recentRange = defaultSessionTimeRange();
     setTimeRange(recentRange);

From 1f07d0acefcbb4be035903cc786cfbe6bb983cb9 Mon Sep 17 00:00:00 2001
From: Harshil Vasoya <harshil@truefoundry.com>
Date: Wed, 23 Sep 2026 10:12:32 +0530
Subject: [PATCH 4/4] fix: enhance condition for displaying empty state in
 AgentSessions component

---
 .../src/atoms/agent-details/AgentSessions.tsx |  3 ++-
 .../test/atoms/SessionsPage.test.tsx          | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsx b/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsx
index 8774b8809..edd02b176 100644
--- a/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsx
+++ b/packages/trueforge-ui/src/atoms/agent-details/AgentSessions.tsx
@@ -280,7 +280,8 @@ export function AgentSessions({
     !listLoading &&
     !listFailed &&
     entries.length === 0 &&
-    (selectedSessionId == null || selectedSessionId.length === 0)
+    (selectedSessionId == null || selectedSessionId.length === 0) &&
+    onLoadRecentSessions == null
   ) {
     return (
       <EmptyScreen
diff --git a/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx b/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
index de78f7c92..461b39db2 100644
--- a/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
+++ b/packages/trueforge-ui/test/atoms/SessionsPage.test.tsx
@@ -168,6 +168,33 @@ describe('SessionsPage', () => {
     expect(screen.queryByRole('separator', { name: 'Resize session list' })).not.toBeInTheDocument();
   });
 
+  it('keeps the recent-sessions action when a timestamp-pinned range is empty', async () => {
+    const now = Date.parse('2026-01-31T00:10:00.000Z');
+    vi.spyOn(Date, 'now').mockReturnValue(now);
+    const createdAtMs = Date.parse(namedRow.createdAt);
+    window.history.replaceState(
+      null,
+      '',
+      `/?view=sessions&s_sts=${String(createdAtMs - SESSION_TIME_BUFFER_MS)}&s_ets=${String(createdAtMs + SESSION_TIME_BUFFER_MS)}`,
+    );
+    const listSessions = vi.fn(async () => ({ data: [] as SessionListEntry[] }));
+    renderPage({ listSessions });
+
+    await waitFor(() => {
+      expect(screen.queryByRole('status', { name: 'Loading sessions' })).not.toBeInTheDocument();
+    });
+    fireEvent.click(screen.getByRole('button', { name: 'Load recent sessions' }));
+
+    await waitFor(() => {
+      expect(listSessions).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          startTimestamp: new Date(now - DEFAULT_SESSION_TIME_WINDOW_MS).toISOString(),
+          endTimestamp: new Date(now).toISOString(),
+        }),
+      );
+    });
+  });
+
   it('keeps session detail visible when the list is empty but a sessionId is selected', async () => {
     window.history.replaceState(null, '', '/?view=sessions&sessionId=sess-1');
     const getSession = vi.fn(async (): Promise<Session> => ({