fix(migrate): humanize conflict-status messaging across migrate UI · openclaw/openclaw@2d231ce

Recent Commits to openclaw:main

sjf · 2026-05-14 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ export async function discoverCodexSource(`
`576`	`576`	`const hooksPath = path.join(codexHome, "hooks", "hooks.json");`
`577`	`577`	`const codexSkills = await discoverSkillDirs({`
`578`	`578`	`root: codexSkillsDir,`
`579`		`-sourceLabel: "Codex CLI skill",`
	`579`	`+sourceLabel: "Codex skill",`
`580`	`580`	`excludeSystem: true,`
`581`	`581`	`});`
`582`	`582`	`const personalAgentSkills = await discoverSkillDirs({`

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ function codexSkillPlan(overrides: Partial<MigrationPlan> = {}): MigrationPlan {`
`103`	`103`	`target: "/tmp/openclaw/workspace/skills/alpha",`
`104`	`104`	`details: {`
`105`	`105`	`skillName: "alpha",`
`106`		`-sourceLabel: "Codex CLI skill",`
	`106`	`+sourceLabel: "Codex skill",`
`107`	`107`	`},`
`108`	`108`	`},`
`109`	`109`	`{`
`@@ -676,7 +676,7 @@ describe("migrateApplyCommand", () => {`
`676`	`676`	`const optionsByValue = new Map(pluginPrompt.options?.map((option) => [option.value, option]));`
`677`	`677`	`expect(optionsByValue.get("plugin:google-calendar")?.label).toBe("google-calendar");`
`678`	`678`	`expect(String(optionsByValue.get("plugin:google-calendar")?.hint)).toContain(`
`679`		`-"conflict: plugin exists",`
	`679`	`+"already installed in workspace",`
`680`	`680`	`);`
`681`	`681`	`expect(optionsByValue.get("plugin:gmail")?.label).toBe("gmail");`
`682`	`682`	`const appliedPlan = firstAppliedPlan();`

Original file line number	Diff line number	Diff line change
`@@ -132,15 +132,34 @@ const REASON_CODE_MESSAGES: Record<string, string> = {`
`132`	`132`	`"not selected for migration": "Skipped because it was not selected for migration.",`
`133`	`133`	`};`
`134`	`134`
	`135`	`+// Phrase-form conflict reasons, used as-is in selection-prompt hints`
	`136`	+// (`<source label> <phrase>`) and wrapped into sentence form for preview
	`137`	`+// /result rows. Keep one map so the two surfaces never drift.`
	`138`	`+export const MIGRATION_CONFLICT_REASON_PHRASES: Record<string, string> = {`
	`139`	`+"target exists": "already installed in workspace",`
	`140`	`+"plugin exists": "already installed in workspace",`
	`141`	`+};`
	`142`	`+`
	`143`	`+function conflictReasonSentence(reason: string): string \| undefined {`
	`144`	`+const phrase = MIGRATION_CONFLICT_REASON_PHRASES[reason];`
	`145`	`+if (!phrase) {`
	`146`	`+return undefined;`
	`147`	`+}`
	`148`	+return `${phrase.charAt(0).toUpperCase()}${phrase.slice(1)}.`;
	`149`	`+}`
	`150`	`+`
`135`	`151`	`function humanizeReason(reason: string \| undefined): string \| undefined {`
`136`	`152`	`if (!reason) {`
`137`	`153`	`return undefined;`
`138`	`154`	`}`
`139`		`-return REASON_CODE_MESSAGES[reason] ?? reason;`
	`155`	`+return REASON_CODE_MESSAGES[reason] ?? conflictReasonSentence(reason) ?? reason;`
`140`	`156`	`}`
`141`	`157`
`142`	`158`	`function formatItemMessage(item: MigrationItem, mode: FormatMode): string \| undefined {`
`143`	`159`	`if (mode === "preview") {`
	`160`	`+if (item.status === "conflict" \|\| item.status === "skipped" \|\| item.status === "error") {`
	`161`	`+return humanizeReason(item.reason) ?? item.message;`
	`162`	`+}`
`144`	`163`	`if (item.kind === "skill" && item.action === "copy") {`
`145`	`164`	`return "Copy Codex skill into OpenClaw";`
`146`	`165`	`}`
`@@ -177,29 +196,26 @@ const RESULT_STATUS_GLYPHS: Record<string, string> = {`
`177`	`196`	`conflict: "⚠️ ",`
`178`	`197`	`};`
`179`	`198`
`180`		`-function formatItemPrefix(item: MigrationItem, mode: FormatMode): string {`
	`199`	`+function formatItemPrefix(item: MigrationItem): string {`
`181`	`200`	`if (item.kind === "manual") {`
`182`	`201`	`return "🔍 ";`
`183`	`202`	`}`
`184`	`203`	`if (item.kind === "archive") {`
`185`	`204`	`return "📖 ";`
`186`	`205`	`}`
`187`		`-if (mode === "result") {`
`188`		`-const glyph = RESULT_STATUS_GLYPHS[item.status];`
`189`		`-if (glyph) {`
`190`		-return `${glyph} `;
`191`		`-}`
`192`		`-return "• ";`
	`206`	`+const glyph = RESULT_STATUS_GLYPHS[item.status];`
	`207`	`+if (glyph) {`
	`208`	+return `${glyph} `;
`193`	`209`	`}`
`194`		-return item.status === "planned" ? "• " : `• ${item.status}: `;
	`210`	`+return "• ";`
`195`	`211`	`}`
`196`	`212`
`197`	`213`	`function formatMigrationItem(item: MigrationItem, mode: FormatMode): string {`
`198`	`214`	`const name = formatItemDisplayName(item);`
`199`	`215`	`const message = formatItemMessage(item, mode);`
`200`	`216`	const messageSuffix = message ? ` ${theme.muted(`(${message})`)}` : "";
`201`	`217`	`const sensitive = item.sensitive ? " [sensitive]" : "";`
`202`		`-const prefix = formatItemPrefix(item, mode);`
	`218`	`+const prefix = formatItemPrefix(item);`
`203`	`219`	return `${prefix}${name}${sensitive}${messageSuffix}`;
`204`	`220`	`}`
`205`	`221`

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ function skillItem(params: {`
`36`	`36`	`reason: params.reason,`
`37`	`37`	`details: {`
`38`	`38`	`skillName: params.name,`
`39`		`-sourceLabel: "Codex CLI skill",`
	`39`	`+sourceLabel: "Codex skill",`
`40`	`40`	`},`
`41`	`41`	`};`
`42`	`42`	`}`
`@@ -491,7 +491,7 @@ describe("applyMigrationPluginSelection", () => {`
`491`	`491`	`"plugin:gmail",`
`492`	`492`	`]);`
`493`	`493`	`expect(formatMigrationPluginSelectionHint(items[1])).toBe(`
`494`		`-"openai-curated; conflict: plugin exists",`
	`494`	`+"openai-curated plugin already installed in workspace",`
`495`	`495`	`);`
`496`	`496`	`});`
`497`	`497`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import path from "node:path";`
`2`	`2`	`import { markMigrationItemSkipped, summarizeMigrationItems } from "../../plugin-sdk/migration.js";`
`3`	`3`	`import type { MigrationItem, MigrationPlan } from "../../plugins/types.js";`
	`4`	`+import { MIGRATION_CONFLICT_REASON_PHRASES } from "./output.js";`
`4`	`5`
`5`	`6`	`export const MIGRATION_SKILL_NOT_SELECTED_REASON = "not selected for migration";`
`6`	`7`	`export const MIGRATION_PLUGIN_NOT_SELECTED_REASON = "not selected for migration";`
`@@ -253,28 +254,34 @@ export function formatMigrationSkillSelectionLabel(item: MigrationItem): string`
`253`	`254`	`return readMigrationSkillName(item) ?? item.id.replace(/^skill:/u, "");`
`254`	`255`	`}`
`255`	`256`
	`257`	`+function humanizeMigrationConflictReason(reason: string \| undefined): string {`
	`258`	`+if (!reason) {`
	`259`	`+return "conflict";`
	`260`	`+}`
	`261`	`+return MIGRATION_CONFLICT_REASON_PHRASES[reason] ?? reason;`
	`262`	`+}`
	`263`	`+`
`256`	`264`	`export function formatMigrationSkillSelectionHint(item: MigrationItem): string \| undefined {`
`257`		`-const parts = [readMigrationSkillSourceLabel(item)];`
	`265`	`+const sourceLabel = readMigrationSkillSourceLabel(item);`
`258`	`266`	`if (item.status === "conflict") {`
`259`		-parts.push(item.reason ? `conflict: ${item.reason}` : "conflict");
	`267`	`+const reason = humanizeMigrationConflictReason(item.reason);`
	`268`	+return sourceLabel ? `${sourceLabel} ${reason}` : reason;
`260`	`269`	`}`
`261`		`-return (`
`262`		`-parts`
`263`		`-.filter((value): value is string => typeof value === "string" && value.length > 0)`
`264`		`-.join("; ") \|\| undefined`
`265`		`-);`
	`270`	`+return sourceLabel ?? undefined;`
`266`	`271`	`}`
`267`	`272`
`268`	`273`	`export function formatMigrationPluginSelectionHint(item: MigrationItem): string \| undefined {`
`269`	`274`	`const pluginName = readMigrationPluginName(item);`
`270`	`275`	`const configKey = readMigrationPluginConfigKey(item);`
	`276`	`+const marketplace = readMigrationPluginMarketplaceName(item);`
	`277`	`+if (item.status === "conflict") {`
	`278`	`+const reason = humanizeMigrationConflictReason(item.reason);`
	`279`	+return marketplace ? `${marketplace} plugin ${reason}` : reason;
	`280`	`+}`
`271`	`281`	`const parts = [`
`272`		`-readMigrationPluginMarketplaceName(item),`
	`282`	`+marketplace,`
`273`	`283`	configKey && configKey !== pluginName ? `config: ${configKey}` : undefined,
`274`	`284`	`];`
`275`		`-if (item.status === "conflict") {`
`276`		-parts.push(item.reason ? `conflict: ${item.reason}` : "conflict");
`277`		`-}`
`278`	`285`	`return (`
`279`	`286`	`parts`
`280`	`287`	`.filter((value): value is string => typeof value === "string" && value.length > 0)`

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

推荐订阅源

Recent Commits to openclaw:main