fix(core): address post-merge monitor tool and UI routing issues

packages/cli/src/nonInteractiveCli.test.ts

@@ -29,7 +29,10 @@ import type { LoadedSettings } from './config/settings.js';
 import { CommandKind, type ExecutionMode } from './ui/commands/types.js';
 import { filterCommandsForMode } from './services/commandUtils.js';
 import { _resetCleanupFunctionsForTest } from './utils/cleanup.js';
-import { AlreadyReportedError, _resetExitLatchForTest } from './utils/errors.js';
+import {
+  AlreadyReportedError,
+  _resetExitLatchForTest,
+} from './utils/errors.js';
 
 // Mock core modules
 vi.mock('./ui/hooks/atCommandProcessor.js');

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

@@ -71,6 +71,7 @@ describe('clearCommand', () => {
           }),
           getBackgroundShellRegistry: vi.fn().mockReturnValue({
             getAll: vi.fn().mockReturnValue([]),
+            hasRunningEntries: vi.fn().mockReturnValue(false),
             reset: mockResetBackgroundShells,
             abortAll: mockAbortBackgroundShells,
           }),
@@ -307,6 +308,7 @@ describe('clearCommand', () => {
             }),
             getBackgroundShellRegistry: vi.fn().mockReturnValue({
               getAll: vi.fn().mockReturnValue([]),
+              hasRunningEntries: vi.fn().mockReturnValue(false),
               reset: mockResetBackgroundShells,
               abortAll: mockAbortBackgroundShells,
             }),
@@ -380,6 +382,7 @@ describe('clearCommand', () => {
             }),
             getBackgroundShellRegistry: vi.fn().mockReturnValue({
               getAll: vi.fn().mockReturnValue([]),
+              hasRunningEntries: vi.fn().mockReturnValue(false),
               reset: vi.fn(),
             }),
             getMonitorRegistry: vi.fn().mockReturnValue({
@@ -430,6 +433,7 @@ describe('clearCommand', () => {
             }),
             getBackgroundShellRegistry: vi.fn().mockReturnValue({
               getAll: vi.fn().mockReturnValue([]),
+              hasRunningEntries: vi.fn().mockReturnValue(false),
               reset: vi.fn(),
             }),
             getMonitorRegistry: vi.fn().mockReturnValue({
@@ -470,5 +474,61 @@ describe('clearCommand', () => {
       expect(mockStartNewSession).not.toHaveBeenCalled();
       expect(mockResetChat).not.toHaveBeenCalled();
     });
+
+    it('blocks session clearing while a background shell is still running', async () => {
+      if (!clearCommand.action)
+        throw new Error('clearCommand must have an action.');
+
+      const blockedContext = createMockCommandContext({
+        executionMode: 'non_interactive',
+        services: {
+          config: {
+            getBackgroundTaskRegistry: vi.fn().mockReturnValue({
+              hasUnfinalizedTasks: vi.fn().mockReturnValue(false),
+              reset: vi.fn(),
+            }),
+            getBackgroundShellRegistry: vi.fn().mockReturnValue({
+              getAll: vi.fn().mockReturnValue([
+                {
+                  shellId: 'shell_123',
+                  status: 'running',
+                },
+              ]),
+              hasRunningEntries: vi.fn().mockReturnValue(true),
+              reset: vi.fn(),
+            }),
+            getMonitorRegistry: vi.fn().mockReturnValue({
+              getRunning: vi.fn().mockReturnValue([]),
+              reset: vi.fn(),
+            }),
+            getHookSystem: mockGetHookSystem,
+            startNewSession: mockStartNewSession,
+            getGeminiClient: vi.fn().mockReturnValue({
+              resetChat: mockResetChat,
+            } as unknown as GeminiClient),
+            getModel: vi.fn().mockReturnValue('test-model'),
+            getApprovalMode: vi.fn().mockReturnValue('default'),
+            getToolRegistry: vi.fn().mockReturnValue({
+              getAllTools: vi.fn().mockReturnValue([]),
+            }),
+            getDebugLogger: vi.fn().mockReturnValue({ warn: vi.fn() }),
+          },
+        },
+        session: {
+          startNewSession: vi.fn(),
+        },
+      });
+
+      const result = await clearCommand.action(blockedContext, '');
+
+      expect(result).toEqual({
+        type: 'message',
+        messageType: 'error',
+        content:
+          "Stop the current session's running background tasks before starting a new session.",
+      });
+      expect(mockStartNewSession).not.toHaveBeenCalled();
+      expect(mockResetChat).not.toHaveBeenCalled();
+    });
   });
 });

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

@@ -12,26 +12,12 @@ import {
   SessionEndReason,
   SessionStartSource,
   ToolNames,
-  type Config,
   type PermissionMode,
 } from '@qwen-code/qwen-code-core';
-
-function hasBlockingBackgroundWork(config: Config): boolean {
-  return (
-    config.getBackgroundTaskRegistry().hasUnfinalizedTasks() ||
-    config.getMonitorRegistry().getRunning().length > 0 ||
-    config
-      .getBackgroundShellRegistry()
-      .getAll()
-      .some((entry) => entry.status === 'running')
-  );
-}
-
-function resetBackgroundStateForSessionSwitch(config: Config): void {
-  config.getBackgroundTaskRegistry().reset();
-  config.getMonitorRegistry().reset();
-  config.getBackgroundShellRegistry().reset();
-}
+import {
+  hasBlockingBackgroundWork,
+  resetBackgroundStateForSessionSwitch,
+} from '../utils/backgroundWorkUtils.js';
 
 export const clearCommand: SlashCommand = {
   name: 'clear',

packages/cli/src/ui/hooks/useResumeCommand.ts

@@ -15,6 +15,10 @@ import {
 import { buildResumedHistoryItems } from '../utils/resumeHistoryUtils.js';
 import type { UseHistoryManagerReturn } from './useHistoryManager.js';
 import { MessageType, type HistoryItem } from '../types.js';
+import {
+  hasBlockingBackgroundWork,
+  resetBackgroundStateForSessionSwitch,
+} from '../utils/backgroundWorkUtils.js';
 
 export interface UseResumeCommandOptions {
   config: Config | null;
@@ -45,23 +49,6 @@ export interface UseResumeCommandResult {
 const BACKGROUND_WORK_SWITCH_BLOCKED_MESSAGE =
   "Stop the current session's running background tasks before resuming another session.";
 
-function hasBlockingBackgroundWork(config: Config): boolean {
-  return (
-    config.getBackgroundTaskRegistry().hasUnfinalizedTasks() ||
-    config.getMonitorRegistry().getRunning().length > 0 ||
-    config
-      .getBackgroundShellRegistry()
-      .getAll()
-      .some((entry) => entry.status === 'running')
-  );
-}
-
-function resetBackgroundStateForSessionSwitch(config: Config): void {
-  config.getBackgroundTaskRegistry().reset();
-  config.getMonitorRegistry().reset();
-  config.getBackgroundShellRegistry().reset();
-}
-
 export function useResumeCommand(
   options?: UseResumeCommandOptions,
 ): UseResumeCommandResult {

packages/cli/src/ui/utils/backgroundWorkUtils.ts

@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright 2025 Qwen Code
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { Config } from '@qwen-code/qwen-code-core';
+
+export function hasBlockingBackgroundWork(config: Config): boolean {
+  return (
+    config.getBackgroundTaskRegistry().hasUnfinalizedTasks() ||
+    config.getMonitorRegistry().getRunning().length > 0 ||
+    config.getBackgroundShellRegistry().hasRunningEntries()
+  );
+}
+
+export function resetBackgroundStateForSessionSwitch(config: Config): void {
+  config.getBackgroundTaskRegistry().reset();
+  config.getMonitorRegistry().reset();
+  config.getBackgroundShellRegistry().reset();
+}

packages/cli/src/utils/errors.test.ts

@@ -267,7 +267,8 @@ describe('errors', () => {
             {
               error: {
                 type: 'AlreadyReportedError',
-                message: '[API Error: 402 Model X is not available for billing.]',
+                message:
+                  '[API Error: 402 Model X is not available for billing.]',
                 code: 42,
               },
             },

packages/core/src/permissions/permission-manager.ts

@@ -10,6 +10,7 @@ import {
   matchesRule,
   resolveToolName,
   splitCompoundCommand,
+  SHELL_TOOL_NAMES,
 } from './rule-parser.js';
 import type { PathMatchContext } from './rule-parser.js';
 import { extractShellOperations } from './shell-semantics.js';
@@ -32,13 +33,6 @@ import type {
 
 const debugLogger = createDebugLogger('PERMISSIONS');
 
-/**
- * Tools that spawn shell commands and share the same permission evaluation
- * semantics: compound-command splitting, AST read-only analysis, and
- * virtual file/network operation matching.
- */
-const SHELL_LIKE_TOOLS = new Set(['run_shell_command', 'monitor']);
-
 /**
  * Numeric priority for each PermissionDecision.
  * Higher number = more restrictive. Used to combine decisions by taking
@@ -189,7 +183,7 @@ export class PermissionManager {
     // a concrete permission (deny/ask/allow) based on the command's readonly status.
     if (
       decision === 'default' &&
-      SHELL_LIKE_TOOLS.has(toolName) &&
+      SHELL_TOOL_NAMES.has(toolName) &&
       command !== undefined
     ) {
       return this.resolveDefaultPermission(command);
@@ -267,7 +261,7 @@ export class PermissionManager {
     // must never downgrade an explicit 'allow' decision from a Bash rule.
     // Example: `git status` has no file ops; an allow rule for `Bash(git *)`
     // should return 'allow', not be downgraded to 'default'.
-    if (SHELL_LIKE_TOOLS.has(toolName) && command !== undefined) {
+    if (SHELL_TOOL_NAMES.has(toolName) && command !== undefined) {
       const cwd = pathCtx?.cwd ?? process.cwd();
       const virtualDecision = this.evaluateShellVirtualOps(
         extractShellOperations(command, cwd),
@@ -584,7 +578,7 @@ export class PermissionManager {
     ctx = this.normalizePermissionContext(ctx);
     const { toolName, command, cwd, filePath, domain, specifier } = ctx;
 
-    if (SHELL_LIKE_TOOLS.has(ctx.toolName) && command !== undefined) {
+    if (SHELL_TOOL_NAMES.has(ctx.toolName) && command !== undefined) {
       const subCommands = splitCompoundCommand(command);
       if (subCommands.length > 1) {
         return subCommands.some((subCmd) =>
@@ -625,7 +619,7 @@ export class PermissionManager {
     // extracted from the command has a relevant rule. This ensures the PM is
     // consulted (and the confirmation dialog shown) when Read/Edit/etc. rules
     // would match equivalent shell commands.
-    if (SHELL_LIKE_TOOLS.has(ctx.toolName) && ctx.command !== undefined) {
+    if (SHELL_TOOL_NAMES.has(ctx.toolName) && ctx.command !== undefined) {
       const cwd = pathCtx?.cwd ?? process.cwd();
       const ops = extractShellOperations(ctx.command, cwd);
       if (
@@ -661,7 +655,7 @@ export class PermissionManager {
     ctx = this.normalizePermissionContext(ctx);
     const { toolName, command, cwd, filePath, domain, specifier } = ctx;
 
-    if (SHELL_LIKE_TOOLS.has(ctx.toolName) && command !== undefined) {
+    if (SHELL_TOOL_NAMES.has(ctx.toolName) && command !== undefined) {
       const subCommands = splitCompoundCommand(command);
       if (subCommands.length > 1) {
         return subCommands.some((subCmd) =>
@@ -693,7 +687,7 @@ export class PermissionManager {
       return true;
     }
 
-    if (SHELL_LIKE_TOOLS.has(ctx.toolName) && ctx.command !== undefined) {
+    if (SHELL_TOOL_NAMES.has(ctx.toolName) && ctx.command !== undefined) {
       const cwd = pathCtx?.cwd ?? process.cwd();
       const ops = extractShellOperations(ctx.command, cwd);
       return ops.some((op) => {

packages/core/src/permissions/rule-parser.ts

@@ -130,7 +130,10 @@ export const TOOL_NAME_ALIASES: Readonly<Record<string, string>> = {
 /**
  * Shell tool canonical names. These use command-style rule specifiers.
  */
-const SHELL_TOOL_NAMES = new Set(['run_shell_command', 'monitor']);
+export const SHELL_TOOL_NAMES: ReadonlySet<string> = new Set([
+  'run_shell_command',
+  'monitor',
+]);
 
 /**
  * File-reading tools — "Read" rules apply to all of these (best-effort).

packages/core/src/services/monitorRegistry.test.ts

@@ -585,6 +585,21 @@ describe('MonitorRegistry', () => {
     ).not.toThrow();
   });
 
+  it('includes droppedLines count in terminal notification text', () => {
+    const callback = vi.fn();
+    registry.setNotificationCallback(callback);
+    const entry = createEntry();
+    registry.register(entry);
+
+    // Simulate throttle drops (droppedLines is incremented by Monitor tool)
+    entry.droppedLines = 5;
+    registry.complete('mon-1', 0);
+
+    const [displayText, modelText] = callback.mock.calls[0] as [string, string];
+    expect(displayText).toContain('5 lines dropped due to throttling');
+    expect(modelText).toContain('5 lines dropped due to throttling');
+  });
+
   describe('setStatusChangeCallback', () => {
     it('fires once on register (nothing → running)', () => {
       const cb = vi.fn();