fix opencode client reuse and selector refetch

simstudioai · Danigm-dev · Mar 25, 2026 · Mar 25, 2026 · Mar 25, 2026 · Mar 25, 2026
commit 314e41011a482715cabee825bec2fadf7f3fe312
diff --git a/.../components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx b/.../components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx
@@ -129,6 +129,7 @@ export const ComboBox = memo(function ComboBox({
   const optionsFetchVersionRef = useRef(0)
   const isOptionsFetchInFlightRef = useRef(false)
   const hasAttemptedOptionsFetchRef = useRef(false)
+  const fetchOptionsIfNeededRef = useRef<((force?: boolean) => Promise<void>) | null>(null)
 
   /**
    * Fetches options from the async fetchOptions function if provided
@@ -171,7 +172,7 @@ export const ComboBox = memo(function ComboBox({
         isOptionsFetchInFlightRef.current = false
 
         if (shouldTriggerReplacementFetch) {
-          void fetchOptionsIfNeeded(true)
+          void fetchOptionsIfNeededRef.current?.(true)
         } else {
           setIsLoadingOptions(false)
         }
@@ -180,6 +181,10 @@ export const ComboBox = memo(function ComboBox({
     [fetchOptions, blockId, subBlockId, isPreview, disabled]
   )
 
+  useEffect(() => {
+    fetchOptionsIfNeededRef.current = fetchOptionsIfNeeded
+  }, [fetchOptionsIfNeeded])
+
   // Determine the active value based on mode (preview vs. controlled vs. store)
   const value = isPreview ? previewValue : propValue !== undefined ? propValue : storeValue
 

diff --git a/.../components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx b/.../components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx
@@ -135,6 +135,7 @@ export const Dropdown = memo(function Dropdown({
   const optionsFetchVersionRef = useRef(0)
   const isOptionsFetchInFlightRef = useRef(false)
   const hasAttemptedOptionsFetchRef = useRef(false)
+  const fetchOptionsIfNeededRef = useRef<((force?: boolean) => Promise<void>) | null>(null)
 
   const [builderData, setBuilderData] = useSubBlockValue<any[]>(blockId, 'builderData')
   const [data, setData] = useSubBlockValue<string>(blockId, 'data')
@@ -196,7 +197,7 @@ export const Dropdown = memo(function Dropdown({
         isOptionsFetchInFlightRef.current = false
 
         if (shouldTriggerReplacementFetch) {
-          void fetchOptionsIfNeeded(true)
+          void fetchOptionsIfNeededRef.current?.(true)
         } else {
           setIsLoadingOptions(false)
         }
@@ -205,6 +206,10 @@ export const Dropdown = memo(function Dropdown({
     [fetchOptions, blockId, subBlockId, isPreview, disabled]
   )
 
+  useEffect(() => {
+    fetchOptionsIfNeededRef.current = fetchOptionsIfNeeded
+  }, [fetchOptionsIfNeeded])
+
   /**
    * Handles combobox open state changes to trigger option fetching
    */

diff --git a/apps/sim/lib/opencode/client.test.ts b/apps/sim/lib/opencode/client.test.ts
@@ -0,0 +1,52 @@
+/**
+ * @vitest-environment node
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { mockCreateOpencodeClient } = vi.hoisted(() => ({
+  mockCreateOpencodeClient: vi.fn(),
+}))
+
+vi.mock('@opencode-ai/sdk', () => ({
+  createOpencodeClient: mockCreateOpencodeClient,
+}))
+
+import { createOpenCodeClient, resetOpenCodeClientForTesting } from '@/lib/opencode/client'
+
+describe('createOpenCodeClient', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.stubEnv('OPENCODE_BASE_URL', 'http://localhost:4096')
+    vi.stubEnv('OPENCODE_SERVER_USERNAME', 'opencode')
+    vi.stubEnv('OPENCODE_SERVER_PASSWORD', 'password')
+    mockCreateOpencodeClient.mockReturnValue({ session: {} })
+    resetOpenCodeClientForTesting()
+  })
+
+  afterEach(() => {
+    vi.unstubAllEnvs()
+    resetOpenCodeClientForTesting()
+  })
+
+  it('reuses the same client instance across calls', () => {
+    const firstClient = createOpenCodeClient()
+    const secondClient = createOpenCodeClient()
+
+    expect(firstClient).toBe(secondClient)
+    expect(mockCreateOpencodeClient).toHaveBeenCalledTimes(1)
+  })
+
+  it('recreates the client after resetting the cache', () => {
+    const firstClient = { session: { id: 'first' } }
+    const secondClient = { session: { id: 'second' } }
+    mockCreateOpencodeClient.mockReturnValueOnce(firstClient).mockReturnValueOnce(secondClient)
+
+    const initialClient = createOpenCodeClient()
+    resetOpenCodeClientForTesting()
+    const recreatedClient = createOpenCodeClient()
+
+    expect(initialClient).toBe(firstClient)
+    expect(recreatedClient).toBe(secondClient)
+    expect(mockCreateOpencodeClient).toHaveBeenCalledTimes(2)
+  })
+})
diff --git a/apps/sim/lib/opencode/client.ts b/apps/sim/lib/opencode/client.ts
@@ -5,6 +5,7 @@ const OPEN_CODE_HOST = 'opencode'
 const OPEN_CODE_LOCALHOST = '127.0.0.1'
 const OPEN_CODE_DEFAULT_PORT = '4096'
 const IS_DOCKER_RUNTIME = existsSync('/.dockerenv')
+let cachedOpenCodeClient: ReturnType<typeof createOpencodeClient> | null = null
 
 function getOpenCodeBasicAuthHeader(): string {
   const username = process.env.OPENCODE_SERVER_USERNAME
@@ -30,10 +31,18 @@ function getOpenCodeBaseUrl(): string {
 }
 
 export function createOpenCodeClient() {
-  return createOpencodeClient({
-    baseUrl: getOpenCodeBaseUrl(),
-    headers: {
-      Authorization: getOpenCodeBasicAuthHeader(),
-    },
-  })
+  if (!cachedOpenCodeClient) {
+    cachedOpenCodeClient = createOpencodeClient({
+      baseUrl: getOpenCodeBaseUrl(),
+      headers: {
+        Authorization: getOpenCodeBasicAuthHeader(),
+      },
+    })
+  }
+
+  return cachedOpenCodeClient
+}
+
+export function resetOpenCodeClientForTesting(): void {
+  cachedOpenCodeClient = null
 }