Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ export function resolveAcpxVersion(params?: {
env?: NodeJS.ProcessEnv;
packageJsonPath?: string;
}): string {
const envVersion = parseVersion((params?.env ?? process.env).npm_package_version);
if (envVersion) {
const env = params?.env ?? process.env;
const envPackageName = parseVersion(env.npm_package_name);
const envVersion = parseVersion(env.npm_package_version);
if (envPackageName === "acpx" && envVersion) {
return envVersion;
}

Expand Down
29 changes: 27 additions & 2 deletions test/version.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,39 @@ import path from "node:path";
import test from "node:test";
import { resolveAcpxVersion } from "../src/version.js";

test("resolveAcpxVersion prefers npm_package_version from env", () => {
test("resolveAcpxVersion prefers npm_package_version from env when package name is acpx", () => {
const version = resolveAcpxVersion({
env: { npm_package_version: "9.9.9-ci" },
env: {
npm_package_name: "acpx",
npm_package_version: "9.9.9-ci",
},
packageJsonPath: "/definitely/missing/package.json",
});
assert.equal(version, "9.9.9-ci");
});

test("resolveAcpxVersion ignores npm_package_version from non-acpx package env", async () => {
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "acpx-version-test-"));
try {
const packagePath = path.join(tmpDir, "package.json");
await fs.writeFile(
packagePath,
`${JSON.stringify({ name: "acpx", version: "1.2.3" }, null, 2)}\n`,
"utf8",
);
const version = resolveAcpxVersion({
env: {
npm_package_name: "openclaw",
npm_package_version: "2026.2.25",
},
packageJsonPath: packagePath,
});
assert.equal(version, "1.2.3");
} finally {
await fs.rm(tmpDir, { recursive: true, force: true });
}
});

test("resolveAcpxVersion reads version from package.json when env is unset", async () => {
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "acpx-version-test-"));
try {
Expand Down