From 534ff56692ab08d9826ba0607625838635c9cae4 Mon Sep 17 00:00:00 2001 From: shuv1337 Date: Sat, 14 Nov 2026 07:09:38 -0800 Subject: [PATCH] fix(cli): report current manager-owned installations correctly --- .github/CODEOWNERS | 8 +- .github/release/targets/README.md | 6 +- packages/cli/src/services/updater.ts | 9 ++- packages/cli/test/updater-install.test.ts | 91 ++++++++++++++++++++++- 4 files changed, 102 insertions(+), 12 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a3f533d5cb31..9292f0af1930 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,5 @@ -# CI and releases. Release jobs that hold secrets run only .github/workflows/release.yml and .github/release/, -# which makes this path the release security boundary. It is the only path that needs a code owner review. -/.github/ @thdxr +# Fork CI and release workflow ownership. publish.yml gates CLI package publishing on typecheck.yml and +# test.yml, runs packages/cli/script/ code, and attaches GPT-Live helper assets. Upstream infrastructure +# deploy paths remain in the tree but are outside fork CI/publishing; .github/ is not the whole release boundary. +# Required code owner approval is a separate repository ruleset/branch-protection setting. +/.github/ @shuv1337 diff --git a/.github/release/targets/README.md b/.github/release/targets/README.md index 52f1a1a9949b..483c8e81cc7d 100644 --- a/.github/release/targets/README.md +++ b/.github/release/targets/README.md @@ -1,5 +1,8 @@ # Pinned deploy targets +These upstream deployment definitions are retained in the fork but are not used by +its `publish.yml` CLI release workflow. + These files are the allow-list for the deploy jobs that hold a Cloudflare token. `deploy-*.sh` refuses an artifact whose resolved config is not exactly one of these files, then deploys the pinned config (never the artifact's copy). @@ -7,7 +10,8 @@ one of these files, then deploys the pinned config (never the artifact's copy). The deploy token can write every Worker on the account (the data sync Workflow needs account-wide `Workers Scripts Write`; Cloudflare has no per-Worker Workflows permission), so changing what a stage can deploy means changing these -files, which CODEOWNERS (`/.github/ @thdxr`) reviews. +files. In the fork, CODEOWNERS assigns `/.github/` to `@shuv1337`; requiring +that owner's approval is a separate repository ruleset/branch-protection setting. - `site/`, `legacy/`, `data/`: expected `v0/config.json` and `v0/workers//worker.config.json` from the `cf` Build Output artifact. diff --git a/packages/cli/src/services/updater.ts b/packages/cli/src/services/updater.ts index 5ad6d5898ea0..5576acfca811 100644 --- a/packages/cli/src/services/updater.ts +++ b/packages/cli/src/services/updater.ts @@ -533,10 +533,6 @@ const make = Effect.gen(function* () { type: "unavailable" as const, message: "This build runs from a source checkout. Use an installed Shuvcode release to check for updates.", } - if (installedOwner) { - const error = yield* managed() - if (error) return { type: "unavailable" as const, message: managedMessage(error) } - } const version = yield* latest() if (!parseReleaseVersion(version)) return yield* Effect.fail(new Error(`Invalid version: ${version}`)) const current = yield* Ref.get(installedVersion) @@ -546,6 +542,11 @@ const make = Effect.gen(function* () { ? undefined : { type: "installed" as const, version: current } } + if (installedOwner) + return { + type: "unavailable" as const, + message: managedMessage(managedError(installedOwner, `${packageName}@${version}`)), + } return { type: "available" as const, version } }) diff --git a/packages/cli/test/updater-install.test.ts b/packages/cli/test/updater-install.test.ts index c04c5dcf5ef7..f41b9e9383e3 100644 --- a/packages/cli/test/updater-install.test.ts +++ b/packages/cli/test/updater-install.test.ts @@ -5,12 +5,13 @@ import { Global } from "@opencode/util/global" import { AppProcess } from "@opencode/util/process" import { expect, spyOn, test } from "bun:test" import { Effect, FileSystem, Layer, PlatformError, Stream } from "effect" -import { OPENCODE_CHANNEL } from "../src/version" +import { OPENCODE_CHANNEL, OPENCODE_LOCAL, OPENCODE_VERSION } from "../src/version" import { ChildProcessSpawner } from "effect/process" import { existsSync, readdirSync, readFileSync } from "node:fs" import path from "node:path" import { Updater } from "../src/services/updater" import { testEffect } from "../../core/test/lib/effect" +import { isolatedEnv } from "./fixture/environment" const it = testEffect(NodeServices.layer) const hostPackage = `shuvcode-${process.platform === "win32" ? "windows" : process.platform}-${process.arch}` @@ -30,6 +31,7 @@ function fixture( failCleanup = false, manifest: Updater.Manifest = { name, bin: { shuvcode: "bin/shuvcode" } }, layout?: "prefix" | "platform-prefix" | "volta" | "mise", + registry = { version: "2.3.4", status: 200 }, ) { return Effect.gen(function* () { const fs = yield* FileSystem.FileSystem @@ -55,13 +57,13 @@ function fixture( yield* fs.writeFileString(path.join(root, "bin", "npm"), "npm") } // The updater uses global fetch; scope this replacement to each install test. - yield* Effect.acquireRelease( + const request = yield* Effect.acquireRelease( Effect.sync(() => spyOn(globalThis, "fetch").mockImplementation( Object.assign( async (input: string | URL | Request) => { expect(input).toBe(`https://registry.npmjs.org/${name}/${encodeURIComponent(OPENCODE_CHANNEL)}`) - return Response.json({ version: "2.3.4" }) + return Response.json({ version: registry.version }, { status: registry.status }) }, { preconnect: fetch.preconnect }, ), @@ -138,7 +140,7 @@ function fixture( }), ), ) - return { updater, commands, global, fs, executable, root } + return { updater, commands, global, fs, executable, root, request } }) } @@ -219,6 +221,87 @@ unix("npm locates the owning prefix through the fork's nested native platform pa }), ) }) +;[ + { name: "shuvcode", channel: "latest" }, + { name: "shuvcode-node", channel: "latest" }, + { name: "shuvcode", channel: "local" }, +].forEach(({ name, channel }) => { + it.live(`checks ${name} updates on the ${channel} channel`, () => + Effect.gen(function* () { + const fs = yield* FileSystem.FileSystem + const root = yield* fs.makeTempDirectoryScoped({ prefix: "opencode-updater-check-" }) + const child = Bun.spawn( + [ + process.execPath, + "test", + import.meta.path, + "--define", + 'OPENCODE_VERSION="2.3.4"', + "--define", + `OPENCODE_CLI_NAME=${JSON.stringify(name)}`, + "--define", + `OPENCODE_CHANNEL=${JSON.stringify(channel)}`, + "--test-name-pattern", + "^update check respects ", + ], + { + cwd: path.join(import.meta.dir, ".."), + stdout: "ignore", + stderr: "pipe", + env: isolatedEnv(root, { BUN_RUNTIME_TRANSPILER_CACHE_PATH: "0" }), + }, + ) + const [code, stderr] = yield* Effect.promise(() => Promise.all([child.exited, new Response(child.stderr).text()])) + expect(code, stderr).toBe(0) + expect(stderr).toContain("3 pass") + }), + ) +}) + +if (OPENCODE_VERSION === "2.3.4") { + ;( + [ + { layout: undefined, owner: undefined, command: undefined }, + { layout: "volta", owner: "Volta", command: "volta install " }, + { layout: "mise", owner: "mise", command: "mise use -g npm:" }, + ] as const + ).forEach(({ layout, owner, command }) => { + it.live(`update check respects ${layout ?? "unmanaged"} installation state`, () => + Effect.gen(function* () { + const registry = { version: "2.3.4", status: 200 } + const test = yield* fixture(() => ({}), Updater.packageName, false, undefined, layout, registry) + if (OPENCODE_LOCAL) { + expect(yield* test.updater.check()).toEqual({ + type: "unavailable", + message: "This build runs from a source checkout. Use an installed Shuvcode release to check for updates.", + }) + expect(test.request).not.toHaveBeenCalled() + expect(test.commands).toEqual([]) + return + } + expect(yield* test.updater.check()).toBeUndefined() + expect(test.request).toHaveBeenCalledTimes(1) + registry.version = "2.3.5" + expect(yield* test.updater.check()).toEqual( + owner + ? { + type: "unavailable", + message: `Shuvcode is managed by ${owner}. Update it with ${command}${Updater.packageName}@2.3.5`, + } + : { type: "available", version: "2.3.5" }, + ) + expect(test.request).toHaveBeenCalledTimes(2) + registry.version = "invalid" + expect((yield* test.updater.check().pipe(Effect.flip)).message).toBe("Invalid version: invalid") + registry.status = 503 + const error = yield* test.updater.check().pipe(Effect.flip) + expect(error).toBeInstanceOf(Updater.UpgradeError) + expect(error.message).toBe("The npm registry returned HTTP 503.") + expect(test.commands).toEqual([]) + }), + ) + }) +} const installs = [ {