diff --git a/packages/cli/script/postinstall.mjs b/packages/cli/script/postinstall.mjs index 3a470bbcfea..c0f69091964 100644 --- a/packages/cli/script/postinstall.mjs +++ b/packages/cli/script/postinstall.mjs @@ -100,7 +100,11 @@ function packageNames() { function copyBinary(source) { if (!fs.existsSync(source)) throw new Error(`Binary not found at ${source}`) fs.mkdirSync(path.dirname(targetBinary), { recursive: true }) - if (fs.existsSync(targetBinary)) fs.unlinkSync(targetBinary) + if (fs.existsSync(targetBinary)) { + try { + fs.unlinkSync(targetBinary) + } catch {} + } try { fs.linkSync(source, targetBinary) } catch { diff --git a/packages/cli/src/services/updater.ts b/packages/cli/src/services/updater.ts index 683893e3fdb..bba59446a5d 100644 --- a/packages/cli/src/services/updater.ts +++ b/packages/cli/src/services/updater.ts @@ -167,6 +167,11 @@ const make = Effect.gen(function* () { const latest = () => release().pipe(Effect.map((data) => data.version)) + const temporaryDirectory = (prefix: string) => + Effect.acquireRelease(fs.makeTempDirectory({ directory: global.cache, prefix }), (directory) => + fs.remove(directory, { recursive: true, force: true }).pipe(Effect.ignore), + ) + const upgrade = Effect.fnUntraced(function* (method: Method, input: string) { if (!parseReleaseVersion(input)) return yield* Effect.fail(new Error(`Invalid version: ${input}`)) const version = input.trim().replace(/^v/, "") @@ -192,12 +197,12 @@ const make = Effect.gen(function* () { if (method === "bun") { // Bun does not prune old versions from its shared package cache. yield* fs.makeDirectory(global.cache, { recursive: true }) - const cache = yield* fs.makeTempDirectoryScoped({ directory: global.cache, prefix: "update-" }) + const cache = yield* temporaryDirectory("update-") return yield* exec(["bun", "install", "--global", "--trust", "--cache-dir", cache, target], "5 minutes") } if (method === "curl") { yield* fs.makeDirectory(global.cache, { recursive: true }) - const directory = yield* fs.makeTempDirectoryScoped({ directory: global.cache, prefix: "update-" }) + const directory = yield* temporaryDirectory("update-") const installer = path.join(directory, "install") const download = yield* exec( ["curl", "-fsSL", "-o", installer, "https://opencode.ai/v2/install"], diff --git a/packages/cli/test/updater-install.test.ts b/packages/cli/test/updater-install.test.ts index 8f606e96982..5851894c2e3 100644 --- a/packages/cli/test/updater-install.test.ts +++ b/packages/cli/test/updater-install.test.ts @@ -2,7 +2,7 @@ import { NodeServices } from "@effect/platform-node" import { Global } from "@opencode/util/global" import { AppProcess } from "@opencode/util/process" import { expect, spyOn, test } from "bun:test" -import { Effect, FileSystem, Stream } from "effect" +import { Effect, FileSystem, PlatformError, Stream } from "effect" import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process" import { existsSync } from "node:fs" import path from "node:path" @@ -18,6 +18,7 @@ function fixture( error?: AppProcess.AppProcessError } = () => ({}), name = "@opencode/cli", + failCleanup = false, ) { return Effect.gen(function* () { const fs = yield* FileSystem.FileSystem @@ -57,6 +58,17 @@ function fixture( Effect.provideService(Global.Service, global), Effect.provideService(FileSystem.FileSystem, { ...fs, + remove: (target, options) => + failCleanup && target.startsWith(global.cache) + ? Effect.fail( + PlatformError.systemError({ + _tag: "PermissionDenied", + module: "FileSystem", + method: "remove", + pathOrDescriptor: target, + }), + ) + : fs.remove(target, options), realPath: (input) => (input === process.execPath ? Effect.succeed(executable) : fs.realPath(input)), }), Effect.provideService( @@ -125,6 +137,14 @@ installs.forEach(({ method, command }) => { }), ) }) + +it.live("bun ignores install cache cleanup failures", () => + Effect.gen(function* () { + const test = yield* fixture(() => ({}), "@opencode/cli", true) + yield* test.updater.upgrade("bun", "v2.3.4-beta.1") + expect(test.commands).toHaveLength(1) + }), +) ;["success", "download", "install"].forEach((failure) => { it.live(`curl uses the V2 installer and cleans its directory: ${failure}`, () => Effect.gen(function* () {