Skip to content

Commit 4baba3b

Browse files
fix(server): disabled providers stop checking for CLI updates (#16772)
Signed-off-by: Yordis Prieto <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 0eef5d0 commit 4baba3b

5 files changed

Lines changed: 48 additions & 23 deletions

File tree

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -257,31 +257,23 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
257257
),
258258
);
259259

260-
it.effect("records explicit sign-in while disabled without starting a health probe", () =>
260+
it.effect("ignores account updates while disabled", () =>
261261
Effect.scoped(
262262
Effect.gen(function* () {
263263
const harness = yield* makeHarness({ enabled: false });
264-
const signedIn = yield* Stream.toPull(
265-
harness.provider.snapshot.streamChanges.pipe(
266-
Stream.filter(
267-
(snapshot) =>
268-
snapshot.auth.status === "authenticated" && snapshot.slashCommands.length > 0,
269-
),
270-
),
271-
);
272264
yield* harness.provider.onSessionStarted(started);
273265
yield* harness.provider.onAvailableCommands(commands);
274-
const [snapshot] = yield* signedIn;
266+
yield* harness.provider.onSignedOut;
267+
const snapshot = yield* harness.provider.snapshot.refresh;
275268
expect(snapshot).toMatchObject({
276269
enabled: false,
277-
installed: true,
270+
installed: false,
278271
status: "disabled",
279-
auth: { status: "authenticated", type: "oauth-personal" },
272+
auth: { status: "unknown" },
273+
models: [],
274+
slashCommands: [],
280275
workspaceSnapshots: [],
281276
});
282-
expect(snapshot.models).toEqual(buildAntigravityModelsFromSession(sessionSetupResult));
283-
expect(snapshot.slashCommands).toEqual(expectedCommands);
284-
expect((yield* harness.provider.snapshot.refresh).models).toEqual(snapshot.models);
285277
expect(yield* Ref.get(harness.probeCalls)).toBe(0);
286278
}),
287279
),

‎apps/server/src/provider/AntigravityProvider.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,10 @@ interface AntigravityProviderOptions {
132132
readonly auth?: { readonly type: string; readonly label: string };
133133
}
134134

135-
/** Health uses initialize only. Session callbacks supply account-specific metadata. */
135+
/**
136+
* Health uses initialize only. Session callbacks supply account-specific
137+
* metadata, which a disabled instance never shows.
138+
*/
136139
export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(function* (
137140
settings: AntigravitySettings,
138141
options: AntigravityProviderOptions,
@@ -271,6 +274,7 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
271274
started: AcpSessionRuntime.AcpSessionRuntimeStartResult,
272275
cwd?: string,
273276
) {
277+
if (!settings.enabled) return;
274278
const before = yield* SubscriptionRef.get(metadata);
275279
const supportsTextGeneration = yield* options.supportsTextGeneration;
276280
const usageLimits =
@@ -293,7 +297,7 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
293297
draft: {
294298
...draft,
295299
installed: true,
296-
status: settings.enabled ? "ready" : "disabled",
300+
status: "ready",
297301
version: started.initializeResult.agentInfo?.version || draft.version,
298302
auth: {
299303
status: "authenticated",
@@ -339,6 +343,7 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
339343
commands: ReadonlyArray<EffectAcpSchema.AvailableCommand>,
340344
cwd?: string,
341345
) {
346+
if (!settings.enabled) return;
342347
const slashCommands = nativeCommands(commands);
343348
const updatedAt = DateTime.formatIso(yield* DateTime.now);
344349
yield* SubscriptionRef.update(metadata, (state) => {
@@ -371,6 +376,7 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
371376

372377
const clearAccountMetadata = Effect.fn("AntigravityProvider.clearAccountMetadata")(function* () {
373378
if (options.clearUsage) yield* options.clearUsage;
379+
if (!settings.enabled) return;
374380
const updatedAt = DateTime.formatIso(yield* DateTime.now);
375381
yield* SubscriptionRef.update(
376382
metadata,
@@ -380,7 +386,7 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
380386
draft: {
381387
...state.draft,
382388
auth: { status: "unauthenticated" },
383-
status: settings.enabled ? "warning" : "disabled",
389+
status: "warning",
384390
message: SIGN_IN_MESSAGE,
385391
checkedAt: updatedAt,
386392
models: [],

‎apps/server/src/provider/Drivers/AntigravityDriver.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ const makeHarness = Effect.fn("makeAntigravityDriverHarness")(function* (
187187
const instance = yield* AntigravityDriver.create({
188188
instanceId,
189189
displayName: "Google test account",
190-
enabled: options.enabled ?? false,
190+
enabled: options.enabled ?? true,
191191
config: { ...AntigravityDriver.defaultConfig(), ...options.config },
192192
environment: [
193193
{ name: "PATH", value: instancePath },
@@ -292,7 +292,7 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
292292

293293
it.effect.skipIf(windowsHost)("does not launch a process for a disabled instance", () =>
294294
Effect.gen(function* () {
295-
const h = yield* makeHarness();
295+
const h = yield* makeHarness({ enabled: false });
296296
const snapshot = yield* h.instance.snapshot.refresh;
297297
expect(snapshot.status).toBe("disabled");
298298
expect(h.acquisitions).toEqual([]);
@@ -322,13 +322,13 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
322322
);
323323

324324
it.effect.skipIf(windowsHost)(
325-
"refreshes a disabled instance through the selected executable and personal Google ACP",
325+
"refreshes through the selected executable and personal Google ACP",
326326
() =>
327327
Effect.gen(function* () {
328328
const h = yield* makeHarness();
329329
yield* h.refresh();
330330
const snapshot = yield* h.instance.snapshot.getSnapshot;
331-
expect(snapshot.status).toBe("disabled");
331+
expect(snapshot.status).toBe("ready");
332332
expect(snapshot.auth.status).toBe("authenticated");
333333
expect(snapshot.models.map((model) => model.slug)).toEqual([
334334
"gemini-test-low",

‎packages/provider-core/src/server/managedProvider.test.ts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,31 @@ describe("makeManagedServerProvider", () => {
183183
).pipe(Effect.provide(layerAlwaysRunTest)),
184184
);
185185

186+
it.effect("does not enrich a disabled provider's snapshot", () =>
187+
Effect.scoped(
188+
Effect.gen(function* () {
189+
let enrichmentCalls = 0;
190+
const provider = yield* makeManagedServerProvider<TestSettings>({
191+
resolveMaintenance: () => Effect.succeed(maintenanceCapabilities),
192+
getSettings: Effect.succeed({ enabled: false }),
193+
streamSettings: Stream.empty,
194+
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
195+
refreshOnInterval: false,
196+
initialSnapshot: () => Effect.succeed({ ...initialSnapshot, enabled: false }),
197+
checkProvider: Effect.succeed({ ...refreshedSnapshot, enabled: false }),
198+
enrichSnapshot: () => {
199+
enrichmentCalls += 1;
200+
return Effect.void;
201+
},
202+
});
203+
204+
yield* provider.refresh;
205+
206+
assert.strictEqual(enrichmentCalls, 0);
207+
}),
208+
).pipe(Effect.provide(layerAlwaysRunTest)),
209+
);
210+
186211
it.effect("skips periodic provider refreshes without foreground provider-status demand", () =>
187212
Effect.scoped(
188213
Effect.gen(function* () {

‎packages/provider-core/src/server/managedProvider.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
106106
yield* Fiber.interrupt(previousFiber).pipe(Effect.ignore);
107107
}
108108

109-
if (!input.enrichSnapshot) {
109+
// Enrichment resolves binaries and package-manager state, which a disabled
110+
// provider has no use for.
111+
if (!input.enrichSnapshot || !snapshot.enabled) {
110112
return;
111113
}
112114

0 commit comments

Comments
 (0)