diff --git a/apps/server/src/provider/providerMaintenanceRunner.test.ts b/apps/server/src/provider/providerMaintenanceRunner.test.ts index 32bf49d5861af..3003cfb1b4093 100644 --- a/apps/server/src/provider/providerMaintenanceRunner.test.ts +++ b/apps/server/src/provider/providerMaintenanceRunner.test.ts @@ -537,6 +537,42 @@ describe("providerMaintenanceRunner", () => { }, ); + it.effect("an update that leaves the provider unable to start reports the probe's reason", () => { + const probeMessage = + "Codex app-server provider probe failed: Codex App Server process exited with code 1: Error: Missing optional dependency @openai/codex-linux-x64. Reinstall Codex: npm install -g @openai/codex@latest."; + return Effect.gen(function* () { + const { registry, providersRef } = yield* makeRegistry(baseProvider); + const updater = yield* makeTestRunner({ + ...registry, + refreshAfterUpdate: () => + Ref.updateAndGet(providersRef, (providers) => + providers.map((provider) => ({ + ...provider, + installed: true, + version: null, + status: "error" as const, + auth: { status: "unknown" as const }, + message: probeMessage, + })), + ), + }); + + const result = yield* updater.updateProvider(CODEX_DRIVER); + assert.include( + result.providers[0]?.updateState?.message ?? "", + "Missing optional dependency", + ); + }).pipe( + Effect.provide( + Layer.mergeAll( + layerNonWindowsPlatform, + layerLatestVersionHttpClient("1.0.0"), + layerMockSpawner(() => ({ stdout: "updated" })), + ), + ), + ); + }); + it.effect("spawns the updater with the environment its capabilities declare", () => { const seen: Array = []; return Effect.gen(function* () { diff --git a/apps/server/src/provider/providerMaintenanceRunner.ts b/apps/server/src/provider/providerMaintenanceRunner.ts index 80248acea577e..0a9b75ed97efb 100644 --- a/apps/server/src/provider/providerMaintenanceRunner.ts +++ b/apps/server/src/provider/providerMaintenanceRunner.ts @@ -646,6 +646,10 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () { installedVersion?.replace(/^v/, "") !== targetVersion) ); }); + const startupFailure = verifiedProviders.find( + (verifiedProvider) => + verifiedProvider.status === "error" && verifiedProvider.message?.trim(), + )?.message; const stillOutdated = targetVersion === undefined && verifiedProviders.some((verifiedProvider) => isOutdatedProvider(verifiedProvider)); @@ -655,7 +659,9 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () { startedAt, finishedAt, message: couldNotVerify - ? "Update command completed, but T3 Code could not verify the provider version." + ? startupFailure + ? `Update command completed, but the provider cannot start: ${startupFailure.trim()}` + : "Update command completed, but T3 Code could not verify the provider version." : stillOutdated ? "Update command completed, but T3 Code still detects an outdated provider version." : needsOpenCodeServerRestart(verifiedProviders) diff --git a/apps/web/src/components/settings/ProviderInstanceCard.tsx b/apps/web/src/components/settings/ProviderInstanceCard.tsx index 36a737959c508..89e3d2fbd4fd7 100644 --- a/apps/web/src/components/settings/ProviderInstanceCard.tsx +++ b/apps/web/src/components/settings/ProviderInstanceCard.tsx @@ -72,6 +72,7 @@ import { FoldedSettingsSection } from "./FoldedSettingsSection"; import { readCodexSetupMode } from "./CodexSetupSection.logic"; import { getProviderRestartNotice } from "../ProviderUpdateLaunchNotification.logic"; import { + getProviderReinstallPresentation, getProviderVersionAdvisoryPresentation, PROVIDER_STATUS_STYLES, getProviderStatusKey, @@ -755,11 +756,14 @@ export function ProviderInstanceCard({ ? (liveProvider.auth.label ?? liveProvider.auth.type ?? null) : null; const versionLabel = getProviderVersionLabel(liveProvider?.version); - const versionAdvisory = getProviderVersionAdvisoryPresentation( - liveProvider?.versionAdvisory, - liveProvider?.compatibilityAdvisory, - enabled, - ); + const reinstall = enabled ? getProviderReinstallPresentation(liveProvider) : null; + const versionAdvisory = + getProviderVersionAdvisoryPresentation( + liveProvider?.versionAdvisory, + liveProvider?.compatibilityAdvisory, + enabled, + ) ?? reinstall; + const isReinstall = reinstall !== null && versionAdvisory === reinstall; const updateCommand = versionAdvisory?.updateCommand ?? null; const updateState = liveProvider?.updateState; const updateProgress = isUpdating @@ -777,7 +781,8 @@ export function ProviderInstanceCard({ compatibility !== undefined && compatibility.status !== "supported" && compatibility.status !== "unknown"; - const VersionAdvisoryIcon = hasCompatibilityWarning ? AlertTriangleIcon : ArrowUpCircleIcon; + const VersionAdvisoryIcon = + hasCompatibilityWarning || isReinstall ? AlertTriangleIcon : ArrowUpCircleIcon; const onRunVersionAction = readOnly ? undefined : versionAdvisory?.targetVersion @@ -995,7 +1000,7 @@ export function ProviderInstanceCard({ )} @@ -1035,9 +1040,11 @@ export function ProviderInstanceCard({ {isUpdating ? : } {isUpdating ? "Updating" - : versionAdvisory.targetVersion - ? `Install ${getProviderVersionLabel(versionAdvisory.targetVersion)}` - : "Update now"} + : isReinstall + ? "Reinstall" + : versionAdvisory.targetVersion + ? `Install ${getProviderVersionLabel(versionAdvisory.targetVersion)}` + : "Update now"} ) : null} {updateProgress || updateProblem ? ( diff --git a/apps/web/src/components/settings/ProviderSettingsPanel.tsx b/apps/web/src/components/settings/ProviderSettingsPanel.tsx index aca6e5eb56fc5..bff0c22e5c1fd 100644 --- a/apps/web/src/components/settings/ProviderSettingsPanel.tsx +++ b/apps/web/src/components/settings/ProviderSettingsPanel.tsx @@ -102,6 +102,7 @@ import { ProviderSetupSection, readAntigravityAuthMethod } from "./ProviderSetup import { ProviderAuthenticationSection } from "./ProviderAuthenticationSection"; import { CodexSetupSection, CodexManagedRuntimeFields } from "./CodexSetupSection"; import { readCodexSetupMode } from "./CodexSetupSection.logic"; +import { getProviderReinstallPresentation } from "./providerStatus"; import { providerClients } from "./providerDriverMeta"; import { searchableSetting } from "./settingsSearch"; import { CompactIdleThreadsRow } from "./SettingsPanels"; @@ -1271,7 +1272,9 @@ function ProviderInstanceRow({ const instance = explicitInstance ?? { driver }; const driverOption = providerClients.get(driver); const updateCandidate = - liveProvider !== undefined && isProviderSettingsUpdateCandidate(liveProvider) + liveProvider !== undefined && + (isProviderSettingsUpdateCandidate(liveProvider) || + getProviderReinstallPresentation(liveProvider) !== null) ? liveProvider : undefined; const isInstanceUpdateRunning = diff --git a/apps/web/src/components/settings/providerStatus.test.ts b/apps/web/src/components/settings/providerStatus.test.ts index bc4b9674b674f..1418397d7d143 100644 --- a/apps/web/src/components/settings/providerStatus.test.ts +++ b/apps/web/src/components/settings/providerStatus.test.ts @@ -2,6 +2,7 @@ import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3 import { describe, expect, it } from "vite-plus/test"; import { + getProviderReinstallPresentation, getProviderSummary, getProviderVersionAdvisoryPresentation, getProviderStatusKey, @@ -233,3 +234,33 @@ it("shows compatibility in the version popover even when the installed version i targetVersion: null, }); }); + +it("offers a reinstall only for an install that lost its platform package", () => { + const broken: ServerProvider = { + ...provider, + version: null, + status: "error", + message: + "Codex app-server provider probe failed: Error: Missing optional dependency @openai/codex-linux-x64.", + versionAdvisory: { + status: "unknown", + currentVersion: null, + latestVersion: null, + updateCommand: "npm install -g @openai/codex@latest", + canUpdate: true, + checkedAt: provider.checkedAt, + message: null, + }, + }; + expect(getProviderReinstallPresentation(broken)?.updateCommand).toBe( + "npm install -g @openai/codex@latest", + ); + expect(getProviderReinstallPresentation({ ...broken, message: "spawn codex EACCES" })).toBeNull(); + expect(getProviderReinstallPresentation({ ...broken, version: "0.167.2" })).toBeNull(); + expect( + getProviderReinstallPresentation({ + ...broken, + versionAdvisory: { ...broken.versionAdvisory!, canUpdate: false }, + }), + ).toBeNull(); +}); diff --git a/apps/web/src/components/settings/providerStatus.ts b/apps/web/src/components/settings/providerStatus.ts index a4db548906549..1856dc873b29e 100644 --- a/apps/web/src/components/settings/providerStatus.ts +++ b/apps/web/src/components/settings/providerStatus.ts @@ -182,3 +182,27 @@ export function getProviderVersionAdvisoryPresentation( targetVersion: null, }; } + +// npm can install a launcher without its platform package; the launcher then reports this. +const MISSING_PLATFORM_PACKAGE = "Missing optional dependency"; + +export function getProviderReinstallPresentation(provider: ServerProvider | undefined) { + const advisory = provider?.versionAdvisory; + if ( + !provider?.installed || + provider.status !== "error" || + provider.version || + !provider.message?.includes(MISSING_PLATFORM_PACKAGE) || + advisory?.canUpdate !== true || + !advisory.updateCommand + ) { + return null; + } + return { + title: "Reinstall needed", + detail: "This installation is missing files it needs to start. Reinstall it to fix it.", + updateCommand: advisory.updateCommand, + emphasis: "strong" as const, + targetVersion: null, + }; +}