@nextclaw/ui 0.11.21 → 0.11.23

package/src/components/chat/ncp/ncp-chat-thread.manager.ts

@@ -1,6 +1,7 @@
 import { appQueryClient } from '@/app-query-client';
 import { deleteNcpSessionSummaryInQueryClient } from '@/api/ncp-session-query-cache';
 import { deleteNcpSession as deleteNcpSessionApi } from '@/api/ncp-session';
+import type { ChatToolActionViewModel } from '@nextclaw/agent-chat-ui';
 import type { ChatSessionListManager } from '@/components/chat/managers/chat-session-list.manager';
 import type { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
 import type { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';
@@ -45,6 +46,54 @@ export class NcpChatThreadManager {
     this.uiManager.goToProviders();
   };
 
+  openSessionFromToolAction = (action: ChatToolActionViewModel) => {
+    if (action.kind !== 'open-session') {
+      return;
+    }
+    if (action.sessionKind === 'child' && !this.isCompactViewport()) {
+      const parentSessionKey =
+        action.parentSessionId?.trim() ||
+        useChatSessionListStore.getState().snapshot.selectedSessionKey ||
+        null;
+      useChatThreadStore.getState().setSnapshot({
+        childSessionDetailSessionKey: action.sessionId,
+        childSessionDetailParentSessionKey: parentSessionKey,
+        childSessionDetailLabel: action.label?.trim() || null,
+      });
+      return;
+    }
+    this.uiManager.goToSession(action.sessionId);
+  };
+
+  closeChildSessionDetail = () => {
+    useChatThreadStore.getState().setSnapshot({
+      childSessionDetailSessionKey: null,
+      childSessionDetailParentSessionKey: null,
+      childSessionDetailLabel: null,
+    });
+  };
+
+  goToParentSession = () => {
+    const {
+      parentSessionKey,
+      childSessionDetailParentSessionKey,
+    } = useChatThreadStore.getState().snapshot;
+    const resolvedParentSessionKey =
+      parentSessionKey ?? childSessionDetailParentSessionKey;
+    if (!resolvedParentSessionKey) {
+      return;
+    }
+    this.closeChildSessionDetail();
+    this.uiManager.goToSession(resolvedParentSessionKey);
+  };
+
+  private isCompactViewport = (): boolean => {
+    if (typeof window === 'undefined' || typeof window.matchMedia !== 'function') {
+      return false;
+    }
+    return window.matchMedia('(max-width: 767px)').matches;
+  };
+
   private deleteCurrentSession = async () => {
     const {
       snapshot: { selectedSessionKey }

package/src/components/chat/ncp/ncp-session-adapter.test.ts

@@ -24,6 +24,7 @@ describe('adaptNcpSessionSummary', () => {
           label: 'NCP Planning Thread',
           model: 'openai/gpt-5',
           preferred_thinking: 'medium',
+          project_root: '/Users/demo/workspace/project-alpha',
           session_type: 'native'
         }
       })
@@ -34,11 +35,34 @@ describe('adaptNcpSessionSummary', () => {
       label: 'NCP Planning Thread',
       preferredModel: 'openai/gpt-5',
       preferredThinking: 'medium',
+      projectRoot: '/Users/demo/workspace/project-alpha',
+      projectName: 'project-alpha',
       sessionType: 'native',
       sessionTypeMutable: false,
+      isChildSession: false,
       messageCount: 3
     });
   });
+
+  it('marks child sessions from parent_session_id metadata and keeps the request link', () => {
+    const adapted = adaptNcpSessionSummary(
+      createSummary({
+        metadata: {
+          label: 'Verifier',
+          session_type: 'native',
+          parent_session_id: 'parent-session-1',
+          spawned_by_request_id: 'request-1',
+        },
+      }),
+    );
+
+    expect(adapted).toMatchObject({
+      key: 'ncp-session-1',
+      isChildSession: true,
+      parentSessionId: 'parent-session-1',
+      spawnedByRequestId: 'request-1',
+    });
+  });
 });
 
 describe('adaptNcpMessageToUiMessage', () => {

package/src/components/chat/ncp/ncp-session-adapter.ts

@@ -1,6 +1,10 @@
 import { ToolInvocationStatus, type UIMessage } from '@nextclaw/agent-chat';
 import type { NcpMessagePart } from '@nextclaw/ncp';
 import type { NcpMessageView, NcpSessionSummaryView, SessionEntryView, ThinkingLevel } from '@/api/types';
+import {
+  getSessionProjectName,
+  normalizeSessionProjectRootValue,
+} from '@/lib/session-project/session-project.utils';
 
 const THINKING_LEVEL_SET = new Set<string>(['off', 'minimal', 'low', 'medium', 'high', 'adaptive', 'xhigh']);
 
@@ -68,6 +72,14 @@ function readNcpSessionLabel(summary: NcpSessionSummaryView): string | null {
   return readOptionalString(metadata.label);
 }
 
+function readNcpSessionProjectRoot(summary: NcpSessionSummaryView): string | null {
+  const metadata = readMetadata(summary);
+  if (!metadata) {
+    return null;
+  }
+  return normalizeSessionProjectRootValue(metadata.project_root ?? metadata.projectRoot);
+}
+
 function readNcpSessionType(summary: NcpSessionSummaryView): string {
   const metadata = readMetadata(summary);
   if (!metadata) {
@@ -76,6 +88,30 @@ function readNcpSessionType(summary: NcpSessionSummaryView): string {
   return readOptionalString(metadata.session_type) ?? readOptionalString(metadata.sessionType) ?? 'native';
 }
 
+function readNcpParentSessionId(summary: NcpSessionSummaryView): string | null {
+  const metadata = readMetadata(summary);
+  if (!metadata) {
+    return null;
+  }
+  return readOptionalString(metadata.parent_session_id) ?? readOptionalString(metadata.parentSessionId);
+}
+
+function readNcpSpawnedByRequestId(summary: NcpSessionSummaryView): string | null {
+  const metadata = readMetadata(summary);
+  if (!metadata) {
+    return null;
+  }
+  return readOptionalString(metadata.spawned_by_request_id) ?? readOptionalString(metadata.spawnedByRequestId);
+}
+
+function readPromotedChildSession(summary: NcpSessionSummaryView): boolean {
+  const metadata = readMetadata(summary);
+  if (!metadata) {
+    return false;
+  }
+  return metadata.child_session_promoted === true;
+}
+
 function parseSessionContext(sessionKey: string): { channel?: string; type?: string } {
   if (sessionKey === 'heartbeat') {
     return { type: 'heartbeat' };
@@ -207,7 +243,12 @@ export function adaptNcpSessionSummary(summary: NcpSessionSummaryView): SessionE
   const label = readNcpSessionLabel(summary);
   const preferredModel = readNcpSessionPreferredModel(summary);
   const preferredThinking = readNcpSessionPreferredThinking(summary);
+  const projectRoot = readNcpSessionProjectRoot(summary);
+  const projectName = getSessionProjectName(projectRoot);
   const context = parseSessionContext(summary.sessionId);
+  const parentSessionId = readNcpParentSessionId(summary);
+  const spawnedByRequestId = readNcpSpawnedByRequestId(summary);
+  const isPromotedChildSession = readPromotedChildSession(summary);
   return {
     key: summary.sessionId,
     createdAt: summary.updatedAt,
@@ -216,8 +257,14 @@ export function adaptNcpSessionSummary(summary: NcpSessionSummaryView): SessionE
     ...context,
     ...(preferredModel ? { preferredModel } : {}),
     ...(preferredThinking ? { preferredThinking } : {}),
+    ...(projectRoot ? { projectRoot } : {}),
+    ...(projectName ? { projectName } : {}),
     sessionType: readNcpSessionType(summary),
     sessionTypeMutable: false,
+    isChildSession: Boolean(parentSessionId),
+    ...(isPromotedChildSession ? { isPromotedChildSession } : {}),
+    ...(parentSessionId ? { parentSessionId } : {}),
+    ...(spawnedByRequestId ? { spawnedByRequestId } : {}),
     messageCount: summary.messageCount
   };
 }

package/src/components/chat/ncp/use-ncp-session-list-view.ts

@@ -15,13 +15,22 @@ function filterSessionsByQuery(sessions: readonly SessionEntryView[], query: str
   return sessions.filter((session) => sessionMatchesQuery(session, query));
 }
 
+function shouldShowSessionInSidebar(session: SessionEntryView): boolean {
+  if (!session.isChildSession) {
+    return true;
+  }
+  return session.isPromotedChildSession === true;
+}
+
 export function useNcpSessionListView(params: { limit?: number } = {}) {
   const query = useChatSessionListStore((state) => state.snapshot.query);
   const sessionsQuery = useNcpSessions({ limit: params.limit ?? 200 });
 
   const items = useMemo<NcpSessionListItemView[]>(() => {
     const summaries = sessionsQuery.data?.sessions ?? [];
-    const sessions = adaptNcpSessionSummaries(summaries);
+    const sessions = adaptNcpSessionSummaries(summaries).filter(
+      shouldShowSessionInSidebar,
+    );
     const filteredSessions = filterSessionsByQuery(sessions, query);
     const summaryBySessionId = new Map(summaries.map((summary) => [summary.sessionId, summary]));
 

package/src/components/chat/presenter/chat-presenter-context.tsx

@@ -1,4 +1,4 @@
-import type { ChatComposerNode } from '@nextclaw/agent-chat-ui';
+import type { ChatComposerNode, ChatToolActionViewModel } from '@nextclaw/agent-chat-ui';
 import type { NcpDraftAttachment } from '@nextclaw/ncp-react';
 import { createContext, useContext } from 'react';
 import type { ReactNode } from 'react';
@@ -37,6 +37,9 @@ export type ChatThreadManagerLike = {
   deleteSession: () => void;
   createSession: () => void;
   goToProviders: () => void;
+  openSessionFromToolAction: (action: ChatToolActionViewModel) => void;
+  closeChildSessionDetail: () => void;
+  goToParentSession: () => void;
 };
 
 export type ChatPresenterLike = {

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

@@ -0,0 +1,63 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { ChatSessionHeaderActions } from '@/components/chat/session-header/chat-session-header-actions';
+
+const mocks = vi.hoisted(() => ({
+  updateSessionProject: vi.fn(),
+  onDeleteSession: vi.fn(),
+}));
+
+vi.mock('@/components/chat/hooks/use-chat-session-project', () => ({
+  useChatSessionProject: () => mocks.updateSessionProject,
+}));
+
+vi.mock('@/components/chat/session-header/chat-session-project-dialog', () => ({
+  ChatSessionProjectDialog: () => null,
+}));
+
+describe('ChatSessionHeaderActions', () => {
+  beforeEach(() => {
+    mocks.updateSessionProject.mockReset();
+    mocks.onDeleteSession.mockReset();
+  });
+
+  it('keeps only the set-project action in the more-actions menu when a project is already attached', async () => {
+    const user = userEvent.setup();
+
+    render(
+      <ChatSessionHeaderActions
+        sessionKey="session-1"
+        canDeleteSession
+        isDeletePending={false}
+        projectRoot="/tmp/project-alpha"
+        onDeleteSession={mocks.onDeleteSession}
+      />
+    );
+
+    await user.click(screen.getByRole('button', { name: 'More actions' }));
+
+    expect(screen.getByText('Set Project Directory')).toBeTruthy();
+    expect(screen.queryByText('Clear Project Directory')).toBeNull();
+    expect(screen.getByText('Delete Session')).toBeTruthy();
+  });
+
+  it('keeps the set-project entry in the more-actions menu when no project is attached', async () => {
+    const user = userEvent.setup();
+
+    render(
+      <ChatSessionHeaderActions
+        sessionKey="draft-session"
+        canDeleteSession={false}
+        isDeletePending={false}
+        projectRoot={null}
+        onDeleteSession={mocks.onDeleteSession}
+      />
+    );
+
+    await user.click(screen.getByRole('button', { name: 'More actions' }));
+
+    expect(screen.getByText('Set Project Directory')).toBeTruthy();
+    expect(screen.queryByText('Clear Project Directory')).toBeNull();
+  });
+});

package/src/components/chat/session-header/chat-session-header-actions.tsx

@@ -0,0 +1,95 @@
+import { useState } from 'react';
+import { FolderOpen, MoreHorizontal, Trash2 } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
+import { useChatSessionProject } from '@/components/chat/hooks/use-chat-session-project';
+import { ChatSessionHeaderMenuItem } from '@/components/chat/session-header/chat-session-header-menu-item';
+import { ChatSessionProjectDialog } from '@/components/chat/session-header/chat-session-project-dialog';
+import { t } from '@/lib/i18n';
+
+type ChatSessionHeaderActionsProps = {
+  sessionKey: string;
+  canDeleteSession: boolean;
+  isDeletePending: boolean;
+  projectRoot?: string | null;
+  onDeleteSession: () => void;
+};
+
+export function ChatSessionHeaderActions({
+  sessionKey,
+  canDeleteSession,
+  isDeletePending,
+  projectRoot,
+  onDeleteSession,
+}: ChatSessionHeaderActionsProps) {
+  const updateSessionProject = useChatSessionProject();
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+  const [isProjectPending, setIsProjectPending] = useState(false);
+  const isBusy = isDeletePending || isProjectPending;
+
+  const runProjectUpdate = async (nextProjectRoot: string | null) => {
+    const persistToServer = canDeleteSession;
+    setIsProjectPending(true);
+    try {
+      await updateSessionProject({
+        sessionKey,
+        projectRoot: nextProjectRoot,
+        persistToServer,
+      });
+      setIsDialogOpen(false);
+      setIsMenuOpen(false);
+    } finally {
+      setIsProjectPending(false);
+    }
+  };
+
+  return (
+    <>
+      <Popover open={isMenuOpen} onOpenChange={setIsMenuOpen}>
+        <PopoverTrigger asChild>
+          <Button
+            variant="ghost"
+            size="icon"
+            className="rounded-lg shrink-0 text-gray-400 hover:text-gray-700"
+            aria-label={t('chatSessionMoreActions')}
+            disabled={isBusy}
+          >
+            <MoreHorizontal className="h-4 w-4" />
+          </Button>
+        </PopoverTrigger>
+        <PopoverContent align="end" className="w-56 p-2">
+          <div className="space-y-1">
+            <ChatSessionHeaderMenuItem
+              icon={FolderOpen}
+              label={t('chatSessionSetProject')}
+              onClick={() => {
+                setIsMenuOpen(false);
+                setIsDialogOpen(true);
+              }}
+              disabled={isBusy}
+            />
+            <ChatSessionHeaderMenuItem
+              icon={Trash2}
+              label={t('chatDeleteSession')}
+              onClick={() => {
+                setIsMenuOpen(false);
+                onDeleteSession();
+              }}
+              disabled={!canDeleteSession || isBusy}
+              destructive
+            />
+          </div>
+        </PopoverContent>
+      </Popover>
+
+      <ChatSessionProjectDialog
+        open={isDialogOpen}
+        currentProjectRoot={projectRoot}
+        isSaving={isProjectPending}
+        onOpenChange={setIsDialogOpen}
+        onSave={runProjectUpdate}
+      />
+    </>
+  );
+}

package/src/components/chat/session-header/chat-session-header-menu-item.tsx

@@ -0,0 +1,35 @@
+import type { LucideIcon } from 'lucide-react';
+import { cn } from '@/lib/utils';
+
+type ChatSessionHeaderMenuItemProps = {
+  icon: LucideIcon;
+  label: string;
+  onClick: () => void;
+  disabled?: boolean;
+  destructive?: boolean;
+};
+
+export function ChatSessionHeaderMenuItem({
+  icon: Icon,
+  label,
+  onClick,
+  disabled = false,
+  destructive = false,
+}: ChatSessionHeaderMenuItemProps) {
+  return (
+    <button
+      type="button"
+      className={cn(
+        'flex w-full items-center gap-2 rounded-xl px-3 py-2 text-left text-sm transition-colors disabled:cursor-not-allowed disabled:opacity-50',
+        destructive
+          ? 'text-destructive hover:bg-destructive/10'
+          : 'text-gray-700 hover:bg-gray-100'
+      )}
+      onClick={onClick}
+      disabled={disabled}
+    >
+      <Icon className="h-4 w-4 shrink-0" />
+      <span>{label}</span>
+    </button>
+  );
+}

package/src/components/chat/session-header/chat-session-project-badge.test.tsx

@@ -0,0 +1,66 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { ChatSessionProjectBadge } from '@/components/chat/session-header/chat-session-project-badge';
+
+const mocks = vi.hoisted(() => ({
+  updateSessionProject: vi.fn(),
+}));
+
+vi.mock('@/components/chat/hooks/use-chat-session-project', () => ({
+  useChatSessionProject: () => mocks.updateSessionProject,
+}));
+
+vi.mock('@/components/chat/session-header/chat-session-project-dialog', () => ({
+  ChatSessionProjectDialog: () => null,
+}));
+
+describe('ChatSessionProjectBadge', () => {
+  beforeEach(() => {
+    mocks.updateSessionProject.mockReset();
+    mocks.updateSessionProject.mockResolvedValue(undefined);
+  });
+
+  it('shows project actions inside the badge popover', async () => {
+    const user = userEvent.setup();
+
+    render(
+      <ChatSessionProjectBadge
+        sessionKey="session-1"
+        projectName="project-alpha"
+        projectRoot="/tmp/project-alpha"
+        persistToServer
+      />
+    );
+
+    await user.click(screen.getByRole('button', { name: 'Set Project Directory' }));
+
+    expect(screen.getAllByText('Set Project Directory').length).toBeGreaterThan(0);
+    expect(screen.getByText('Clear Project Directory')).toBeTruthy();
+    expect(screen.getByText('/tmp/project-alpha')).toBeTruthy();
+  });
+
+  it('clears the current project from the badge popover', async () => {
+    const user = userEvent.setup();
+
+    render(
+      <ChatSessionProjectBadge
+        sessionKey="session-1"
+        projectName="project-alpha"
+        projectRoot="/tmp/project-alpha"
+        persistToServer
+      />
+    );
+
+    await user.click(screen.getByRole('button', { name: 'Set Project Directory' }));
+    await user.click(screen.getByText('Clear Project Directory'));
+
+    await waitFor(() => {
+      expect(mocks.updateSessionProject).toHaveBeenCalledWith({
+        sessionKey: 'session-1',
+        projectRoot: null,
+        persistToServer: true,
+      });
+    });
+  });
+});

package/src/components/chat/session-header/chat-session-project-badge.tsx

@@ -0,0 +1,102 @@
+import { useState } from 'react';
+import { ChevronDown, FolderOpen, FolderX, Pencil } from 'lucide-react';
+import { useChatSessionProject } from '@/components/chat/hooks/use-chat-session-project';
+import { ChatSessionHeaderMenuItem } from '@/components/chat/session-header/chat-session-header-menu-item';
+import { ChatSessionProjectDialog } from '@/components/chat/session-header/chat-session-project-dialog';
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
+import { t } from '@/lib/i18n';
+
+type ChatSessionProjectBadgeProps = {
+  sessionKey: string;
+  projectName: string;
+  projectRoot?: string | null;
+  persistToServer: boolean;
+};
+
+export function ChatSessionProjectBadge({
+  sessionKey,
+  projectName,
+  projectRoot,
+  persistToServer,
+}: ChatSessionProjectBadgeProps) {
+  const updateSessionProject = useChatSessionProject();
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+  const [isProjectPending, setIsProjectPending] = useState(false);
+
+  const runProjectUpdate = async (nextProjectRoot: string | null) => {
+    setIsProjectPending(true);
+    try {
+      await updateSessionProject({
+        sessionKey,
+        projectRoot: nextProjectRoot,
+        persistToServer,
+      });
+      setIsDialogOpen(false);
+      setIsMenuOpen(false);
+    } finally {
+      setIsProjectPending(false);
+    }
+  };
+
+  return (
+    <>
+      <Popover open={isMenuOpen} onOpenChange={setIsMenuOpen}>
+        <PopoverTrigger asChild>
+          <button
+            type="button"
+            title={projectRoot ?? undefined}
+            className="min-w-0 max-w-[320px] shrink rounded-full border border-emerald-200 bg-emerald-50 px-2 py-0.5 text-[11px] font-medium text-emerald-700 transition-colors hover:border-emerald-300 hover:bg-emerald-100 disabled:cursor-not-allowed disabled:opacity-60"
+            aria-label={t('chatSessionSetProject')}
+            disabled={isProjectPending}
+          >
+            <span className="flex min-w-0 items-center gap-1.5">
+              <FolderOpen className="h-3.5 w-3.5 shrink-0" />
+              <span className="truncate">{projectName}</span>
+              <ChevronDown className="h-3 w-3 shrink-0 opacity-70" />
+            </span>
+          </button>
+        </PopoverTrigger>
+        <PopoverContent align="start" className="w-72 p-2">
+          <div className="px-3 pb-2 pt-1">
+            <div className="text-[11px] font-medium uppercase tracking-wider text-emerald-700/80">
+              {projectName}
+            </div>
+            {projectRoot ? (
+              <div className="mt-1 break-all text-xs text-gray-500">
+                {projectRoot}
+              </div>
+            ) : null}
+          </div>
+          <div className="space-y-1">
+            <ChatSessionHeaderMenuItem
+              icon={Pencil}
+              label={t('chatSessionSetProject')}
+              onClick={() => {
+                setIsMenuOpen(false);
+                setIsDialogOpen(true);
+              }}
+              disabled={isProjectPending}
+            />
+            <ChatSessionHeaderMenuItem
+              icon={FolderX}
+              label={t('chatSessionClearProject')}
+              onClick={() => {
+                void runProjectUpdate(null);
+              }}
+              disabled={isProjectPending}
+            />
+          </div>
+        </PopoverContent>
+      </Popover>
+
+      <ChatSessionProjectDialog
+        open={isDialogOpen}
+        currentProjectRoot={projectRoot}
+        isSaving={isProjectPending}
+        onOpenChange={setIsDialogOpen}
+        onSave={runProjectUpdate}
+      />
+    </>
+  );
+}

package/src/components/chat/session-header/chat-session-project-dialog.tsx

@@ -0,0 +1,34 @@
+import { ServerPathPickerDialog } from '@/components/path-picker/server-path-picker-dialog';
+import { t } from '@/lib/i18n';
+
+type ChatSessionProjectDialogProps = {
+  open: boolean;
+  currentProjectRoot?: string | null;
+  isSaving: boolean;
+  onOpenChange: (open: boolean) => void;
+  onSave: (projectRoot: string) => Promise<void> | void;
+};
+
+export function ChatSessionProjectDialog({
+  open,
+  currentProjectRoot,
+  isSaving,
+  onOpenChange,
+  onSave,
+}: ChatSessionProjectDialogProps) {
+  return (
+    <ServerPathPickerDialog
+      open={open}
+      currentPath={currentProjectRoot}
+      isSaving={isSaving}
+      onOpenChange={onOpenChange}
+      onConfirm={onSave}
+      title={t('chatSessionProjectDialogTitle')}
+      description={t('chatSessionProjectDialogDescription')}
+      pathLabel={t('chatSessionProjectPathLabel')}
+      pathPlaceholder={t('chatSessionProjectPathPlaceholder')}
+      confirmLabel={t('chatSessionSetProject')}
+      hint={t('chatSessionProjectUpdateHint')}
+    />
+  );
+}

package/src/components/chat/stores/chat-input.store.ts

@@ -1,8 +1,7 @@
 import { create } from 'zustand';
 import type { ChatComposerNode } from '@nextclaw/agent-chat-ui';
 import type { NcpDraftAttachment } from '@nextclaw/ncp-react';
-import type { MarketplaceInstalledRecord } from '@/api/types';
-import type { ThinkingLevel } from '@/api/types';
+import type { SessionSkillEntryView, ThinkingLevel } from '@/api/types';
 import type { ChatModelOption } from '@/components/chat/chat-input.types';
 import { createInitialChatComposerNodes } from '@/components/chat/chat-composer-state';
 
@@ -12,6 +11,8 @@ export type ChatInputSnapshot = {
   attachments: NcpDraftAttachment[];
   draft: string;
   pendingSessionType: string;
+  pendingProjectRoot: string | null;
+  pendingProjectRootSessionKey: string | null;
   defaultSessionType: string;
   canStopGeneration: boolean;
   stopDisabledReason: string | null;
@@ -39,7 +40,7 @@ export type ChatInputSnapshot = {
   stopReason?: string;
   canEditSessionType: boolean;
   sessionTypeUnavailable: boolean;
-  skillRecords: MarketplaceInstalledRecord[];
+  skillRecords: SessionSkillEntryView[];
   isSkillsLoading: boolean;
   selectedSkills: string[];
 };
@@ -55,6 +56,8 @@ const initialSnapshot: ChatInputSnapshot = {
   attachments: [],
   draft: '',
   pendingSessionType: 'native',
+  pendingProjectRoot: null,
+  pendingProjectRootSessionKey: null,
   defaultSessionType: 'native',
   canStopGeneration: false,
   stopDisabledReason: null,