fix(state): clarify plugin sidecar conflicts

jalehman · jalehman · commit 73cf2ba0c914 · 2026-07-17T14:53:07.000-07:00
diff --git a/src/commands/doctor-state-migrations.test.ts b/src/commands/doctor-state-migrations.test.ts
@@ -3348,7 +3348,7 @@ describe("doctor legacy state migrations", () => {
     const result = await runLegacyStateMigrations({ detected });
 
     expect(result.warnings).toStrictEqual([
-      "Left plugin-state sidecar in place because 1 row have different values in the sidecar and shared state; sidecar data is newer. First key: discord/components/interaction:1",
+      "Left plugin-state sidecar in place because 1 row differs from shared state without a newer canonical timestamp. First key: discord/components/interaction:1",
     ]);
     expect(fs.existsSync(sourcePath)).toBe(true);
     expect(fs.existsSync(`${sourcePath}.migrated`)).toBe(false);
@@ -3402,7 +3402,7 @@ describe("doctor legacy state migrations", () => {
     const result = await runLegacyStateMigrations({ detected });
 
     expect(result.warnings).toStrictEqual([
-      "Left plugin-state sidecar in place because 1 row have different values in the sidecar and shared state; sidecar data is newer. First key: discord/components/interaction:1",
+      "Left plugin-state sidecar in place because 1 row differs from shared state without a newer canonical timestamp. First key: discord/components/interaction:1",
     ]);
     expect(fs.existsSync(sourcePath)).toBe(true);
     expect(fs.existsSync(`${sourcePath}.migrated`)).toBe(false);
diff --git a/src/infra/state-migrations.plugin-state.ts b/src/infra/state-migrations.plugin-state.ts
@@ -146,7 +146,7 @@ export async function migrateLegacyPluginStateSidecar(params: {
       return {
         changes,
         warnings: [
-          `Left plugin-state sidecar in place because ${conflictedKeys.length} ${conflictedKeys.length === 1 ? "row" : "rows"} have different values in the sidecar and shared state; sidecar data is newer. First key: ${conflictedKeys[0]}`,
+          `Left plugin-state sidecar in place because ${conflictedKeys.length} ${conflictedKeys.length === 1 ? "row differs" : "rows differ"} from shared state without a newer canonical timestamp. First key: ${conflictedKeys[0]}`,
         ],
       };
     }

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ export async function migrateLegacyPluginStateSidecar(params: {`
`146`	`146`	`return {`
`147`	`147`	`changes,`
`148`	`148`	`warnings: [`
`149`		- `Left plugin-state sidecar in place because ${conflictedKeys.length} ${conflictedKeys.length === 1 ? "row" : "rows"} have different values in the sidecar and shared state; sidecar data is newer. First key: ${conflictedKeys[0]}`,
	`149`	+ `Left plugin-state sidecar in place because ${conflictedKeys.length} ${conflictedKeys.length === 1 ? "row differs" : "rows differ"} from shared state without a newer canonical timestamp. First key: ${conflictedKeys[0]}`,
`150`	`150`	`],`
`151`	`151`	`};`
`152`	`152`	`}`