diff --git a/extensions/telegram/src/bot-message-dispatch.ts b/extensions/telegram/src/bot-message-dispatch.ts
index 42287b2858b..bbe0e4a0bc1 100644
--- a/extensions/telegram/src/bot-message-dispatch.ts
+++ b/extensions/telegram/src/bot-message-dispatch.ts
@@ -811,7 +811,10 @@ export const dispatchTelegramMessage = async ({
           : undefined,
         onToolStart: statusReactionController
           ? async (payload) => {
-              await Promise.resolve(statusReactionController.setTool(payload.name ?? "tool"));
+              const toolName = payload.name?.trim();
+              if (toolName) {
+                await statusReactionController.setTool(toolName);
+              }
             }
           : undefined,
         onCompactionStart: statusReactionController
diff --git a/src/channels/plugins/legacy-config.test.ts b/src/channels/plugins/legacy-config.test.ts
index cf2fd95a956..fb65f43f30c 100644
--- a/src/channels/plugins/legacy-config.test.ts
+++ b/src/channels/plugins/legacy-config.test.ts
@@ -1,4 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { LegacyConfigRule } from "../../config/legacy.shared.js";
 
 const {
   loadBundledChannelDoctorContractApiMock,
@@ -7,9 +8,7 @@ const {
 } = vi.hoisted(() => ({
   loadBundledChannelDoctorContractApiMock: vi.fn(),
   getBootstrapChannelPluginMock: vi.fn(),
-  listPluginDoctorLegacyConfigRulesMock: vi.fn<() => Array<{ path: string[]; message: string }>>(
-    () => [],
-  ),
+  listPluginDoctorLegacyConfigRulesMock: vi.fn((): LegacyConfigRule[] => []),
 }));
 
 vi.mock("./doctor-contract-api.js", () => ({
diff --git a/src/cli/daemon-cli/install.test.ts b/src/cli/daemon-cli/install.test.ts
index 050c345c9c2..ec2822743fe 100644
--- a/src/cli/daemon-cli/install.test.ts
+++ b/src/cli/daemon-cli/install.test.ts
@@ -17,7 +17,7 @@ const hasConfiguredSecretInputMock = vi.hoisted(() =>
     if (typeof value === "string" && value.trim()) {
       return true;
     }
-    return resolveSecretInputRefMock(value as never)?.ref != null;
+    return resolveSecretInputRefMock(value)?.ref != null;
   }),
 );
 const resolveGatewayAuthMock = vi.hoisted(() =>