@nextclaw/ui 0.12.10 → 0.12.12

package/src/{components/chat/chat-session-preference-sync.test.ts → features/chat/managers/chat-session-preference-sync.manager.test.ts}

@@ -1,19 +1,23 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
-import { updateNcpSession } from '@/api/ncp-session';
-import { ChatSessionPreferenceSync } from '@/components/chat/chat-session-preference-sync';
-import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
+import { updateNcpSession } from '@/shared/lib/api';
+import { ChatSessionPreferenceSync } from './chat-session-preference-sync.manager';
+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';
 
-vi.mock('@/api/ncp-session', () => ({
-  updateNcpSession: vi.fn(async () => ({
-    sessionId: 'session-1',
-    messageCount: 0,
-    updatedAt: new Date().toISOString(),
-    status: 'idle',
-    metadata: {}
-  }))
-}));
+vi.mock('@/shared/lib/api', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/shared/lib/api')>();
+  return {
+    ...actual,
+    updateNcpSession: vi.fn(async () => ({
+      sessionId: 'session-1',
+      messageCount: 0,
+      updatedAt: new Date().toISOString(),
+      status: 'idle',
+      metadata: {}
+    }))
+  };
+});
 
 describe('ChatSessionPreferenceSync', () => {
   afterEach(() => {

package/src/{components/chat/chat-session-preference-sync.ts → features/chat/managers/chat-session-preference-sync.manager.ts}

@@ -1,16 +1,12 @@
-import type { SessionPatchUpdate, ThinkingLevel } from '@/api/types';
-import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
+import type { SessionPatchUpdate, ThinkingLevel } 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';
 
-type QueuedSessionPreferenceSync = {
-  sessionKey: string;
-  patch: SessionPatchUpdate;
-};
+type QueuedSessionPreferenceSync = { sessionKey: string; patch: SessionPatchUpdate };
 
 function normalizeOptionalModel(value: string): string | null {
-  const normalized = value.trim();
-  return normalized.length > 0 ? normalized : null;
+  const normalized = value.trim(); return normalized.length > 0 ? normalized : null;
 }
 
 function normalizeOptionalThinking(value: ThinkingLevel | null): ThinkingLevel | null {
@@ -22,10 +18,7 @@ export class ChatSessionPreferenceSync {
   private queued: QueuedSessionPreferenceSync | null = null;
 
   constructor(
-    private readonly updateSession: (
-      sessionKey: string,
-      patch: SessionPatchUpdate
-    ) => Promise<unknown>
+    private readonly updateSession: (sessionKey: string, patch: SessionPatchUpdate) => Promise<unknown>
   ) {}
 
   syncSelectedSessionPreferences = (): void => {

package/src/{components → features}/chat/managers/chat-stream-actions.manager.ts

@@ -1,4 +1,4 @@
-import type { ChatStreamActions } from '@/components/chat/chat-stream/types';
+import type { ChatStreamActions } from '@/features/chat/types/chat-stream.types';
 
 const noopAsync = async () => {};
 const noop = () => {};
@@ -19,7 +19,8 @@ export class ChatStreamActionsManager {
     };
   };
 
-  sendMessage = (payload: Parameters<ChatStreamActions['sendMessage']>[0]) => this.actions.sendMessage(payload);
+  sendMessage = (payload: Parameters<ChatStreamActions['sendMessage']>[0]) =>
+    this.actions.sendMessage(payload);
 
   stopCurrentRun = () => this.actions.stopCurrentRun();
 

package/src/{components → features}/chat/managers/chat-ui.manager.ts

@@ -1,5 +1,5 @@
-import { buildSessionPath } from '@/components/chat/chat-session-route';
 import type { NavigateFunction, NavigateOptions } from 'react-router-dom';
+import { buildSessionPath } from '@/features/chat/utils/chat-session-route.utils';
 
 type ChatUiState = {
   pathname: string;
@@ -7,10 +7,18 @@ type ChatUiState = {
 
 type ChatUiActions = {
   navigate: NavigateFunction | null;
-  confirm: (params: { title: string; variant: 'destructive'; confirmLabel: string }) => Promise<boolean>;
+  confirm: (params: {
+    title: string;
+    variant: 'destructive';
+    confirmLabel: string;
+  }) => Promise<boolean>;
 };
 
-const noopConfirm = async (_params: { title: string; variant: 'destructive'; confirmLabel: string }) => false;
+const noopConfirm = async (_params: {
+  title: string;
+  variant: 'destructive';
+  confirmLabel: string;
+}) => false;
 
 export class ChatUiManager {
   private state: ChatUiState = {

package/src/{components/chat/ncp/tests → features/chat/managers}/ncp-chat-input.manager.test.ts

@@ -1,9 +1,10 @@
 import { createChatComposerTextNode } from '@nextclaw/agent-chat-ui';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { NcpChatInputManager } from '@/components/chat/ncp/ncp-chat-input.manager';
-import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
+import { NcpChatInputManager } from '@/features/chat/managers/ncp-chat-input.manager';
+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';
+import { useSystemStatusStore } from '@/features/system-status';
 
 describe('NcpChatInputManager', () => {
   beforeEach(() => {
@@ -15,8 +16,23 @@ describe('NcpChatInputManager', () => {
         attachments: [],
         selectedSkills: [],
         selectedSessionType: 'native',
-        selectedModel: '',
+        selectedModel: 'gpt-5',
         selectedThinkingLevel: null,
+        isProviderStateResolved: true,
+        modelOptions: [
+          {
+            value: 'gpt-5',
+            modelLabel: 'GPT-5',
+            providerLabel: 'OpenAI',
+            thinkingCapability: null,
+          },
+        ],
+      },
+    });
+    useSystemStatusStore.setState({
+      state: {
+        ...useSystemStatusStore.getState().state,
+        lifecyclePhase: 'ready',
       },
     });
     useChatSessionListStore.setState({
@@ -96,4 +112,38 @@ describe('NcpChatInputManager', () => {
     );
     expect(sessionListManager.promoteRootDraftSessionRoute).toHaveBeenCalledWith('draft-root-session');
   });
+
+  it('does not send while the runtime is still blocked during startup', async () => {
+    useChatInputStore.setState({
+      snapshot: {
+        ...useChatInputStore.getState().snapshot,
+        isProviderStateResolved: false,
+        modelOptions: [],
+      },
+    });
+    useSystemStatusStore.setState({
+      state: {
+        ...useSystemStatusStore.getState().state,
+        lifecyclePhase: 'cold-starting',
+      },
+    });
+    const streamActionsManager = {
+      sendMessage: vi.fn().mockResolvedValue(undefined),
+      stopCurrentRun: vi.fn().mockResolvedValue(undefined),
+    } as unknown as ConstructorParameters<typeof NcpChatInputManager>[1];
+    const sessionListManager = {
+      ensureDraftSession: vi.fn(() => 'draft-session'),
+      promoteRootDraftSessionRoute: vi.fn(),
+    } as unknown as ConstructorParameters<typeof NcpChatInputManager>[2];
+    const manager = new NcpChatInputManager(
+      {} as ConstructorParameters<typeof NcpChatInputManager>[0],
+      streamActionsManager,
+      sessionListManager,
+    );
+
+    await manager.send();
+
+    expect(streamActionsManager.sendMessage).not.toHaveBeenCalled();
+    expect(sessionListManager.promoteRootDraftSessionRoute).not.toHaveBeenCalled();
+  });
 });

package/src/{components/chat/ncp → features/chat/managers}/ncp-chat-input.manager.ts

@@ -1,8 +1,8 @@
 import type { ChatComposerNode } from '@nextclaw/agent-chat-ui';
 import type { NcpDraftAttachment } from '@nextclaw/ncp-react';
 import type { SetStateAction } from 'react';
-import type { ThinkingLevel } from '@/api/types';
-import { updateNcpSession } from '@/api/ncp-session';
+import type { ThinkingLevel } from '@/shared/lib/api';
+import { updateNcpSession } from '@/shared/lib/api';
 import {
   createChatComposerNodesFromDraft,
   createInitialChatComposerNodes,
@@ -12,19 +12,21 @@ import {
   pruneComposerAttachments,
   syncComposerAttachments,
   syncComposerSkills
-} from '@/components/chat/chat-composer-state';
-import { useChatInputStore } from '@/components/chat/stores/chat-input.store';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
-import type { ChatInputSnapshot } from '@/components/chat/stores/chat-input.store';
-import type { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
-import type { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';
-import type { ChatSessionListManager } from '@/components/chat/managers/chat-session-list.manager';
-import { ChatSessionPreferenceSync } from '@/components/chat/chat-session-preference-sync';
-import { chatRecentModelsManager } from '@/components/chat/chat-recent-models.manager';
-import { chatRecentSkillsManager } from '@/components/chat/chat-recent-skills.manager';
-import type { ChatModelOption } from '@/components/chat/chat-input.types';
-import { normalizeSessionType } from '@/components/chat/useChatSessionTypeState';
+} from '@/features/chat/utils/chat-composer-state.utils';
+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';
+import type { ChatInputSnapshot } from '@/features/chat/stores/chat-input.store';
+import type { ChatStreamActionsManager } from '@/features/chat/managers/chat-stream-actions.manager';
+import type { ChatUiManager } from '@/features/chat/managers/chat-ui.manager';
+import type { ChatSessionListManager } from '@/features/chat/managers/chat-session-list.manager';
+import { ChatSessionPreferenceSync } from '@/features/chat/managers/chat-session-preference-sync.manager';
+import { isNcpChatSendDisabled } from '@/features/chat/utils/ncp-chat-input-availability.utils';
+import { chatRecentModelsManager } from '@/features/chat/managers/chat-recent-models.manager';
+import { chatRecentSkillsManager } from '@/features/chat/managers/chat-recent-skills.manager';
+import type { ChatModelOption } from '@/features/chat/types/chat-input.types';
+import { normalizeSessionType } from '@/features/chat/hooks/use-chat-session-type-state';
+import { systemStatusManager } from '@/features/system-status';
 
 export class NcpChatInputManager {
   private readonly sessionPreferenceSync = new ChatSessionPreferenceSync(updateNcpSession);
@@ -139,7 +141,7 @@ export class NcpChatInputManager {
     if (attachments.length === 0) {
       return [];
     }
-    const snapshot = useChatInputStore.getState().snapshot;
+    const { snapshot } = useChatInputStore.getState();
     const existingSignatures = new Set(snapshot.attachments.map(this.buildAttachmentSignature));
     const nextAttachments = this.dedupeAttachments([...snapshot.attachments, ...attachments]);
     const insertedAttachments = nextAttachments.filter(
@@ -173,12 +175,18 @@ export class NcpChatInputManager {
     const sessionSnapshot = useChatSessionListStore.getState().snapshot;
     const threadSnapshot = useChatThreadStore.getState().snapshot;
     const message = inputSnapshot.draft.trim();
-    const attachments = inputSnapshot.attachments;
+    const { attachments } = inputSnapshot;
     const parts = deriveNcpMessagePartsFromComposer(inputSnapshot.composerNodes, attachments);
     const hasSendableContent = parts.some(
       (part) => part.type !== 'text' || part.text.trim().length > 0
     );
-    if (!hasSendableContent) {
+    if (
+      isNcpChatSendDisabled({
+        snapshot: inputSnapshot,
+        hasSendableDraft: hasSendableContent,
+        isRuntimeBlocked: systemStatusManager.isChatInteractionBlocked(),
+      })
+    ) {
       return;
     }
     const { selectedSkills: requestedSkills, composerNodes } = inputSnapshot;
@@ -237,7 +245,7 @@ export class NcpChatInputManager {
   };
 
   setSelectedSkills = (next: SetStateAction<string[]>) => {
-    const snapshot = useChatInputStore.getState().snapshot;
+    const { snapshot } = useChatInputStore.getState();
     const { selectedSkills: prev } = snapshot;
     const value = this.resolveUpdateValue(prev, next);
     if (this.isSameStringArray(value, prev)) {
@@ -292,7 +300,7 @@ export class NcpChatInputManager {
   };
 
   private reconcileThinkingForModel = (model: string): void => {
-    const snapshot = useChatInputStore.getState().snapshot;
+    const { snapshot } = useChatInputStore.getState();
     const modelOption = snapshot.modelOptions.find((option) => option.value === model);
     const { selectedThinkingLevel } = snapshot;
     const nextThinking = this.resolveThinkingForModel(modelOption, selectedThinkingLevel);

package/src/{components/chat/ncp/ncp-chat.presenter.ts → features/chat/managers/ncp-chat-presenter.manager.ts}

@@ -1,8 +1,8 @@
-import { ChatSessionListManager } from '@/components/chat/managers/chat-session-list.manager';
-import { ChatStreamActionsManager } from '@/components/chat/managers/chat-stream-actions.manager';
-import { ChatUiManager } from '@/components/chat/managers/chat-ui.manager';
-import { NcpChatInputManager } from '@/components/chat/ncp/ncp-chat-input.manager';
-import { NcpChatThreadManager } from '@/components/chat/ncp/ncp-chat-thread.manager';
+import { ChatSessionListManager } from '@/features/chat/managers/chat-session-list.manager';
+import { ChatStreamActionsManager } from '@/features/chat/managers/chat-stream-actions.manager';
+import { ChatUiManager } from '@/features/chat/managers/chat-ui.manager';
+import { NcpChatInputManager } from '@/features/chat/managers/ncp-chat-input.manager';
+import { NcpChatThreadManager } from '@/features/chat/managers/ncp-chat-thread.manager';
 
 export class NcpChatPresenter {
   chatUiManager = new ChatUiManager();

package/src/{components/chat/ncp/tests → features/chat/managers}/ncp-chat-thread.manager.test.ts

@@ -1,21 +1,22 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { appQueryClient } from '@/app-query-client';
-import { NcpChatThreadManager } from '@/components/chat/ncp/ncp-chat-thread.manager';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
+import { NcpChatThreadManager } from '@/features/chat/managers/ncp-chat-thread.manager';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
+import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
 
 const { deleteNcpSessionMock, deleteSummaryMock } = vi.hoisted(() => ({
   deleteNcpSessionMock: vi.fn(async () => ({ deleted: true, sessionId: 'parent-session-1' })),
   deleteSummaryMock: vi.fn(),
 }));
 
-vi.mock('@/api/ncp-session', () => ({
-  deleteNcpSession: deleteNcpSessionMock,
-}));
-
-vi.mock('@/api/ncp-session-query-cache', () => ({
-  deleteNcpSessionSummaryInQueryClient: deleteSummaryMock,
-}));
+vi.mock('@/shared/lib/api', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/shared/lib/api')>();
+  return {
+    ...actual,
+    deleteNcpSession: deleteNcpSessionMock,
+    deleteNcpSessionSummaryInQueryClient: deleteSummaryMock,
+  };
+});
 
 describe('NcpChatThreadManager', () => {
   beforeEach(() => {

package/src/{components/chat/ncp → features/chat/managers}/ncp-chat-thread.manager.ts

@@ -1,20 +1,21 @@
 import { appQueryClient } from '@/app-query-client';
-import { deleteNcpSessionSummaryInQueryClient } from '@/api/ncp-session-query-cache';
-import { deleteNcpSession as deleteNcpSessionApi } from '@/api/ncp-session';
+import { deleteNcpSessionSummaryInQueryClient } from '@/shared/lib/api';
+import { deleteNcpSession as deleteNcpSessionApi } from '@/shared/lib/api';
 import type {
   ChatFileOpenActionViewModel,
   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';
-import { useChatSessionListStore } from '@/components/chat/stores/chat-session-list.store';
+import type { ChatSessionListManager } from '@/features/chat/managers/chat-session-list.manager';
+import type { ChatStreamActionsManager } from '@/features/chat/managers/chat-stream-actions.manager';
+import type { ChatUiManager } from '@/features/chat/managers/chat-ui.manager';
+import { useChatSessionListStore } from '@/features/chat/stores/chat-session-list.store';
 import type {
   ChatThreadSnapshot,
   ChatWorkspaceFileTab,
-} from '@/components/chat/stores/chat-thread.store';
-import { useChatThreadStore } from '@/components/chat/stores/chat-thread.store';
-import { t } from '@/lib/i18n';
+} from '@/features/chat/stores/chat-thread.store';
+import { useChatThreadStore } from '@/features/chat/stores/chat-thread.store';
+import { viewportLayoutManager } from '@/app/managers/viewport-layout.manager';
+import { t } from '@/shared/lib/i18n';
 
 export class NcpChatThreadManager {
   constructor(
@@ -281,10 +282,7 @@ export class NcpChatThreadManager {
   };
 
   private isCompactViewport = (): boolean => {
-    if (typeof window === 'undefined' || typeof window.matchMedia !== 'function') {
-      return false;
-    }
-    return window.matchMedia('(max-width: 767px)').matches;
+    return viewportLayoutManager.getSnapshot().mode === 'mobile';
   };
 
   private deleteCurrentSession = async () => {

package/src/{lib → features/chat/managers}/recent-selection.manager.test.ts

@@ -1,4 +1,4 @@
-import { RecentSelectionManager } from '@/lib/recent-selection.manager';
+import { RecentSelectionManager } from './recent-selection.manager';
 
 describe('RecentSelectionManager', () => {
   const storageKey = 'test.recent-selection-manager';

package/src/{lib → features/chat/managers}/recent-selection.manager.ts

@@ -13,7 +13,7 @@ type VisibleRecentSelectionParams = {
 export class RecentSelectionManager {
   constructor(private readonly options: RecentSelectionManagerOptions) {}
 
-  read(): string[] {
+  read = (): string[] => {
     const storage = this.getStorage();
     if (!storage) {
       return [];
@@ -23,9 +23,9 @@ export class RecentSelectionManager {
     } catch {
       return [];
     }
-  }
+  };
 
-  remember(value: string): string[] {
+  remember = (value: string): string[] => {
     const normalizedValue = this.normalizeValue(value);
     if (!normalizedValue) {
       return this.read();
@@ -33,9 +33,9 @@ export class RecentSelectionManager {
     const next = [normalizedValue, ...this.read().filter((item) => item !== normalizedValue)].slice(0, this.options.limit);
     this.write(next);
     return next;
-  }
+  };
 
-  resolveVisible(params: VisibleRecentSelectionParams): string[] {
+  resolveVisible = (params: VisibleRecentSelectionParams): string[] => {
     const availableValues = this.normalizeList(params.availableValues, Number.POSITIVE_INFINITY);
     if (availableValues.length <= params.minAvailableCount) {
       return [];
@@ -53,9 +53,9 @@ export class RecentSelectionManager {
       }
     }
     return visible;
-  }
+  };
 
-  private write(values: string[]): void {
+  private write = (values: string[]): void => {
     const storage = this.getStorage();
     if (!storage) {
       return;
@@ -65,9 +65,9 @@ export class RecentSelectionManager {
     } catch {
       // Ignore storage write failures and keep the runtime behavior deterministic.
     }
-  }
+  };
 
-  private getStorage(): Storage | null {
+  private getStorage = (): Storage | null => {
     if (Object.prototype.hasOwnProperty.call(this.options, 'storage')) {
       return (this.options.storage as Storage | null | undefined) ?? null;
     }
@@ -75,9 +75,9 @@ export class RecentSelectionManager {
       return null;
     }
     return window.localStorage;
-  }
+  };
 
-  private normalizeList(values: unknown, limit = this.options.limit): string[] {
+  private normalizeList = (values: unknown, limit = this.options.limit): string[] => {
     if (!Array.isArray(values)) {
       return [];
     }
@@ -93,13 +93,13 @@ export class RecentSelectionManager {
       }
     }
     return deduped;
-  }
+  };
 
-  private normalizeValue(value: unknown): string | null {
+  private normalizeValue = (value: unknown): string | null => {
     if (typeof value !== 'string') {
       return null;
     }
     const normalized = value.trim();
     return normalized.length > 0 ? normalized : null;
-  }
+  };
 }

package/src/features/chat/pages/chat-page.tsx

@@ -0,0 +1,6 @@
+import type { ChatPageProps } from '@/features/chat/components/layout/chat-page-shell';
+import { NcpChatPage } from '@/features/chat/pages/ncp-chat-page';
+
+export function ChatPage({ view }: ChatPageProps) {
+  return <NcpChatPage view={view} />;
+}

package/src/{components/chat/chat-page-runtime.test.ts → features/chat/pages/ncp-chat-page.test.ts}

@@ -1,16 +1,19 @@
 import { describe, expect, it } from 'vitest';
-import type { SessionEntryView, ThinkingLevel } from '@/api/types';
+import type { SessionEntryView, ThinkingLevel } from '@/shared/lib/api';
+import type { ChatModelOption } from '@/features/chat/types/chat-input.types';
 import {
   resolveRecentSessionPreferredModel,
   resolveRecentSessionPreferredThinking,
   resolveSelectedModelValue,
   resolveSelectedThinkingLevelValue
-} from '@/components/chat/chat-session-preference-governance';
+} from '@/features/chat/utils/chat-session-preference-governance.utils';
 import {
+  buildNcpSendMetadata,
   shouldClearPendingProjectRootOverride
-} from '@/components/chat/ncp/ncp-chat-page';
+} from '@/features/chat/pages/ncp-chat-page';
+import { filterModelOptionsBySessionType } from '@/features/chat/hooks/use-ncp-chat-page-data';
 
-const modelOptions = [
+const modelOptions: ChatModelOption[] = [
   {
     value: 'anthropic/claude-sonnet-4',
     modelLabel: 'claude-sonnet-4',
@@ -25,6 +28,68 @@ const modelOptions = [
   }
 ];
 
+describe('filterModelOptionsBySessionType', () => {
+  it('keeps the full model catalog when the session type does not publish a supportedModels whitelist', () => {
+    expect(
+      filterModelOptionsBySessionType({
+        modelOptions
+      })
+    ).toEqual(modelOptions);
+  });
+
+  it('keeps only session-type-supported models when the runtime publishes a filtered list', () => {
+    expect(
+      filterModelOptionsBySessionType({
+        modelOptions,
+        supportedModels: ['anthropic/claude-sonnet-4']
+      })
+    ).toEqual([modelOptions[0]]);
+  });
+
+  it('falls back to the full model catalog when the advertised models do not match the current catalog', () => {
+    expect(
+      filterModelOptionsBySessionType({
+        modelOptions,
+        supportedModels: ['unknown/model']
+      })
+    ).toEqual(modelOptions);
+  });
+});
+
+describe('buildNcpSendMetadata', () => {
+  it('includes the project root in the first-message metadata when present', () => {
+    expect(
+      buildNcpSendMetadata({
+        agentId: 'engineer',
+        sessionType: 'codex',
+        projectRoot: ' /tmp/project-alpha ',
+      }),
+    ).toMatchObject({
+      agent_id: 'engineer',
+      session_type: 'codex',
+      project_root: '/tmp/project-alpha',
+    });
+  });
+
+  it('omits project_root when the input is blank', () => {
+    expect(
+      buildNcpSendMetadata({
+        projectRoot: '   ',
+      }),
+    ).not.toHaveProperty('project_root');
+  });
+
+  it('sends requested skill refs instead of legacy requested skill names', () => {
+    expect(
+      buildNcpSendMetadata({
+        requestedSkills: ['project:/tmp/project-alpha/.agents/skills/review'],
+      }),
+    ).toMatchObject({
+      requested_skill_refs: ['project:/tmp/project-alpha/.agents/skills/review'],
+    });
+  });
+});
+
 function createSession(overrides: Partial<SessionEntryView> & Pick<SessionEntryView, 'key'>): SessionEntryView {
   return {
     key: overrides.key,