@decocms/blocks-cli 7.21.0 → 7.22.0

package/scripts/migrate/transforms/tailwind.test.ts

@@ -0,0 +1,74 @@
+import { describe, expect, it } from "vitest";
+import { transformTailwind } from "./tailwind";
+
+describe("transformTailwind — v3 -> v4 class renames", () => {
+  it("renames the flex-grow/shrink family", () => {
+    const r = transformTailwind(`<div className="flex-grow-0 flex-shrink" />`);
+    expect(r.content).toContain('className="grow-0 shrink"');
+  });
+
+  it("removes transform/filter (v4 applies them automatically)", () => {
+    const r = transformTailwind(`<div className="transform filter scale-105" />`);
+    expect(r.content).toContain('className="scale-105"');
+  });
+
+  it("bumps the default ring width (v3 3px -> v4 ring-3)", () => {
+    const r = transformTailwind(`<div className="ring ring-blue-500" />`);
+    expect(r.content).toContain("ring-3 ring-blue-500");
+  });
+
+  it("shifts the shadow scale down one step without cascading (single-pass map lookup)", () => {
+    const r = transformTailwind(`<div className="shadow-sm" />`);
+    expect(r.content).toContain('className="shadow-xs"');
+  });
+
+  it("shifts shadow, blur, rounded, and drop-shadow scales independently", () => {
+    const r = transformTailwind(
+      `<div className="shadow blur rounded drop-shadow" />`,
+    );
+    expect(r.content).toContain("shadow-sm");
+    expect(r.content).toContain("blur-sm");
+    expect(r.content).toContain("rounded-sm");
+    expect(r.content).toContain("drop-shadow-sm");
+  });
+
+  it("renames outline-none to outline-hidden", () => {
+    const r = transformTailwind(`<div className="outline-none" />`);
+    expect(r.content).toContain('className="outline-hidden"');
+  });
+
+  it("renames bg-gradient-to-* to bg-linear-to-*", () => {
+    const r = transformTailwind(`<div className="bg-gradient-to-r from-red-500" />`);
+    expect(r.content).toContain("bg-linear-to-r");
+  });
+
+  it("renames known daisyUI v4 -> v5 classes", () => {
+    const r = transformTailwind(`<div className="badge-ghost card-compact" />`);
+    expect(r.content).toContain("badge-soft");
+    expect(r.content).toContain("card-sm");
+  });
+});
+
+describe("transformTailwind — gotcha detection (flag, don't auto-fix)", () => {
+  it("flags DaisyUI .collapse usage as a manual-review finding", () => {
+    const r = transformTailwind(
+      `<div className="collapse"><div className="collapse-title" /></div>`,
+    );
+    expect(r.notes.some((n) => n.startsWith("MANUAL:") && n.includes("collapse"))).toBe(true);
+  });
+
+  it("flags btn-group and form-control as removed-in-v5", () => {
+    const r = transformTailwind(`<div className="btn-group" /><div className="form-control" />`);
+    expect(r.notes.filter((n) => n.startsWith("MANUAL:")).length).toBeGreaterThanOrEqual(2);
+  });
+
+  it("flags a shorthand/longhand spacing conflict (px-* mixed with pl-*/pr-*)", () => {
+    const r = transformTailwind(`<div className="pl-4 sm:pl-0 md:px-6" />`);
+    expect(r.notes.some((n) => n.startsWith("MANUAL:") && n.includes("padding-inline"))).toBe(true);
+  });
+
+  it("does not flag px-* used alone (no mixed longhand)", () => {
+    const r = transformTailwind(`<div className="px-4 md:px-6" />`);
+    expect(r.notes.some((n) => n.includes("padding-inline"))).toBe(false);
+  });
+});

package/scripts/migrate/transforms/tailwind.ts

@@ -1,4 +1,11 @@
 import type { TransformResult } from "../types";
+import {
+  PX_TO_SPACING,
+  TEXT_SIZE_MAP,
+  detectDaisyUiV5StructuralIssues,
+  detectLogicalPropertyConflict,
+  renameToken,
+} from "./tailwind-renames";
 
 /**
  * Tailwind v3 → v4 class migration transform.
@@ -9,6 +16,8 @@ import type { TransformResult } from "../types";
  * 3. Responsive class ordering (base → sm → md → lg → xl → 2xl)
  * 4. Arbitrary values → native equivalents (px-[16px] → px-4)
  * 5. Deprecated patterns
+ * 6. Flags (does not auto-fix) DaisyUI v5 structural breaks and v4
+ *    logical-vs-physical spacing property conflicts
  */
 
 // ── Breakpoint order (mobile-first) ─────────────────────────────
@@ -18,111 +27,6 @@ BREAKPOINT_ORDER.forEach((bp, i) => {
   BP_INDEX[bp] = i + 1; // base = 0
 });
 
-// ── Tailwind v3 → v4 class renames ──────────────────────────────
-// These are direct 1:1 replacements
-const CLASS_RENAMES: Record<string, string> = {
-  // Flexbox/Grid
-  "flex-grow-0": "grow-0",
-  "flex-grow": "grow",
-  "flex-shrink-0": "shrink-0",
-  "flex-shrink": "shrink",
-
-  // Overflow
-  "overflow-ellipsis": "text-ellipsis",
-
-  // Decoration
-  "decoration-clone": "box-decoration-clone",
-  "decoration-slice": "box-decoration-slice",
-
-  // Transforms (v4 applies transforms automatically)
-  "transform": "",  // remove — v4 applies automatically
-  "transform-gpu": "",
-  "transform-none": "transform-none", // this one stays
-
-  // Blur/filter (v4 applies automatically)
-  "filter": "",  // remove
-  "backdrop-filter": "",  // remove
-
-  // Ring width default
-  "ring": "ring-3", // v4 changed default from 3px to 1px
-};
-
-// ── DaisyUI v4 → v5 class renames ──────────────────────────────
-const DAISYUI_RENAMES: Record<string, string> = {
-  // Button changes
-  "btn-ghost": "btn-ghost",  // kept
-  "btn-outline": "btn-outline",  // kept
-  "btn-active": "btn-active",  // kept
-
-  // Alert/Badge
-  "badge-ghost": "badge-soft",
-  "alert-info": "alert-info",
-  "alert-success": "alert-success",
-  "alert-warning": "alert-warning",
-  "alert-error": "alert-error",
-
-  // Card
-  "card-compact": "card-sm",
-
-  // Modal
-  "modal-open": "modal-open",
-
-  // Drawer
-  "drawer-end": "drawer-end",
-
-  // Menu
-  "menu-horizontal": "menu-horizontal",
-
-  // Toast position classes (daisy v5 uses different system)
-  "toast-top": "toast-top",
-  "toast-bottom": "toast-bottom",
-  "toast-center": "toast-center",
-  "toast-end": "toast-end",
-  "toast-start": "toast-start",
-  "toast-middle": "toast-middle",
-
-  // Loading
-  "loading-spinner": "loading-spinner",
-  "loading-dots": "loading-dots",
-  "loading-ring": "loading-ring",
-  "loading-ball": "loading-ball",
-  "loading-bars": "loading-bars",
-  "loading-infinity": "loading-infinity",
-
-  // Sizes (daisy v5 naming)
-  "btn-xs": "btn-xs",
-  "btn-sm": "btn-sm",
-  "btn-md": "btn-md",
-  "btn-lg": "btn-lg",
-};
-
-// ── Spacing scale: px → Tailwind unit ───────────────────────────
-const PX_TO_SPACING: Record<number, string> = {};
-for (let i = 0; i <= 96; i++) {
-  PX_TO_SPACING[i * 4] = String(i);
-}
-PX_TO_SPACING[2] = "0.5";
-PX_TO_SPACING[6] = "1.5";
-PX_TO_SPACING[10] = "2.5";
-PX_TO_SPACING[14] = "3.5";
-
-// Text size: px → native class
-const TEXT_SIZE_MAP: Record<string, string> = {
-  "12": "xs",
-  "14": "sm",
-  "16": "base",
-  "18": "lg",
-  "20": "xl",
-  "24": "2xl",
-  "30": "3xl",
-  "36": "4xl",
-  "48": "5xl",
-  "60": "6xl",
-  "72": "7xl",
-  "96": "8xl",
-  "128": "9xl",
-};
-
 // Properties that accept spacing values
 const SPACING_PROPS = new Set([
   "p", "px", "py", "pt", "pb", "pl", "pr",
@@ -200,24 +104,7 @@ function parseClass(cls: string): ParsedClass {
 
 // ── Fix class renames ───────────────────────────────────────────
 function fixRenames(cls: string): string {
-  const parts = cls.split(":");
-  const utility = parts.pop()!;
-
-  // Check direct rename
-  if (CLASS_RENAMES[utility] !== undefined) {
-    const renamed = CLASS_RENAMES[utility];
-    if (renamed === "") return ""; // Remove class entirely
-    parts.push(renamed);
-    return parts.join(":");
-  }
-
-  // Check DaisyUI rename
-  if (DAISYUI_RENAMES[utility] && DAISYUI_RENAMES[utility] !== utility) {
-    parts.push(DAISYUI_RENAMES[utility]);
-    return parts.join(":");
-  }
-
-  return cls;
+  return renameToken(cls);
 }
 
 // ── Fix arbitrary values ────────────────────────────────────────
@@ -402,6 +289,11 @@ function fixClassNameString(classes: string): { fixed: string; changes: string[]
     }
   }
 
+  // 5. Flag (don't auto-fix) shorthand/longhand spacing conflicts — gotcha #42
+  for (const finding of detectLogicalPropertyConflict(classList)) {
+    changes.push(`MANUAL: ${finding.message}`);
+  }
+
   return { fixed: classList.join(" "), changes };
 }
 
@@ -626,6 +518,18 @@ export function transformTailwind(content: string): TransformResult {
   let changed = false;
   let result = content;
 
+  // ── Flag (don't auto-fix) DaisyUI v5 structural breaks — gotcha #37 ──
+  const daisyFindings = detectDaisyUiV5StructuralIssues(result);
+  if (daisyFindings.length > 0) {
+    // No content is rewritten here, but the caller (phase-transform) only
+    // surfaces `notes` when `changed` is true — mark it so these
+    // manual-review findings aren't silently dropped.
+    changed = true;
+    for (const finding of daisyFindings) {
+      notes.push(`MANUAL: ${finding.message}`);
+    }
+  }
+
   // ── Fix negative z-index on background images ──────────────────
   const zFix = fixNegativeZIndex(result);
   if (zFix.changed) {

package/scripts/migrate/types.ts

@@ -157,6 +157,15 @@ export interface MigrationContext {
   /** Font family from CMS config */
   fontFamily: string | null;
 
+  /**
+   * Statically-extracted content of the source site's `tailwind.config.ts`
+   * (colors, fontFamily, screens, safelist, plugins) — read during analyze,
+   * before the file is deleted in cleanup, so its content can be ported into
+   * the scaffolded `src/styles/app.css` @theme block instead of silently
+   * dropped. See analyzers/tailwind-config.ts.
+   */
+  tailwindConfig: import("./analyzers/tailwind-config").TailwindConfigExtract;
+
   /** All categorized source files */
   files: FileRecord[];
 
@@ -217,6 +226,15 @@ export function createContext(
     discoveredNpmDeps: {},
     themeColors: {},
     fontFamily: null,
+    tailwindConfig: {
+      colors: {},
+      fontFamily: {},
+      screens: {},
+      safelist: [],
+      safelistPatterns: [],
+      plugins: [],
+      reviewItems: [],
+    },
     files: [],
     sectionMetas: [],
     islandClassifications: [],

package/scripts/tailwind-lint.ts

@@ -18,6 +18,13 @@
 
 import { readFileSync, writeFileSync, readdirSync, statSync } from "node:fs";
 import { join, relative } from "node:path";
+import {
+  CLASS_RENAMES,
+  DAISYUI_RENAMES,
+  PX_TO_SPACING,
+  TEXT_SIZE_MAP,
+  renameToken,
+} from "./migrate/transforms/tailwind-renames";
 
 // ── Breakpoint order (mobile-first) ─────────────────────────────
 const BREAKPOINT_ORDER = ["sm", "md", "lg", "xl", "2xl"] as const;
@@ -26,44 +33,6 @@ BREAKPOINT_ORDER.forEach((bp, i) => {
   BP_INDEX[bp] = i + 1;
 });
 
-// ── Tailwind v3 → v4 class renames ──────────────────────────────
-const CLASS_RENAMES: Record<string, string> = {
-  "flex-grow-0": "grow-0",
-  "flex-grow": "grow",
-  "flex-shrink-0": "shrink-0",
-  "flex-shrink": "shrink",
-  "overflow-ellipsis": "text-ellipsis",
-  "decoration-clone": "box-decoration-clone",
-  "decoration-slice": "box-decoration-slice",
-  "transform": "",
-  "transform-gpu": "",
-  "filter": "",
-  "backdrop-filter": "",
-  "ring": "ring-3",
-};
-
-// ── DaisyUI v4 → v5 class renames ──────────────────────────────
-const DAISYUI_RENAMES: Record<string, string> = {
-  "badge-ghost": "badge-soft",
-  "card-compact": "card-sm",
-};
-
-// ── Spacing scale ───────────────────────────────────────────────
-const PX_TO_SPACING: Record<number, string> = {};
-for (let i = 0; i <= 96; i++) {
-  PX_TO_SPACING[i * 4] = String(i);
-}
-PX_TO_SPACING[2] = "0.5";
-PX_TO_SPACING[6] = "1.5";
-PX_TO_SPACING[10] = "2.5";
-PX_TO_SPACING[14] = "3.5";
-
-const TEXT_SIZE_MAP: Record<string, string> = {
-  "12": "xs", "14": "sm", "16": "base", "18": "lg", "20": "xl",
-  "24": "2xl", "30": "3xl", "36": "4xl", "48": "5xl", "60": "6xl",
-  "72": "7xl", "96": "8xl", "128": "9xl",
-};
-
 const SPACING_PROPS = new Set([
   "p", "px", "py", "pt", "pb", "pl", "pr",
   "m", "mx", "my", "mt", "mb", "ml", "mr",
@@ -247,7 +216,7 @@ function scanFile(filePath: string): Issue[] {
     for (const cls of classList) {
       const parts = cls.split(":");
       const utility = parts[parts.length - 1];
-      if (CLASS_RENAMES[utility] !== undefined) {
+      if (CLASS_RENAMES[utility] !== undefined && CLASS_RENAMES[utility] !== utility) {
         const renamed = CLASS_RENAMES[utility];
         issues.push({
           file: filePath, line, type: "rename",
@@ -291,21 +260,7 @@ function fixClassOrder(classes: string): string {
 function fixClassName(classes: string): string {
   let classList = classes.split(/\s+/).filter(Boolean);
 
-  classList = classList.map((cls) => {
-    const parts = cls.split(":");
-    const utility = parts.pop()!;
-    if (CLASS_RENAMES[utility] !== undefined) {
-      const renamed = CLASS_RENAMES[utility];
-      if (renamed === "") return "";
-      parts.push(renamed);
-      return parts.join(":");
-    }
-    if (DAISYUI_RENAMES[utility] && DAISYUI_RENAMES[utility] !== utility) {
-      parts.push(DAISYUI_RENAMES[utility]);
-      return parts.join(":");
-    }
-    return cls;
-  }).filter(Boolean);
+  classList = classList.map(renameToken).filter(Boolean);
 
   classList = classList.map((cls) => {
     if (!cls.includes("[")) return cls;

package/scripts/upgrade-6-to-7.test.ts

@@ -0,0 +1,80 @@
+/**
+ * Smoke tests for the `deco-upgrade-6-to-7` CLI (#367) — drives the script
+ * as a child process against a tmp site fixture, verifying:
+ *  - dry-run prints what would change without touching disk
+ *  - --write applies the import-specifier rewrites and package.json swap
+ *  - second --write run is a no-op (idempotency)
+ */
+import * as cp from "node:child_process";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+
+const SCRIPT = path.resolve(__dirname, "upgrade-6-to-7.ts");
+
+function run(cwd: string, args: string[]): { stdout: string; code: number } {
+  const r = cp.spawnSync("npx", ["tsx", SCRIPT, ...args], { cwd, encoding: "utf8" });
+  return { stdout: r.stdout || "", code: r.status ?? 0 };
+}
+
+describe("deco-upgrade-6-to-7 CLI (#367)", () => {
+  let tmp: string;
+
+  beforeEach(() => {
+    tmp = fs.mkdtempSync(path.join(os.tmpdir(), "upgrade-6-to-7-"));
+    fs.mkdirSync(path.join(tmp, "src", "routes"), { recursive: true });
+    fs.writeFileSync(
+      path.join(tmp, "src", "routes", "$.tsx"),
+      `import { cmsRouteConfig } from "@decocms/start/routes";\n` +
+        `import { DecoPageRenderer } from "@decocms/start/hooks";\n`,
+    );
+    fs.writeFileSync(
+      path.join(tmp, "package.json"),
+      JSON.stringify(
+        { name: "fixture-site", dependencies: { "@decocms/start": "6.30.0", "@decocms/apps": "5.4.0" } },
+        null,
+        2,
+      ),
+    );
+  });
+
+  afterEach(() => {
+    fs.rmSync(tmp, { recursive: true, force: true });
+  });
+
+  it("dry-run reports what would change without writing", () => {
+    const { stdout, code } = run(tmp, []);
+    expect(code).toBe(0);
+    expect(stdout).toContain("would upgrade");
+    expect(stdout).toContain("removing @decocms/start, @decocms/apps");
+
+    // Nothing actually changed on disk
+    const src = fs.readFileSync(path.join(tmp, "src", "routes", "$.tsx"), "utf-8");
+    expect(src).toContain("@decocms/start/routes");
+    const pkg = JSON.parse(fs.readFileSync(path.join(tmp, "package.json"), "utf-8"));
+    expect(pkg.dependencies).toHaveProperty("@decocms/start");
+  });
+
+  it("--write rewrites specifiers and package.json dependencies", () => {
+    const { code } = run(tmp, ["--write"]);
+    expect(code).toBe(0);
+
+    const src = fs.readFileSync(path.join(tmp, "src", "routes", "$.tsx"), "utf-8");
+    expect(src).toContain('import { cmsRouteConfig } from "@decocms/tanstack";');
+    expect(src).toContain('import { DecoPageRenderer } from "@decocms/tanstack";');
+    expect(src).not.toContain("@decocms/start");
+
+    const pkg = JSON.parse(fs.readFileSync(path.join(tmp, "package.json"), "utf-8"));
+    expect(pkg.dependencies).not.toHaveProperty("@decocms/start");
+    expect(pkg.dependencies).not.toHaveProperty("@decocms/apps");
+    expect(pkg.dependencies).toHaveProperty("@decocms/tanstack");
+    expect(pkg.dependencies).toHaveProperty("@decocms/blocks");
+  });
+
+  it("second --write run is idempotent (no-op)", () => {
+    run(tmp, ["--write"]);
+    const { stdout } = run(tmp, ["--write"]);
+    expect(stdout).toContain("Upgraded 0 file(s).");
+  });
+});

package/scripts/upgrade-6-to-7.ts

@@ -0,0 +1,169 @@
+#!/usr/bin/env tsx
+/**
+ * Upgrade a site off the frozen pre-split `@decocms/start@6.30.0` /
+ * `@decocms/apps@5.4.0` packages onto the current 7.x split
+ * (`@decocms/tanstack` + `@decocms/blocks` + `@decocms/blocks-admin` +
+ * `@decocms/apps-*`). See #367.
+ *
+ * This is NOT the Fresh→TanStack migrator (`deco-migrate`) — it assumes the
+ * site is already on TanStack Start and only needs its package dependency
+ * moved to the current split. Rewrites import specifiers (including the
+ * `@decocms/start/routes` / `@decocms/start/hooks` symbol fan-out and the
+ * `decoMetaRoute`/`RenderSection` renames — see scripts/lib/upgrade-6-to-7.ts
+ * for the full mapping) and updates package.json dependencies.
+ *
+ * Usage (from the site root):
+ *   # dry-run (default): prints every file that would change, no writes
+ *   npx -p @decocms/blocks-cli deco-upgrade-6-to-7
+ *   # apply:
+ *   npx -p @decocms/blocks-cli deco-upgrade-6-to-7 --write
+ *
+ * Options:
+ *   --src-dir <dir>   Source dir to scan (default: src)
+ *   --write           Apply changes (otherwise dry-run, exit 0)
+ *   --help, -h        Show this help
+ *
+ * Exit codes: 0 ok / dry-run; 2 error (bad dir)
+ */
+
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { upgradeFileToV7 } from "./lib/upgrade-6-to-7";
+
+const FRAMEWORK_DEPS = [
+  "@decocms/blocks",
+  "@decocms/blocks-admin",
+  "@decocms/tanstack",
+  "@decocms/apps-commerce",
+];
+const PLATFORM_APPS_PREFIX = "@decocms/apps-";
+
+function parseArgs(argv: string[]) {
+  const has = (f: string) => argv.includes(f);
+  const val = (f: string, d: string) => {
+    const i = argv.indexOf(f);
+    return i >= 0 && argv[i + 1] ? argv[i + 1] : d;
+  };
+  return {
+    help: has("--help") || has("-h"),
+    write: has("--write"),
+    srcDir: val("--src-dir", "src"),
+  };
+}
+
+function walkTsFiles(dir: string, out: string[] = []): string[] {
+  if (!fs.existsSync(dir)) return out;
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const full = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      if (entry.name === "node_modules" || entry.name === ".git") continue;
+      walkTsFiles(full, out);
+    } else if (entry.name.endsWith(".ts") || entry.name.endsWith(".tsx")) {
+      out.push(full);
+    }
+  }
+  return out;
+}
+
+/** Removes @decocms/start and @decocms/apps (bare, monolith) from a deps
+ * object, and ensures the current split packages are present. Site- and
+ * platform-specific version pins are left to `bun install`/`npm install`
+ * against the fallback "latest" this writes — sites should pin exact
+ * versions afterward the same way the scaffolder does. */
+function upgradeDeps(deps: Record<string, string> | undefined): {
+  next: Record<string, string>;
+  removed: string[];
+  added: string[];
+} {
+  const next: Record<string, string> = { ...(deps ?? {}) };
+  const removed: string[] = [];
+  for (const key of Object.keys(next)) {
+    if (key === "@decocms/start" || key === "@decocms/apps") {
+      delete next[key];
+      removed.push(key);
+    }
+  }
+  const added: string[] = [];
+  if (removed.length > 0) {
+    for (const dep of FRAMEWORK_DEPS) {
+      if (!next[dep]) {
+        next[dep] = "latest";
+        added.push(dep);
+      }
+    }
+  }
+  return { next, removed, added };
+}
+
+function upgradePackageJson(pkgPath: string, write: boolean): void {
+  if (!fs.existsSync(pkgPath)) return;
+  const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+
+  const depsResult = upgradeDeps(pkg.dependencies);
+  const devDepsResult = upgradeDeps(pkg.devDependencies);
+
+  const removed = [...depsResult.removed, ...devDepsResult.removed];
+  if (removed.length === 0) return;
+
+  console.log(`  package.json: removing ${removed.join(", ")}`);
+  const added = [...new Set([...depsResult.added, ...devDepsResult.added])];
+  if (added.length > 0) {
+    console.log(`  package.json: adding ${added.join(", ")} at "latest" — pin exact versions after install`);
+  }
+
+  if (!write) return;
+  pkg.dependencies = depsResult.next;
+  pkg.devDependencies = devDepsResult.next;
+  fs.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
+}
+
+function main() {
+  const args = parseArgs(process.argv.slice(2));
+  if (args.help) {
+    console.log(
+      "Usage: deco-upgrade-6-to-7 [--src-dir <dir>] [--write]\n\n" +
+        "Upgrades a site off @decocms/start@6.30.0 / @decocms/apps@5.4.0 onto the\n" +
+        "current 7.x split. Dry-run by default; pass --write to apply.",
+    );
+    return;
+  }
+
+  const cwd = process.cwd();
+  const srcDir = path.resolve(cwd, args.srcDir);
+  if (!fs.existsSync(srcDir)) {
+    console.error(`Source dir not found: ${srcDir}`);
+    process.exitCode = 2;
+    return;
+  }
+
+  const files = walkTsFiles(srcDir);
+  let changedCount = 0;
+  const allNotes: Array<{ file: string; note: string }> = [];
+
+  for (const abs of files) {
+    const content = fs.readFileSync(abs, "utf-8");
+    const result = upgradeFileToV7(content);
+    if (!result.changed) continue;
+
+    changedCount++;
+    const rel = path.relative(cwd, abs);
+    console.log(`${args.write ? "upgraded" : "would upgrade"}: ${rel}`);
+    for (const note of result.notes) allNotes.push({ file: rel, note });
+
+    if (args.write) fs.writeFileSync(abs, result.content);
+  }
+
+  upgradePackageJson(path.join(cwd, "package.json"), args.write);
+
+  if (allNotes.length > 0) {
+    console.log("\nManual review needed:");
+    for (const { file, note } of allNotes) console.log(`  [${file}] ${note}`);
+  }
+
+  console.log(
+    `\n${args.write ? "Upgraded" : "Would upgrade"} ${changedCount} file(s).` +
+      (args.write ? "" : " Re-run with --write to apply."),
+  );
+}
+
+main();