Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ export function makeAntigravityAcpAdapterFlavor(
supportsImagePrompts: true,
compactViaAdvertisedCommand: true,
requiresSignIn: isAntigravitySignInRequiredError,
checksVersionAtHandshake: true,
// Antigravity can leave a prompt open without updates; long tools and approvals pause this.
promptInactivityTimeout: "15 minutes",
reportsPerTurnPromptUsage: true,
Expand Down
16 changes: 9 additions & 7 deletions apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { pipe } from "effect/Function";
import * as DocumentText from "../../provider/DocumentText.ts";
import { brokenRuntimeError } from "../../provider/providerCompatibility.ts";
import { revertCodexThread } from "../../provider/CodexThreadRevert.ts";
import { historyResponseItems } from "@t3tools/provider-core/server/handoffBudget";
import { makeProviderTextDeltaCoalescer } from "./ProviderTextDeltaCoalescer.ts";
Expand Down Expand Up @@ -1947,6 +1948,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
return ProviderAdapter.ProviderAdapterV2.of({
instanceId: adapterOptions.instanceId,
driver: CODEX_PROVIDER,
checksVersionAtHandshake: adapterOptions.compatibility !== undefined,
getCapabilities: Effect.fn("CodexAdapterV2.getCapabilities")(function () {
return Effect.succeed(CodexProviderCapabilitiesV2);
}),
Expand Down Expand Up @@ -2074,15 +2076,15 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
version && adapterOptions.compatibility
? yield* adapterOptions.compatibility(version)
: undefined;
if (advisory?.status === "broken") {
const target =
advisory.recommendedVersion ?? advisory.recommendedRange ?? "a newer version";
return yield* new ProviderSetupError({
const refused =
version &&
brokenRuntimeError({
instanceId: adapterOptions.instanceId,
operation: "runtime",
detail: `Codex ${version} does not work with this T3 Code release. Update Codex to ${target}, then retry.`,
name: "Codex",
version,
advisory,
});
}
if (refused) return yield* refused;
yield* client.notify("initialized", undefined);
yield* Ref.set(initialized, true);
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import * as SqlitePersistence from "../persistence/Sqlite.ts";
import * as ProjectEnrichmentService from "../project/ProjectEnrichmentService.ts";
import * as ProjectService from "../project/ProjectService.ts";
import type { ProviderInstance } from "@t3tools/provider-core/server/driver";
import * as ModelManifest from "../provider/ModelManifest.ts";
import * as ProviderInstanceRegistry from "../provider/ProviderInstanceRegistry.ts";
import * as ServerSettings from "../serverSettings.ts";
import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
Expand Down Expand Up @@ -108,16 +109,16 @@ const providerInstance = {
textGeneration: {} as ProviderInstance["textGeneration"],
} satisfies ProviderInstance;

const layerTestProviderInstanceRegistry = Layer.succeed(
ProviderInstanceRegistry.ProviderInstanceRegistry,
{
const layerTestProviderInstanceRegistry = Layer.merge(
ModelManifest.layerTest,
Layer.succeed(ProviderInstanceRegistry.ProviderInstanceRegistry, {
getInstance: (instanceId) =>
Effect.succeed(instanceId === providerInstance.instanceId ? providerInstance : undefined),
listInstances: Effect.succeed([providerInstance]),
listUnavailable: Effect.succeed([]),
streamChanges: Stream.empty,
subscribeChanges: Effect.never,
},
}),
);

const layerTest = Layer.mergeAll(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import * as SqlitePersistence from "../persistence/Sqlite.ts";
import { runMigrations } from "../persistence/Migrations.ts";
import * as ProjectEnrichmentService from "../project/ProjectEnrichmentService.ts";
import * as ProjectService from "../project/ProjectService.ts";
import * as ModelManifest from "../provider/ModelManifest.ts";
import * as ProviderInstanceRegistry from "../provider/ProviderInstanceRegistry.ts";
import * as ServerSettings from "../serverSettings.ts";
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
Expand Down Expand Up @@ -156,6 +157,7 @@ const layerRuntime = (dbPath: string) => {
Layer.provide(layerCheckpointStore),
Layer.provide(layerServerConfig),
Layer.provide(ServerSettings.layerTest()),
Layer.provide(ModelManifest.layerTest),
Layer.provide(
Layer.succeed(ProviderInstanceRegistry.ProviderInstanceRegistry, {
getInstance: () => Effect.undefined,
Expand Down
58 changes: 51 additions & 7 deletions apps/server/src/orchestration-v2/ProviderAdapterRegistry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import * as Stream from "effect/Stream";
import * as ProviderAuthFlow from "@t3tools/provider-core/server/providerAuthFlow";
import type { ProviderAuthController } from "../provider/ProviderAuthService.ts";
import type { ProviderInstance } from "@t3tools/provider-core/server/driver";
import * as ModelManifest from "../provider/ModelManifest.ts";
import * as ProviderInstanceRegistry from "../provider/ProviderInstanceRegistry.ts";
import * as ProviderAdapterRegistry from "./ProviderAdapterRegistry.ts";
import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
Expand All @@ -40,6 +41,8 @@ const makeAdapter = (
const makeInstance = (
instanceId: ProviderInstanceId,
orchestrationAdapter: ProviderAdapter.ProviderAdapterV2["Service"],
version: string | null = null,
refreshedVersion = version,
): ProviderInstance => ({
instanceId,
driverKind: driver,
Expand All @@ -49,7 +52,10 @@ const makeInstance = (
},
displayName: String(instanceId),
enabled: true,
snapshot: {} as ProviderInstance["snapshot"],
snapshot: {
getSnapshot: Effect.succeed({ version }),
refresh: Effect.succeed({ version: refreshedVersion }),
} as unknown as ProviderInstance["snapshot"],
orchestrationAdapter,
textGeneration: {} as ProviderInstance["textGeneration"],
});
Expand All @@ -68,20 +74,58 @@ const layerInstanceRegistry = Layer.succeed(ProviderInstanceRegistry.ProviderIns
streamChanges: Stream.empty,
subscribeChanges: Effect.never,
});
const layerTest = ProviderAdapterRegistry.layerFromProviderInstanceRegistry.pipe(
Layer.provide(layerInstanceRegistry),
const layerRegistry = ProviderAdapterRegistry.layerFromProviderInstanceRegistry.pipe(
Layer.provide(ModelManifest.layerTest),
);
const layerTest = layerRegistry.pipe(Layer.provide(layerInstanceRegistry));

it.effect("routes two configured instances of the same driver independently", () =>
Effect.gen(function* () {
const registry = yield* ProviderAdapterRegistry.ProviderAdapterRegistryV2;

assert.strictEqual(yield* registry.get(personalId), personalAdapter);
assert.strictEqual(yield* registry.get(workId), workAdapter);
assert.strictEqual((yield* registry.get(personalId)).instanceId, personalId);
assert.strictEqual((yield* registry.get(workId)).instanceId, workId);
assert.deepEqual(yield* registry.list(), [personalId, workId]);
}).pipe(Effect.provide(layerTest)),
);

const openOn = Effect.fn("openOn")(function* (instance: ProviderInstance) {
const registry = yield* Effect.service(ProviderAdapterRegistry.ProviderAdapterRegistryV2).pipe(
Effect.provide(
layerRegistry.pipe(
Layer.provide(
Layer.mock(ProviderInstanceRegistry.ProviderInstanceRegistry)({
getInstance: () => Effect.succeed(instance),
}),
),
),
),
);
return yield* (yield* registry.get(instance.instanceId))
.openSession({
threadId: ThreadId.make("gated-thread"),
providerSessionId: ProviderSessionId.make("gated-session"),
modelSelection: { instanceId: instance.instanceId, model: "test-model" },
runtimePolicy: { runtimeMode: "full-access", interactionMode: "default", cwd: "/workspace" },
})
.pipe(Effect.exit);
});

it.effect("refuses a session only when a fresh probe still rates the version broken", () =>
Effect.gen(function* () {
const opened = { ...personalAdapter, openSession: () => Effect.succeed({} as never) };
const refused = yield* openOn(makeInstance(personalId, opened, "0.100.0"));
assert.include(JSON.stringify(refused), "0.100.0 does not work with this T3 Code release");
// Updated since the last probe.
assert.isTrue(
Exit.isSuccess(yield* openOn(makeInstance(personalId, opened, "0.100.0", "0.200.0"))),
);
// An adapter that rates the handshake version is not judged on the probe.
const handshake = { ...opened, checksVersionAtHandshake: true };
assert.isTrue(Exit.isSuccess(yield* openOn(makeInstance(personalId, handshake, "0.100.0"))));
}),
);

it.effect(
"blocks a new session while another instance changes their shared provider credentials",
() =>
Expand All @@ -104,7 +148,7 @@ it.effect(
ProviderAdapterRegistry.ProviderAdapterRegistryV2,
).pipe(
Effect.provide(
ProviderAdapterRegistry.layerFromProviderInstanceRegistry.pipe(
layerRegistry.pipe(
Layer.provide(
Layer.mock(ProviderInstanceRegistry.ProviderInstanceRegistry)({
getInstance: (id) =>
Expand Down Expand Up @@ -166,7 +210,7 @@ it.effect("interrupts admitted session startup when a shared peer signs out", ()
];
const registry = yield* Effect.service(ProviderAdapterRegistry.ProviderAdapterRegistryV2).pipe(
Effect.provide(
ProviderAdapterRegistry.layerFromProviderInstanceRegistry.pipe(
layerRegistry.pipe(
Layer.provide(
Layer.mock(ProviderInstanceRegistry.ProviderInstanceRegistry)({
getInstance: (id) =>
Expand Down
28 changes: 26 additions & 2 deletions apps/server/src/orchestration-v2/ProviderAdapterRegistry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ import {
ProviderInstanceId,
ProviderSetupError,
type OrchestrationV2ProviderCapabilities,
type ServerProvider,
} from "@t3tools/contracts";
import * as Context from "effect/Context";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Schema from "effect/Schema";
import * as Scope from "effect/Scope";

import * as ModelManifest from "../provider/ModelManifest.ts";
import { brokenRuntimeError } from "../provider/providerCompatibility.ts";
import * as ProviderInstanceRegistry from "../provider/ProviderInstanceRegistry.ts";
import { ProviderAdapterDriverCreateError } from "@t3tools/provider-core/server/adapterDriver";
import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
Expand Down Expand Up @@ -62,11 +65,12 @@ export class ProviderAdapterRegistryV2 extends Context.Service<
export const layerFromProviderInstanceRegistry: Layer.Layer<
ProviderAdapterRegistryV2,
never,
ProviderInstanceRegistry.ProviderInstanceRegistry
ProviderInstanceRegistry.ProviderInstanceRegistry | ModelManifest.ModelManifest
> = Layer.effect(
ProviderAdapterRegistryV2,
Effect.gen(function* () {
const instances = yield* ProviderInstanceRegistry.ProviderInstanceRegistry;
const manifest = yield* ModelManifest.ModelManifest;
return ProviderAdapterRegistryV2.of({
get: Effect.fn("ProviderAdapterRegistryV2.get")(function (instanceId) {
return instances.getInstance(instanceId).pipe(
Expand All @@ -75,11 +79,31 @@ export const layerFromProviderInstanceRegistry: Layer.Layer<
return new ProviderAdapterRegistryLookupError({ instanceId });
const adapter = instance.orchestrationAdapter;
const auth = instance.auth;
if (!auth) return Effect.succeed(adapter);
const refuseBroken = Effect.fnUntraced(function* (snapshot: ServerProvider) {
return snapshot.version
? brokenRuntimeError({
instanceId,
name: snapshot.displayName ?? instance.displayName ?? adapter.driver,
version: snapshot.version,
advisory: ModelManifest.providerCompatibility(
yield* manifest.current,
adapter.driver,
snapshot.version,
),
})
: undefined;
});
return Effect.succeed({
...adapter,
openSession: (input) => {
const open = Effect.gen(function* () {
if (!adapter.checksVersionAtHandshake) {
let refused = yield* refuseBroken(yield* instance.snapshot.getSnapshot);
// The last probe may predate an update, so look again before refusing.
if (refused) refused = yield* refuseBroken(yield* instance.snapshot.refresh);
Comment thread
juliusmarminge marked this conversation as resolved.
Resolved
if (refused) return yield* refused;
}
if (!auth) return yield* adapter.openSession(input);
const binding = auth.credentialBinding;
const related = binding
? (yield* instances.listInstances).filter(
Expand Down
9 changes: 5 additions & 4 deletions apps/server/src/orchestration-v2/runtimeLayer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ import * as ProjectEnrichmentService from "../project/ProjectEnrichmentService.t
import * as ProjectService from "../project/ProjectService.ts";
import * as ServerSettings from "../serverSettings.ts";
import * as McpSessionRegistryTestkit from "../mcp/McpSessionRegistry.testkit.ts";
import * as ModelManifest from "../provider/ModelManifest.ts";
import * as ProviderInstanceRegistry from "../provider/ProviderInstanceRegistry.ts";
import type { ProviderInstance } from "@t3tools/provider-core/server/driver";
import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
Expand Down Expand Up @@ -209,9 +210,9 @@ const antigravityProviderInstance = {
},
} satisfies ProviderInstance;

const layerTestProviderInstanceRegistry = Layer.succeed(
ProviderInstanceRegistry.ProviderInstanceRegistry,
{
const layerTestProviderInstanceRegistry = Layer.merge(
ModelManifest.layerTest,
Layer.succeed(ProviderInstanceRegistry.ProviderInstanceRegistry, {
getInstance: (instanceId) =>
Effect.succeed(
[
Expand All @@ -230,7 +231,7 @@ const layerTestProviderInstanceRegistry = Layer.succeed(
listUnavailable: Effect.succeed([]),
streamChanges: Stream.empty,
subscribeChanges: Effect.never,
},
}),
);

const watchedPullRequestDetail = (input: {
Expand Down
11 changes: 1 addition & 10 deletions apps/server/src/provider/AntigravityInstallation.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// @effect-diagnostics nodeBuiltinImport:off - Effect has no incremental digest or free-space query.
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
import * as ModelManifest from "./ModelManifest.ts";
import { resolveProviderCompatibility } from "./providerCompatibility.ts";
import { cliArchiveTarCommand } from "@t3tools/shared/cliRelease";
import { compareSemverVersions } from "@t3tools/shared/semver";
import {
Expand Down Expand Up @@ -231,15 +230,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
const compatibility = Effect.fn("AntigravityInstallation.compatibility")(function* (
version: string,
) {
const manifest = yield* manifestService.current;
return (
resolveProviderCompatibility(manifest.compatibility, DRIVER, version) ??
resolveProviderCompatibility(
ModelManifest.BUNDLED_MODEL_MANIFEST.compatibility,
DRIVER,
version,
)
);
return ModelManifest.providerCompatibility(yield* manifestService.current, DRIVER, version);
});
const isWithdrawn = Effect.fn("AntigravityInstallation.isWithdrawn")(function* (version: string) {
const status = (yield* compatibility(version))?.status;
Expand Down
11 changes: 1 addition & 10 deletions apps/server/src/provider/CodexInstallation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import * as NodeCrypto from "node:crypto";
import * as ServerConfig from "../config.ts";
import { selectManagedRelease } from "./managedRelease.ts";
import * as ModelManifest from "./ModelManifest.ts";
import { resolveProviderCompatibility } from "./providerCompatibility.ts";

const DRIVER = ProviderDriverKind.make("codex");
const STAGING_STALE_AFTER_MS = 24 * 60 * 60_000;
Expand Down Expand Up @@ -299,15 +298,7 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
return yield* fromDirectory(directory, version, record.target);
});
const compatibility = Effect.fn("CodexInstallation.compatibility")(function* (version: string) {
const manifest = yield* manifestService.current;
return (
resolveProviderCompatibility(manifest.compatibility, DRIVER, version) ??
resolveProviderCompatibility(
ModelManifest.BUNDLED_MODEL_MANIFEST.compatibility,
DRIVER,
version,
)
);
return ModelManifest.providerCompatibility(yield* manifestService.current, DRIVER, version);
});
const isSupported = (version: string) =>
compatibility(version).pipe(Effect.map((advisory) => advisory?.status === "supported"));
Expand Down
24 changes: 13 additions & 11 deletions apps/server/src/provider/Drivers/AntigravityDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import {
} from "../../textGeneration/AntigravityTextGeneration.ts";
import { makeAntigravityAuth, type AntigravityAuth } from "../AntigravityAuth.ts";
import * as AntigravityInstallation from "../AntigravityInstallation.ts";
import { brokenRuntimeError } from "../providerCompatibility.ts";
import * as AntigravityUsage from "./AntigravityUsage.ts";
import {
antigravityAuthConfigIssue,
Expand Down Expand Up @@ -317,19 +318,20 @@ export const AntigravityDriver: ProviderDriver<
const startCompatible = Effect.fn("AntigravityDriver.startCompatible")(function* () {
const version = (yield* runtime.initialize()).agentInfo?.version;
const advisory = version ? yield* installation.compatibility(version) : undefined;
if (advisory?.status === "broken") {
const target =
advisory.recommendedVersion ?? advisory.recommendedRange ?? "a newer version";
const update =
executable.source === "managed"
? `Update it in Antigravity setup to ${target}`
: `Update the Antigravity executable at ${executable.executablePath} to ${target}`;
const cause = new ProviderSetupError({
const refused =
version &&
brokenRuntimeError({
instanceId,
operation: "runtime",
detail: `Antigravity ${version} does not work with this T3 Code release. ${update}, then retry.`,
name: "Antigravity",
version,
advisory,
action:
executable.source === "managed"
? "Update it in Antigravity setup"
: `Update the Antigravity executable at ${executable.executablePath}`,
});
return yield* new AcpErrors.AcpTransportError({ detail: cause.detail, cause });
if (refused) {
return yield* new AcpErrors.AcpTransportError({ detail: refused.detail, cause: refused });
}
return yield* runtime.start();
});
Expand Down
Loading
Loading