fix(cli): improve slash command history feedback

docs/design/slash-command-feedback.md

@@ -0,0 +1,40 @@
+# Slash command history feedback
+
+## Problem
+
+Interactive slash commands are added to the TUI history before their action is
+known. Commands that only open a dialog can therefore leave a bare invocation
+behind after the dialog closes. The model picker has the same problem when it
+is dismissed without a selection.
+
+## Design
+
+- Do not add the built-in `/auth`, `/settings`, `/status`, `/help`, `/theme`,
+  `/editor`, `/diff`, or `/stats` invocations to visible TUI history. Bare
+  `/effort`, `/model`, and `/statusline` pickers are hidden too. Their existing
+  UI remains unchanged, as do chat recording and slash-command telemetry. User
+  and project commands that override those names keep their invocation
+  history.
+- Root matches apply to the bare command only; subcommands keep their
+  invocation because they perform work (for example `/status paths` prints
+  session paths).
+- Resolve the command before adding its invocation so aliases use the canonical
+  command name for this decision.
+- Preserve invocations for commands that directly perform work, change session
+  state, write data, or enter a management/security workflow. Argument-sensitive
+  commands only hide their bare picker form; for example, `/effort` is hidden
+  while `/effort high` remains visible, and `/model` is hidden while
+  `/model <id>` remains visible.
+- Commands that fail before opening their dialog keep the invocation paired
+  with the failure message: `/theme` under `NO_COLOR` is not hidden because it
+  prints feedback instead of opening the picker, and a hidden picker-shaped
+  `/model` invocation is revealed when its arguments are rejected.
+- Record the hiding decision in the chat record (`hiddenInvocation`) so
+  `/resume`, `/branch`, and session previews reconstruct the same history the
+  live session displayed instead of bringing the bare invocation row back.
+- When the primary model picker is dismissed without a selection, add an info
+  message identifying the unchanged model. Successful selections keep their
+  existing feedback. The other pickers leave no trace when dismissed; the
+  model picker states the outcome explicitly because the active model is
+  session-critical and otherwise invisible in history, so a silent close would
+  leave it ambiguous whether the model changed.

packages/cli/src/i18n/locales/ca.js

@@ -2835,4 +2835,5 @@ export default {
     "Els canvis del gestor d'habilitats automàtiques estan desactivats en mode segur.",
   'Auto-skill curator changes are only available in trusted workspaces. Trust this folder via `/trust` and try again.':
     "Els canvis del gestor d'habilitats automàtiques només estan disponibles en espais de treball de confiança. Marca aquesta carpeta com a fiable amb `/trust` i torna-ho a provar.",
+  'Kept model as {{model}}': 'Model mantingut com a {{model}}',
 };

packages/cli/src/i18n/locales/de.js

@@ -2316,4 +2316,5 @@ export default {
     'Änderungen durch den Auto-Skill-Kurator sind im Sicherheitsmodus deaktiviert.',
   'Auto-skill curator changes are only available in trusted workspaces. Trust this folder via `/trust` and try again.':
     'Änderungen durch den Auto-Skill-Kurator sind nur in vertrauenswürdigen Arbeitsbereichen verfügbar. Stufen Sie diesen Ordner mit `/trust` als vertrauenswürdig ein und versuchen Sie es erneut.',
+  'Kept model as {{model}}': 'Modell als {{model}} beibehalten',
 };

packages/cli/src/i18n/locales/en.js

@@ -2827,4 +2827,5 @@ export default {
     'Auto-skill curator changes are disabled in safe mode.',
   'Auto-skill curator changes are only available in trusted workspaces. Trust this folder via `/trust` and try again.':
     'Auto-skill curator changes are only available in trusted workspaces. Trust this folder via `/trust` and try again.',
+  'Kept model as {{model}}': 'Kept model as {{model}}',
 };

packages/cli/src/i18n/locales/fr.js

@@ -2321,4 +2321,5 @@ export default {
     'Les modifications du gestionnaire de compétences automatiques sont désactivées en mode sécurisé.',
   'Auto-skill curator changes are only available in trusted workspaces. Trust this folder via `/trust` and try again.':
     'Les modifications du gestionnaire de compétences automatiques ne sont disponibles que dans les espaces de travail approuvés. Marquez ce dossier comme approuvé avec `/trust`, puis réessayez.',
+  'Kept model as {{model}}': 'Modèle conservé : {{model}}',
 };

packages/cli/src/i18n/locales/ja.js

@@ -2082,4 +2082,5 @@ export default {
     'セーフモードでは自動スキル管理による変更は無効です。',
   'Auto-skill curator changes are only available in trusted workspaces. Trust this folder via `/trust` and try again.':
     '自動スキル管理による変更は信頼済みのワークスペースでのみ利用できます。`/trust` でこのフォルダーを信頼してから、もう一度お試しください。',
+  'Kept model as {{model}}': 'モデルは {{model}} のままです',
 };

packages/cli/src/i18n/locales/pt.js

@@ -2300,4 +2300,5 @@ export default {
     'As alterações do gerenciador de habilidades automáticas estão desativadas no modo seguro.',
   'Auto-skill curator changes are only available in trusted workspaces. Trust this folder via `/trust` and try again.':
     'As alterações do gerenciador de habilidades automáticas estão disponíveis apenas em espaços de trabalho confiáveis. Marque esta pasta como confiável usando `/trust` e tente novamente.',
+  'Kept model as {{model}}': 'Modelo mantido como {{model}}',
 };

packages/cli/src/i18n/locales/ru.js

@@ -2291,4 +2291,5 @@ export default {
     'Изменения куратора автоматических навыков отключены в безопасном режиме.',
   'Auto-skill curator changes are only available in trusted workspaces. Trust this folder via `/trust` and try again.':
     'Изменения куратора автоматических навыков доступны только в доверенных рабочих пространствах. Сделайте эту папку доверенной с помощью `/trust` и повторите попытку.',
+  'Kept model as {{model}}': 'Оставлена модель {{model}}',
 };

packages/cli/src/i18n/locales/zh-TW.js

@@ -2406,4 +2406,5 @@ export default {
     '安全模式下禁止變更自動技能管理器。',
   'Auto-skill curator changes are only available in trusted workspaces. Trust this folder via `/trust` and try again.':
     '只有受信任的工作區可以變更自動技能管理器。請透過 `/trust` 信任此資料夾後再試一次。',
+  'Kept model as {{model}}': '模型保持為 {{model}}',
 };

packages/cli/src/i18n/locales/zh.js

@@ -2608,4 +2608,5 @@ export default {
     '安全模式下禁止更改自动技能管理器。',
   'Auto-skill curator changes are only available in trusted workspaces. Trust this folder via `/trust` and try again.':
     '仅受信任的工作区可以更改自动技能管理器。请通过 `/trust` 信任此文件夹后重试。',
+  'Kept model as {{model}}': '模型保持为 {{model}}',
 };

packages/cli/src/ui/AppContainer.tsx

@@ -1428,6 +1428,7 @@ export const AppContainer = (props: AppContainerProps) => {
     setThemeError,
     historyManager.addItem,
     initializationResult.themeError,
+    config,
   );
 
   const {
@@ -1487,7 +1488,12 @@ export const AppContainer = (props: AppContainerProps) => {
     openEditorDialog,
     handleEditorSelect,
     exitEditorDialog,
-  } = useEditorSettings(settings, setEditorError, historyManager.addItem);
+  } = useEditorSettings(
+    settings,
+    setEditorError,
+    historyManager.addItem,
+    config,
+  );
 
   const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } =
     useSettingsCommand();

packages/cli/src/ui/auth/useAuth.test.ts

@@ -58,7 +58,7 @@ const createSettings = () => ({
   })),
 });
 
-const createConfig = () => {
+const createConfig = (recordSlashCommand = vi.fn()) => {
   const modelsConfig = {
     syncAfterAuthRefresh: vi.fn(),
   };
@@ -68,6 +68,7 @@ const createConfig = () => {
     reloadModelProvidersConfig: vi.fn(),
     refreshAuth: vi.fn(async () => undefined),
     getModelsConfig: vi.fn(() => modelsConfig),
+    getChatRecordingService: vi.fn(() => ({ recordSlashCommand })),
   };
 };
 
@@ -99,7 +100,8 @@ describe('useAuthCommand', () => {
 
   it('configures DeepSeek via the unified provider submit', async () => {
     const settings = createSettings();
-    const config = createConfig();
+    const recordSlashCommand = vi.fn();
+    const config = createConfig(recordSlashCommand);
     const addItem = vi.fn();
 
     const { result } = renderHook(() =>
@@ -112,6 +114,10 @@ describe('useAuthCommand', () => {
       modelIds: ['deepseek-v4-flash', 'deepseek-v4-pro'],
     };
 
+    act(() => {
+      result.current.openAuthDialog();
+    });
+
     await act(async () => {
       await result.current.handleProviderSubmit(deepseekProvider, inputs);
     });
@@ -139,6 +145,70 @@ describe('useAuthCommand', () => {
       }),
       expect.any(Number),
     );
+    expect(recordSlashCommand).toHaveBeenCalledWith({
+      phase: 'result',
+      rawCommand: '/auth',
+      outputHistoryItems: [
+        expect.objectContaining({
+          text: expect.stringContaining('Successfully configured DeepSeek'),
+        }),
+      ],
+    });
+  });
+
+  it('keeps live feedback but skips the /auth record when the dialog auto-opened', async () => {
+    const settings = createSettings();
+    const recordSlashCommand = vi.fn();
+    const config = createConfig(recordSlashCommand);
+    const addItem = vi.fn();
+
+    const { result } = renderHook(() =>
+      useAuthCommand(settings as never, config as never, addItem),
+    );
+
+    await act(async () => {
+      await result.current.handleProviderSubmit(deepseekProvider, {
+        baseUrl: resolveBaseUrl(deepseekProvider),
+        apiKey: 'sk-deepseek',
+        modelIds: ['deepseek-v4-flash'],
+      });
+    });
+
+    expect(addItem).toHaveBeenCalledWith(
+      expect.objectContaining({
+        text: expect.stringContaining('Successfully configured DeepSeek'),
+      }),
+      expect.any(Number),
+    );
+    expect(recordSlashCommand).not.toHaveBeenCalled();
+  });
+
+  it('clears the /auth recording latch when a command-opened dialog closes', async () => {
+    const settings = createSettings();
+    const recordSlashCommand = vi.fn();
+    const config = createConfig(recordSlashCommand);
+    const addItem = vi.fn();
+
+    const { result } = renderHook(() =>
+      useAuthCommand(settings as never, config as never, addItem),
+    );
+
+    act(() => {
+      result.current.openAuthDialog();
+      result.current.closeAuthDialog();
+      result.current.onAuthError('later unauthorized');
+    });
+
+    await act(async () => {
+      await result.current.handleProviderSubmit(deepseekProvider, {
+        baseUrl: resolveBaseUrl(deepseekProvider),
+        apiKey: 'sk-deepseek',
+        modelIds: ['deepseek-v4-flash'],
+      });
+    });
+
+    expect(addItem).toHaveBeenCalledTimes(1);
+    expect(recordSlashCommand).not.toHaveBeenCalled();
   });
 
   it('configures OpenRouter via the unified provider submit', async () => {

packages/cli/src/ui/auth/useAuth.ts

@@ -15,7 +15,7 @@ import {
   type ProviderConfig,
   type ProviderSetupInputs,
 } from '@qwen-code/qwen-code-core';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import type { LoadedSettings } from '../../config/settings.js';
 import { createLoadedSettingsAdapter } from '../../config/loadedSettingsAdapter.js';
 import { useQwenAuth } from '../hooks/useQwenAuth.js';
@@ -106,6 +106,10 @@ export const useAuthCommand = (
     isAuthenticating,
   );
 
+  // The dialog also auto-opens at startup when unauthenticated; only a
+  // command-opened dialog has an /auth invocation record to pair with.
+  const openedViaCommandRef = useRef(false);
+
   // -- Shared helpers -------------------------------------------------------
 
   const onAuthError = useCallback(
@@ -181,16 +185,22 @@ export const useAuthCommand = (
 
         completeAuthentication();
 
-        addItem(
-          {
-            type: MessageType.INFO,
-            text: t(
-              'Successfully configured {{provider}}. Use /model to switch models.',
-              { provider: providerConfig.label },
-            ),
-          },
-          Date.now(),
-        );
+        const feedbackItem: HistoryItemWithoutId & Record<string, unknown> = {
+          type: MessageType.INFO,
+          text: t(
+            'Successfully configured {{provider}}. Use /model to switch models.',
+            { provider: providerConfig.label },
+          ),
+        };
+        addItem(feedbackItem, Date.now());
+        if (openedViaCommandRef.current) {
+          openedViaCommandRef.current = false;
+          config.getChatRecordingService?.()?.recordSlashCommand({
+            phase: 'result',
+            rawCommand: '/auth',
+            outputHistoryItems: [feedbackItem],
+          });
+        }
 
         logAuth(config, new AuthEvent(protocol, 'manual', 'success'));
       } catch (error) {
@@ -205,10 +215,12 @@ export const useAuthCommand = (
   // -- Dialog open / close / cancel ----------------------------------------
 
   const openAuthDialog = useCallback(() => {
+    openedViaCommandRef.current = true;
     setIsAuthDialogOpen(true);
   }, []);
 
   const closeAuthDialog = useCallback(() => {
+    openedViaCommandRef.current = false;
     setIsAuthDialogOpen(false);
     setAuthError(null);
   }, []);

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

@@ -5,7 +5,7 @@
  */
 
 import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { modelCommand } from './modelCommand.js';
+import { modelCommand, isPickerOnlyModelInvocation } from './modelCommand.js';
 import { type CommandContext } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import { SettingScope } from '../../config/settings.js';
@@ -2643,3 +2643,35 @@ describe('modelCommand', () => {
     });
   });
 });
+
+describe('isPickerOnlyModelInvocation', () => {
+  it.each([
+    '',
+    '   ',
+    '--fast',
+    '--voice',
+    '--vision',
+    '--compaction',
+    '--image',
+    '--project',
+    '--global',
+    '--fast --project',
+    '--vision --global',
+    '  --fast   --voice  ',
+  ])('treats %j as picker-only', (args) => {
+    expect(isPickerOnlyModelInvocation(args)).toBe(true);
+  });
+
+  it.each([
+    '--fast qwen3-coder-flash',
+    '--vision qwen-vl-max',
+    '--project qwen-max',
+    '--fast --global qwen-max',
+    '--invalid-flag',
+    '--fastx',
+    'qwen-max',
+    'qwen-max write a one-off prompt',
+  ])('treats %j as not picker-only', (args) => {
+    expect(isPickerOnlyModelInvocation(args)).toBe(false);
+  });
+});

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

@@ -47,6 +47,24 @@ const COMPACTION_MODEL_CONFIGURATION_HINT =
 const IMAGE_MODEL_CONFIGURATION_HINT =
   'Configure a model with imageOnly: true, baseUrl, and envKey in settings.modelProviders. Run /model --image <model-id> to select it.';
 
+const MODEL_PICKER_FLAGS = [
+  'fast',
+  'voice',
+  'vision',
+  'compaction',
+  'image',
+  'project',
+  'global',
+] as const;
+const MODEL_PICKER_FLAG_PATTERN = `(?:${MODEL_PICKER_FLAGS.join('|')})`;
+const MODEL_PICKER_ONLY_PATTERN = new RegExp(
+  `^(?:\\s*--${MODEL_PICKER_FLAG_PATTERN})*\\s*$`,
+);
+
+export function isPickerOnlyModelInvocation(args: string): boolean {
+  return MODEL_PICKER_ONLY_PATTERN.test(args);
+}
+
 /**
  * Parse --project / --global scope flags from the argument string.
  * Returns the resolved scope override and the remaining args with flags stripped.