fix(cli): improve slash command history feedback

docs/design/slash-command-feedback.md

@@ -0,0 +1,25 @@
+# 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`, or `/diff` invocations to visible TUI history. Bare `/effort`,
+  `/statusline`, and `/stats` 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.
+- 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.
+- When the primary model picker is dismissed without a selection, add an info
+  message identifying the unchanged model. Successful selections keep their
+  existing feedback.

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

@@ -1254,8 +1254,8 @@ describe('<ModelDialog />', () => {
     expect(typeof childOnHighlight).toBe('function');
   });
 
-  it('calls onClose prop when "escape" key is pressed', () => {
-    const { props } = renderComponent();
+  it('reports the unchanged model when "escape" closes the primary picker', () => {
+    const { props, mockHistoryManager } = renderComponent();
 
     expect(mockedUseKeypress).toHaveBeenCalled();
 
@@ -1272,6 +1272,13 @@ describe('<ModelDialog />', () => {
       paste: false,
       sequence: '',
     });
+    expect(mockHistoryManager.addItem).toHaveBeenCalledWith(
+      {
+        type: 'info',
+        text: `Kept model as ${DEFAULT_QWEN_MODEL}`,
+      },
+      expect.any(Number),
+    );
     expect(props.onClose).toHaveBeenCalledTimes(1);
 
     keyPressHandler({
@@ -1282,9 +1289,58 @@ describe('<ModelDialog />', () => {
       paste: false,
       sequence: '',
     });
+    expect(mockHistoryManager.addItem).toHaveBeenCalledTimes(1);
     expect(props.onClose).toHaveBeenCalledTimes(1);
   });
 
+  it('does not close the primary picker on "left"', () => {
+    const { props, mockHistoryManager } = renderComponent();
+
+    const keyPressHandler = mockedUseKeypress.mock.calls[0][0];
+    keyPressHandler({
+      name: 'left',
+      ctrl: false,
+      meta: false,
+      shift: false,
+      paste: false,
+      sequence: '',
+    });
+
+    expect(mockHistoryManager.addItem).not.toHaveBeenCalled();
+    expect(props.onClose).not.toHaveBeenCalled();
+  });
+
+  it.each([
+    [{ isFastModelMode: true }, 'escape'],
+    [{ isVoiceModelMode: true }, 'escape'],
+    [{ isVisionModelMode: true }, 'escape'],
+    [{ isCompactionModelMode: true }, 'escape'],
+    [{ isImageModelMode: true }, 'escape'],
+    [{ isFastModelMode: true }, 'left'],
+    [{ isVoiceModelMode: true }, 'left'],
+    [{ isVisionModelMode: true }, 'left'],
+    [{ isCompactionModelMode: true }, 'left'],
+    [{ isImageModelMode: true }, 'left'],
+  ])(
+    'does not report the primary model when closing an auxiliary picker (%j, %s)',
+    (modeProps, keyName) => {
+      const { props, mockHistoryManager } = renderComponent(modeProps);
+
+      const keyPressHandler = mockedUseKeypress.mock.calls[0][0];
+      keyPressHandler({
+        name: keyName,
+        ctrl: false,
+        meta: false,
+        shift: false,
+        paste: false,
+        sequence: '',
+      });
+
+      expect(mockHistoryManager.addItem).not.toHaveBeenCalled();
+      expect(props.onClose).toHaveBeenCalledTimes(1);
+    },
+  );
+
   it('updates initialIndex when config context changes', () => {
     const mockGetModel = vi.fn(() => DEFAULT_QWEN_MODEL);
     const mockGetAuthType = vi.fn(() => 'qwen-oauth');

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

@@ -520,16 +520,17 @@ export function ModelDialog({
         : isImageModelMode && parsedImageModelSetting
           ? parsedImageModelSetting.modelId
           : config?.getModel() || MAINLINE_CODER_MODEL;
-  // Check if current model is a runtime model
-  // Runtime snapshot ID is already in $runtime|${authType}|${modelId} format
-  const activeRuntimeSnapshot =
+  const isAuxiliaryModelMode =
     isFastModelMode ||
     isVoiceModelMode ||
     isVisionModelMode ||
     isCompactionModelMode ||
-    isImageModelMode
-      ? undefined
-      : config?.getActiveRuntimeModelSnapshot?.();
+    isImageModelMode;
+  // Check if current model is a runtime model
+  // Runtime snapshot ID is already in $runtime|${authType}|${modelId} format
+  const activeRuntimeSnapshot = isAuxiliaryModelMode
+    ? undefined
+    : config?.getActiveRuntimeModelSnapshot?.();
   const currentBaseUrl = config
     ?.getModelsConfig()
     .getGenerationConfig()?.baseUrl;
@@ -656,18 +657,31 @@ export function ModelDialog({
                   )
                 : '';
 
+  const closeWithoutSelection = useCallback(() => {
+    if (!isAuxiliaryModelMode) {
+      uiState?.historyManager.addItem(
+        {
+          type: 'info',
+          text: t('Kept model as {{model}}', { model: preferredModelId }),
+        },
+        Date.now(),
+      );
+    }
+    onClose();
+  }, [
+    isAuxiliaryModelMode,
+    onClose,
+    preferredModelId,
+    uiState,
+  ]);
+
   useKeypress(
     (key) => {
       if (
         key.name === 'escape' ||
-        (key.name === 'left' &&
-          (isFastModelMode ||
-            isVoiceModelMode ||
-            isVisionModelMode ||
-            isCompactionModelMode ||
-            isImageModelMode))
+        (key.name === 'left' && isAuxiliaryModelMode)
       ) {
-        onClose();
+        closeWithoutSelection();
       }
     },
     { isActive: true },