@nextclaw/ui 0.15.21 → 0.15.23

package/src/features/chat/features/ncp/utils/__tests__/ncp-chat-query-derived.utils.test.ts

@@ -0,0 +1,110 @@
+import { describe, expect, it } from 'vitest';
+import {
+  buildNcpChatDiscoveredModelOptions,
+  filterNcpChatDiscoveredModelOptionsBySessionType,
+} from '@/features/chat/features/ncp/utils/ncp-chat-query-derived.utils';
+
+const providersView = {
+  providers: {
+    opencode: {
+      providerId: 'opencode',
+      providerType: 'opencode',
+      isBuiltInType: true,
+      isCustom: false,
+      enabled: true,
+      displayName: 'OpenCode Zen Free Trial',
+      apiKeyRequired: false,
+      apiKeySet: false,
+      models: ['big-pickle'],
+    },
+  },
+};
+
+const templatesView = {
+  providerTemplates: [{
+    id: 'opencode',
+    providerType: 'opencode',
+    displayName: 'OpenCode Zen Free Trial',
+    modelPrefix: 'opencode',
+    keywords: [],
+    envKey: 'OPENCODE_API_KEY',
+    apiKeyRequired: false,
+  }],
+};
+
+const catalogView = {
+  refreshIntervalMs: 43_200_000,
+  refreshing: false,
+  lastRefreshStartedAt: '2026-08-07T00:00:00.000Z',
+  lastRefreshCompletedAt: '2026-08-07T00:00:01.000Z',
+  providers: {
+    opencode: {
+      providerId: 'opencode',
+      models: ['big-pickle', 'opencode/deepseek-v4-flash-free', 'mimo-v2.5-free'],
+      source: 'catalog' as const,
+      fetchedAt: '2026-08-07T00:00:00.500Z',
+      lastError: null,
+    },
+  },
+};
+
+describe('provider model catalog derivation', () => {
+  it('keeps remote order and returns only configured-provider models that are not already enabled', () => {
+    const result = buildNcpChatDiscoveredModelOptions({
+      catalogView,
+      config: null,
+      providersView,
+      templatesView,
+    });
+
+    expect(result).toEqual([
+      expect.objectContaining({
+        value: 'opencode/deepseek-v4-flash-free',
+        providerId: 'opencode',
+        providerModel: 'deepseek-v4-flash-free',
+      }),
+      expect.objectContaining({
+        value: 'opencode/mimo-v2.5-free',
+        providerId: 'opencode',
+        providerModel: 'mimo-v2.5-free',
+      }),
+    ]);
+  });
+
+  it('does not suggest models for providers that still require configuration', () => {
+    const result = buildNcpChatDiscoveredModelOptions({
+      catalogView,
+      config: null,
+      providersView: {
+        providers: {
+          opencode: {
+            ...providersView.providers.opencode,
+            apiKeyRequired: true,
+          },
+        },
+      },
+      templatesView,
+    });
+
+    expect(result).toEqual([]);
+  });
+
+  it('respects runtime-owned and explicitly restricted session model contracts', () => {
+    const options = buildNcpChatDiscoveredModelOptions({
+      catalogView,
+      config: null,
+      providersView,
+      templatesView,
+    });
+
+    expect(filterNcpChatDiscoveredModelOptionsBySessionType({
+      modelOptions: options,
+      modelSelectionMode: 'runtime-default',
+    })).toEqual([]);
+    expect(filterNcpChatDiscoveredModelOptionsBySessionType({
+      modelOptions: options,
+      modelSelectionMode: 'nextclaw',
+      supportedModels: ['opencode/mimo-v2.5-free'],
+    }).map((option) => option.value)).toEqual(['opencode/mimo-v2.5-free']);
+  });
+});

package/src/features/chat/features/ncp/utils/ncp-chat-query-derived.utils.ts

@@ -2,9 +2,14 @@ import {
   RUNTIME_DEFAULT_MODEL_VALUE,
   type RuntimeModelSelectionMode,
 } from '@nextclaw/shared';
-import type { ConfigView, ProvidersView, ProviderTemplatesView } from '@/shared/lib/api';
-import type { ChatModelOption } from '@/features/chat/types/chat-input.types';
-import { buildProviderModelCatalog, composeProviderModel, resolveModelThinkingCapability } from '@/shared/lib/provider-models';
+import type { ConfigView, ProviderModelCatalogView, ProvidersView, ProviderTemplatesView } from '@/shared/lib/api';
+import type { ChatModelOption, DiscoveredChatModelOption } from '@/features/chat/types/chat-input.types';
+import {
+  buildProviderModelCatalog,
+  composeProviderModel,
+  resolveModelThinkingCapability,
+  toProviderLocalModel,
+} from '@/shared/lib/provider-models';
 
 function buildRuntimeDefaultModelOption(
   label: string,
@@ -50,6 +55,63 @@ export function buildNcpChatProviderModelOptions(params: {
   });
 }
 
+export function buildNcpChatDiscoveredModelOptions(params: {
+  catalogView: ProviderModelCatalogView | null;
+  config: ConfigView | null;
+  providersView: ProvidersView | null;
+  templatesView: ProviderTemplatesView | null;
+}): DiscoveredChatModelOption[] {
+  const { catalogView, config, providersView, templatesView } = params;
+  const remoteCatalog = catalogView?.providers ?? {};
+  const seen = new Set<string>();
+  return buildProviderModelCatalog({
+    providersView: providersView ?? undefined,
+    templatesView: templatesView ?? undefined,
+    config: config ?? undefined,
+  }).flatMap((provider) => {
+    if (!provider.configured) {
+      return [];
+    }
+    const configuredModels = new Set(provider.models);
+    return (remoteCatalog[provider.name]?.models ?? []).map((remoteModel): DiscoveredChatModelOption | null => {
+      const providerModel = toProviderLocalModel(remoteModel, provider.aliases);
+      const value = composeProviderModel(provider.prefix, providerModel);
+      if (!providerModel || !value || configuredModels.has(providerModel) || seen.has(value)) {
+        return null;
+      }
+      seen.add(value);
+      return {
+        value,
+        providerId: provider.name,
+        providerModel,
+        modelLabel: providerModel,
+        providerLabel: provider.displayName,
+        thinkingCapability: resolveModelThinkingCapability(
+          provider.modelThinking,
+          providerModel,
+          provider.aliases,
+        ),
+      };
+    }).filter((option): option is DiscoveredChatModelOption => option !== null);
+  });
+}
+
+export function filterNcpChatDiscoveredModelOptionsBySessionType(params: {
+  modelOptions: DiscoveredChatModelOption[];
+  modelSelectionMode?: RuntimeModelSelectionMode;
+  supportedModels?: string[];
+}): DiscoveredChatModelOption[] {
+  const { modelOptions, modelSelectionMode, supportedModels } = params;
+  if (modelSelectionMode === 'runtime-default') {
+    return [];
+  }
+  if (!supportedModels || supportedModels.length === 0) {
+    return modelOptions;
+  }
+  const supportedModelSet = new Set(supportedModels);
+  return modelOptions.filter((option) => supportedModelSet.has(option.value));
+}
+
 export function filterNcpChatModelOptionsBySessionType(params: {
   modelOptions: ChatModelOption[];
   modelSelectionMode?: RuntimeModelSelectionMode;

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

@@ -63,12 +63,12 @@ function ChatSidebarSessionEditingView({
           }
         }}
         placeholder={t('sessionsLabelPlaceholder')}
-        className="h-8 rounded-lg border-gray-300 bg-white text-xs"
+        className="h-8 rounded-lg border-border bg-background text-xs"
         autoFocus
         disabled={isSaving}
       />
       <div className="flex items-center justify-between gap-2">
-        <div className="min-w-0 text-[11px] text-gray-400 truncate">{sessionKey}</div>
+        <div className="min-w-0 truncate text-[11px] text-muted-foreground/65">{sessionKey}</div>
         <div className="flex items-center gap-1">
           <IconActionButton
             icon={<Check className="h-3.5 w-3.5" />}
@@ -134,8 +134,8 @@ function ChatSidebarSessionDisplayView({
                 className={cn(
                   'shrink-0 rounded-full border px-1.5 py-0.5 text-[10px] font-semibold leading-none',
                   active
-                    ? 'border-gray-300 bg-white/80 text-gray-700'
-                    : 'border-gray-200 bg-gray-100 text-gray-500'
+                    ? 'border-border/70 bg-background/80 text-foreground/75'
+                    : 'border-transparent bg-muted/70 text-muted-foreground'
                 )}
               >
                 {context.label}
@@ -143,12 +143,12 @@ function ChatSidebarSessionDisplayView({
             ) : null}
             {context.icon ? (
               <span className="inline-flex h-4 w-4 shrink-0 items-center justify-center">
-                <SessionContextIconNode icon={context.icon} className={cn('h-[13px] w-[13px]', active ? 'text-gray-700' : 'text-gray-500')} />
+                <SessionContextIconNode icon={context.icon} className={cn('h-[13px] w-[13px]', active ? 'text-foreground/75' : 'text-muted-foreground')} />
               </span>
             ) : null}
           </span>
         </div>
-        <div className="mt-1 flex items-center gap-2 text-[11px] text-gray-400">
+        <div className="mt-0.5 flex items-center gap-2 text-[11px] text-muted-foreground/65">
           <span className="min-w-0 truncate">
             {previewText}
           </span>
@@ -169,7 +169,7 @@ function ChatSidebarSessionDisplayView({
             event.stopPropagation();
             onOpenChildSessions();
           }}
-          className="pointer-events-none absolute right-12 top-0 inline-flex h-6 items-center gap-1 rounded-md px-1.5 text-[10px] font-medium text-muted-foreground opacity-0 transition-colors hover:bg-black/10 hover:text-foreground group-hover/session:pointer-events-auto group-hover/session:opacity-100 focus-visible:pointer-events-auto focus-visible:opacity-100"
+          className="pointer-events-none absolute right-12 top-0 inline-flex h-6 items-center gap-1 rounded-md px-1.5 text-[10px] font-medium text-muted-foreground opacity-0 transition-colors hover:bg-background/80 hover:text-foreground group-hover/session:pointer-events-auto group-hover/session:opacity-100 focus-visible:pointer-events-auto focus-visible:opacity-100"
           aria-label={t('chatSessionOpenChildSessions')}
           title={t('chatSessionOpenChildSessions')}
         >
@@ -245,10 +245,10 @@ export function ChatSidebarSessionItem({
   return (
     <div
       className={cn(
-        'w-full rounded-xl px-3 py-2.5 text-left transition-all text-[13px]',
+        'w-full rounded-lg px-2.5 py-2 text-left text-[13px] transition-colors',
         active
-          ? 'bg-gray-200/80 text-gray-900 font-semibold shadow-sm'
-          : 'text-gray-700 hover:bg-gray-200/60 hover:text-gray-900'
+          ? 'bg-background/90 font-medium text-foreground'
+          : 'text-foreground/80 hover:bg-background/65 hover:text-foreground'
       )}
     >
       {isEditing ? (

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

@@ -61,10 +61,10 @@ export function ChatSidebarSessionList({
   }
 
   return (
-    <div className="space-y-3">
+    <div className="space-y-2">
       {groups.map((group) => (
         <div key={group.label}>
-          <div className="px-2 py-1 text-[11px] font-medium uppercase tracking-wider text-muted-foreground/70">
+          <div className="px-2 pb-1 pt-0.5 text-[11px] font-medium uppercase tracking-wider text-muted-foreground/65">
             {group.label}
           </div>
           <div className="space-y-0.5">{group.items.map(renderSessionItem)}</div>

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

@@ -120,6 +120,23 @@ describe('ChatSessionHeaderActions', () => {
     expect(screen.queryByRole('button', { name: 'View session cron jobs' })).toBeNull();
   });
 
+  it('keeps only the workspace action before a draft becomes a session', () => {
+    render(
+      <ChatSessionHeaderActions
+        sessionKey={null}
+        canDeleteSession={false}
+        isDeletePending={false}
+        currentPath="/tmp/project-alpha"
+        isWorkspaceOpen={false}
+        onToggleWorkspace={mocks.onToggleWorkspace}
+        onDeleteSession={mocks.onDeleteSession}
+      />
+    );
+
+    expect(screen.getByRole('button', { name: 'Open session workspace' })).toBeTruthy();
+    expect(screen.queryByRole('button', { name: 'More actions' })).toBeNull();
+  });
+
   it('uses the shared compact action density for workspace and menu buttons', () => {
     render(
       <ChatSessionHeaderActions

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

@@ -12,7 +12,7 @@ import { t } from '@/shared/lib/i18n';
 const SESSION_HEADER_ACTION_GROUP_CLASS = 'flex shrink-0 items-center gap-1.5';
 
 type ChatSessionHeaderActionsProps = {
-  sessionKey: string;
+  sessionKey: string | null;
   canDeleteSession: boolean;
   isDeletePending: boolean;
   currentPath?: string | null;
@@ -42,6 +42,9 @@ export function ChatSessionHeaderActions({
   const isBusy = isDeletePending || isProjectPending;
 
   const runProjectUpdate = async (nextProjectRoot: string | null) => {
+    if (!sessionKey) {
+      return;
+    }
     const persistToServer = canDeleteSession;
     setIsProjectPending(true);
     try {
@@ -59,48 +62,50 @@ export function ChatSessionHeaderActions({
 
   return (
     <div className={SESSION_HEADER_ACTION_GROUP_CLASS}>
-      <Popover open={isMenuOpen} onOpenChange={setIsMenuOpen}>
-        <PopoverTrigger asChild>
-          <IconActionButton
-            icon={<MoreVertical className="h-4 w-4" />}
-            label={t('chatSessionMoreActions')}
-            tooltip={false}
-            disabled={isBusy}
-          />
-        </PopoverTrigger>
-        <ChatPopoverContent align="end" className="w-56 p-2">
-          <div className="space-y-1">
-            <ChatSessionHeaderMenuItem
-              icon={FolderOpen}
-              label={t('chatSessionSetProject')}
-              onClick={() => {
-                setIsMenuOpen(false);
-                setIsDialogOpen(true);
-              }}
+      {sessionKey ? (
+        <Popover open={isMenuOpen} onOpenChange={setIsMenuOpen}>
+          <PopoverTrigger asChild>
+            <IconActionButton
+              icon={<MoreVertical className="h-4 w-4" />}
+              label={t('chatSessionMoreActions')}
+              tooltip={false}
               disabled={isBusy}
             />
-            <ChatSessionHeaderMenuItem
-              icon={Braces}
-              label={t('chatSessionViewMetadata')}
-              onClick={() => {
-                setIsMenuOpen(false);
-                setIsMetadataDialogOpen(true);
-              }}
-              disabled={isBusy}
-            />
-            <ChatSessionHeaderMenuItem
-              icon={Trash2}
-              label={t('chatDeleteSession')}
-              onClick={() => {
-                setIsMenuOpen(false);
-                onDeleteSession();
-              }}
-              disabled={!canDeleteSession || isBusy}
-              destructive
-            />
-          </div>
-        </ChatPopoverContent>
-      </Popover>
+          </PopoverTrigger>
+          <ChatPopoverContent 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={Braces}
+                label={t('chatSessionViewMetadata')}
+                onClick={() => {
+                  setIsMenuOpen(false);
+                  setIsMetadataDialogOpen(true);
+                }}
+                disabled={isBusy}
+              />
+              <ChatSessionHeaderMenuItem
+                icon={Trash2}
+                label={t('chatDeleteSession')}
+                onClick={() => {
+                  setIsMenuOpen(false);
+                  onDeleteSession();
+                }}
+                disabled={!canDeleteSession || isBusy}
+                destructive
+              />
+            </div>
+          </ChatPopoverContent>
+        </Popover>
+      ) : null}
       <IconActionButton
         icon={
           isWorkspaceOpen ? (
@@ -119,19 +124,23 @@ export function ChatSessionHeaderActions({
         disabled={isBusy}
       />
 
-      <ChatSessionProjectDialog
-        open={isDialogOpen}
-        currentProjectRoot={currentPath}
-        defaultWorkspacePath={defaultWorkspacePath}
-        isSaving={isProjectPending}
-        onOpenChange={setIsDialogOpen}
-        onSave={runProjectUpdate}
-      />
-      <ChatSessionMetadataDialog
-        open={isMetadataDialogOpen}
-        metadata={metadata}
-        onOpenChange={setIsMetadataDialogOpen}
-      />
+      {sessionKey ? (
+        <>
+          <ChatSessionProjectDialog
+            open={isDialogOpen}
+            currentProjectRoot={currentPath}
+            defaultWorkspacePath={defaultWorkspacePath}
+            isSaving={isProjectPending}
+            onOpenChange={setIsDialogOpen}
+            onSave={runProjectUpdate}
+          />
+          <ChatSessionMetadataDialog
+            open={isMetadataDialogOpen}
+            metadata={metadata}
+            onOpenChange={setIsMetadataDialogOpen}
+          />
+        </>
+      ) : null}
     </div>
   );
 }

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

@@ -23,7 +23,7 @@ export function ChatSessionHeaderMenuItem({
         '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-muted-foreground hover:bg-accent hover:text-accent-foreground'
+          : 'text-muted-foreground hover:bg-[var(--interaction-hover)] hover:text-accent-foreground'
       )}
       onClick={onClick}
       disabled={disabled}

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

@@ -57,7 +57,7 @@ export function ChatSessionProjectBadge({
           <button
             type="button"
             title={projectRoot ?? undefined}
-            className="min-w-0 max-w-[320px] shrink rounded-full border border-border bg-muted px-2 py-0.5 text-[11px] font-medium text-muted-foreground transition-colors hover:border-primary/35 hover:bg-accent hover:text-accent-foreground disabled:cursor-not-allowed disabled:opacity-60"
+            className="min-w-0 max-w-[320px] shrink rounded-full border border-border bg-muted px-2 py-0.5 text-[11px] font-medium text-muted-foreground transition-colors hover:border-primary/35 hover:bg-[var(--interaction-hover)] hover:text-accent-foreground disabled:cursor-not-allowed disabled:opacity-60"
             aria-label={t('chatSessionSetProject')}
             disabled={isProjectPending}
           >

package/src/features/chat/features/session/components/session-header/chat-session-switcher-groups.tsx

@@ -69,7 +69,7 @@ function ChatSessionSwitchItem({
         "flex w-full min-w-0 items-start gap-2 rounded-lg px-2.5 py-2 text-left transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border",
         active
           ? "bg-accent text-accent-foreground"
-          : "text-foreground hover:bg-accent/65 hover:text-accent-foreground",
+          : "text-foreground hover:bg-[var(--interaction-hover)] hover:text-accent-foreground",
       )}
       onClick={() => onSelect(session.key)}
     >

package/src/features/chat/features/session/components/session-header/chat-session-title-switcher.tsx

@@ -29,7 +29,7 @@ import { cn } from "@/shared/lib/utils";
 import { useProjects } from "@/shared/hooks/use-projects";
 
 const SWITCHER_TRIGGER_CLASS =
-  "group inline-flex min-w-0 max-w-full items-center gap-1.5 rounded-md px-1.5 py-1 text-sm font-medium text-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border";
+  "group inline-flex min-w-0 max-w-full items-center gap-1.5 rounded-md px-1.5 py-1 text-sm font-medium text-foreground transition-colors hover:bg-[var(--interaction-hover)] hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border";
 
 function ChatSessionTitle({ title }: { title: string }) {
   return (

package/src/features/chat/features/session/hooks/__tests__/use-selected-session-context-window-indicator.test.tsx

@@ -22,8 +22,11 @@ describe('useSelectedSessionContextWindowIndicator', () => {
     useChatThreadStore.getState().setSnapshot({
       sessionKey: 'session-current',
       contextWindow: {
+        completeInputBudget: true,
         usedContextTokens: 25,
         totalContextTokens: 100,
+        fixedInputTokens: 10,
+        dynamicInputTokens: 15,
         availableContextTokens: 75,
         prunedUsedContextTokens: 25,
         droppedHistoryCount: 0,
@@ -48,6 +51,59 @@ describe('useSelectedSessionContextWindowIndicator', () => {
     });
   });
 
+  it('shows pressure against the compaction threshold and exposes the full input breakdown', () => {
+    useChatThreadStore.getState().setSnapshot({
+      sessionKey: 'session-current',
+      contextWindow: {
+        completeInputBudget: true,
+        usedContextTokens: 28_000,
+        totalContextTokens: 35_000,
+        fixedInputTokens: 25_000,
+        dynamicInputTokens: 3_000,
+        reservedContextTokens: 7_000,
+        triggerContextTokens: 28_000,
+        availableBeforeCompactionTokens: 0,
+        availableContextTokens: 7_000,
+        prunedUsedContextTokens: 28_000,
+        droppedHistoryCount: 0,
+        truncatedToolResultCount: 0,
+        truncatedSystemPrompt: false,
+        truncatedUserMessage: false,
+        compacted: false,
+        compactedMessageCount: 0,
+        updatedAt: '2026-08-08T00:00:00.000Z',
+      },
+    });
+
+    const { result } = renderHook(() =>
+      useSelectedSessionContextWindowIndicator(),
+    );
+
+    expect(result.current).toMatchObject({
+      percentLabel: '100%',
+      ratio: 1,
+      tone: 'danger',
+    });
+    expect(result.current?.details.map((detail) => detail.value)).toEqual([
+      '28k',
+      '28k',
+      '0',
+      '25k',
+      '3.0k',
+      '7.0k',
+      '35k',
+    ]);
+    expect(result.current?.details.map((detail) => detail.dividerBefore ?? false)).toEqual([
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+    ]);
+  });
+
   it('hides the indicator when the current thread snapshot has no context window', () => {
     useChatThreadStore.getState().setSnapshot({
       sessionKey: 'session-current',
@@ -60,4 +116,35 @@ describe('useSelectedSessionContextWindowIndicator', () => {
 
     expect(result.current).toBeNull();
   });
+
+  it('hides history-only snapshots instead of presenting missing fixed input as zero', () => {
+    useChatThreadStore.getState().setSnapshot({
+      sessionKey: 'session-current',
+      contextWindow: {
+        completeInputBudget: true,
+        usedContextTokens: 5,
+        totalContextTokens: 35_000,
+        fixedInputTokens: 0,
+        dynamicInputTokens: 5,
+        reservedContextTokens: 7_000,
+        triggerContextTokens: 28_000,
+        availableBeforeCompactionTokens: 27_995,
+        availableContextTokens: 34_995,
+        prunedUsedContextTokens: 5,
+        droppedHistoryCount: 0,
+        truncatedToolResultCount: 0,
+        truncatedSystemPrompt: false,
+        truncatedUserMessage: false,
+        compacted: false,
+        compactedMessageCount: 0,
+        updatedAt: '2026-08-08T00:00:00.000Z',
+      },
+    });
+
+    const { result } = renderHook(() =>
+      useSelectedSessionContextWindowIndicator(),
+    );
+
+    expect(result.current).toBeNull();
+  });
 });

package/src/features/chat/features/session/utils/__tests__/chat-session-display.utils.test.ts

@@ -73,6 +73,32 @@ describe('chat-session-display', () => {
     ).toBe('正在调用工具：shell');
   });
 
+  it('localizes structured tool activity previews', () => {
+    const session = createSession({
+      activityPreview: {
+        state: 'running',
+        statusKind: 'tool-completed',
+        statusText: 'gateway',
+        timestamp: '2026-05-16T01:00:00.000Z'
+      }
+    });
+
+    expect(sessionActivityPreviewText(session, 'zh')).toBe('工具调用 · 已完成 · gateway');
+    expect(sessionActivityPreviewText(session, 'en')).toBe('Tool Call · Completed · gateway');
+  });
+
+  it('localizes persisted legacy tool activity previews', () => {
+    const session = createSession({
+      activityPreview: {
+        state: 'running',
+        statusText: 'Tool call completed: gateway',
+        timestamp: '2026-05-16T01:00:00.000Z'
+      }
+    });
+
+    expect(sessionActivityPreviewText(session, 'zh')).toBe('工具调用 · 已完成 · gateway');
+  });
+
   it('shows the final assistant reply after completion', () => {
     expect(
       sessionActivityPreviewText(

package/src/features/chat/features/session/utils/__tests__/ncp-session-adapter.utils.test.ts

@@ -1,4 +1,5 @@
 import {
+  adaptNcpMessagePartsForChat,
   adaptNcpMessageToUiMessage,
   adaptNcpSessionSummary,
   readNcpSessionPreferredThinking
@@ -16,6 +17,24 @@ function createSummary(partial: Partial<NcpSessionSummaryView> = {}): NcpSession
   };
 }
 
+it('preserves NCP extension parts for the chat presentation adapter', () => {
+  const extension = {
+    type: 'extension' as const,
+    extensionType: 'nextclaw.context-compaction',
+    data: { id: 'context-compaction-message-1' },
+  };
+
+  expect(adaptNcpMessagePartsForChat([
+    { type: 'text', text: 'before' },
+    extension,
+    { type: 'text', text: 'after' },
+  ])).toEqual([
+    { type: 'text', text: 'before' },
+    extension,
+    { type: 'text', text: 'after' },
+  ]);
+});
+
 describe('adaptNcpSessionSummary', () => {
   it('maps session metadata into shared session entry fields', () => {
     const adapted = adaptNcpSessionSummary(
@@ -106,7 +125,8 @@ describe('adaptNcpSessionSummary', () => {
           last_activity_preview: {
             state: 'completed',
             replyText: 'Plan is ready',
-            statusText: 'Tool call completed',
+            statusKind: 'tool-completed',
+            statusText: 'read_file',
             timestamp: '2026-05-16T01:00:00.000Z',
           },
         },
@@ -116,7 +136,8 @@ describe('adaptNcpSessionSummary', () => {
     expect(adapted.activityPreview).toEqual({
       state: 'completed',
       replyText: 'Plan is ready',
-      statusText: 'Tool call completed',
+      statusKind: 'tool-completed',
+      statusText: 'read_file',
       timestamp: '2026-05-16T01:00:00.000Z',
     });
   });