@devries-cameron20 / t3code Mirror · read-only / commits / e3592efe7f
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 17:00 UTC

fix(server): Grok refresh no longer restores removed models from cache (#22849)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Theo Browne committed Oct 25, 2026 at 14:32 UTC e3592efe7f5dbd3a869e46e608d8f6815e1bb7f6
5 files changed +75 -8
apps/server/scripts/acp-mock-agent.ts
+2 -1
@@ -52,6 +52,7 @@ const emitGrokMonitorPostTurnPoll = process.env.T3_ACP_EMIT_GROK_MONITOR_POST_TU
52 const emitGrokBackgroundTaskStarted = process.env.T3_ACP_EMIT_GROK_BACKGROUND_TASK_STARTED === "1";
53 const emitGrokBackgroundTaskPoll = process.env.T3_ACP_GROK_BACKGROUND_TASK_COMPLETION === "poll";
54 const emitForeignSessionUpdates = process.env.T3_ACP_EMIT_FOREIGN_SESSION_UPDATES === "1";
55 +const omitInitializeModelState = process.env.T3_ACP_OMIT_INITIALIZE_MODEL_STATE === "1";
56 const waitForResumeRelease = process.env.T3_ACP_WAIT_FOR_RESUME_RELEASE === "1";
57 const completeFirstPromptOnCancel = process.env.T3_ACP_COMPLETE_FIRST_PROMPT_ON_CANCEL === "1";
58 const floodStderr = process.env.T3_ACP_FLOOD_STDERR === "1";
@@ -575,7 +576,7 @@ const program = Effect.gen(function* () {
576 return {
577 protocolVersion: 2,
578 info: { name: "t3-acp-mock-agent", version: "0.0.0" },
578 - _meta: { modelState: modelState() },
579 + ...(omitInitializeModelState ? {} : { _meta: { modelState: modelState() } }),
580 capabilities: {
581 session: {
582 ...(supportsSessionLifecycle ? { fork: {}, additionalDirectories: {} } : {}),
apps/server/src/provider/GrokProvider.test.ts
+21
@@ -352,6 +352,27 @@ it.layer(NodeServices.layer)("checkGrokProviderStatus", (it) => {
352 }),
353 );
354
355 + it.effect("warns instead of reporting ready when no models are discovered", () =>
356 + Effect.gen(function* () {
357 + const snapshot = yield* Effect.scoped(
358 + Effect.gen(function* () {
359 + const grokPath = yield* writeFakeGrokCli({
360 + modelsOutput: "You are logged in with grok.com.\n",
361 + acp: true,
362 + });
363 + return yield* checkGrokProviderStatus(
364 + decodeGrokSettings({ enabled: true, binaryPath: grokPath }),
365 + { ...process.env, XAI_API_KEY: "", T3_ACP_OMIT_INITIALIZE_MODEL_STATE: "1" },
366 + );
367 + }),
368 + );
369 +
370 + expect(snapshot.status).toBe("warning");
371 + expect(snapshot.message).toContain("did not list any models");
372 + expect(snapshot.models.map((model) => model.slug)).toEqual(["grok-build"]);
373 + }),
374 + );
375 +
376 it.effect("treats XAI_API_KEY as authenticated regardless of CLI login state", () =>
377 Effect.gen(function* () {
378 const snapshot = yield* Effect.scoped(
apps/server/src/provider/ProviderRegistry.test.ts
+38
@@ -693,6 +693,44 @@ it.layer(
693 );
694 });
695
696 + it("drops Grok models a completed probe no longer advertises", () => {
697 + const previousProvider = {
698 + instanceId: ProviderInstanceId.make("grok"),
699 + driver: ProviderDriverKind.make("grok"),
700 + status: "ready",
701 + enabled: true,
702 + installed: true,
703 + auth: { status: "authenticated" },
704 + checkedAt: "2026-09-30T00:00:00.000Z",
705 + version: "1.0.44",
706 + models: [
707 + { slug: "grok-4.7", name: "Grok 4.7", isCustom: false, capabilities: null },
708 + { slug: "codexhub-removed", name: "Removed", isCustom: false, capabilities: null },
709 + ],
710 + slashCommands: [],
711 + skills: [],
712 + } as const satisfies ServerProvider;
713 + const refreshedProvider = {
714 + ...previousProvider,
715 + checkedAt: "2026-09-30T00:01:00.000Z",
716 + models: [previousProvider.models[0]],
717 + } satisfies ServerProvider;
718 + const acpFailedProvider = {
719 + ...refreshedProvider,
720 + status: "warning",
721 + message: "Grok CLI is installed but ACP initialize failed.",
722 + } satisfies ServerProvider;
723 +
724 + assert.deepStrictEqual(
725 + ProviderRegistry.mergeProviderSnapshot(previousProvider, refreshedProvider).models,
726 + [previousProvider.models[0]],
727 + );
728 + assert.deepStrictEqual(
729 + ProviderRegistry.mergeProviderSnapshot(previousProvider, acpFailedProvider).models,
730 + [...previousProvider.models],
731 + );
732 + });
733 +
734 it("retains stale OpenCode models when a refresh fails", () => {
735 const previousProvider = {
736 instanceId: ProviderInstanceId.make("opencode"),
apps/server/src/provider/ProviderRegistry.ts
+6
@@ -168,6 +168,12 @@ const shouldRetainMissingProviderModels = (provider: ServerProvider): boolean =>
168 );
169 }
170
171 + if (provider.driver === ProviderDriverKind.make("grok")) {
172 + // Grok reports ready only after it discovers a model list; the pending,
173 + // ACP-failed, empty-inventory, and logged-out probes are warning/error.
174 + return !(provider.installed && provider.status === "ready");
175 + }
176 +
177 const isAntigravity = provider.driver === ProviderDriverKind.make("antigravity");
178 const isCodex = provider.driver === ProviderDriverKind.make("codex");
179 if (!isAntigravity && !isCodex && provider.driver !== ProviderDriverKind.make("opencode")) {
packages/provider-grok/src/server/status.ts
+8 -7
@@ -527,6 +527,12 @@ export const checkGrokProviderStatus = Effect.fn("checkGrokProviderStatus")(func
527 discoveredModels.length > 0
528 ? grokModelsFromSettings(grokSettings.customModels, discoveredModels)
529 : fallbackModels;
530 + // The registry replaces cached models on a ready probe, so a fallback-only list must not be ready.
531 + const incompleteMessage = acpFailed
532 + ? "Grok CLI is installed but ACP initialize failed. Model options may be incomplete."
533 + : discoveredModels.length === 0
534 + ? "Grok CLI did not list any models. Model options may be incomplete."
535 + : undefined;
536
537 if (auth.status === "unauthenticated") {
538 return buildServerProvider({
@@ -555,14 +561,9 @@ export const checkGrokProviderStatus = Effect.fn("checkGrokProviderStatus")(func
561 probe: {
562 installed: true,
563 version,
558 - status: acpFailed ? "warning" : "ready",
564 + status: incompleteMessage ? "warning" : "ready",
565 auth,
560 - ...(acpFailed
561 - ? {
562 - message:
563 - "Grok CLI is installed but ACP initialize failed. Model options may be incomplete.",
564 - }
565 - : {}),
566 + ...(incompleteMessage ? { message: incompleteMessage } : {}),
567 },
568 });
569 });