Merge branch 'main' into 1179-add-resume-cmd

packages/cli/src/ui/commands/directoryCommand.tsx

@@ -130,7 +130,7 @@ export const directoryCommand: SlashCommand = {
             {
               type: MessageType.INFO,
               text: t(
-                'Successfully added GEMINI.md files from the following directories if there are:\n- {{directories}}',
+                'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}',
                 {
                   directories: added.join('\n- '),
                 },

packages/cli/src/ui/commands/languageCommand.test.ts

@@ -46,12 +46,15 @@ vi.mock('node:fs', async (importOriginal) => {
 
 // Mock Storage from core
 vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('@qwen-code/qwen-code-core')>();
+  const actual =
+    await importOriginal<typeof import('@qwen-code/qwen-code-core')>();
   return {
     ...actual,
     Storage: {
       getGlobalQwenDir: vi.fn().mockReturnValue('/mock/.qwen'),
-      getGlobalSettingsPath: vi.fn().mockReturnValue('/mock/.qwen/settings.json'),
+      getGlobalSettingsPath: vi
+        .fn()
+        .mockReturnValue('/mock/.qwen/settings.json'),
     },
   };
 });
@@ -360,7 +363,10 @@ describe('languageCommand', () => {
         throw new Error('The language command must have an action.');
       }
 
-      const result = await languageCommand.action(mockContext, 'output Chinese');
+      const result = await languageCommand.action(
+        mockContext,
+        'output Chinese',
+      );
 
       expect(fs.mkdirSync).toHaveBeenCalled();
       expect(fs.writeFileSync).toHaveBeenCalledWith(
@@ -371,7 +377,9 @@ describe('languageCommand', () => {
       expect(result).toEqual({
         type: 'message',
         messageType: 'info',
-        content: expect.stringContaining('LLM output language rule file generated'),
+        content: expect.stringContaining(
+          'LLM output language rule file generated',
+        ),
       });
     });
 
@@ -380,7 +388,10 @@ describe('languageCommand', () => {
         throw new Error('The language command must have an action.');
       }
 
-      const result = await languageCommand.action(mockContext, 'output Japanese');
+      const result = await languageCommand.action(
+        mockContext,
+        'output Japanese',
+      );
 
       expect(result).toEqual({
         type: 'message',
@@ -514,7 +525,9 @@ describe('languageCommand', () => {
       expect(result).toEqual({
         type: 'message',
         messageType: 'info',
-        content: expect.stringContaining('LLM output language rule file generated'),
+        content: expect.stringContaining(
+          'LLM output language rule file generated',
+        ),
       });
     });
   });

packages/cli/src/ui/commands/restoreCommand.test.ts

@@ -89,7 +89,7 @@ describe('restoreCommand', () => {
       ).toEqual({
         type: 'message',
         messageType: 'error',
-        content: 'Could not determine the .gemini directory path.',
+        content: 'Could not determine the .qwen directory path.',
       });
     });
 

packages/cli/src/ui/commands/restoreCommand.ts

@@ -28,7 +28,7 @@ async function restoreAction(
     return {
       type: 'message',
       messageType: 'error',
-      content: 'Could not determine the .gemini directory path.',
+      content: 'Could not determine the .qwen directory path.',
     };
   }
 

packages/cli/src/ui/components/HistoryItemDisplay.test.tsx

@@ -15,6 +15,7 @@ import type {
 } from '@qwen-code/qwen-code-core';
 import { ToolGroupMessage } from './messages/ToolGroupMessage.js';
 import { renderWithProviders } from '../../test-utils/render.js';
+import { ConfigContext } from '../contexts/ConfigContext.js';
 
 // Mock child components
 vi.mock('./messages/ToolGroupMessage.js', () => ({
@@ -22,7 +23,9 @@ vi.mock('./messages/ToolGroupMessage.js', () => ({
 }));
 
 describe('<HistoryItemDisplay />', () => {
-  const mockConfig = {} as unknown as Config;
+  const mockConfig = {
+    getChatRecordingService: () => undefined,
+  } as unknown as Config;
   const baseItem = {
     id: 1,
     timestamp: 12345,
@@ -133,9 +136,11 @@ describe('<HistoryItemDisplay />', () => {
       duration: '1s',
     };
     const { lastFrame } = renderWithProviders(
-      <SessionStatsProvider>
-        <HistoryItemDisplay {...baseItem} item={item} />
-      </SessionStatsProvider>,
+      <ConfigContext.Provider value={mockConfig as never}>
+        <SessionStatsProvider>
+          <HistoryItemDisplay {...baseItem} item={item} />
+        </SessionStatsProvider>
+      </ConfigContext.Provider>,
     );
     expect(lastFrame()).toContain('Agent powering down. Goodbye!');
   });

packages/cli/src/ui/components/PermissionsModifyTrustDialog.tsx

@@ -115,7 +115,7 @@ export function PermissionsModifyTrustDialog({
       {needsRestart && (
         <Box marginLeft={1} marginTop={1}>
           <Text color={theme.status.warning}>
-            To apply the trust changes, Gemini CLI must be restarted. Press
+            To apply the trust changes, Qwen Code must be restarted. Press
             &apos;r&apos; to restart CLI now.
           </Text>
         </Box>

packages/cli/src/ui/components/SessionSummaryDisplay.test.tsx

@@ -9,6 +9,7 @@ import { describe, it, expect, vi } from 'vitest';
 import { SessionSummaryDisplay } from './SessionSummaryDisplay.js';
 import * as SessionContext from '../contexts/SessionContext.js';
 import type { SessionMetrics } from '../contexts/SessionContext.js';
+import { ConfigContext } from '../contexts/ConfigContext.js';
 
 vi.mock('../contexts/SessionContext.js', async (importOriginal) => {
   const actual = await importOriginal<typeof SessionContext>();
@@ -24,6 +25,7 @@ const renderWithMockedStats = (
   metrics: SessionMetrics,
   sessionId: string = 'test-session-id-12345',
   promptCount: number = 5,
+  chatRecordingEnabled: boolean = true,
 ) => {
   useSessionStatsMock.mockReturnValue({
     stats: {
@@ -38,7 +40,17 @@ const renderWithMockedStats = (
     startNewPrompt: vi.fn(),
   });
 
-  return render(<SessionSummaryDisplay duration="1h 23m 45s" />);
+  const mockConfig = {
+    getChatRecordingService: vi.fn(() =>
+      chatRecordingEnabled ? ({} as never) : undefined,
+    ),
+  };
+
+  return render(
+    <ConfigContext.Provider value={mockConfig as never}>
+      <SessionSummaryDisplay duration="1h 23m 45s" />
+    </ConfigContext.Provider>,
+  );
 };
 
 describe('<SessionSummaryDisplay />', () => {
@@ -109,4 +121,34 @@ describe('<SessionSummaryDisplay />', () => {
     expect(output).not.toContain('To continue this session, run');
     expect(output).not.toContain('qwen --resume');
   });
+
+  it('does not show resume message when chat recording is disabled', () => {
+    const metrics: SessionMetrics = {
+      models: {},
+      tools: {
+        totalCalls: 0,
+        totalSuccess: 0,
+        totalFail: 0,
+        totalDurationMs: 0,
+        totalDecisions: { accept: 0, reject: 0, modify: 0 },
+        byName: {},
+      },
+      files: {
+        totalLinesAdded: 0,
+        totalLinesRemoved: 0,
+      },
+    };
+
+    const { lastFrame } = renderWithMockedStats(
+      metrics,
+      'test-session-id-12345',
+      5,
+      false,
+    );
+    const output = lastFrame();
+
+    expect(output).toContain('Agent powering down. Goodbye!');
+    expect(output).not.toContain('To continue this session, run');
+    expect(output).not.toContain('qwen --resume');
+  });
 });

packages/cli/src/ui/components/SessionSummaryDisplay.tsx

@@ -8,6 +8,7 @@ import type React from 'react';
 import { Box, Text } from 'ink';
 import { StatsDisplay } from './StatsDisplay.js';
 import { useSessionStats } from '../contexts/SessionContext.js';
+import { useConfig } from '../contexts/ConfigContext.js';
 import { theme } from '../semantic-colors.js';
 import { t } from '../../i18n/index.js';
 
@@ -18,10 +19,13 @@ interface SessionSummaryDisplayProps {
 export const SessionSummaryDisplay: React.FC<SessionSummaryDisplayProps> = ({
   duration,
 }) => {
+  const config = useConfig();
   const { stats } = useSessionStats();
 
-  // Only show the resume message if there were messages in the session
+  // Only show the resume message if there were messages in the session AND
+  // chat recording is enabled (otherwise there is nothing to resume).
   const hasMessages = stats.promptCount > 0;
+  const canResume = !!config.getChatRecordingService();
 
   return (
     <>
@@ -29,7 +33,7 @@ export const SessionSummaryDisplay: React.FC<SessionSummaryDisplayProps> = ({
         title={t('Agent powering down. Goodbye!')}
         duration={duration}
       />
-      {hasMessages && (
+      {hasMessages && canResume && (
         <Box marginTop={1}>
           <Text color={theme.text.secondary}>
             {t('To continue this session, run')}{' '}

packages/cli/src/ui/components/SettingsDialog.test.tsx

@@ -1461,7 +1461,7 @@ describe('SettingsDialog', () => {
         context: {
           fileFiltering: {
             respectGitIgnore: false,
-            respectQwemIgnore: true,
+            respectQwenIgnore: true,
             enableRecursiveFileSearch: false,
             disableFuzzySearch: true,
           },
@@ -1535,7 +1535,7 @@ describe('SettingsDialog', () => {
           loadMemoryFromIncludeDirectories: false,
           fileFiltering: {
             respectGitIgnore: false,
-            respectQwemIgnore: false,
+            respectQwenIgnore: false,
             enableRecursiveFileSearch: false,
             disableFuzzySearch: false,
           },