refactor

Author: e-fisher

src/handlers/ai/a2a/assistantAuth.ts

@@ -15,6 +15,7 @@ import { browserWindowFromEvent } from '@/utils/electron'
 import { abortAllActiveAssistantSessions } from '../grafanaAssistantProvider'
 import { AssistantAuthHandler } from '../types'
 
+import { getCurrentStackUrl } from './config'
 import { LOG_PREFIX } from './constants'
 import {
   checkStackHealth,
@@ -222,39 +223,13 @@ export function initialize() {
   })
 
   ipcMain.handle(AssistantAuthHandler.WakeStack, async (): Promise<void> => {
-    const profile = await getProfileData()
-    const stackId = profile.profiles.currentStack
-
-    if (!stackId) {
-      throw new Error('No stack selected')
-    }
-
-    const stack = profile.profiles.stacks[stackId]
-
-    if (!stack) {
-      throw new Error(`Stack ${stackId} not found in profile`)
-    }
-
-    return wakeStack(stack.url)
+    return wakeStack(await getCurrentStackUrl())
   })
 
   ipcMain.handle(
     AssistantAuthHandler.CheckStackHealth,
     async (): Promise<StackHealthStatus> => {
-      const profile = await getProfileData()
-      const stackId = profile.profiles.currentStack
-
-      if (!stackId) {
-        throw new Error('No stack selected')
-      }
-
-      const stack = profile.profiles.stacks[stackId]
-
-      if (!stack) {
-        throw new Error(`Stack ${stackId} not found in profile`)
-      }
-
-      return checkStackHealth(stack.url)
+      return checkStackHealth(await getCurrentStackUrl())
     }
   )
 

src/handlers/ai/a2a/config.ts

@@ -17,6 +17,23 @@ const REMOTE_TOOL_EXTENSION =
 const TOKEN_STREAMING_EXTENSION =
   'https://grafana.com/extensions/token-streaming/v1'
 
+export async function getCurrentStackUrl(): Promise<string> {
+  const profile = await getProfileData()
+  const stackId = profile.profiles.currentStack
+
+  if (!stackId) {
+    throw new Error('No stack selected')
+  }
+
+  const stack = profile.profiles.stacks[stackId]
+
+  if (!stack) {
+    throw new Error(`Stack ${stackId} not found in profile`)
+  }
+
+  return stack.url
+}
+
 export async function getA2AConfig(): Promise<A2AConfig> {
   const profile = await getProfileData()
   const stackId = profile.profiles.currentStack

src/handlers/ai/a2a/stackHealth.test.ts

@@ -100,31 +100,4 @@ describe('checkStackHealth', () => {
 
     expect(result).toBe<StackHealthStatus>('loading')
   })
-
-  it('uses a timeout to avoid hanging on unresponsive stacks', async () => {
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      json: () => Promise.resolve({ database: 'ok' }),
-    })
-
-    await checkStackHealth(stackUrl)
-
-    const healthInit = mockFetch.mock.calls[0]![1] as RequestInit
-    expect(healthInit.signal).toBeInstanceOf(AbortSignal)
-  })
-
-  it('does not call wakeStack', async () => {
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      json: () => Promise.resolve({ database: 'ok' }),
-    })
-
-    await checkStackHealth(stackUrl)
-
-    expect(mockFetch).toHaveBeenCalledTimes(1)
-    expect(mockFetch).toHaveBeenCalledWith(
-      expect.stringContaining('/api/health'),
-      expect.any(Object)
-    )
-  })
 })