fix(migrate): use resolved provider for options (#83323) ...

Recent Commits to openclaw:main

giodl73-repo · 2026-05-19 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,75 @@`
	`1`	`+import { mkdtempSync } from "node:fs";`
	`2`	`+import { tmpdir } from "node:os";`
	`3`	`+import path from "node:path";`
	`4`	`+import { describe, expect, it, vi } from "vitest";`
	`5`	`+import type { MigrationPlan, MigrationProviderPlugin } from "../../plugins/types.js";`
	`6`	`+import { createNonExitingRuntime } from "../../runtime.js";`
	`7`	`+import { runMigrationApply } from "./apply.js";`
	`8`	`+`
	`9`	`+const stateDir = mkdtempSync(path.join(tmpdir(), "openclaw-migrate-apply-"));`
	`10`	`+`
	`11`	`+vi.mock("../../config/paths.js", () => ({`
	`12`	`+resolveStateDir: () => stateDir,`
	`13`	`+}));`
	`14`	`+`
	`15`	`+function buildEmptyPlan(): MigrationPlan {`
	`16`	`+return {`
	`17`	`+providerId: "codex",`
	`18`	`+source: "/tmp/codex",`
	`19`	`+summary: {`
	`20`	`+total: 0,`
	`21`	`+planned: 0,`
	`22`	`+migrated: 0,`
	`23`	`+skipped: 0,`
	`24`	`+conflicts: 0,`
	`25`	`+errors: 0,`
	`26`	`+sensitive: 0,`
	`27`	`+},`
	`28`	`+items: [],`
	`29`	`+};`
	`30`	`+}`
	`31`	`+`
	`32`	`+describe("runMigrationApply", () => {`
	`33`	`+it("uses the resolved provider id when forwarding Codex options", async () => {`
	`34`	`+const plan = vi.fn(async () => buildEmptyPlan());`
	`35`	`+const apply = vi.fn(async () => buildEmptyPlan());`
	`36`	`+const provider: MigrationProviderPlugin = {`
	`37`	`+id: "codex",`
	`38`	`+label: "Codex",`
	`39`	`+ plan,`
	`40`	`+ apply,`
	`41`	`+};`
	`42`	`+`
	`43`	`+await runMigrationApply({`
	`44`	`+runtime: createNonExitingRuntime(),`
	`45`	`+opts: {`
	`46`	`+yes: true,`
	`47`	`+json: true,`
	`48`	`+noBackup: true,`
	`49`	`+configOverride: {},`
	`50`	`+configPatchMode: "return",`
	`51`	`+verifyPluginApps: true,`
	`52`	`+},`
	`53`	`+providerId: "codex",`
	`54`	`+ provider,`
	`55`	`+});`
	`56`	`+`
	`57`	`+expect(plan).toHaveBeenCalledWith(`
	`58`	`+expect.objectContaining({`
	`59`	`+providerOptions: {`
	`60`	`+configPatchMode: "return",`
	`61`	`+verifyPluginApps: true,`
	`62`	`+},`
	`63`	`+}),`
	`64`	`+);`
	`65`	`+expect(apply).toHaveBeenCalledWith(`
	`66`	`+expect.objectContaining({`
	`67`	`+providerOptions: {`
	`68`	`+configPatchMode: "return",`
	`69`	`+verifyPluginApps: true,`
	`70`	`+},`
	`71`	`+}),`
	`72`	`+expect.anything(),`
	`73`	`+);`
	`74`	`+});`
	`75`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ export async function runMigrationApply(params: {`
`69`	`69`	`includeSecrets: params.opts.includeSecrets,`
`70`	`70`	`overwrite: params.opts.overwrite,`
`71`	`71`	`configOverride: params.opts.configOverride,`
`72`		`-providerOptions: buildMigrationProviderOptions(params.opts),`
	`72`	`+providerOptions: buildMigrationProviderOptions(params.opts, params.providerId),`
`73`	`73`	`runtime: params.runtime,`
`74`	`74`	`json: params.opts.json,`
`75`	`75`	`}),`
`@@ -99,7 +99,7 @@ export async function runMigrationApply(params: {`
`99`	`99`	`includeSecrets: params.opts.includeSecrets,`
`100`	`100`	`overwrite: params.opts.overwrite,`
`101`	`101`	`configOverride: params.opts.configOverride,`
`102`		`-providerOptions: buildMigrationProviderOptions(params.opts),`
	`102`	`+providerOptions: buildMigrationProviderOptions(params.opts, params.providerId),`
`103`	`103`	`runtime: params.runtime,`
`104`	`104`	`backupPath,`
`105`	`105`	`reportDir,`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,32 @@`
	`1`	`+import { describe, expect, it } from "vitest";`
	`2`	`+import { buildMigrationProviderOptions } from "./providers.js";`
	`3`	`+`
	`4`	`+describe("buildMigrationProviderOptions", () => {`
	`5`	`+it("uses the resolved provider id for Codex options", () => {`
	`6`	`+expect(`
	`7`	`+buildMigrationProviderOptions(`
	`8`	`+{`
	`9`	`+configPatchMode: "return",`
	`10`	`+verifyPluginApps: true,`
	`11`	`+},`
	`12`	`+"codex",`
	`13`	`+),`
	`14`	`+).toEqual({`
	`15`	`+configPatchMode: "return",`
	`16`	`+verifyPluginApps: true,`
	`17`	`+});`
	`18`	`+});`
	`19`	`+`
	`20`	`+it("omits Codex-only options for other providers", () => {`
	`21`	`+expect(`
	`22`	`+buildMigrationProviderOptions(`
	`23`	`+{`
	`24`	`+configPatchMode: "return",`
	`25`	`+provider: "other",`
	`26`	`+verifyPluginApps: true,`
	`27`	`+},`
	`28`	`+"other",`
	`29`	`+),`
	`30`	`+).toBeUndefined();`
	`31`	`+});`
	`32`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,13 @@ export function resolveMigrationProvider(`
`28`	`28`
`29`	`29`	`export function buildMigrationProviderOptions(`
`30`	`30`	`opts: MigrateCommonOptions,`
	`31`	`+providerId = opts.provider,`
`31`	`32`	`): Record<string, unknown> \| undefined {`
`32`	`33`	`const options: Record<string, unknown> = {};`
`33`		`-if (opts.provider === "codex" && opts.verifyPluginApps === true) {`
	`34`	`+if (providerId === "codex" && opts.verifyPluginApps === true) {`
`34`	`35`	`options.verifyPluginApps = true;`
`35`	`36`	`}`
`36`		`-if (opts.provider === "codex" && opts.configPatchMode) {`
	`37`	`+if (providerId === "codex" && opts.configPatchMode) {`
`37`	`38`	`options.configPatchMode = opts.configPatchMode;`
`38`	`39`	`}`
`39`	`40`	`return Object.keys(options).length > 0 ? options : undefined;`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main