@nextclaw/ui 0.12.24 → 0.12.25

package/src/features/chat/components/chat-sidebar-session-item.tsx

@@ -5,9 +5,13 @@ import { SessionRunBadge } from '@/features/chat/components/session/session-run-
 import { Button } from '@/shared/components/ui/button';
 import { Input } from '@/shared/components/ui/input';
 import { type SessionContextView } from '@/features/chat/utils/session-context.utils';
+import {
+  formatSessionListTime,
+  sessionActivityPreviewText
+} from '@/features/chat/utils/chat-session-display.utils';
 import type { SessionRunStatus } from '@/features/chat/types/session-run-status.types';
 import { cn } from '@/shared/lib/utils';
-import { formatDateShort, t } from '@/shared/lib/i18n';
+import { t } from '@/shared/lib/i18n';
 import { Check, GitBranch, Pencil, X } from 'lucide-react';
 
 type ChatSidebarSessionItemProps = {
@@ -116,6 +120,8 @@ function ChatSidebarSessionDisplayView({
   onStartEditing
 }: ChatSidebarSessionDisplayViewProps) {
   const trailingControlsClassName = childSessionCount > 0 && onOpenChildSessions ? 'pr-14' : 'pr-6';
+  const previewText = sessionActivityPreviewText(session);
+  const fallbackPreviewText = `${agentLabel?.trim() ? `${agentLabel} · ` : ''}${session.messageCount}`;
 
   return (
     <div className="group/session relative">
@@ -157,7 +163,7 @@ function ChatSidebarSessionDisplayView({
         </div>
         <div className="mt-1 flex items-center gap-2 text-[11px] text-gray-400">
           <span className="min-w-0 truncate">
-            {agentLabel?.trim() ? `${agentLabel} · ` : ''}{session.messageCount}
+            {previewText ?? fallbackPreviewText}
           </span>
           {showUnreadDot ? (
             <span
@@ -165,7 +171,7 @@ function ChatSidebarSessionDisplayView({
               className="ml-auto h-2 w-2 shrink-0 rounded-full bg-primary"
             />
           ) : (
-            <span className="ml-auto shrink-0">{formatDateShort(session.lastMessageAt ?? session.createdAt)}</span>
+            <span className="ml-auto shrink-0">{formatSessionListTime(session.lastMessageAt ?? session.createdAt)}</span>
           )}
         </div>
       </button>

package/src/features/chat/components/conversation/chat-conversation-header.test.tsx

@@ -0,0 +1,71 @@
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { ChatConversationHeader } from "@/features/chat/components/conversation/chat-conversation-header";
+import { useChatThreadStore } from "@/features/chat/stores/chat-thread.store";
+
+vi.mock("@/shared/components/common/agent-avatar", () => ({
+  AgentAvatar: ({ agentId }: { agentId: string }) => (
+    <div data-testid="agent-avatar">{agentId}</div>
+  ),
+}));
+
+function renderHeader(
+  snapshotPatch: Partial<ReturnType<typeof useChatThreadStore.getState>["snapshot"]>,
+) {
+  const queryClient = new QueryClient();
+  const snapshot = {
+    ...useChatThreadStore.getState().snapshot,
+    isProviderStateResolved: true,
+    modelOptions: [],
+    sessionTypeLabel: "Codex",
+    sessionKey: null,
+    agentId: "main",
+    canDeleteSession: false,
+    messages: [],
+    ...snapshotPatch,
+  };
+
+  return render(
+    <QueryClientProvider client={queryClient}>
+      <ChatConversationHeader
+        snapshot={snapshot}
+        childSessionCount={0}
+        sessionCronJobCount={0}
+        layoutMode="desktop"
+        normalizedAgentId={snapshot.agentId ?? ""}
+        sessionHeaderTitle={snapshot.sessionDisplayName ?? "New Task"}
+        shouldShowHeaderAgentAvatar={false}
+        shouldShowSessionHeader={Boolean(
+          snapshot.sessionKey || snapshot.sessionTypeLabel,
+        )}
+        onOpenChildSessions={vi.fn()}
+        onOpenSessionCronJobs={vi.fn()}
+        onDeleteSession={vi.fn()}
+      />
+    </QueryClientProvider>,
+  );
+}
+
+describe("ChatConversationHeader", () => {
+  it("does not reserve extra height for draft sessions", () => {
+    renderHeader({});
+
+    const header = screen.getByText("New Task").closest(".border-b");
+
+    expect(header?.className).not.toContain("min-h-");
+  });
+
+  it("uses the standard session-header action button density after the session is materialized", () => {
+    renderHeader({
+      sessionKey: "session-1",
+      canDeleteSession: true,
+      sessionDisplayName: "First message",
+    });
+
+    const moreActions = screen.getByRole("button", { name: "More actions" });
+
+    expect(moreActions.className).toContain("h-7");
+    expect(moreActions.className).toContain("w-7");
+  });
+});

package/src/features/chat/components/conversation/chat-conversation-header.tsx

@@ -44,6 +44,7 @@ export function ChatParentSessionBanner({
 export function ChatConversationHeader({
   snapshot,
   childSessionCount,
+  sessionCronJobCount,
   layoutMode,
   normalizedAgentId,
   sessionHeaderTitle,
@@ -51,10 +52,12 @@ export function ChatConversationHeader({
   shouldShowSessionHeader,
   onBackToList,
   onOpenChildSessions,
+  onOpenSessionCronJobs,
   onDeleteSession,
 }: {
   snapshot: ChatThreadSnapshot;
   childSessionCount: number;
+  sessionCronJobCount: number;
   layoutMode: "desktop" | "mobile";
   normalizedAgentId: string;
   sessionHeaderTitle: string;
@@ -62,6 +65,7 @@ export function ChatConversationHeader({
   shouldShowSessionHeader: boolean;
   onBackToList?: () => void;
   onOpenChildSessions: () => void;
+  onOpenSessionCronJobs: () => void;
   onDeleteSession: ChatHeaderDeleteHandler;
 }) {
   const isMobileLayout = layoutMode === "mobile";
@@ -137,7 +141,9 @@ export function ChatConversationHeader({
           isDeletePending={snapshot.isDeletePending}
           projectRoot={snapshot.sessionProjectRoot}
           childSessionCount={childSessionCount}
+          sessionCronJobCount={sessionCronJobCount}
           onOpenChildSessions={onOpenChildSessions}
+          onOpenSessionCronJobs={onOpenSessionCronJobs}
           onDeleteSession={onDeleteSession}
         />
       ) : null}

package/src/features/chat/components/conversation/chat-conversation-panel.test.tsx

@@ -4,6 +4,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import { ChatConversationPanel } from "@/features/chat/components/conversation/chat-conversation-panel";
 import { ChatSessionWorkspacePanel } from "@/features/chat";
 import type { ResolvedChildSessionTab } from "@/features/chat/hooks/use-ncp-child-session-tabs-view";
+import type { CronJobView } from "@/shared/lib/api";
 import { useChatInputStore } from "@/features/chat/stores/chat-input.store";
 import { useChatSessionListStore } from "@/features/chat/stores/chat-session-list.store";
 import { useChatThreadStore } from "@/features/chat/stores/chat-thread.store";
@@ -12,7 +13,11 @@ const mocks = vi.hoisted(() => ({
   deleteSession: vi.fn(),
   goToProviders: vi.fn(),
   createSession: vi.fn(() => "draft-session-2"),
+  goToChatRoot: vi.fn(),
   goToSession: vi.fn(),
+  openSessionCronPanel: vi.fn(),
+  deleteCronJob: vi.fn(),
+  cronJobs: [] as CronJobView[],
   setSelectedAgentId: vi.fn(),
   setPendingSessionType: vi.fn(),
   stickyBottomScroll: vi.fn(() => ({
@@ -48,7 +53,19 @@ vi.mock("@/features/chat/components/conversation/chat-input-bar.container", () =
 }));
 
 vi.mock("@/features/chat/components/conversation/chat-message-list.container", () => ({
-  ChatMessageListContainer: () => <div data-testid="chat-message-list" />,
+  ChatMessageListContainer: ({
+    isSending,
+    messages,
+  }: {
+    isSending: boolean;
+    messages: readonly unknown[];
+  }) => (
+    <div
+      data-testid="chat-message-list"
+      data-message-count={String(messages.length)}
+      data-sending={String(isSending)}
+    />
+  ),
 }));
 
 vi.mock("@/features/chat/components/chat-session-workspace-file-preview", () => ({
@@ -81,12 +98,14 @@ vi.mock("@/features/chat/components/chat-welcome", () => ({
 vi.mock("@/features/chat/components/providers/chat-presenter.provider", () => ({
   usePresenter: () => ({
     chatUiManager: {
+      goToChatRoot: mocks.goToChatRoot,
       goToSession: mocks.goToSession,
     },
     chatThreadManager: {
       deleteSession: mocks.deleteSession,
       goToProviders: mocks.goToProviders,
       openChildSessionPanel: vi.fn(),
+      openSessionCronPanel: mocks.openSessionCronPanel,
       openFilePreview: vi.fn(),
       openSessionFromToolAction: vi.fn(),
       selectChildSessionDetail: vi.fn(),
@@ -116,6 +135,14 @@ vi.mock("@/features/chat/components/providers/chat-presenter.provider", () => ({
   }),
 }));
 
+vi.mock("@/shared/hooks/use-config", () => ({
+  useCronJobs: () => ({ data: { jobs: mocks.cronJobs, total: mocks.cronJobs.length } }),
+  useDeleteCronJob: () => ({
+    mutate: mocks.deleteCronJob,
+    isPending: false,
+  }),
+}));
+
 vi.mock("@/features/chat/components/conversation/session-header/chat-session-header-actions", () => ({
   ChatSessionHeaderActions: () => <button aria-label="More actions" />,
 }));
@@ -157,66 +184,73 @@ vi.mock("@/shared/components/common/agent-identity", () => ({
   ),
 }));
 
-describe("ChatConversationPanel", () => {
-  beforeEach(() => {
-    mocks.deleteSession.mockReset();
-    mocks.goToProviders.mockReset();
-    mocks.createSession.mockReset();
-    mocks.createSession.mockReturnValue("draft-session-2");
-    mocks.goToSession.mockReset();
-    mocks.setSelectedAgentId.mockReset();
-    mocks.setPendingSessionType.mockReset();
-    mocks.stickyBottomScroll.mockClear();
-    useChatInputStore.setState({
-      snapshot: {
-        ...useChatInputStore.getState().snapshot,
-        defaultSessionType: "native",
-      },
-    });
-    useChatThreadStore.setState({
-      snapshot: {
-        ...useChatThreadStore.getState().snapshot,
-        isProviderStateResolved: true,
-        modelOptions: [
-          {
-            value: "openai/gpt-5.1",
-            modelLabel: "gpt-5.1",
-            providerLabel: "OpenAI",
-          } as never,
-        ],
-        sessionTypeLabel: "Codex",
-        sessionKey: "draft-session-1",
-        sessionDisplayName: undefined,
-        agentId: null,
-        agentDisplayName: null,
-        sessionProjectRoot: null,
-        sessionProjectName: null,
-        canDeleteSession: false,
-        isDeletePending: false,
-        isHistoryLoading: false,
-        messages: [],
-        isSending: false,
-        isAwaitingAssistantOutput: false,
-        parentSessionKey: null,
-        parentSessionLabel: null,
-        workspacePanelParentKey: null,
-        availableAgents: [
-          { id: "main", displayName: "Main", runtime: "native" },
-          { id: "engineer", displayName: "Engineer", runtime: "codex" },
-        ],
-        childSessionTabs: [],
-        activeChildSessionKey: null,
-        workspaceFileTabs: [],
-        activeWorkspaceFileKey: null,
-      },
-    });
-    useChatSessionListStore.setState({
-      optimisticReadAtBySessionKey: {},
-      snapshot: {
-        ...useChatSessionListStore.getState().snapshot,
-      },
-    });
+function resetChatConversationPanelTestState() {
+  mocks.deleteSession.mockReset();
+  mocks.goToProviders.mockReset();
+  mocks.createSession.mockReset();
+  mocks.createSession.mockReturnValue("draft-session-2");
+  mocks.goToChatRoot.mockReset();
+  mocks.goToSession.mockReset();
+  mocks.openSessionCronPanel.mockReset();
+  mocks.deleteCronJob.mockReset();
+  mocks.cronJobs = [];
+  mocks.setSelectedAgentId.mockReset();
+  mocks.setPendingSessionType.mockReset();
+  mocks.stickyBottomScroll.mockClear();
+  useChatInputStore.setState({
+    snapshot: {
+      ...useChatInputStore.getState().snapshot,
+      defaultSessionType: "native",
+    },
+  });
+  useChatThreadStore.setState({
+    snapshot: {
+      ...useChatThreadStore.getState().snapshot,
+      isProviderStateResolved: true,
+      modelOptions: [
+        {
+          value: "openai/gpt-5.1",
+          modelLabel: "gpt-5.1",
+          providerLabel: "OpenAI",
+        } as never,
+      ],
+      sessionTypeLabel: "Codex",
+      sessionKey: "draft-session-1",
+      sessionDisplayName: undefined,
+      agentId: null,
+      agentDisplayName: null,
+      sessionProjectRoot: null,
+      sessionProjectName: null,
+      canDeleteSession: false,
+      isDeletePending: false,
+      isHistoryLoading: false,
+      messages: [],
+      isSending: false,
+      isAwaitingAssistantOutput: false,
+      hasSubmittedDraftMessage: false,
+      parentSessionKey: null,
+      parentSessionLabel: null,
+      workspacePanelParentKey: null,
+      availableAgents: [
+        { id: "main", displayName: "Main", runtime: "native" },
+        { id: "engineer", displayName: "Engineer", runtime: "codex" },
+      ],
+      childSessionTabs: [],
+      activeChildSessionKey: null,
+      workspaceFileTabs: [],
+      activeWorkspaceFileKey: null,
+    },
+  });
+  useChatSessionListStore.setState({
+    optimisticReadAtBySessionKey: {},
+    snapshot: {
+      ...useChatSessionListStore.getState().snapshot,
+    },
   });
+}
+
+describe("ChatConversationPanel", () => {
+  beforeEach(resetChatConversationPanelTestState);
 
   it("shows the draft session type in the conversation header", () => {
     render(<ChatConversationPanel />);
@@ -247,7 +281,7 @@ describe("ChatConversationPanel", () => {
     await user.click(screen.getByRole("button", { name: "create draft session" }));
 
     expect(mocks.createSession).toHaveBeenCalledWith("native");
-    expect(mocks.goToSession).toHaveBeenCalledWith("draft-session-2");
+    expect(mocks.goToChatRoot).toHaveBeenCalledTimes(1);
   });
 
   it("shows the selected session project badge and more actions trigger", () => {
@@ -334,6 +368,40 @@ describe("ChatConversationPanel", () => {
     expect(screen.queryByText("No messages yet. Send one to start.")).toBeNull();
   });
 
+  it("keeps the message list mounted while waiting for the first assistant token", () => {
+    useChatThreadStore.setState({
+      snapshot: {
+        ...useChatThreadStore.getState().snapshot,
+        messages: [],
+        isSending: true,
+        isAwaitingAssistantOutput: true,
+      },
+    });
+
+    render(<ChatConversationPanel />);
+
+    expect(screen.getByTestId("chat-message-list").dataset).toMatchObject({ messageCount: "0", sending: "true" });
+    expect(screen.queryByText("No messages yet. Send one to start.")).toBeNull();
+  });
+
+  it("does not reopen the welcome panel after a root draft send fails", () => {
+    useChatThreadStore.setState({
+      snapshot: {
+        ...useChatThreadStore.getState().snapshot,
+        sessionKey: null,
+        messages: [],
+        isSending: false,
+        isAwaitingAssistantOutput: false,
+        hasSubmittedDraftMessage: true,
+      },
+    });
+
+    render(<ChatConversationPanel />);
+
+    expect(screen.queryByTestId("chat-welcome")).toBeNull();
+    expect(screen.queryByText("No messages yet. Send one to start.")).toBeNull();
+  });
+
   it("does not render runtime lifecycle copy in the conversation alert strip", () => {
     render(<ChatConversationPanel />);
 
@@ -555,4 +623,56 @@ describe("ChatSessionWorkspacePanel", () => {
       "workspace-horizontal-scrollbar",
     );
   });
+
+  it("renders session cron jobs in the workspace sidebar and deletes with a neutral confirmation", async () => {
+    const user = userEvent.setup();
+    const job: CronJobView = {
+      id: "job-1",
+      name: "Follow up",
+      enabled: true,
+      schedule: { kind: "every", everyMs: 3600000 },
+      payload: {
+        kind: "agent_turn",
+        message: "Continue this session later",
+        sessionId: "parent-session-1",
+      },
+      state: {
+        nextRunAt: "2026-05-15T10:00:00.000Z",
+        lastRunAt: null,
+        lastStatus: null,
+        lastError: null,
+      },
+      createdAt: "2026-05-15T09:00:00.000Z",
+      updatedAt: "2026-05-15T09:00:00.000Z",
+      deleteAfterRun: false,
+    };
+
+    render(
+      <ChatSessionWorkspacePanel
+        childSessionTabs={[]}
+        activeChildSessionKey={null}
+        workspaceFileTabs={[]}
+        activeWorkspaceFileKey={null}
+        activePanelKind="cron"
+        sessionCronJobs={[job]}
+        sessionProjectRoot="/Users/demo/project-alpha"
+        onSelectSession={vi.fn()}
+        onSelectFile={vi.fn()}
+        onCloseFile={vi.fn()}
+        onClose={vi.fn()}
+        onBackToParent={vi.fn()}
+        onFileOpen={vi.fn()}
+      />,
+    );
+
+    expect(screen.getAllByText("Session cron jobs").length).toBeGreaterThan(0);
+    expect(screen.getByText("Follow up")).toBeTruthy();
+    expect(screen.getByText("Continue this session later")).toBeTruthy();
+
+    await user.click(screen.getByRole("button", { name: "Delete" }));
+    expect(screen.getByText("Delete cron job?")).toBeTruthy();
+    await user.click(screen.getAllByRole("button", { name: "Delete" }).at(-1)!);
+
+    expect(mocks.deleteCronJob).toHaveBeenCalledWith({ id: "job-1" });
+  });
 });

package/src/features/chat/components/conversation/chat-conversation-panel.tsx

@@ -1,4 +1,4 @@
-import { type ComponentProps, useRef } from "react";
+import { type ComponentProps, useMemo, useRef } from "react";
 import { useStickyBottomScroll } from "@nextclaw/agent-chat-ui";
 import type { ChatFileOpenActionViewModel } from "@nextclaw/agent-chat-ui";
 import { ChatInputBarContainer } from "@/features/chat/components/conversation/chat-input-bar.container";
@@ -13,6 +13,8 @@ import { usePresenter } from "@/features/chat/components/providers/chat-presente
 import { resolveAgentRuntimeSessionType } from "@/features/chat/hooks/use-chat-session-type-state";
 import { useChatInputStore } from "@/features/chat/stores/chat-input.store";
 import { useChatThreadStore } from "@/features/chat/stores/chat-thread.store";
+import { useCronJobs } from "@/shared/hooks/use-config";
+import { isCronJobForSession } from "@/shared/lib/cron";
 import { Skeleton } from "@/shared/components/ui/skeleton";
 import { t } from "@/shared/lib/i18n";
 import { cn } from "@/shared/lib/utils";
@@ -173,6 +175,11 @@ function ChatConversationContent({
   onToolAction,
   onFileOpen,
 }: ChatConversationContentProps) {
+  const isAwaitingAssistantOutput =
+    snapshot.isSending && snapshot.isAwaitingAssistantOutput;
+  const shouldShowMessages =
+    snapshot.messages.length > 0 || isAwaitingAssistantOutput;
+
   return (
     <div
       ref={threadRef}
@@ -186,16 +193,11 @@ function ChatConversationContent({
           selectedAgentId={snapshot.agentId ?? "main"}
           onSelectAgent={onSelectAgent}
         />
-      ) : hideEmptyHint ? null : snapshot.messages.length === 0 ? (
-        <div className="px-4 py-4 text-sm text-gray-500 sm:px-5 sm:py-5">
-          {t("chatNoMessages")}
-        </div>
-      ) : (
+      ) : hideEmptyHint || !shouldShowMessages ? null : (
         <div className="mx-auto w-full max-w-[min(1120px,100%)] px-4 py-4 sm:px-6 sm:py-5">
           <ChatMessageListContainer
-            key={snapshot.sessionKey ?? "draft"}
             messages={snapshot.messages}
-            isSending={snapshot.isSending && snapshot.isAwaitingAssistantOutput}
+            isSending={isAwaitingAssistantOutput}
             onToolAction={onToolAction}
             onFileOpen={onFileOpen}
           />
@@ -209,11 +211,39 @@ function shouldShowWorkspacePanel(
   snapshot: ChatThreadSnapshot,
   childSessionTabs: ChatThreadSnapshot["childSessionTabs"],
   workspaceFileTabs: ChatThreadSnapshot["workspaceFileTabs"],
+  sessionCronJobCount: number,
 ) {
   if (snapshot.workspacePanelParentKey !== snapshot.sessionKey) {
     return false;
   }
-  return childSessionTabs.length > 0 || workspaceFileTabs.length > 0;
+  return childSessionTabs.length > 0 || workspaceFileTabs.length > 0 || sessionCronJobCount > 0;
+}
+
+function useSessionWorkspaceState(snapshot: ChatThreadSnapshot) {
+  const childSessionTabs = useMemo(
+    () => snapshot.childSessionTabs.filter((tab) => tab.parentSessionKey === snapshot.sessionKey),
+    [snapshot.childSessionTabs, snapshot.sessionKey],
+  );
+  const workspaceFileTabs = useMemo(
+    () => snapshot.workspaceFileTabs.filter((tab) => tab.parentSessionKey === snapshot.sessionKey),
+    [snapshot.sessionKey, snapshot.workspaceFileTabs],
+  );
+  const cronQuery = useCronJobs({ all: true });
+  const sessionCronJobs = useMemo(
+    () => (cronQuery.data?.jobs ?? []).filter((job) => isCronJobForSession(job, snapshot.sessionKey)),
+    [cronQuery.data?.jobs, snapshot.sessionKey],
+  );
+  return {
+    childSessionTabs,
+    workspaceFileTabs,
+    sessionCronJobs,
+    showWorkspacePanel: shouldShowWorkspacePanel(
+      snapshot,
+      childSessionTabs,
+      workspaceFileTabs,
+      sessionCronJobs.length,
+    ),
+  };
 }
 
 export function ChatConversationPanel({
@@ -224,23 +254,12 @@ export function ChatConversationPanel({
   onBackToList?: () => void;
 }) {
   const presenter = usePresenter();
-  const defaultSessionType = useChatInputStore(
-    (state) => state.snapshot.defaultSessionType,
-  );
+  const defaultSessionType = useChatInputStore((state) => state.snapshot.defaultSessionType);
   const snapshot = useChatThreadStore((state) => state.snapshot);
   const fallbackThreadRef = useRef<HTMLDivElement | null>(null);
   const threadRef = snapshot.threadRef ?? fallbackThreadRef;
-  const childSessionTabs = snapshot.childSessionTabs.filter(
-    (tab) => tab.parentSessionKey === snapshot.sessionKey,
-  );
-  const workspaceFileTabs = snapshot.workspaceFileTabs.filter(
-    (tab) => tab.parentSessionKey === snapshot.sessionKey,
-  );
-  const showWorkspacePanel = shouldShowWorkspacePanel(
-    snapshot,
-    childSessionTabs,
-    workspaceFileTabs,
-  );
+  const { childSessionTabs, workspaceFileTabs, sessionCronJobs, showWorkspacePanel } =
+    useSessionWorkspaceState(snapshot);
   const shouldShowSessionHeader = Boolean(
     snapshot.sessionKey || snapshot.sessionTypeLabel,
   );
@@ -255,6 +274,7 @@ export function ChatConversationPanel({
 
   const showWelcome =
     !snapshot.canDeleteSession &&
+    !snapshot.hasSubmittedDraftMessage &&
     snapshot.messages.length === 0 &&
     !snapshot.isSending;
   const hasConfiguredModel = snapshot.modelOptions.length > 0;
@@ -294,6 +314,12 @@ export function ChatConversationPanel({
       activeChildSessionKey: childSessionTabs[0]?.sessionKey ?? null,
     });
   };
+  const openSessionCronJobs = () => {
+    if (!snapshot.sessionKey || sessionCronJobs.length === 0) {
+      return;
+    }
+    presenter.chatThreadManager.openSessionCronPanel(snapshot.sessionKey);
+  };
 
   const { onScroll: handleScroll } = useStickyBottomScroll({
     scrollRef: threadRef,
@@ -319,6 +345,7 @@ export function ChatConversationPanel({
         <ChatConversationHeader
           snapshot={snapshot}
           childSessionCount={childSessionTabs.length}
+          sessionCronJobCount={sessionCronJobs.length}
           layoutMode={layoutMode}
           normalizedAgentId={normalizedAgentId}
           sessionHeaderTitle={sessionHeaderTitle}
@@ -326,6 +353,7 @@ export function ChatConversationPanel({
           shouldShowSessionHeader={shouldShowSessionHeader}
           onBackToList={onBackToList}
           onOpenChildSessions={openChildSessions}
+          onOpenSessionCronJobs={openSessionCronJobs}
           onDeleteSession={presenter.chatThreadManager.deleteSession}
         />
         <ChatConversationAlerts
@@ -356,11 +384,14 @@ export function ChatConversationPanel({
           activeChildSessionKey={snapshot.activeChildSessionKey ?? null}
           workspaceFileTabs={workspaceFileTabs}
           activeWorkspaceFileKey={snapshot.activeWorkspaceFileKey ?? null}
+          activePanelKind={snapshot.activeWorkspacePanelKind ?? null}
+          sessionCronJobs={sessionCronJobs}
           sessionProjectRoot={snapshot.sessionProjectRoot ?? null}
           displayMode={layoutMode === "mobile" ? "overlay" : "docked"}
           onSelectSession={presenter.chatThreadManager.selectChildSessionDetail}
           onSelectFile={presenter.chatThreadManager.selectWorkspaceFile}
           onCloseFile={presenter.chatThreadManager.closeWorkspaceFile}
+          onSelectCronJobs={() => snapshot.sessionKey ? presenter.chatThreadManager.openSessionCronPanel(snapshot.sessionKey) : undefined}
           onClose={presenter.chatThreadManager.closeWorkspacePanel}
           onBackToParent={presenter.chatThreadManager.goToParentSession}
           onToolAction={presenter.chatThreadManager.openSessionFromToolAction}

package/src/features/chat/components/conversation/session-header/chat-session-header-actions.test.tsx

@@ -7,6 +7,7 @@ const mocks = vi.hoisted(() => ({
   updateSessionProject: vi.fn(),
   onDeleteSession: vi.fn(),
   onOpenChildSessions: vi.fn(),
+  onOpenSessionCronJobs: vi.fn(),
 }));
 
 vi.mock('@/features/chat/hooks/use-chat-session-project', () => ({
@@ -22,6 +23,7 @@ describe('ChatSessionHeaderActions', () => {
     mocks.updateSessionProject.mockReset();
     mocks.onDeleteSession.mockReset();
     mocks.onOpenChildSessions.mockReset();
+    mocks.onOpenSessionCronJobs.mockReset();
   });
 
   it('keeps only the set-project action in the more-actions menu when a project is already attached', async () => {
@@ -86,4 +88,26 @@ describe('ChatSessionHeaderActions', () => {
 
     expect(mocks.onOpenChildSessions).toHaveBeenCalledTimes(1);
   });
+
+  it('uses a shared spaced action group for child, cron, and menu buttons', () => {
+    render(
+      <ChatSessionHeaderActions
+        sessionKey="session-actions"
+        canDeleteSession
+        isDeletePending={false}
+        projectRoot={null}
+        childSessionCount={1}
+        sessionCronJobCount={1}
+        onOpenChildSessions={mocks.onOpenChildSessions}
+        onOpenSessionCronJobs={mocks.onOpenSessionCronJobs}
+        onDeleteSession={mocks.onDeleteSession}
+      />
+    );
+
+    const actionGroup = screen.getByRole('button', { name: 'More actions' }).parentElement;
+
+    expect(actionGroup?.className).toContain('gap-1.5');
+    expect(screen.getByRole('button', { name: 'View child sessions' }).className).toContain('h-7');
+    expect(screen.getByRole('button', { name: 'View session cron jobs' }).className).toContain('w-7');
+  });
 });