From 0805078118dd8ce42eb9ca896da0b02a979ef860 Mon Sep 17 00:00:00 2001 From: Tak Hoffman <781889+Takhoffman@users.noreply.github.com> Date: Thu, 26 Mar 2026 16:05:25 -0500 Subject: [PATCH] fix(ci): format discord provider follow-up --- .../discord/src/monitor/provider.test.ts | 34 ++++++++++++------- extensions/discord/src/monitor/provider.ts | 15 ++++---- .../discord-provider.test-support.ts | 22 ++++++++---- 3 files changed, 43 insertions(+), 28 deletions(-) diff --git a/extensions/discord/src/monitor/provider.test.ts b/extensions/discord/src/monitor/provider.test.ts index 69ae62feda9..5a19791c640 100644 --- a/extensions/discord/src/monitor/provider.test.ts +++ b/extensions/discord/src/monitor/provider.test.ts @@ -136,16 +136,16 @@ describe("monitorDiscordProvider", () => { beforeEach(() => { resetDiscordProviderMonitorMocks(); providerTesting.setFetchDiscordApplicationId(async () => "app-1"); - providerTesting.setCreateDiscordNativeCommand( - ((...args: Parameters[0] extends + providerTesting.setCreateDiscordNativeCommand((( + ...args: Parameters[0] extends | ((...inner: infer P) => unknown) | undefined ? P - : never) => - createDiscordNativeCommandMock( - ...(args as Parameters), - )) as NonNullable[0]>, - ); + : never + ) => + createDiscordNativeCommandMock( + ...(args as Parameters), + )) as NonNullable[0]>); providerTesting.setRunDiscordGatewayLifecycle((...args) => monitorLifecycleMock(...(args as Parameters)), ); @@ -186,14 +186,24 @@ describe("monitorDiscordProvider", () => { getPlugin: (name: string) => clientGetPluginMock(name), } as never; }); - providerTesting.setGetPluginCommandSpecs((provider?: string) => getPluginCommandSpecsMock(provider)); - providerTesting.setResolveDiscordAccount((...args) => resolveDiscordAccountMock(...args) as never); - providerTesting.setResolveNativeCommandsEnabled((...args) => resolveNativeCommandsEnabledMock(...args)); - providerTesting.setResolveNativeSkillsEnabled((...args) => resolveNativeSkillsEnabledMock(...args)); + providerTesting.setGetPluginCommandSpecs((provider?: string) => + getPluginCommandSpecsMock(provider), + ); + providerTesting.setResolveDiscordAccount( + (...args) => resolveDiscordAccountMock(...args) as never, + ); + providerTesting.setResolveNativeCommandsEnabled((...args) => + resolveNativeCommandsEnabledMock(...args), + ); + providerTesting.setResolveNativeSkillsEnabled((...args) => + resolveNativeSkillsEnabledMock(...args), + ); providerTesting.setListNativeCommandSpecsForConfig((...args) => listNativeCommandSpecsForConfigMock(...args), ); - providerTesting.setListSkillCommandsForAgents((...args) => listSkillCommandsForAgentsMock(...args) as never); + providerTesting.setListSkillCommandsForAgents( + (...args) => listSkillCommandsForAgentsMock(...args) as never, + ); providerTesting.setIsVerbose(() => isVerboseMock()); providerTesting.setShouldLogVerbose(() => shouldLogVerboseMock()); }); diff --git a/extensions/discord/src/monitor/provider.ts b/extensions/discord/src/monitor/provider.ts index 3aafebf9e75..aab32015226 100644 --- a/extensions/discord/src/monitor/provider.ts +++ b/extensions/discord/src/monitor/provider.ts @@ -111,9 +111,7 @@ let createDiscordNativeCommandForTesting: typeof createDiscordNativeCommand | un let runDiscordGatewayLifecycleForTesting: typeof runDiscordGatewayLifecycle | undefined; let createDiscordGatewayPluginForTesting: typeof createDiscordGatewayPlugin | undefined; let createDiscordGatewaySupervisorForTesting: typeof createDiscordGatewaySupervisor | undefined; -let loadDiscordVoiceRuntimeForTesting: - | (() => Promise) - | undefined; +let loadDiscordVoiceRuntimeForTesting: (() => Promise) | undefined; let loadDiscordProviderSessionRuntimeForTesting: | (() => Promise) | undefined; @@ -652,8 +650,7 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) { providerSetting: discordCfg.commands?.native, globalSetting: cfg.commands?.native, }); - const nativeSkillsEnabled = (resolveNativeSkillsEnabledForTesting ?? resolveNativeSkillsEnabled)( - { + const nativeSkillsEnabled = (resolveNativeSkillsEnabledForTesting ?? resolveNativeSkillsEnabled)({ providerId: "discord", providerSetting: discordCfg.commands?.nativeSkills, globalSetting: cfg.commands?.nativeSkills, @@ -949,13 +946,13 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) { }, clientPlugins, ); - gatewaySupervisor = (createDiscordGatewaySupervisorForTesting ?? createDiscordGatewaySupervisor)( - { + gatewaySupervisor = ( + createDiscordGatewaySupervisorForTesting ?? createDiscordGatewaySupervisor + )({ client, isDisallowedIntentsError: isDiscordDisallowedIntentsError, runtime, - }, - ); + }); const lifecycleGateway = client.getPlugin("gateway"); earlyGatewayEmitter = gatewaySupervisor.emitter; diff --git a/test/helpers/extensions/discord-provider.test-support.ts b/test/helpers/extensions/discord-provider.test-support.ts index e670c698f0e..ae60abfc93b 100644 --- a/test/helpers/extensions/discord-provider.test-support.ts +++ b/test/helpers/extensions/discord-provider.test-support.ts @@ -36,9 +36,14 @@ type ProviderMonitorTestMocks = { >; getPluginCommandSpecsMock: Mock<(provider?: string) => PluginCommandSpecMock[]>; listNativeCommandSpecsForConfigMock: Mock< - (cfg?: unknown, params?: { skillCommands?: unknown[]; provider?: string }) => NativeCommandSpecMock[] + ( + cfg?: unknown, + params?: { skillCommands?: unknown[]; provider?: string }, + ) => NativeCommandSpecMock[] + >; + listSkillCommandsForAgentsMock: Mock< + (params?: { cfg?: unknown; agentIds?: string[] }) => unknown[] >; - listSkillCommandsForAgentsMock: Mock<(params?: { cfg?: unknown; agentIds?: string[] }) => unknown[]>; monitorLifecycleMock: Mock<(params: { threadBindings: { stop: () => void } }) => Promise>; resolveDiscordAccountMock: Mock< (params?: { cfg?: unknown; accountId?: string | null; token?: string | null }) => unknown @@ -111,11 +116,14 @@ const providerMonitorTestMocks: ProviderMonitorTestMocks = vi.hoisted(() => { ), getPluginCommandSpecsMock: vi.fn<(provider?: string) => PluginCommandSpecMock[]>(() => []), listNativeCommandSpecsForConfigMock: vi.fn< - (cfg?: unknown, params?: { skillCommands?: unknown[]; provider?: string }) => NativeCommandSpecMock[] - >(() => [ - { name: "cmd", description: "built-in", acceptsArgs: false }, - ]), - listSkillCommandsForAgentsMock: vi.fn<(params?: { cfg?: unknown; agentIds?: string[] }) => unknown[]>(() => []), + ( + cfg?: unknown, + params?: { skillCommands?: unknown[]; provider?: string }, + ) => NativeCommandSpecMock[] + >(() => [{ name: "cmd", description: "built-in", acceptsArgs: false }]), + listSkillCommandsForAgentsMock: vi.fn< + (params?: { cfg?: unknown; agentIds?: string[] }) => unknown[] + >(() => []), monitorLifecycleMock: vi.fn(async (params: { threadBindings: { stop: () => void } }) => { params.threadBindings.stop(); }),