Skip to content

Commit 22d5767

Browse files
committed
fix(server): check Homebrew for provider updates on Homebrew installs
Provider update advisories compared the installed version against npm's latest for every install kind. A Homebrew-managed Codex or Claude is flagged as outdated the moment a release hits npm, and the offered `brew upgrade` cannot clear it until the cask catches up, so the nag never goes away. Homebrew-managed installs now resolve the latest version from formulae.brew.sh (cask first, then formula), which is what `brew upgrade` can actually deliver. Third-party taps keep npm since they have no public API. Everything else is unchanged.
1 parent 9996038 commit 22d5767

3 files changed

Lines changed: 192 additions & 12 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ interface TestSettings {
4040
const maintenanceCapabilities = {
4141
provider: ProviderDriverKind.make("codex"),
4242
packageName: "@openai/codex",
43+
homebrewFormula: null,
4344
update: {
4445
command: "npm install -g @openai/codex@latest",
4546

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

Lines changed: 110 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3
88
import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
99
import * as Crypto from "effect/Crypto";
1010
import * as Effect from "effect/Effect";
11-
import { HttpClient } from "effect/unstable/http";
11+
import { HttpClient, HttpClientResponse } from "effect/unstable/http";
1212
import {
1313
createProviderVersionAdvisory,
1414
enrichProviderSnapshotWithVersionAdvisory,
@@ -82,6 +82,21 @@ const installedPackageToolProvider: ServerProvider = {
8282
skills: [],
8383
};
8484

85+
// Serves the given JSON bodies by URL, 404s everything else, and records every URL hit.
86+
const jsonHttpClient = (requestedUrls: string[], responses: Record<string, unknown>) =>
87+
HttpClient.make((request) => {
88+
requestedUrls.push(request.url);
89+
const body = responses[request.url];
90+
return Effect.succeed(
91+
HttpClientResponse.fromWeb(
92+
request,
93+
body === undefined
94+
? new Response(null, { status: 404 })
95+
: Response.json(body, { headers: { "content-type": "application/json" } }),
96+
),
97+
);
98+
});
99+
85100
it.layer(NodeServices.layer)("providerMaintenance", (it) => {
86101
it.effect("reads cached versions through the injectable cache reference", () =>
87102
resolveLatestProviderVersion(packageToolUpdate.resolve()).pipe(
@@ -109,6 +124,87 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
109124
),
110125
);
111126

127+
it.effect("asks Homebrew for the latest version of Homebrew-managed installs", () =>
128+
Effect.gen(function* () {
129+
const requestedUrls: string[] = [];
130+
const version = yield* resolveLatestProviderVersion(
131+
packageToolUpdate.resolve({
132+
binaryPath: "/opt/homebrew/bin/package-tool",
133+
env: { PATH: "" },
134+
}),
135+
).pipe(
136+
Effect.provideService(ProviderVersionCache, new Map()),
137+
Effect.provideService(
138+
HttpClient.HttpClient,
139+
jsonHttpClient(requestedUrls, {
140+
"https://formulae.brew.sh/api/cask/package-tool.json": {
141+
token: "package-tool",
142+
version: "2.0.0,4567",
143+
},
144+
}),
145+
),
146+
);
147+
148+
expect(version).toBe("2.0.0");
149+
expect(requestedUrls).toEqual(["https://formulae.brew.sh/api/cask/package-tool.json"]);
150+
}),
151+
);
152+
153+
it.effect("falls back to the Homebrew formula when the name is not a cask", () =>
154+
Effect.gen(function* () {
155+
const requestedUrls: string[] = [];
156+
const version = yield* resolveLatestProviderVersion(
157+
packageToolUpdate.resolve({
158+
binaryPath: "/opt/homebrew/bin/package-tool",
159+
env: { PATH: "" },
160+
}),
161+
).pipe(
162+
Effect.provideService(ProviderVersionCache, new Map()),
163+
Effect.provideService(
164+
HttpClient.HttpClient,
165+
jsonHttpClient(requestedUrls, {
166+
"https://formulae.brew.sh/api/formula/package-tool.json": {
167+
versions: { stable: "3.0.0" },
168+
},
169+
}),
170+
),
171+
);
172+
173+
expect(version).toBe("3.0.0");
174+
expect(requestedUrls).toEqual([
175+
"https://formulae.brew.sh/api/cask/package-tool.json",
176+
"https://formulae.brew.sh/api/formula/package-tool.json",
177+
]);
178+
}),
179+
);
180+
181+
it.effect("keeps npm as the latest-version source for third-party Homebrew taps", () =>
182+
Effect.gen(function* () {
183+
const requestedUrls: string[] = [];
184+
const version = yield* resolveLatestProviderVersion(
185+
scopedPackageToolUpdate.resolve({
186+
binaryPath: "/opt/homebrew/bin/scoped-package-tool",
187+
env: { PATH: "" },
188+
}),
189+
).pipe(
190+
Effect.provideService(ProviderVersionCache, new Map()),
191+
Effect.provideService(
192+
HttpClient.HttpClient,
193+
jsonHttpClient(requestedUrls, {
194+
"https://registry.npmjs.org/%40example%2Fscoped-package-tool/latest": {
195+
version: "4.0.0",
196+
},
197+
}),
198+
),
199+
);
200+
201+
expect(version).toBe("4.0.0");
202+
expect(requestedUrls).toEqual([
203+
"https://registry.npmjs.org/%40example%2Fscoped-package-tool/latest",
204+
]);
205+
}),
206+
);
207+
112208
it.effect("does not fetch latest provider versions when update checks are disabled", () =>
113209
enrichProviderSnapshotWithVersionAdvisory(
114210
installedPackageToolProvider,
@@ -187,6 +283,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
187283
expect(staticToolUpdate.resolve()).toEqual({
188284
provider: driver("staticTool"),
189285
packageName: null,
286+
homebrewFormula: null,
190287
update: {
191288
command: "static-tool update",
192289

@@ -223,6 +320,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
223320
expect(capabilities).toEqual({
224321
provider: driver("packageTool"),
225322
packageName: "@example/package-tool",
323+
homebrewFormula: null,
226324
update: {
227325
command: "vp i -g @example/package-tool",
228326

@@ -259,6 +357,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
259357
expect(capabilities).toEqual({
260358
provider: driver("nativePackageTool"),
261359
packageName: "@example/native-package-tool",
360+
homebrewFormula: null,
262361
update: {
263362
command: "bun i -g @example/native-package-tool@latest",
264363

@@ -296,6 +395,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
296395
expect(capabilities).toEqual({
297396
provider: driver("scopedPackageTool"),
298397
packageName: "@example/scoped-package-tool",
398+
homebrewFormula: null,
299399
update: {
300400
command: "pnpm add -g @example/scoped-package-tool@latest",
301401

@@ -320,6 +420,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
320420
).toEqual({
321421
provider: driver("packageTool"),
322422
packageName: "@example/package-tool",
423+
homebrewFormula: "package-tool",
323424
update: {
324425
command: "brew upgrade package-tool",
325426

@@ -356,6 +457,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
356457
expect(capabilities).toEqual({
357458
provider: driver("nativePackageTool"),
358459
packageName: "@example/native-package-tool",
460+
homebrewFormula: null,
359461
update: {
360462
command: "native-package-tool update",
361463

@@ -393,6 +495,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
393495
expect(capabilities).toEqual({
394496
provider: driver("scopedPackageTool"),
395497
packageName: "@example/scoped-package-tool",
498+
homebrewFormula: null,
396499
update: {
397500
command: "scoped-package-tool upgrade",
398501

@@ -417,6 +520,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
417520
).toEqual({
418521
provider: driver("nativePackageTool"),
419522
packageName: "@example/native-package-tool",
523+
homebrewFormula: "native-package-tool",
420524
update: {
421525
command: "brew upgrade native-package-tool",
422526

@@ -440,6 +544,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
440544
).toEqual({
441545
provider: driver("scopedPackageTool"),
442546
packageName: "@example/scoped-package-tool",
547+
homebrewFormula: "example/tap/scoped-package-tool",
443548
update: {
444549
command: "brew upgrade example/tap/scoped-package-tool",
445550

@@ -482,6 +587,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
482587
expect(capabilities).toEqual({
483588
provider: driver("packageTool"),
484589
packageName: "@example/package-tool",
590+
homebrewFormula: null,
485591
update: {
486592
command:
487593
"npm install -g --allow-scripts=@example/package-tool @example/package-tool@latest",
@@ -535,6 +641,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
535641
expect(capabilities).toEqual({
536642
provider: driver("packageTool"),
537643
packageName: "@example/package-tool",
644+
homebrewFormula: null,
538645
update: {
539646
command: "pnpm add -g @example/package-tool@latest",
540647

@@ -564,6 +671,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
564671
expect(claudeUpdate.resolve()).toEqual({
565672
provider: driver("claudeAgent"),
566673
packageName: "@anthropic-ai/claude-code",
674+
homebrewFormula: null,
567675
update: {
568676
command:
569677
"npm install -g --allow-scripts=@anthropic-ai/claude-code @anthropic-ai/claude-code@latest",
@@ -594,6 +702,7 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
594702
).toEqual({
595703
provider: driver("packageTool"),
596704
packageName: "@example/package-tool",
705+
homebrewFormula: null,
597706
update: null,
598707
});
599708
});

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

Lines changed: 81 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ const readCommandLookupEnv = CommandLookupEnvConfig.pipe(Effect.orElseSucceed(()
4040
export interface ProviderMaintenanceCapabilities {
4141
readonly provider: ProviderDriverKind;
4242
readonly packageName: string | null;
43+
/**
44+
* Cask or formula name when the install is Homebrew-managed. `brew upgrade`
45+
* can only reach what Homebrew has published, so latest-version checks for
46+
* these installs ask Homebrew instead of npm.
47+
*/
48+
readonly homebrewFormula: string | null;
4349
readonly update: ProviderMaintenanceCommandAction | null;
4450
}
4551

@@ -89,6 +95,12 @@ export const ProviderVersionCache = Context.Reference<Map<string, ProviderVersio
8995
const NpmLatestVersionResponse = Schema.Struct({
9096
version: Schema.optional(Schema.String),
9197
});
98+
const HomebrewCaskResponse = Schema.Struct({
99+
version: Schema.optional(Schema.String),
100+
});
101+
const HomebrewFormulaResponse = Schema.Struct({
102+
versions: Schema.optional(Schema.Struct({ stable: Schema.optional(Schema.String) })),
103+
});
92104

93105
function nonEmptyString(value: unknown): string | null {
94106
return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
@@ -97,6 +109,7 @@ function nonEmptyString(value: unknown): string | null {
97109
export function makeProviderMaintenanceCapabilities(input: {
98110
readonly provider: ProviderDriverKind;
99111
readonly packageName: string | null;
112+
readonly homebrewFormula?: string | null;
100113
readonly updateExecutable: string | null;
101114
readonly updateArgs: ReadonlyArray<string>;
102115
readonly updateLockKey: string | null;
@@ -113,6 +126,7 @@ export function makeProviderMaintenanceCapabilities(input: {
113126
return {
114127
provider: input.provider,
115128
packageName: input.packageName,
129+
homebrewFormula: input.homebrewFormula ?? null,
116130
update,
117131
};
118132
}
@@ -201,6 +215,7 @@ function makeHomebrewProviderMaintenanceCapabilities(
201215
return makeProviderMaintenanceCapabilities({
202216
provider: definition.provider,
203217
packageName: definition.npmPackageName,
218+
homebrewFormula: definition.homebrewFormula,
204219
updateExecutable: "brew",
205220
updateArgs: ["upgrade", definition.homebrewFormula],
206221
updateLockKey: "homebrew",
@@ -430,11 +445,14 @@ export function createProviderVersionAdvisory(input: {
430445
};
431446
}
432447

433-
const fetchNpmLatestVersion = Effect.fn("fetchNpmLatestVersion")(function* (packageName: string) {
448+
const fetchJson = Effect.fn("fetchJson")(function* <A>(
449+
url: string,
450+
schema: Schema.Codec<A, unknown>,
451+
) {
434452
const client = yield* HttpClient.HttpClient;
435-
const request = HttpClientRequest.get(
436-
`https://registry.npmjs.org/${encodeURIComponent(packageName)}/latest`,
437-
).pipe(HttpClientRequest.setHeader("accept", "application/json"));
453+
const request = HttpClientRequest.get(url).pipe(
454+
HttpClientRequest.setHeader("accept", "application/json"),
455+
);
438456
const response = yield* client.execute(request).pipe(
439457
Effect.timeoutOption(LATEST_VERSION_TIMEOUT_MS),
440458
Effect.orElseSucceed(() => Option.none()),
@@ -446,30 +464,82 @@ const fetchNpmLatestVersion = Effect.fn("fetchNpmLatestVersion")(function* (pack
446464
if (httpResponse.status < 200 || httpResponse.status >= 300) {
447465
return null;
448466
}
449-
const payload = yield* httpResponse.json.pipe(
450-
Effect.flatMap(Schema.decodeUnknownEffect(NpmLatestVersionResponse)),
467+
return yield* httpResponse.json.pipe(
468+
Effect.flatMap(Schema.decodeUnknownEffect(schema)),
451469
Effect.orElseSucceed(() => null),
452470
);
471+
});
472+
473+
const fetchNpmLatestVersion = Effect.fn("fetchNpmLatestVersion")(function* (packageName: string) {
474+
const payload = yield* fetchJson(
475+
`https://registry.npmjs.org/${encodeURIComponent(packageName)}/latest`,
476+
NpmLatestVersionResponse,
477+
);
453478
return payload ? nonEmptyString(payload.version) : null;
454479
});
455480

481+
// formulae.brew.sh is the same JSON API `brew` itself installs from, so its
482+
// version is exactly what `brew upgrade` can deliver. Casks are tried first
483+
// because every Homebrew-packaged provider today ships as a cask.
484+
const fetchHomebrewLatestVersion = Effect.fn("fetchHomebrewLatestVersion")(function* (
485+
name: string,
486+
) {
487+
const encoded = encodeURIComponent(name);
488+
const cask = yield* fetchJson(
489+
`https://formulae.brew.sh/api/cask/${encoded}.json`,
490+
HomebrewCaskResponse,
491+
);
492+
// Cask versions may carry a build suffix ("1.2.3,4567") that semver cannot read.
493+
const caskVersion = cask ? nonEmptyString(cask.version?.split(",")[0]) : null;
494+
if (caskVersion) {
495+
return caskVersion;
496+
}
497+
const formula = yield* fetchJson(
498+
`https://formulae.brew.sh/api/formula/${encoded}.json`,
499+
HomebrewFormulaResponse,
500+
);
501+
return formula ? nonEmptyString(formula.versions?.stable) : null;
502+
});
503+
504+
type ProviderLatestVersionSource =
505+
| { readonly kind: "npm"; readonly packageName: string }
506+
| { readonly kind: "homebrew"; readonly name: string };
507+
508+
// Third-party taps ("owner/tap/name") are not on formulae.brew.sh, so npm
509+
// stays the only signal we have for them.
510+
function resolveLatestVersionSource(
511+
capabilities: ProviderMaintenanceCapabilities,
512+
): ProviderLatestVersionSource | null {
513+
if (capabilities.homebrewFormula && !capabilities.homebrewFormula.includes("/")) {
514+
return { kind: "homebrew", name: capabilities.homebrewFormula };
515+
}
516+
if (capabilities.packageName) {
517+
return { kind: "npm", packageName: capabilities.packageName };
518+
}
519+
return null;
520+
}
521+
456522
export const resolveLatestProviderVersion = Effect.fn("resolveLatestProviderVersion")(function* (
457523
maintenanceCapabilities: ProviderMaintenanceCapabilities,
458524
) {
459-
const packageName = maintenanceCapabilities.packageName;
460-
if (!packageName) {
525+
const source = resolveLatestVersionSource(maintenanceCapabilities);
526+
if (!source) {
461527
return null;
462528
}
463529

464530
const latestVersionCache = yield* ProviderVersionCache;
465-
const cached = latestVersionCache.get(packageName);
531+
const cacheKey = source.kind === "npm" ? source.packageName : `homebrew:${source.name}`;
532+
const cached = latestVersionCache.get(cacheKey);
466533
const now = DateTime.toEpochMillis(yield* DateTime.now);
467534
if (cached && cached.expiresAt > now) {
468535
return cached.version;
469536
}
470537

471-
const version = yield* fetchNpmLatestVersion(packageName);
472-
latestVersionCache.set(packageName, {
538+
const version =
539+
source.kind === "npm"
540+
? yield* fetchNpmLatestVersion(source.packageName)
541+
: yield* fetchHomebrewLatestVersion(source.name);
542+
latestVersionCache.set(cacheKey, {
473543
expiresAt: now + LATEST_VERSION_CACHE_TTL_MS,
474544
version,
475545
});

0 commit comments

Comments
 (0)