diff --git a/packages/paperclip-runner/scripts/build-verified-provider-entrypoints.mjs b/packages/paperclip-runner/scripts/build-verified-provider-entrypoints.mjs index 4711b73f797..11ddf7e1d08 100644 --- a/packages/paperclip-runner/scripts/build-verified-provider-entrypoints.mjs +++ b/packages/paperclip-runner/scripts/build-verified-provider-entrypoints.mjs @@ -20,6 +20,12 @@ export const verifiedProviderEntrypoints = Object.freeze([ output: resolve(packageRoot, "dist/cli/kimi-metadata-probe.js"), verifiedOutput: resolve(packageRoot, "dist/cli/kimi-metadata-probe.cjs"), }), + Object.freeze({ + name: "copilot-metadata-probe", + source: resolve(packageRoot, "src/cli/copilot-metadata-probe.ts"), + output: resolve(packageRoot, "dist/cli/copilot-metadata-probe.js"), + verifiedOutput: resolve(packageRoot, "dist/cli/copilot-metadata-probe.cjs"), + }), Object.freeze({ name: "provision-antigravity", source: resolve(packageRoot, "scripts/provision-antigravity.mjs"), diff --git a/packages/paperclip-runner/scripts/build-verified-provider-entrypoints.test.mjs b/packages/paperclip-runner/scripts/build-verified-provider-entrypoints.test.mjs index 7b7fbf3edeb..ac27e9c07a3 100644 --- a/packages/paperclip-runner/scripts/build-verified-provider-entrypoints.test.mjs +++ b/packages/paperclip-runner/scripts/build-verified-provider-entrypoints.test.mjs @@ -1,5 +1,8 @@ import assert from "node:assert/strict"; -import { stat } from "node:fs/promises"; +import { spawnSync } from "node:child_process"; +import { mkdir, mkdtemp, realpath, rm, stat, writeFile } from "node:fs/promises"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; import test from "node:test"; import { @@ -24,6 +27,36 @@ test("provider entrypoints include self-contained ESM and descriptor-safe Common } }); +test("Copilot metadata probe runs as one standalone bundle in a selected pack layout", async (t) => { + const bundles = await bundleVerifiedProviderEntrypoints({ write: false }); + const bundle = bundles.find(({ entrypoint }) => entrypoint.name === "copilot-metadata-probe"); + assert.ok(bundle, "The provider pack build must include the Copilot metadata probe"); + for (const result of [bundle.result, bundle.verifiedResult]) { + for (const output of Object.values(result.metafile.outputs)) { + for (const dependency of output.imports) assert.match(dependency.path, /^node:/); + } + } + const root = await realpath(await mkdtemp(join(tmpdir(), "paperclip-copilot-metadata-cli-"))); + t.after(() => rm(root, { recursive: true, force: true })); + await mkdir(join(root, "dist/cli"), { recursive: true }); + await writeFile(join(root, "package.json"), '{"name":"@paperclipai/paperclip-runner","type":"module"}'); + for (const [name, result] of [["copilot-metadata-probe.js", bundle.result], ["copilot-metadata-probe.cjs", bundle.verifiedResult]]) { + const entry = join(root, "dist/cli", name); + await writeFile(entry, result.outputFiles[0].contents); + const run = spawnSync(process.execPath, [entry], { + cwd: root, env: { PATH: "/usr/bin:/bin", COPILOT_GITHUB_TOKEN: "test-token" }, encoding: "utf8", timeout: 20_000, + }); + assert.ifError(run.error); + assert.equal(run.status, 1, run.stderr); + assert.deepEqual(JSON.parse(run.stdout), { + status: "failed", + code: "COPILOT_INSTALLATION_INVALID", + message: "The selected environment does not have the verified Copilot runtime installed.", + promptSent: false, + }); + } +}); + test("written provider entrypoints satisfy qualified launch permissions", async (t) => { if (process.platform === "win32") { t.skip("POSIX launch permissions do not apply on Windows"); diff --git a/packages/paperclip-runner/src/cli/copilot-metadata-probe.ts b/packages/paperclip-runner/src/cli/copilot-metadata-probe.ts index fb33f0628fe..3638cca2bf4 100644 --- a/packages/paperclip-runner/src/cli/copilot-metadata-probe.ts +++ b/packages/paperclip-runner/src/cli/copilot-metadata-probe.ts @@ -1,5 +1,10 @@ #!/usr/bin/env node import { probeCopilotMetadata } from "../drivers/copilot-metadata-probe.js"; -const result = await probeCopilotMetadata(process.env.COPILOT_GITHUB_TOKEN ?? "", process.env.PAPERCLIP_COPILOT_PROBE_MODEL); -process.stdout.write(`${JSON.stringify(result)}\n`); -if (result.status === "failed") process.exitCode = 1; + +async function main() { + const result = await probeCopilotMetadata(process.env.COPILOT_GITHUB_TOKEN ?? "", process.env.PAPERCLIP_COPILOT_PROBE_MODEL); + process.stdout.write(`${JSON.stringify(result)}\n`); + if (result.status === "failed") process.exitCode = 1; +} + +void main(); diff --git a/packages/paperclip-runner/src/drivers/acpx/provider-assets-root.test.ts b/packages/paperclip-runner/src/drivers/acpx/provider-assets-root.test.ts index b08d79b55d0..ff7121d8e11 100644 --- a/packages/paperclip-runner/src/drivers/acpx/provider-assets-root.test.ts +++ b/packages/paperclip-runner/src/drivers/acpx/provider-assets-root.test.ts @@ -19,6 +19,17 @@ it("uses one fixed provider directory for source, compiled and bundled runner la expect(() => resolveRunnerProviderAssetsRoot(pathToFileURL(join(path, "workspace/arbitrary.ts")).href, "cursor")).toThrow("verified package layout"); }); +it("resolves Copilot assets from the bundled metadata probe without widening other providers", async () => { + vi.stubEnv("PAPERCLIP_ACPX_PROVIDER_PACKAGE_ROOT", undefined); + vi.stubEnv("PAPERCLIP_ACPX_PROVIDER_PACKAGE_MANIFEST", undefined); + const path = await root(); + for (const relative of ["dist/cli/copilot-metadata-probe.js", "dist/cli/copilot-metadata-probe.cjs"]) { + const moduleUrl = pathToFileURL(join(path, relative)).href; + expect(resolveRunnerProviderAssetsRoot(moduleUrl, "copilot")).toBe(join(path, "provider-assets/copilot")); + expect(() => resolveRunnerProviderAssetsRoot(moduleUrl, "cursor")).toThrow("verified package layout"); + } +}); + it("resolves descriptor sidecars only through the runner-bound canonical package manifest", async () => { const path = await root(); await writeFile(join(path, "package.json"), JSON.stringify({ name: "@paperclipai/paperclip-runner" })); diff --git a/packages/paperclip-runner/src/drivers/acpx/provider-assets-root.ts b/packages/paperclip-runner/src/drivers/acpx/provider-assets-root.ts index 1161d69800a..2fb5b4002e8 100644 --- a/packages/paperclip-runner/src/drivers/acpx/provider-assets-root.ts +++ b/packages/paperclip-runner/src/drivers/acpx/provider-assets-root.ts @@ -65,6 +65,7 @@ export function resolveRunnerProviderAssetsRoot(moduleUrl: string, provider: Nat if (provider !== "copilot") packageRoot = join(packageRoot, "dist/vendor/paperclip-runner"); } else if (new RegExp(`/(?:src|dist)/drivers/acpx/${provider}-installation\\.(?:ts|js)$`).test(url.pathname)) packageRoot = fileURLToPath(new URL("../../../", url)); else if (/\/dist\/cli\/acpx-runtime-sidecar\.(?:cjs|js)$/.test(url.pathname)) packageRoot = fileURLToPath(new URL("../../", url)); + else if (provider === "copilot" && /\/dist\/cli\/copilot-metadata-probe\.(?:cjs|js)$/.test(url.pathname)) packageRoot = fileURLToPath(new URL("../../", url)); else if (new RegExp(`/dist/vendor/paperclip-runner/drivers/acpx/${provider}-installation\\.(?:js)$`).test(url.pathname)) packageRoot = fileURLToPath(new URL("../../", url)); else if (/\/dist\/vendor\/paperclip-runner\/cli\/acpx-runtime-sidecar\.(?:cjs|js)$/.test(url.pathname)) packageRoot = fileURLToPath(new URL("../", url)); else throw new Error("Provider factory is outside a verified package layout");