Extract shared makePendingProviderSnapshot helper to deduplicate pending provider factories

Author: cursoragent

apps/server/src/provider/Layers/ClaudeProvider.ts

@@ -21,6 +21,7 @@ import {
   detailFromResult,
   extractAuthBoolean,
   isCommandMissingCause,
+  makePendingProviderSnapshot,
   parseGenericCliVersion,
   providerModelsFromSettings,
   spawnAndCollect,
@@ -663,45 +664,15 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
   });
 });
 
-const makePendingClaudeProvider = (claudeSettings: ClaudeSettings): ServerProvider => {
-  const checkedAt = new Date().toISOString();
-  const models = providerModelsFromSettings(
-    BUILT_IN_MODELS,
-    PROVIDER,
-    claudeSettings.customModels,
-    DEFAULT_CLAUDE_MODEL_CAPABILITIES,
-  );
-
-  if (!claudeSettings.enabled) {
-    return buildServerProvider({
-      provider: PROVIDER,
-      enabled: false,
-      checkedAt,
-      models,
-      probe: {
-        installed: false,
-        version: null,
-        status: "warning",
-        auth: { status: "unknown" },
-        message: "Claude is disabled in T3 Code settings.",
-      },
-    });
-  }
-
-  return buildServerProvider({
+const makePendingClaudeProvider = (claudeSettings: ClaudeSettings): ServerProvider =>
+  makePendingProviderSnapshot({
     provider: PROVIDER,
-    enabled: true,
-    checkedAt,
-    models,
-    probe: {
-      installed: false,
-      version: null,
-      status: "warning",
-      auth: { status: "unknown" },
-      message: "Claude provider status has not been checked in this session yet.",
-    },
+    displayName: "Claude",
+    builtInModels: BUILT_IN_MODELS,
+    customModels: claudeSettings.customModels,
+    defaultCapabilities: DEFAULT_CLAUDE_MODEL_CAPABILITIES,
+    enabled: claudeSettings.enabled,
   });
-};
 
 export const ClaudeProviderLive = Layer.effect(
   ClaudeProvider,

apps/server/src/provider/Layers/CodexProvider.ts

@@ -28,6 +28,7 @@ import {
   detailFromResult,
   extractAuthBoolean,
   isCommandMissingCause,
+  makePendingProviderSnapshot,
   parseGenericCliVersion,
   providerModelsFromSettings,
   spawnAndCollect,
@@ -552,45 +553,15 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
   });
 });
 
-const makePendingCodexProvider = (codexSettings: CodexSettings): ServerProvider => {
-  const checkedAt = new Date().toISOString();
-  const models = providerModelsFromSettings(
-    BUILT_IN_MODELS,
-    PROVIDER,
-    codexSettings.customModels,
-    DEFAULT_CODEX_MODEL_CAPABILITIES,
-  );
-
-  if (!codexSettings.enabled) {
-    return buildServerProvider({
-      provider: PROVIDER,
-      enabled: false,
-      checkedAt,
-      models,
-      probe: {
-        installed: false,
-        version: null,
-        status: "warning",
-        auth: { status: "unknown" },
-        message: "Codex is disabled in T3 Code settings.",
-      },
-    });
-  }
-
-  return buildServerProvider({
+const makePendingCodexProvider = (codexSettings: CodexSettings): ServerProvider =>
+  makePendingProviderSnapshot({
     provider: PROVIDER,
-    enabled: true,
-    checkedAt,
-    models,
-    probe: {
-      installed: false,
-      version: null,
-      status: "warning",
-      auth: { status: "unknown" },
-      message: "Codex provider status has not been checked in this session yet.",
-    },
+    displayName: "Codex",
+    builtInModels: BUILT_IN_MODELS,
+    customModels: codexSettings.customModels,
+    defaultCapabilities: DEFAULT_CODEX_MODEL_CAPABILITIES,
+    enabled: codexSettings.enabled,
   });
-};
 
 export const CodexProviderLive = Layer.effect(
   CodexProvider,

apps/server/src/provider/providerSnapshot.ts

@@ -151,6 +151,53 @@ export function buildServerProvider(input: {
   };
 }
 
+export function makePendingProviderSnapshot(input: {
+  provider: ServerProvider["provider"];
+  displayName: string;
+  builtInModels: ReadonlyArray<ServerProviderModel>;
+  customModels: ReadonlyArray<string>;
+  defaultCapabilities: ModelCapabilities;
+  enabled: boolean;
+}): ServerProvider {
+  const checkedAt = new Date().toISOString();
+  const models = providerModelsFromSettings(
+    input.builtInModels,
+    input.provider,
+    input.customModels,
+    input.defaultCapabilities,
+  );
+
+  if (!input.enabled) {
+    return buildServerProvider({
+      provider: input.provider,
+      enabled: false,
+      checkedAt,
+      models,
+      probe: {
+        installed: false,
+        version: null,
+        status: "warning",
+        auth: { status: "unknown" },
+        message: `${input.displayName} is disabled in T3 Code settings.`,
+      },
+    });
+  }
+
+  return buildServerProvider({
+    provider: input.provider,
+    enabled: true,
+    checkedAt,
+    models,
+    probe: {
+      installed: false,
+      version: null,
+      status: "warning",
+      auth: { status: "unknown" },
+      message: `${input.displayName} provider status has not been checked in this session yet.`,
+    },
+  });
+}
+
 export const collectStreamAsString = <E>(
   stream: Stream.Stream<Uint8Array, E>,
 ): Effect.Effect<string, E> =>