diff --git a/scripts/acpx-patch-packaging.test.mjs b/scripts/acpx-patch-packaging.test.mjs index 8aa45833af..d5ef5b817d 100644 --- a/scripts/acpx-patch-packaging.test.mjs +++ b/scripts/acpx-patch-packaging.test.mjs @@ -1,5 +1,17 @@ import assert from "node:assert/strict"; +import { execFileSync } from "node:child_process"; +import { + existsSync, + lstatSync, + mkdirSync, + mkdtempSync, + readFileSync, + rmSync, + writeFileSync, +} from "node:fs"; import { readFile } from "node:fs/promises"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; import test from "node:test"; import cliEsbuildConfig from "../cli/esbuild.config.mjs"; @@ -33,6 +45,87 @@ test("bundled package staging materializes publishConfig entrypoints", () => { assert.deepEqual(staged.exports, adapterUtilsPackage.publishConfig.exports); }); +test("bundled package staging rebuilds npm dependencies and applies the acpx patch", (t) => { + const fixtureDir = mkdtempSync(join(tmpdir(), "paperclip-bundled-stage-")); + const sourceDir = join(fixtureDir, "source"); + const destinationDir = join(fixtureDir, "destination"); + const binDir = join(fixtureDir, "bin"); + const callLog = join(fixtureDir, "calls.log"); + mkdirSync(sourceDir); + mkdirSync(destinationDir); + mkdirSync(binDir); + writeFileSync(join(sourceDir, "package.json"), JSON.stringify(adapterUtilsPackage)); + writeFileSync(callLog, ""); + t.after(() => rmSync(fixtureDir, { recursive: true, force: true })); + + const writeExecutable = (name, body) => { + writeFileSync(join(binDir, name), body, { mode: 0o755 }); + }; + writeExecutable( + "pnpm", + `#!/usr/bin/env bash +set -euo pipefail +printf 'pnpm %s\\n' "$*" >> "$FAKE_CALL_LOG" +destination="\${!#}" +cp "$FAKE_SOURCE_PACKAGE" "$destination/package.json" +mkdir -p "$destination/node_modules/.pnpm" +`, + ); + writeExecutable( + "npm", + `#!/usr/bin/env bash +set -euo pipefail +printf 'npm %s\\n' "$*" >> "$FAKE_CALL_LOG" +[ "$*" = "install --omit=dev --ignore-scripts --no-audit --no-fund" ] +mkdir -p node_modules/acpx/dist +printf 'unpatched runtime\\n' > node_modules/acpx/dist/runtime.js +`, + ); + writeExecutable( + "patch", + `#!/usr/bin/env bash +set -euo pipefail +printf 'patch %s\\n' "$*" >> "$FAKE_CALL_LOG" +target="" +while [ "$#" -gt 0 ]; do + if [ "$1" = "-d" ]; then + target="$2" + shift 2 + else + shift + fi +done +patch_input="$(cat)" +grep -q onAgentStderr <<< "$patch_input" +printf 'patched onAgentStderr runtime\\n' > "$target/dist/runtime.js" +`, + ); + + execFileSync( + process.execPath, + [new URL("./prepare-bundled-package.mjs", import.meta.url).pathname, sourceDir, destinationDir], + { + env: { + ...process.env, + PATH: `${binDir}:${process.env.PATH}`, + FAKE_CALL_LOG: callLog, + FAKE_SOURCE_PACKAGE: join(sourceDir, "package.json"), + }, + stdio: "pipe", + }, + ); + + const stagedAcpxDir = join(destinationDir, "node_modules/acpx"); + assert.equal(lstatSync(stagedAcpxDir).isDirectory(), true); + assert.equal(lstatSync(stagedAcpxDir).isSymbolicLink(), false); + assert.equal(existsSync(join(destinationDir, "node_modules/.pnpm")), false); + assert.match(readFileSync(join(stagedAcpxDir, "dist/runtime.js"), "utf8"), /onAgentStderr/); + assert.match( + readFileSync(callLog, "utf8"), + /patch -p1 --forward -d .*node_modules\/acpx/, + ); +}); + test("bundled package dry runs preview without querying published versions", () => { assert.match(releaseScript, /run_bundled_npm_pack pack --pack-destination "\$publish_dir"/); assert.match(releaseLib, /BUNDLED_NPM_PACK_VERSION="10\.9\.7"/); @@ -40,4 +133,6 @@ test("bundled package dry runs preview without querying published versions", () assert.match(releaseLib, /npx --yes "npm@\$BUNDLED_NPM_PACK_VERSION"/); assert.match(releaseLib, /npx --yes "npm@\$BUNDLED_NPM_PUBLISH_VERSION"/); assert.match(releaseLib, /"\$@" --loglevel verbose/); + assert.match(releaseLib, /run_bundled_npm_publish publish --tag "\$dist_tag"/); + assert.doesNotMatch(releaseLib, /run_bundled_npm_publish publish "\.\/\$tarball"/); }); diff --git a/scripts/prepare-bundled-package.mjs b/scripts/prepare-bundled-package.mjs index 47012959b7..27dbf643c3 100644 --- a/scripts/prepare-bundled-package.mjs +++ b/scripts/prepare-bundled-package.mjs @@ -1,7 +1,7 @@ #!/usr/bin/env node import { execFileSync } from "node:child_process"; -import { readFileSync, writeFileSync } from "node:fs"; +import { readFileSync, rmSync, writeFileSync } from "node:fs"; import { resolve } from "node:path"; import { fileURLToPath } from "node:url"; @@ -19,6 +19,31 @@ export function materializePublishManifest(pkg) { return publishManifest; } +function patchedDependencyPackageName(specifier) { + const versionSeparator = specifier.lastIndexOf("@"); + return versionSeparator > 0 ? specifier.slice(0, versionSeparator) : specifier; +} + +export function applyBundledDependencyPatches(destinationDir, bundledDependencies) { + const rootPackage = JSON.parse(readFileSync(resolve(repoRoot, "package.json"), "utf8")); + const patchedDependencies = rootPackage.pnpm?.patchedDependencies ?? {}; + const bundledDependencyNames = new Set(bundledDependencies); + + for (const [specifier, patchPath] of Object.entries(patchedDependencies)) { + const packageName = patchedDependencyPackageName(specifier); + if (!bundledDependencyNames.has(packageName)) continue; + + execFileSync( + "patch", + ["-p1", "--forward", "-d", resolve(destinationDir, "node_modules", packageName)], + { + input: readFileSync(resolve(repoRoot, patchPath)), + stdio: ["pipe", "inherit", "inherit"], + }, + ); + } +} + export function prepareBundledPackage(sourceDir, destinationDir) { const sourcePackagePath = resolve(sourceDir, "package.json"); const sourcePackage = JSON.parse(readFileSync(sourcePackagePath, "utf8")); @@ -40,6 +65,23 @@ export function prepareBundledPackage(sourceDir, destinationDir) { deployedPackagePath, `${JSON.stringify(materializePublishManifest(deployedPackage), null, 2)}\n`, ); + + rmSync(resolve(destinationDir, "node_modules"), { recursive: true, force: true }); + execFileSync( + "npm", + ["install", "--omit=dev", "--ignore-scripts", "--no-audit", "--no-fund"], + { cwd: destinationDir, stdio: "inherit" }, + ); + applyBundledDependencyPatches(destinationDir, bundledDependencies); + + if ( + bundledDependencies.includes("acpx") && + !readFileSync(resolve(destinationDir, "node_modules/acpx/dist/runtime.js"), "utf8").includes( + "onAgentStderr", + ) + ) { + throw new Error("staged acpx runtime is missing the repository patch"); + } } if (process.argv[1] === fileURLToPath(import.meta.url)) { diff --git a/scripts/release-lib.test.mjs b/scripts/release-lib.test.mjs index 15bf289df4..e33974c8c1 100644 --- a/scripts/release-lib.test.mjs +++ b/scripts/release-lib.test.mjs @@ -78,8 +78,35 @@ if [ "$1" = "view" ] && [ "$NPM_VERSION_EXISTS" = "true" ]; then exit 0 fi if [ "$1" = "publish" ]; then - echo "published" - exit 0 + case "$PNPM_MODE" in + success) + echo "published" + exit 0 + ;; + tlog-then-success) + if [ ! -f "$FAKE_STATE_DIR/npm-called" ]; then + touch "$FAKE_STATE_DIR/npm-called" + echo "npm error code TLOG_CREATE_ENTRY_ERROR" + echo "npm error error creating tlog entry - (409) an equivalent entry already exists in the transparency log with UUID abc" + exit 1 + fi + case " $* " in + *" --provenance=false "*) + echo "published without provenance" + exit 0 + ;; + esac + ;; + tlog-always-fails) + echo "npm error code TLOG_CREATE_ENTRY_ERROR" + echo "npm error error creating tlog entry - (409) an equivalent entry already exists in the transparency log with UUID abc" + exit 1 + ;; + non-tlog-failure) + echo "npm error code E500" + exit 1 + ;; + esac fi exit 1 `, @@ -91,7 +118,9 @@ exit 1 set -euo pipefail printf 'npx %s\n' "$*" >> "$FAKE_CALL_LOG" [ "$1" = "--yes" ] && shift -[ "$1" = "npm@11.18.0" ] && shift +case "$1" in + npm@10.9.7|npm@11.18.0) shift ;; +esac exec npm "$@" `, ); @@ -141,7 +170,7 @@ test("publish_package_to_npm returns after a successful pnpm publish", () => { assert.doesNotMatch(result.calls, /--provenance=false/); }); -test("publish_package_to_npm uses trusted-publishing-capable npm for bundled dependencies", () => { +test("publish_package_to_npm uses trusted publishing from the bundled staging directory", () => { const result = runPublishHelper({ pnpmMode: "success", publishTool: "npm" }); assert.equal(result.status, 0); @@ -149,10 +178,25 @@ test("publish_package_to_npm uses trusted-publishing-capable npm for bundled dep result.calls, /^npx --yes npm@11\.18\.0 publish --tag canary --access public --loglevel verbose$/m, ); - assert.match(result.calls, /^npm publish --tag canary --access public --loglevel verbose$/m); + assert.match( + result.calls, + /^npm publish --tag canary --access public --loglevel verbose$/m, + ); + assert.doesNotMatch(result.calls, / pack /); assert.doesNotMatch(result.calls, /^pnpm publish/m); }); +test("publish_package_to_npm retries bundled directory tlog failures without provenance", () => { + const result = runPublishHelper({ pnpmMode: "tlog-then-success", publishTool: "npm" }); + + assert.equal(result.status, 0); + assert.match(result.calls, /^npm view @paperclipai\/example@1\.2\.3 version$/m); + assert.match( + result.calls, + /^npm publish --tag canary --access public --provenance=false --loglevel verbose$/m, + ); +}); + test("publish_package_to_npm retries duplicate tlog failures without provenance", () => { const result = runPublishHelper({ pnpmMode: "tlog-then-success" });