Share provider-catalog refresh between TUI connect and Go prefetch

Author: Gustav-Simonsson

src/tui/runner/provider-refresh.ts

@@ -0,0 +1,79 @@
+// Shared "reload settings, re-resolve the live provider catalog, repaint the
+// model surfaces" step for the TUI runner. The Alt+A provider connect handler
+// and the post-startup / post-connect OpenCode Go model prefetch each carried
+// their own copy of this block; both now resolve through this module so a
+// live connect and a startup prefetch cannot drift apart.
+
+import { getLogger } from "@intx/log";
+
+import { LOG_NAMESPACE_ROOT } from "../../branding.js";
+import {
+  listFavoriteModels,
+  listRecentModels,
+  loadSettings,
+  type ResolvedProvider,
+} from "../../config/settings.js";
+import { refreshLiveProviderCatalog } from "../../config/index.js";
+import { prefetchGoModels } from "../../provider/opencode-go-models.js";
+import type { ModelCatalogProvidersInput, ModelCatalogRef } from "../model-catalog.js";
+import type { RunnerState } from "./state.js";
+
+const tuiLogger = getLogger([LOG_NAMESPACE_ROOT, "tui"]);
+
+/** Model-surface repaint target for a refreshed catalog (host or holder). */
+export type RefreshModels = (
+  recentModels: readonly ModelCatalogRef[],
+  favoriteModels: readonly ModelCatalogRef[],
+  providers?: ModelCatalogProvidersInput,
+) => void;
+
+// Reload the on-disk settings and re-resolve the live provider catalog
+// (including OAuth profiles) against the current config, then repaint the
+// model surfaces. Shared by the provider connect handler and the Go-model
+// prefetch so a newly authorized provider's models appear the same way in
+// every path.
+export async function refreshProviderCatalogAndSurfaces(
+  state: RunnerState,
+  refreshModels: RefreshModels,
+): Promise<void> {
+  const onDisk = await loadSettings(state.trueGlobalSettingsPath);
+  const resolvedForCatalog: ResolvedProvider = {
+    apiKey: state.config.apiKey,
+    baseURL: state.config.baseURL,
+    model: state.config.model,
+    providerName: state.config.providerName,
+    ...(state.config.keyless !== undefined ? { keyless: state.config.keyless } : {}),
+  };
+  const providers = await refreshLiveProviderCatalog(onDisk, resolvedForCatalog);
+  state.config = {
+    ...state.config,
+    providers,
+    ...(onDisk !== null ? { settings: onDisk } : {}),
+  };
+  refreshModels(
+    listRecentModels(state.config.settings ?? { providers: {} }),
+    listFavoriteModels(state.config.settings ?? { providers: {} }),
+    providers,
+  );
+}
+
+// Prefetch the OpenCode Go model catalog, then re-resolve settings and
+// repaint. Shared by wirePostStartup and the connect handler's post-connect
+// refresh. `getRefreshModels` is a callback so the host-availability guard is
+// re-checked when the prefetch settles, not when it was started.
+export function prefetchGoModelsAndRefresh(
+  state: RunnerState,
+  getRefreshModels: () => RefreshModels | undefined,
+): void {
+  void prefetchGoModels()
+    .then(async () => {
+      const refreshModels = getRefreshModels();
+      if (refreshModels === undefined) return;
+      await refreshProviderCatalogAndSurfaces(state, refreshModels);
+    })
+    .catch((err: unknown) => {
+      tuiLogger.debug("go model prefetch failed: {error}", {
+        error: err instanceof Error ? err.message : String(err),
+      });
+    });
+}

src/tui/runner/settings.ts

@@ -21,11 +21,9 @@ import {
   toggleFavoriteModel,
   type LocalSettings,
   type ModelRef,
-  type ResolvedProvider,
   type Settings,
 } from "../../config/settings.js";
 import { getTelemetry } from "../../telemetry/singleton.js";
-import { refreshLiveProviderCatalog } from "../../config/index.js";
 import { createTelemetryToggleHandler } from "../../telemetry/toggle.js";
 import { telemetryFirstRunPending } from "../../telemetry/first-run.js";
 import { TELEMETRY_NOTICE } from "../../telemetry/index.js";
@@ -35,14 +33,17 @@ import type { GrantScope } from "../../permission/types.js";
 import { connectProviderInline } from "../provider/connect.js";
 import { persistConnectedSelection } from "../provider/submit.js";
 import { modelOptionId } from "../model-catalog.js";
-import { prefetchGoModels } from "../../provider/opencode-go-models.js";
 import { isOpenCodeGoProvider } from "../../../packages/opencode-go/src/index.js";
 import { applyLiveModelSwitch } from "../../session/live-model-switch.js";
 import { applyFocus } from "../shell/chrome.js";
 import { setShellInputSuspended } from "../shell/prompt.js";
 import { warningsForPluginEntry } from "../../plugins/diagnostics.js";
 import { isPluginEnabledForSurface } from "../plugin-surface.js";
 import { resolveWaitForApproval } from "../tool-execution-watchdog.js";
+import {
+  prefetchGoModelsAndRefresh,
+  refreshProviderCatalogAndSurfaces,
+} from "./provider-refresh.js";
 import { hostOf, type RunnerServices, type RunnerState } from "./state.js";
 import { LOG_NAMESPACE_ROOT } from "../../branding.js";
 
@@ -252,25 +253,7 @@ export async function wireSettings(
       }
       if (!result.connected) return;
 
-      const onDisk = await loadSettings(trueGlobalSettingsPath);
-      const resolvedForCatalog: ResolvedProvider = {
-        apiKey: state.config.apiKey,
-        baseURL: state.config.baseURL,
-        model: state.config.model,
-        providerName: state.config.providerName,
-        ...(state.config.keyless !== undefined ? { keyless: state.config.keyless } : {}),
-      };
-      const providers = await refreshLiveProviderCatalog(onDisk, resolvedForCatalog);
-      state.config = {
-        ...state.config,
-        providers,
-        ...(onDisk !== null ? { settings: onDisk } : {}),
-      };
-      hostOf(state).refreshModels(
-        listRecentModels(state.config.settings ?? { providers: {} }),
-        listFavoriteModels(state.config.settings ?? { providers: {} }),
-        providers,
-      );
+      await refreshProviderCatalogAndSurfaces(state, hostOf(state).refreshModels);
       // Reopen positioned at the account just connected — the picker's
       // default open (top of list) would otherwise leave the operator to
       // hunt for the row they just authorized.
@@ -280,27 +263,7 @@ export async function wireSettings(
       );
       state.systemNotice?.(`Connected ${connectedName}. Open /model to pick a model.`);
       if (isOpenCodeGoProvider({ name: providerName })) {
-        void prefetchGoModels()
-          .then(async () => {
-            if (services.hostHolder.instance === undefined) return;
-            const nextDisk = await loadSettings(trueGlobalSettingsPath);
-            const nextProviders = await refreshLiveProviderCatalog(nextDisk, resolvedForCatalog);
-            state.config = {
-              ...state.config,
-              providers: nextProviders,
-              ...(nextDisk !== null ? { settings: nextDisk } : {}),
-            };
-            services.hostHolder.instance.refreshModels(
-              listRecentModels(state.config.settings ?? { providers: {} }),
-              listFavoriteModels(state.config.settings ?? { providers: {} }),
-              nextProviders,
-            );
-          })
-          .catch((err: unknown) => {
-            tuiLogger.debug("go model prefetch failed: {error}", {
-              error: err instanceof Error ? err.message : String(err),
-            });
-          });
+        prefetchGoModelsAndRefresh(state, () => services.hostHolder.instance?.refreshModels);
       }
     })().catch((err: unknown) => {
       tuiLogger.debug("provider connect failed: {error}", {

src/tui/runner/wiring.ts

@@ -7,10 +7,6 @@
  */
 
 import { getLogger } from "@intx/log";
-import { loadSettings, listFavoriteModels, listRecentModels } from "../../config/settings.js";
-import { refreshLiveProviderCatalog } from "../../config/index.js";
-import type { ResolvedProvider } from "../../config/settings.js";
-import { prefetchGoModels } from "../../provider/opencode-go-models.js";
 import { isOpenCodeGoProvider } from "../../../packages/opencode-go/src/index.js";
 import { loadRecentTurns } from "../../session/optimized-context-store.js";
 import { loadSentMessages } from "../../session/sent-messages.js";
@@ -43,6 +39,7 @@ import {
 import { listPathSuggestions } from "../components/at-mention/list.js";
 import { listCommands } from "../commands/registry.js";
 import type { MCPConnectCallbacks } from "../../agent/tools.js";
+import { prefetchGoModelsAndRefresh } from "./provider-refresh.js";
 import { createRuntimeShutdown } from "./shutdown.js";
 import { resumeTranscriptLoadErrorBlock } from "./exit.js";
 import { userInboundMessage } from "./submit.js";
@@ -57,34 +54,7 @@ export function wirePostStartup(
   mcpConnectCallbacks: MCPConnectCallbacks,
 ): void {
   if (state.config.providers.some((p) => isOpenCodeGoProvider(p))) {
-    void prefetchGoModels()
-      .then(async () => {
-        if (services.hostHolder.instance === undefined) return;
-        const onDisk = await loadSettings(state.trueGlobalSettingsPath);
-        const resolvedForCatalog: ResolvedProvider = {
-          apiKey: state.config.apiKey,
-          baseURL: state.config.baseURL,
-          model: state.config.model,
-          providerName: state.config.providerName,
-          ...(state.config.keyless !== undefined ? { keyless: state.config.keyless } : {}),
-        };
-        const providers = await refreshLiveProviderCatalog(onDisk, resolvedForCatalog);
-        state.config = {
-          ...state.config,
-          providers,
-          ...(onDisk !== null ? { settings: onDisk } : {}),
-        };
-        services.hostHolder.instance.refreshModels(
-          listRecentModels(state.config.settings ?? { providers: {} }),
-          listFavoriteModels(state.config.settings ?? { providers: {} }),
-          providers,
-        );
-      })
-      .catch((err: unknown) => {
-        tuiLogger.debug("go model prefetch failed: {error}", {
-          error: err instanceof Error ? err.message : String(err),
-        });
-      });
+    prefetchGoModelsAndRefresh(state, () => services.hostHolder.instance?.refreshModels);
   }
 
   const shutdownRuntime = createRuntimeShutdown({