fix(server): keep the fork's provider divergences typechecking against upstream's new provider surfaces

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>

Author: yordis

apps/server/src/provider/AntigravityAuth.test.ts

@@ -34,6 +34,7 @@ const initialized = {
 const started: AcpSessionRuntimeStartResult = {
   sessionId: "native-session",
   initializeResult: initialized,
+  authenticateResult: {},
   sessionSetupResult: {
     sessionId: "native-session",
     models: {

apps/server/src/provider/Drivers/CodexDriver.test.ts

@@ -25,6 +25,7 @@ import {
   ProviderVersionCache,
   resolveLatestProviderVersion,
 } from "../providerMaintenance.ts";
+import { ProviderSecretResolverPassthroughLayer } from "../Services/ProviderSecretResolver.ts";
 import { CodexDriver } from "./CodexDriver.ts";
 
 const testLayer = ServerConfig.layerTest(process.cwd(), {
@@ -40,6 +41,7 @@ const testLayer = ServerConfig.layerTest(process.cwd(), {
     }),
   ),
   Layer.provideMerge(Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers)),
+  Layer.provideMerge(ProviderSecretResolverPassthroughLayer),
   Layer.provideMerge(
     Layer.succeed(
       HttpClient.HttpClient,

apps/server/src/provider/Drivers/CursorDriver.test.ts

@@ -15,6 +15,7 @@ import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts";
 import { ServerConfig } from "../../config.ts";
 import { ServerSettingsService } from "../../serverSettings.ts";
 import { NoOpProviderEventLoggers, ProviderEventLoggers } from "../Layers/ProviderEventLoggers.ts";
+import { ProviderSecretResolverPassthroughLayer } from "../Services/ProviderSecretResolver.ts";
 import { CursorDriver } from "./CursorDriver.ts";
 
 const testLayer = ServerConfig.layerTest(process.cwd(), {
@@ -28,6 +29,7 @@ const testLayer = ServerConfig.layerTest(process.cwd(), {
     }),
   ),
   Layer.provideMerge(Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers)),
+  Layer.provideMerge(ProviderSecretResolverPassthroughLayer),
   Layer.provideMerge(
     Layer.succeed(
       HttpClient.HttpClient,

apps/server/src/provider/Layers/AntigravityAdapter.test.ts

@@ -159,6 +159,7 @@ const makeHarness = Effect.fn("makeAntigravityAdapterHarness")(function* (option
             protocolVersion: 1,
             agentCapabilities: { sessionCapabilities: { resume: {} } },
           },
+          authenticateResult: {},
           sessionSetupResult: { sessionId: nativeSessionId, configOptions: configOptions() },
           modelConfigId: "model",
         };

apps/server/src/provider/Layers/AntigravityProvider.test.ts

@@ -92,6 +92,7 @@ const sessionSetupResult = {
 const started = {
   sessionId: "session-1",
   initializeResult,
+  authenticateResult: {},
   sessionSetupResult,
   modelConfigId: "model",
 } satisfies AcpSessionRuntimeStartResult;

apps/server/src/provider/Layers/ClaudeAdapter.test.ts

@@ -5644,13 +5644,17 @@ describe("ClaudeAdapterLive", () => {
         return;
       }
 
-      const result = yield* Effect.promise(() =>
+      const result = (yield* Effect.promise(() =>
         canUseTool(
           "Task",
           { subagent_type: "general", prompt: "do it", description: "task" },
-          { signal: new AbortController().signal, toolUseID: "tool-use-task-1" },
+          {
+            signal: new AbortController().signal,
+            requestId: "request-task-1",
+            toolUseID: "tool-use-task-1",
+          },
         ),
-      );
+      )) as PermissionResult;
       assert.equal(result.behavior, "deny");
       if (result.behavior === "deny") {
         assert.include(result.message, "mcp__t3-code__spawn_thread");
@@ -5702,16 +5706,20 @@ describe("ClaudeAdapterLive", () => {
         return;
       }
 
-      const result = yield* Effect.promise(() =>
+      const result = (yield* Effect.promise(() =>
         canUseTool(
           "Task",
           { subagent_type: "general", prompt: "do it", description: "task" },
-          { signal: new AbortController().signal, toolUseID: "tool-use-task-2" },
+          {
+            signal: new AbortController().signal,
+            requestId: "request-task-2",
+            toolUseID: "tool-use-task-2",
+          },
         ),
-      );
+      )) as PermissionResult;
       assert.equal(result.behavior, "allow");
       const systemPrompt = createInput?.options.systemPrompt as { append?: string };
-      assert.isUndefined(systemPrompt.append);
+      assert.notInclude(systemPrompt.append ?? "", "mcp__t3-code__await_thread");
     }).pipe(Effect.scoped, Effect.provide(harness.layer));
   });
 

apps/server/src/provider/Layers/GrokProvider.test.ts

@@ -6,6 +6,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
 import { describe, expect, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
 import * as Schema from "effect/Schema";
 import { GrokSettings } from "@t3tools/contracts";
 

apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts

@@ -644,6 +644,7 @@ describe("ProviderInstanceRegistryLive: rebuildInstanceWhen", () => {
     Layer.provideMerge(Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers)),
     Layer.provideMerge(ProviderSecretResolverPassthroughLayer),
     Layer.provideMerge(ModelManifest.layerTest),
+    Layer.provideMerge(CodexResetCredit.layerTest),
   );
 
   const codexDriverKind = ProviderDriverKind.make("codex");

apps/server/src/provider/Layers/ProviderRegistry.test.ts

@@ -1034,6 +1034,8 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
                   Effect.succeed(id === instance.instanceId ? instance : undefined),
                 listInstances: Effect.succeed([instance]),
                 listUnavailable: Effect.succeed([]),
+                listEnvironments: Effect.succeed(new Map()),
+                rebuildInstanceWhen: () => Effect.succeed(false),
                 streamChanges: Stream.empty,
                 subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), PubSub.subscribe),
               },
@@ -1073,7 +1075,10 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
             Effect.provide(
               ServerConfig.layerTest(process.cwd(), {
                 prefix: "t3-codex-retired-model-cache-",
-              }).pipe(Layer.provideMerge(NodeServices.layer)),
+              }).pipe(
+                Layer.provideMerge(NodeServices.layer),
+                Layer.provideMerge(ProviderSecretResolverPassthroughLayer),
+              ),
             ),
           ),
         );
@@ -1462,13 +1467,17 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
             displayName: undefined,
             enabled: true,
             snapshot: {
-              maintenanceCapabilities: makeManualOnlyProviderMaintenanceCapabilities({
-                provider: codexDriver,
-                packageName: null,
-              }),
+              resolveMaintenance: () =>
+                Effect.succeed(
+                  makeManualOnlyProviderMaintenanceCapabilities({
+                    provider: codexDriver,
+                    packageName: null,
+                  }),
+                ),
               getSnapshot: Effect.succeed(initialProvider),
               refresh: Effect.succeed(initialProvider),
               streamChanges: Stream.empty,
+              applyUsageLimits: () => Effect.void,
             },
             adapter: {} as ProviderInstance["adapter"],
             textGeneration: {} as ProviderInstance["textGeneration"],
@@ -2701,6 +2710,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
           yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
           yield* Layer.build(
             ProviderInstanceRegistryHydrationLive.pipe(
+              Layer.provideMerge(AntigravityInstallation.layer),
               Layer.provideMerge(
                 Layer.succeed(ServerSettingsModule.ServerSettingsService, serverSettings),
               ),
@@ -2717,6 +2727,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
                 ),
               ),
               Layer.provideMerge(ModelManifest.layerTest),
+              Layer.provideMerge(CodexResetCredit.layerTest),
               Layer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),
               Layer.provideMerge(NodeServices.layer),
               Layer.provideMerge(BackgroundPolicyAlwaysRunLayer),

apps/server/src/provider/ProviderInstanceEnvironment.test.ts

@@ -19,11 +19,14 @@ describe("mergeProviderInstanceEnvironment", () => {
         CLAUDE_CONFIG_DIR: "~/.inherited-claude",
       };
       const environment = mergeProviderInstanceEnvironment(
-        [
-          { name: "CODEX_HOME", value, sensitive: false },
-          { name: "CLAUDE_CONFIG_DIR", value, sensitive: false },
-          { name: "CUSTOM_VALUE", value, sensitive: false },
-        ],
+        {
+          variables: [
+            { name: "CODEX_HOME", value, sensitive: false },
+            { name: "CLAUDE_CONFIG_DIR", value, sensitive: false },
+            { name: "CUSTOM_VALUE", value, sensitive: false },
+          ],
+          unresolved: [],
+        },
         baseEnv,
       );
 
@@ -44,7 +47,10 @@ describe("mergeProviderInstanceEnvironment", () => {
 
     expect(
       mergeProviderInstanceEnvironment(
-        [{ name: "CUSTOM_VALUE", value: "~/.custom", sensitive: false }],
+        {
+          variables: [{ name: "CUSTOM_VALUE", value: "~/.custom", sensitive: false }],
+          unresolved: [],
+        },
         baseEnv,
       ),
     ).toEqual({ ...baseEnv, CUSTOM_VALUE: "~/.custom" });