In src/tests/supportCommand.test.ts around lines 37 to 39, the mock for
getUserEmailPreferences is defined but does not set a return value; update the
mock so it returns predictable data (e.g., mockResolvedValue of an object with
email and preferences) either globally in this mock setup or within individual
tests that assert email-related behavior, ensuring async resolution if the real
function is async.

In src/tests/enhancedEmailManager.test.ts around lines 34 to 40, the named
imports from ../utils/emailManager.js are out of alphabetical order and trip the
ESLint sort-imports rule; reorder the imported identifiers into alphabetical
order (deliverPendingAgentMessages, formatEmailForDisplay, generateDummyEmail,
getUserEmailPreferences, updateUserEmail, validateEmail) in that import
statement, save, and re-run the linter/test suite.

Fix the test assertion in src/tests/adminCommands.test.ts at lines 451-454.

The test "should show template manager for activated admin" currently expects:

• Message: 'Template management interface is being prepared'
• Options: { parse_mode: 'Markdown' }

But the actual implementation returns:

• Message containing: '📝 Message Template Manager'
• Options with reply_markup containing inline keyboard

Update lines 451-454 to:

expect(mockContext.reply).toHaveBeenCalledWith(
expect.stringContaining('📝 Message Template Manager'),
expect.objectContaining({
parse_mode: 'Markdown',
reply_markup: expect.any(Object)
})
);

This aligns the test with the actual success-path behavior where the template manager displays the full interface with interactive buttons.

In src/tests/stateCommands.test.ts at lines 133-135, update the test assertion
for ResetCommand's 'should handle missing user ID' test case. The expected reply
message is currently "❌ Invalid command context. Please try again." but must be
changed to "❌ Unable to process reset request." to match the actual implementation
in the ResetCommand class. This change ensures the test accurately validates the
error message displayed when the user context is missing.

Fix the test assertion in src/tests/stateCommands.test.ts at lines 72-74.

The test "should handle missing user ID" currently expects the wrong error message.
Update the assertion to match the actual CancelCommand implementation:

Change from:
expect(mockCtx.reply).toHaveBeenCalledWith(
"❌ Invalid command context. Please try again."
);

Change to:
expect(mockCtx.reply).toHaveBeenCalledWith(
"❌ Unable to process cancellation request."
);

This ensures the test expectation aligns with the error message returned by
CancelCommand.execute() when the user context is missing.

Fix mock path alignment in src/tests/commandExecutor.test.ts

In src/tests/commandExecutor.test.ts, update the vi.mock calls on lines 19-29 to use the correct import paths that match the actual imports in src/commands/utils/commandExecutor.ts:

Change line 19:
FROM: vi.mock('../commands/base/CommandRegistry.js', () => ({
TO: vi.mock('../base/CommandRegistry.js', () => ({

Change line 25:
FROM: vi.mock('../utils/errorContextBuilder.js', () => ({
TO: vi.mock('../../utils/errorContextBuilder.js', () => ({

These changes ensure the mocked modules align with the actual import specifiers used by the system under test, allowing Vitest to properly intercept and mock these dependencies during test execution.

In src/tests/commandRegistry.test.ts, update the vi.mock() calls on lines 26-35 to align with CommandRegistry's actual import paths. The test currently mocks '../utils/logConfig.js' and '../config/env.js', but CommandRegistry imports from '../../utils/logConfig.js' and '../../config/env.js'.

Required changes:

1. Change vi.mock('../utils/logConfig.js', ...) to vi.mock('../../utils/logConfig.js', ...)
2. Change vi.mock('../config/env.js', ...) to vi.mock('../../config/env.js', ...)

Keep all mock implementations unchanged (StartupLogger with logCommandRegistration/logProcessorRegistration functions, and isAdminUser returning false).

Location: src/tests/commandRegistry.test.ts, lines 26-35
Target file under test: src/commands/base/CommandRegistry.ts (which imports from ../../utils/logConfig.js and ../../config/env.js)

This ensures Vitest intercepts the actual modules that CommandRegistry depends on during test execution.

In src/tests/setEmailCommand.test.ts, the formatEmailForDisplay function is currently mocked and imported from the wrong module. The production code (SetEmailCommand) imports formatEmailForDisplay from '../utils/markdownEscape.js', but the test mocks and imports it from '../utils/emailManager.js'.

Please make the following changes:

1. In the vi.mock('../utils/emailManager.js') block (around line 12-18):

   • Remove the line: formatEmailForDisplay: vi.fn(),

2. In the vi.mock('../utils/markdownEscape.js') block (around line 20-22):

   • Add the line: formatEmailForDisplay: vi.fn(),

3. In the import s...