vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-27 05:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(update): carry candidate plugin API version through doctor

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-20 02:36:28 +01:00
parent 70e51b81cf
commit 6b82eaa2cd
5 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cli/update-cli.test.ts
View File

@@ -2365,12 +2365,21 @@ describe("update-cli", () => {
termination: "exit",
};
});
readPackageVersion.mockImplementation(async (packageRoot: string) => {
const manifest = JSON.parse(
await fs.readFile(path.join(packageRoot, "package.json"), "utf-8"),
) as { version?: string };
return manifest.version ?? "0.0.0";
});
await updateCommand({ yes: true });
const doctorCall = doctorCommandCall();
expect(doctorCall?.[0].slice(1)).toEqual([entryPath, "doctor", "--non-interactive", "--fix"]);
expect(doctorCall?.[1].cwd).toBe(pkgRoot);
expect(
(doctorCall?.[1].env as NodeJS.ProcessEnv | undefined)?.OPENCLAW_COMPATIBILITY_HOST_VERSION,
).toBe("2026.5.14");
expect(defaultRuntime.exit).not.toHaveBeenCalledWith(1);
});

2
src/cli/update-cli/update-command.ts
View File

@@ -1403,6 +1403,7 @@ async function runPackageInstallUpdate(params: {
const entryPath = await resolveGatewayInstallEntrypoint(verifiedPackageRoot);
if (entryPath) {
await createUpdateConfigSnapshot();
const candidateHostVersion = await readPackageVersion(verifiedPackageRoot);
return await runUpdateStep({
name: `${CLI_NAME} doctor`,
argv: [
@@ -1421,6 +1422,7 @@ async function runPackageInstallUpdate(params: {
OPENCLAW_UPDATE_IN_PROGRESS: "1",
[UPDATE_DEFER_CONFIGURED_PLUGIN_INSTALL_REPAIR_ENV]: "1",
[UPDATE_PARENT_SUPPORTS_DOCTOR_CONFIG_WRITE_ENV]: "1",
OPENCLAW_COMPATIBILITY_HOST_VERSION: candidateHostVersion,
},
timeoutMs: params.timeoutMs,
progress: params.progress,

2
src/commands/doctor.e2e-harness.ts
View File

@@ -499,7 +499,7 @@ export async function arrangeLegacyStateMigrationTest(): Promise<{
detectLegacyStateMigrations.mockClear();
runLegacyStateMigrations.mockClear();
detectLegacyStateMigrations.mockResolvedValueOnce(
detectLegacyStateMigrations.mockResolvedValue(
createLegacyStateMigrationDetectionResult({
hasLegacySessions: true,
preview: ["- Legacy sessions detected"],

1
src/infra/update-runner.test.ts
View File

@@ -1791,6 +1791,7 @@ describe("runGatewayUpdate", () => {
expect(result.steps.map((step) => step.name)).toContain("openclaw doctor");
expect(doctorEnv?.OPENCLAW_UPDATE_IN_PROGRESS).toBe("1");
expect(doctorEnv?.OPENCLAW_UPDATE_PARENT_SUPPORTS_DOCTOR_CONFIG_WRITE).toBe("1");
expect(doctorEnv?.OPENCLAW_COMPATIBILITY_HOST_VERSION).toBe("2.0.0");
});
it("fails global npm updates when post-update doctor fails", async () => {

2
src/infra/update-runner.ts
View File

@@ -1477,6 +1477,7 @@ export async function runGatewayUpdate(opts: UpdateRunnerOptions = {}): Promise<
return null;
}
const doctorNodePath = await resolveStableNodePath(process.execPath);
const candidateHostVersion = await readPackageVersion(verifiedPackageRoot);
return await runStep({
runCommand,
name: "openclaw doctor",
@@ -1486,6 +1487,7 @@ export async function runGatewayUpdate(opts: UpdateRunnerOptions = {}): Promise<
env: {
OPENCLAW_UPDATE_IN_PROGRESS: "1",
[UPDATE_PARENT_SUPPORTS_DOCTOR_CONFIG_WRITE_ENV]: "1",
OPENCLAW_COMPATIBILITY_HOST_VERSION: candidateHostVersion,
},
progress,
stepIndex: 0,