@decocms/blocks-cli 7.5.1 → 7.5.3

package/scripts/migrate/post-cleanup/runner.test.ts

@@ -242,10 +242,10 @@ describe("rule: dead-runtime-shim", () => {
 
   it("does NOT flag the Wave 15-A canonical re-export shape", () => {
     // The migration template now scaffolds a thin re-export from
-    // @decocms/start/sdk plus a Runtime alias. No inline proxy body.
+    // @decocms/blocks/sdk/invoke plus a Runtime alias. No inline proxy body.
     const fs = makeFs({
       "/site/src/runtime.ts":
-        'import { invoke } from "@decocms/start/sdk";\nexport { invoke };\nexport const Runtime = { invoke };\n',
+        'import { invoke } from "@decocms/blocks/sdk/invoke";\nexport { invoke };\nexport const Runtime = { invoke };\n',
     });
     const report = runAudit(SITE, fs);
     const r = report.rules.find((r) => r.rule === "dead-runtime-shim")!;
@@ -330,7 +330,7 @@ describe("rule: site-local-with-globals", () => {
   it("does not flag a re-export from the framework", () => {
     const fs = makeFs({
       "/site/src/server/routes/withSiteGlobals.ts":
-        'export { withSiteGlobals } from "@decocms/start/routes";\n',
+        'export { withSiteGlobals } from "@decocms/tanstack";\n',
     });
     const report = runAudit(SITE, fs);
     const r = report.rules.find((r) => r.rule === "site-local-with-globals")!;
@@ -492,12 +492,12 @@ describe("rule: vtex-shim-regression — per-symbol fix hints", () => {
     const r = report.rules.find((r) => r.rule === "vtex-shim-regression")!;
     expect(r.findings).toHaveLength(1);
     const f = r.findings[0];
-    expect(f.fix).toContain("toProduct → @decocms/apps/vtex/utils/transform");
+    expect(f.fix).toContain("toProduct → @decocms/apps-vtex/utils/transform");
     expect(f.fix).toContain("1:1 import swap");
     expect(f.meta?.fixHints).toEqual({
       toProduct: {
         kind: "swap",
-        canonical: "@decocms/apps/vtex/utils/transform",
+        canonical: "@decocms/apps-vtex/utils/transform",
         note: expect.stringContaining("canonical signature"),
       },
     });
@@ -537,7 +537,7 @@ describe("rule: vtex-shim-regression — per-symbol fix hints", () => {
     const r = report.rules.find((r) => r.rule === "vtex-shim-regression")!;
     const f = r.findings[0];
     expect(f.fix).toContain("getSegmentFromBag → call-site refactor");
-    expect(f.fix).toContain("toProduct → @decocms/apps/vtex/utils/transform");
+    expect(f.fix).toContain("toProduct → @decocms/apps-vtex/utils/transform");
     // Joined with " | " for visual separation.
     expect(f.fix).toContain(" | ");
     expect(Object.keys(f.meta?.fixHints as object)).toEqual(
@@ -555,7 +555,7 @@ describe("rule: vtex-shim-regression — per-symbol fix hints", () => {
     const report = runAudit(SITE, fs);
     const r = report.rules.find((r) => r.rule === "vtex-shim-regression")!;
     const f = r.findings[0];
-    expect(f.fix).toContain("unknownStub → repoint to '@decocms/apps/vtex/...");
+    expect(f.fix).toContain("unknownStub → repoint to '@decocms/apps-vtex/...");
     // No fixHints in meta when no symbols match the table.
     expect(f.meta?.fixHints).toBeUndefined();
   });
@@ -573,7 +573,7 @@ describe("rule: vtex-shim-regression — per-symbol fix hints", () => {
     const report = runAudit(SITE, fs);
     const r = report.rules.find((r) => r.rule === "vtex-shim-regression")!;
     const f = r.findings[0];
-    expect(f.fix).toContain("toProduct → @decocms/apps/vtex/utils/transform");
+    expect(f.fix).toContain("toProduct → @decocms/apps-vtex/utils/transform");
     expect(f.fix).toContain("unknownStub → repoint");
     // Only the known symbol shows up in fixHints.
     expect(f.meta?.fixHints).toEqual({
@@ -665,6 +665,30 @@ export default createDecoWorkerEntry(serverEntry, {
     expect(r.findings).toEqual([]);
   });
 
+  it("recognizes the current @decocms/apps-vtex package name (post-7.x split)", () => {
+    // Sites migrated with the current scaffolder emit `@decocms/apps-vtex`,
+    // not the retired `@decocms/apps/vtex` monolith path. Both the isVtex
+    // signal and the proxy-import detection must recognize the new form.
+    const currentWorkerEntry = `
+import { createDecoWorkerEntry } from "@decocms/tanstack";
+import { shouldProxyToVtex, createVtexCheckoutProxy } from "@decocms/apps-vtex/utils/proxy";
+const proxy = createVtexCheckoutProxy({ account: "x", checkoutOrigin: "x.vtexcommercestable.com.br" });
+export default createDecoWorkerEntry(serverEntry, {
+  proxyHandler: async (req, url) => {
+    if (!shouldProxyToVtex(url.pathname)) return null;
+    return proxy(req, url);
+  },
+});
+`;
+    const fs = makeFs({
+      "/site/src/commerceLoaders.ts": 'import {} from "@decocms/apps-vtex/mod";',
+      "/site/src/worker-entry.ts": currentWorkerEntry,
+    });
+    const report = runAudit(SITE, fs);
+    const r = report.rules.find((r) => r.rule === "vtex-proxy-handler-missing")!;
+    expect(r.findings).toEqual([]);
+  });
+
   it("flags VTEX site missing src/worker-entry.ts entirely", () => {
     const fs = makeFs({
       "/site/src/commerceLoaders.ts": "import {} from \"@decocms/apps/vtex/mod\";",
@@ -687,7 +711,7 @@ export default createDecoWorkerEntry(serverEntry, { admin: {} });
     const report = runAudit(SITE, fs);
     const r = report.rules.find((r) => r.rule === "vtex-proxy-handler-missing")!;
     expect(r.findings).toHaveLength(1);
-    expect(r.findings[0].message).toContain("no `@decocms/apps/vtex/utils/proxy` import");
+    expect(r.findings[0].message).toContain("no `@decocms/apps-vtex/utils/proxy` import");
   });
 
   it("does not flag VTEX site using object-shorthand proxyHandler wiring", () => {
@@ -821,8 +845,8 @@ describe("runAudit — fix mode", () => {
     expect(r.fixes).toHaveLength(1);
     expect(r.fixes![0].detail).toMatch(/rewrote 2 import/);
     expect("/site/src/runtime.ts" in store).toBe(false);
-    expect(store["/site/src/sections/A.tsx"]).toContain('"@decocms/start/sdk"');
-    expect(store["/site/src/sections/B.tsx"]).toContain("'@decocms/start/sdk'");
+    expect(store["/site/src/sections/A.tsx"]).toContain('"@decocms/blocks/sdk/invoke"');
+    expect(store["/site/src/sections/B.tsx"]).toContain("'@decocms/blocks/sdk/invoke'");
     expect(store["/site/src/sections/C.tsx"]).toContain('"~/something-else"');
     expect(log.filter((e) => e.kind === "delete")).toHaveLength(1);
     expect(log.filter((e) => e.kind === "write")).toHaveLength(2);
@@ -841,8 +865,8 @@ describe("runAudit — fix mode", () => {
     expect(r.fixes).toHaveLength(1);
     expect(r.fixes![0].detail).toMatch(/rewrote 2 import/);
     expect("/site/src/types/widgets.ts" in store).toBe(false);
-    expect(store["/site/src/sections/A.tsx"]).toContain('"@decocms/start/types/widgets"');
-    expect(store["/site/src/sections/B.tsx"]).toContain("'@decocms/start/types/widgets'");
+    expect(store["/site/src/sections/A.tsx"]).toContain('"@decocms/blocks/types/widgets"');
+    expect(store["/site/src/sections/B.tsx"]).toContain("'@decocms/blocks/types/widgets'");
   });
 
   it("fix mode is a no-op for rules without applyFix (e.g. framework-todos)", () => {
@@ -865,7 +889,7 @@ describe("runAudit — fix mode", () => {
         'import type { ImageWidget } from "~/types/widgets";\nimport thing from "~/types/widgets-extra";\n',
     });
     runAudit(SITE, fs, { writer });
-    expect(store["/site/src/sections/A.tsx"]).toContain('"@decocms/start/types/widgets"');
+    expect(store["/site/src/sections/A.tsx"]).toContain('"@decocms/blocks/types/widgets"');
     expect(store["/site/src/sections/A.tsx"]).toContain('"~/types/widgets-extra"');
   });
 });
@@ -887,10 +911,10 @@ describe("runAudit — fix mode — vtex-shim-regression swap cases", () => {
     expect(r.fixes).toHaveLength(1);
     expect(r.fixes![0].file).toBe("src/loaders/search.ts");
     expect(r.fixes![0].kind).toBe("rewrite-imports");
-    expect(r.fixes![0].detail).toContain("@decocms/apps/vtex/utils/transform");
+    expect(r.fixes![0].detail).toContain("@decocms/apps-vtex/utils/transform");
     expect(r.fixes![0].detail).toContain("toProduct");
     expect(store["/site/src/loaders/search.ts"]).toContain(
-      '"@decocms/apps/vtex/utils/transform"',
+      '"@decocms/apps-vtex/utils/transform"',
     );
     expect(store["/site/src/loaders/search.ts"]).not.toContain('"~/lib/vtex-transform"');
   });
@@ -907,9 +931,9 @@ describe("runAudit — fix mode — vtex-shim-regression swap cases", () => {
     const report = runAudit(SITE, fs, { writer });
     const r = report.rules.find((r) => r.rule === "vtex-shim-regression")!;
     expect(r.fixes).toHaveLength(1);
-    expect(r.fixes![0].detail).toContain("@decocms/apps/vtex/utils/segment");
+    expect(r.fixes![0].detail).toContain("@decocms/apps-vtex/utils/segment");
     expect(store["/site/src/loaders/x.ts"]).toContain(
-      '"@decocms/apps/vtex/utils/segment"',
+      '"@decocms/apps-vtex/utils/segment"',
     );
   });
 
@@ -964,10 +988,10 @@ describe("runAudit — fix mode — vtex-shim-regression swap cases", () => {
     const r = report.rules.find((r) => r.rule === "vtex-shim-regression")!;
     expect(r.fixes!.length).toBe(2);
     expect(store["/site/src/loaders/A.ts"]).toContain(
-      '"@decocms/apps/vtex/utils/transform"',
+      '"@decocms/apps-vtex/utils/transform"',
     );
     expect(store["/site/src/loaders/B.ts"]).toContain(
-      "'@decocms/apps/vtex/utils/transform'",
+      "'@decocms/apps-vtex/utils/transform'",
     );
   });
 
@@ -983,7 +1007,7 @@ describe("runAudit — fix mode — vtex-shim-regression swap cases", () => {
     });
     runAudit(SITE, fs, { writer });
     expect(store["/site/src/loaders/x.ts"]).toContain(
-      'import { toProduct as toP } from "@decocms/apps/vtex/utils/transform"',
+      'import { toProduct as toP } from "@decocms/apps-vtex/utils/transform"',
     );
   });
 });
@@ -1296,7 +1320,7 @@ describe("rule: local-framework-duplicate", () => {
     expect(r.findings[0].message).toContain("pure dup");
     expect(r.findings[0].meta?.id).toBe("clx");
     expect(r.findings[0].meta?.safeToAutoFix).toBe(true);
-    expect(r.findings[0].meta?.canonicalImport).toBe("@decocms/start/sdk/clx");
+    expect(r.findings[0].meta?.canonicalImport).toBe("@decocms/blocks/sdk/clx");
   });
 
   it("flags src/sdk/clx.ts when site adds a clsx alias (signature still matches)", () => {
@@ -1328,7 +1352,7 @@ describe("rule: local-framework-duplicate", () => {
   it("flags src/sdk/useSendEvent.ts as warn-only (typing regression risk)", () => {
     const fs = makeFs({
       "/site/src/sdk/useSendEvent.ts":
-        'import { AnalyticsEvent } from "@decocms/apps/commerce/types";\n' +
+        'import { AnalyticsEvent } from "@decocms/apps-commerce/types";\n' +
         "export const useSendEvent = <E extends AnalyticsEvent>(\n" +
         "  { event, on }: { event: E; on: 'click' | 'view' | 'change' },\n" +
         ") => ({\n" +
@@ -1367,7 +1391,7 @@ describe("rule: local-framework-duplicate", () => {
     expect(r.findings[0].meta?.id).toBe("url-relative");
     expect(r.findings[0].meta?.safeToAutoFix).toBe(false);
     expect(r.findings[0].meta?.canonicalImport).toBe(
-      "@decocms/apps/commerce/sdk/url",
+      "@decocms/apps-commerce/sdk/url",
     );
     expect(r.findings[0].fix).toContain("stripSearchParams");
   });
@@ -1393,7 +1417,7 @@ describe("rule: local-framework-duplicate", () => {
     expect(r.findings[0].meta?.id).toBe("use-suggestions");
     expect(r.findings[0].meta?.safeToAutoFix).toBe(false);
     expect(r.findings[0].meta?.canonicalImport).toBe(
-      "@decocms/start/sdk/useSuggestions",
+      "@decocms/blocks/sdk/useSuggestions",
     );
     expect(r.findings[0].fix).toContain("createUseSuggestions");
   });
@@ -1404,7 +1428,7 @@ describe("rule: local-framework-duplicate", () => {
     // strings. The rule's signature must NOT fire on the shim.
     const fs = makeFs({
       "/site/src/sdk/useSuggestions.ts":
-        'import { createUseSuggestions } from "@decocms/start/sdk/useSuggestions";\n' +
+        'import { createUseSuggestions } from "@decocms/blocks/sdk/useSuggestions";\n' +
         'import * as Sentry from "@sentry/react";\n' +
         "export const { useSuggestions } = createUseSuggestions({\n" +
         "  onError: (err) => Sentry.captureException(err),\n" +
@@ -1437,7 +1461,7 @@ describe("rule: local-framework-duplicate", () => {
   it("flags src/matchers/location.ts as warn-only (behaviour-superset opportunity)", () => {
     const fs = makeFs({
       "/site/src/matchers/location.ts":
-        'import { registerMatcher } from "@decocms/start/cms";\n' +
+        'import { registerMatcher } from "@decocms/blocks/cms";\n' +
         "export function registerLocationMatcher(): void {\n" +
         '  registerMatcher("website/matchers/location.ts", (rule, ctx) => {\n' +
         "    const cookies = ctx.cookies ?? {};\n" +
@@ -1457,7 +1481,7 @@ describe("rule: local-framework-duplicate", () => {
   it("emits zero findings on a clean tree (no duplicates present)", () => {
     const fs = makeFs({
       "/site/src/sections/Hello.tsx":
-        'import { clx } from "@decocms/start/sdk/clx";\nexport default () => <div className={clx("a")}>x</div>;\n',
+        'import { clx } from "@decocms/blocks/sdk/clx";\nexport default () => <div className={clx("a")}>x</div>;\n',
     });
     const report = runAudit(SITE, fs);
     const r = report.rules.find((r) => r.rule === "local-framework-duplicate")!;
@@ -1485,7 +1509,7 @@ describe("rule: local-framework-duplicate", () => {
       "/site/src/components/B.tsx":
         'import { clx } from "~/sdk/clx";\nimport React from "react";\nexport default () => clx("y");\n',
       "/site/src/components/Unrelated.tsx":
-        'import { clx } from "@decocms/start/sdk/clx";\nexport default () => clx("z");\n',
+        'import { clx } from "@decocms/blocks/sdk/clx";\nexport default () => clx("z");\n',
     });
     const report = runAudit(SITE, fs, { writer });
     const r = report.rules.find((r) => r.rule === "local-framework-duplicate")!;
@@ -1497,14 +1521,14 @@ describe("rule: local-framework-duplicate", () => {
     expect(store["/site/src/sdk/clx.ts"]).toBeUndefined();
     // Importers rewritten
     expect(store["/site/src/components/A.tsx"]).toContain(
-      'from "@decocms/start/sdk/clx"',
+      'from "@decocms/blocks/sdk/clx"',
     );
     expect(store["/site/src/components/B.tsx"]).toContain(
-      'from "@decocms/start/sdk/clx"',
+      'from "@decocms/blocks/sdk/clx"',
     );
     // Already-canonical import untouched
     expect(store["/site/src/components/Unrelated.tsx"]).toContain(
-      'from "@decocms/start/sdk/clx"',
+      'from "@decocms/blocks/sdk/clx"',
     );
     expect(store["/site/src/components/Unrelated.tsx"]).not.toMatch(/~\/sdk\/clx/);
   });
@@ -1512,12 +1536,12 @@ describe("rule: local-framework-duplicate", () => {
   it("auto-fix is a no-op for warn-only entries (does NOT delete partial-overlap files)", () => {
     const { fs, writer, store } = makeMutableFs({
       "/site/src/sdk/useSendEvent.ts":
-        'import { AnalyticsEvent } from "@decocms/apps/commerce/types";\n' +
+        'import { AnalyticsEvent } from "@decocms/apps-commerce/types";\n' +
         "export const useSendEvent = <E extends AnalyticsEvent>() => ({\n" +
         '  "data-event": encodeURIComponent("x"),\n' +
         "});\n",
       "/site/src/matchers/location.ts":
-        'import { registerMatcher } from "@decocms/start/cms";\n' +
+        'import { registerMatcher } from "@decocms/blocks/cms";\n' +
         'registerMatcher("website/matchers/location.ts", () => Boolean(__cf_geo_country));\n',
     });
     const report = runAudit(SITE, fs, { writer });

package/scripts/migrate/templates/cache-config.ts

@@ -4,18 +4,18 @@ export function generateCacheConfig(ctx: MigrationContext): string {
   if (ctx.platform !== "vtex") {
     return `/**
  * Cache configuration — customize edge cache profiles per route type.
- * See @decocms/start/sdk/cacheHeaders for available profiles.
+ * See @decocms/blocks/sdk/cacheHeaders for available profiles.
  */
-// import { setCacheProfile } from "@decocms/start/sdk/cacheHeaders";
+// import { setCacheProfile } from "@decocms/blocks/sdk/cacheHeaders";
 // setCacheProfile("product", { sMaxAge: 300, staleWhileRevalidate: 600 });
 `;
   }
 
   return `/**
  * Cache configuration for VTEX storefront.
- * Overrides default cache profiles from @decocms/start/sdk/cacheHeaders.
+ * Overrides default cache profiles from @decocms/blocks/sdk/cacheHeaders.
  */
-// import { setCacheProfile } from "@decocms/start/sdk/cacheHeaders";
+// import { setCacheProfile } from "@decocms/blocks/sdk/cacheHeaders";
 
 // Uncomment and adjust as needed:
 // setCacheProfile("product", { sMaxAge: 300, staleWhileRevalidate: 600 });

package/scripts/migrate/templates/commerce-loaders.ts

@@ -37,15 +37,15 @@ export function generateCommerceLoaders(ctx: MigrationContext): string {
   lines.push(` */`);
 
   if (ctx.platform === "vtex") {
-    lines.push(`import { getVtexConfig } from "@decocms/apps/vtex";`);
-    lines.push(`import { createVtexCommerceLoaders, createCachedPDPLoader } from "@decocms/apps/vtex/commerceLoaders";`);
+    lines.push(`import { getVtexConfig } from "@decocms/apps-vtex";`);
+    lines.push(`import { createVtexCommerceLoaders, createCachedPDPLoader } from "@decocms/apps-vtex/commerceLoaders";`);
     if (hasAutocomplete) {
-      lines.push(`import { autocompleteSearch } from "@decocms/apps/vtex/loaders/autocomplete";`);
+      lines.push(`import { autocompleteSearch } from "@decocms/apps-vtex/loaders/autocomplete";`);
     }
-    lines.push(`import { getAddressByPostalCode } from "@decocms/apps/vtex/loaders/address";`);
-    lines.push(`import { createAddressFromRequest, updateAddressFromRequest, deleteAddressFromRequest } from "@decocms/apps/vtex/actions/address";`);
-    lines.push(`import { updateProfileFromRequest, newsletterProfileFromRequest, deletePaymentFromRequest, getPasswordLastUpdate } from "@decocms/apps/vtex/actions/profile";`);
-    lines.push(`import { createCachedLoader } from "@decocms/start/sdk/cachedLoader";`);
+    lines.push(`import { getAddressByPostalCode } from "@decocms/apps-vtex/loaders/address";`);
+    lines.push(`import { createAddressFromRequest, updateAddressFromRequest, deleteAddressFromRequest } from "@decocms/apps-vtex/actions/address";`);
+    lines.push(`import { updateProfileFromRequest, newsletterProfileFromRequest, deletePaymentFromRequest, getPasswordLastUpdate } from "@decocms/apps-vtex/actions/profile";`);
+    lines.push(`import { createCachedLoader } from "@decocms/blocks/sdk/cachedLoader";`);
 
     if (hasVtexAuth) {
       lines.push(`import vtexAuthLoader from "../loaders/vtex-auth-loader";`);
@@ -92,7 +92,7 @@ export function generateCommerceLoaders(ctx: MigrationContext): string {
 
     // Autocomplete aliases
     if (hasAutocomplete) {
-      lines.push(`  // Autocomplete search — from @decocms/apps`);
+      lines.push(`  // Autocomplete search — from @decocms/apps-vtex`);
       lines.push(`  "site/loaders/search/intelligenseSearch.ts": cachedAutocomplete,`);
       lines.push(`  "site/loaders/search/intelligenseSearch": cachedAutocomplete,`);
       lines.push(``);
@@ -109,7 +109,7 @@ export function generateCommerceLoaders(ctx: MigrationContext): string {
     }
 
     // VTEX address CRUD
-    lines.push(`  // VTEX address CRUD — request-aware wrappers from @decocms/apps`);
+    lines.push(`  // VTEX address CRUD — request-aware wrappers from @decocms/apps-vtex`);
     lines.push(`  "vtex/actions/address/createAddress": createAddressFromRequest as any,`);
     lines.push(`  "vtex/actions/address/updateAddress": updateAddressFromRequest as any,`);
     lines.push(`  "vtex/actions/address/deleteAddress": deleteAddressFromRequest as any,`);
@@ -215,7 +215,7 @@ export function generateCommerceLoaders(ctx: MigrationContext): string {
 
     lines.push(``);
     // Profile actions
-    lines.push(`  // Profile actions — request-aware wrappers from @decocms/apps`);
+    lines.push(`  // Profile actions — request-aware wrappers from @decocms/apps-vtex`);
     lines.push(`  "vtex/actions/profile/updateProfile": updateProfileFromRequest as any,`);
     lines.push(`  "vtex/actions/profile/updateProfile.ts": updateProfileFromRequest as any,`);
     lines.push(`  "vtex/actions/profile/newsletterProfile": newsletterProfileFromRequest as any,`);

package/scripts/migrate/templates/cursor-rules.test.ts

@@ -43,6 +43,12 @@ describe("generateMigrationPolicyPointerRule", () => {
 		expect(body.length).toBeLessThan(3000);
 	});
 
+	it("does not emit the pre-split @decocms/start or @decocms/apps package names", () => {
+		expect(body).not.toContain("@decocms/start");
+		expect(body).not.toContain("@decocms/apps\`");
+		expect(body).toContain("@decocms/blocks-cli");
+	});
+
 	it("is deterministic — same site name, same output", () => {
 		const a = generateMigrationPolicyPointerRule("foo");
 		const b = generateMigrationPolicyPointerRule("foo");

package/scripts/migrate/templates/cursor-rules.ts

@@ -26,10 +26,11 @@ alwaysApply: true
 
 # Migration Tooling Policy — Pointer
 
-> This site (\`${siteName}\`) was generated by the \`@decocms/start\`
-> migration script. The canonical policy that governs how the migration
-> tooling, framework (\`@decocms/start\`), and commerce layer
-> (\`@decocms/apps\`) evolve lives **upstream**, not in this repo.
+> This site (\`${siteName}\`) was generated by the \`@decocms/blocks-cli\`
+> migration script (\`deco-migrate\`). The canonical policy that governs how
+> the migration tooling, framework (\`@decocms/blocks\` + \`@decocms/tanstack\`),
+> and commerce layer (\`@decocms/apps-*\`) evolve lives **upstream**, not in
+> this repo.
 
 ## Where to read
 
@@ -38,24 +39,24 @@ alwaysApply: true
 - **Plan (living tracker, decisions + waves):**
   https://github.com/decocms/deco-start/blob/main/MIGRATION_TOOLING_PLAN.md
 - **Migration skill (phase playbook):**
-  \`@decocms/start/.agents/skills/deco-to-tanstack-migration\`
+  https://github.com/decocms/deco-start/blob/main/.agents/skills/deco-to-tanstack-migration/SKILL.md
 
 ## What you need to know in this site
 
 | ID | Decision | What it means here |
 |----|----------|--------------------|
-| **D1** | Force convergence — no fork runtime support | Site customisations live in \`src/apps/local/\` or open a PR to \`@decocms/apps\`. Don't wrap framework/commerce code in soft adapters. |
+| **D1** | Force convergence — no fork runtime support | Site customisations live in \`src/apps/local/\` or open a PR to \`@decocms/apps-*\`. Don't wrap framework/commerce code in soft adapters. |
 | **D2** | Rewrite HTMX on migration | If you find HTMX residue, rewrite to React. Don't bring back \`hx-*\` runtime. |
-| **D3** | Generated stubs throw at runtime | If a \`~/lib/vtex-*\` import comes from a stub that returns \`null\` / \`{}\` / identity-cast, replace it. \`npx -p @decocms/start deco-post-cleanup --fix\` does the safe swaps automatically. |
-| **D4** | Site-local apps by default, promote at 3+ sites | Don't try to upstream a pattern that has only shipped here. Build it twice in different sites first, then PR it to \`@decocms/apps\`. |
+| **D3** | Generated stubs throw at runtime | If a \`~/lib/vtex-*\` import comes from a stub that returns \`null\` / \`{}\` / identity-cast, replace it. \`npx -p @decocms/blocks-cli deco-post-cleanup --fix\` does the safe swaps automatically. |
+| **D4** | Site-local apps by default, promote at 3+ sites | Don't try to upstream a pattern that has only shipped here. Build it twice in different sites first, then PR it to \`@decocms/apps-*\`. |
 | **D5** | Failed migrations: \`rm -rf\` and re-run | No restart-mode magic. If the migration goes sideways, blow away the working tree and run again. |
 
 ## How to find issues this rule wants you to fix
 
 \`\`\`bash
-npx -p @decocms/start deco-post-cleanup           # audit only
-npx -p @decocms/start deco-post-cleanup --fix     # auto-fix the safe rules
-npx -p @decocms/start deco-post-cleanup --strict  # exit 1 on any finding (CI)
+npx -p @decocms/blocks-cli deco-post-cleanup           # audit only
+npx -p @decocms/blocks-cli deco-post-cleanup --fix     # auto-fix the safe rules
+npx -p @decocms/blocks-cli deco-post-cleanup --strict  # exit 1 on any finding (CI)
 \`\`\`
 
 ## Process

package/scripts/migrate/templates/hooks.test.ts

@@ -44,12 +44,12 @@ describe("generateHooks (vtex)", () => {
 		const code = files["src/hooks/useCart.ts"];
 		// Imports from the framework factory.
 		expect(code).toContain(
-			'import { createUseCart } from "@decocms/apps/vtex/hooks/createUseCart"',
+			'import { createUseCart } from "@decocms/apps-vtex/hooks/createUseCart"',
 		);
 		expect(code).toContain('import { invoke } from "~/server/invoke"');
-		// Re-exports types from @decocms/apps directly.
+		// Re-exports types from @decocms/apps-vtex directly.
 		expect(code).toContain(
-			'export type { OrderForm, OrderFormItem } from "@decocms/apps/vtex/types"',
+			'export type { OrderForm, OrderFormItem } from "@decocms/apps-vtex/types"',
 		);
 		// Calls the factory with invoke and destructures the public API.
 		expect(code).toContain(
@@ -70,11 +70,11 @@ describe("generateHooks (vtex)", () => {
 	it("useUser is the createUseUser factory shim (no signal-stub boilerplate)", () => {
 		const code = files["src/hooks/useUser.ts"];
 		expect(code).toContain(
-			'import { createUseUser } from "@decocms/apps/vtex/hooks/createUseUser"',
+			'import { createUseUser } from "@decocms/apps-vtex/hooks/createUseUser"',
 		);
 		expect(code).toContain('import { invoke } from "~/server/invoke"');
 		expect(code).toContain(
-			'export type { Person } from "@decocms/apps/vtex/loaders/user"',
+			'export type { Person } from "@decocms/apps-vtex/loaders/user"',
 		);
 		expect(code).toContain("export const { useUser, resetUser } = createUseUser");
 		// Must NOT scaffold the legacy signal stub.
@@ -85,11 +85,11 @@ describe("generateHooks (vtex)", () => {
 	it("useWishlist is the createUseWishlist factory shim", () => {
 		const code = files["src/hooks/useWishlist.ts"];
 		expect(code).toContain(
-			'import { createUseWishlist } from "@decocms/apps/vtex/hooks/createUseWishlist"',
+			'import { createUseWishlist } from "@decocms/apps-vtex/hooks/createUseWishlist"',
 		);
 		expect(code).toContain('import { invoke } from "~/server/invoke"');
 		expect(code).toContain(
-			'export type { WishlistItem } from "@decocms/apps/vtex/loaders/wishlist"',
+			'export type { WishlistItem } from "@decocms/apps-vtex/loaders/wishlist"',
 		);
 		expect(code).toContain(
 			"export const { useWishlist, resetWishlist } = createUseWishlist",

package/scripts/migrate/templates/hooks.ts

@@ -19,11 +19,11 @@ export function generateHooks(ctx: MigrationContext): Record<string, string> {
 function generateVtexUseCart(): string {
   // The legacy invoke-based useCart hook is now a 5-line factory call —
   // the heavy lifting (singleton state, listener pattern, async actions,
-  // analytics helpers) lives in @decocms/apps/vtex/hooks/createUseCart.
-  return `import { createUseCart } from "@decocms/apps/vtex/hooks/createUseCart";
+  // analytics helpers) lives in @decocms/apps-vtex/hooks/createUseCart.
+  return `import { createUseCart } from "@decocms/apps-vtex/hooks/createUseCart";
 import { invoke } from "~/server/invoke";
 
-export type { OrderForm, OrderFormItem } from "@decocms/apps/vtex/types";
+export type { OrderForm, OrderFormItem } from "@decocms/apps-vtex/types";
 
 export const { useCart, resetCart, itemToAnalyticsItem } = createUseCart({
   invoke,
@@ -70,22 +70,22 @@ export default useCart;
 // VTEX path — these are five-line factory shims. The heavy lifting
 // (singleton state, listener pattern, async actions, signal-shaped
 // accessors, legacy arg-swap conventions) lives in
-// @decocms/apps/vtex/hooks/createUseUser and createUseWishlist.
+// @decocms/apps-vtex/hooks/createUseUser and createUseWishlist.
 function generateVtexUseUser(): string {
-  return `import { createUseUser } from "@decocms/apps/vtex/hooks/createUseUser";
+  return `import { createUseUser } from "@decocms/apps-vtex/hooks/createUseUser";
 import { invoke } from "~/server/invoke";
 
-export type { Person } from "@decocms/apps/vtex/loaders/user";
+export type { Person } from "@decocms/apps-vtex/loaders/user";
 
 export const { useUser, resetUser } = createUseUser({ invoke });
 `;
 }
 
 function generateVtexUseWishlist(): string {
-  return `import { createUseWishlist } from "@decocms/apps/vtex/hooks/createUseWishlist";
+  return `import { createUseWishlist } from "@decocms/apps-vtex/hooks/createUseWishlist";
 import { invoke } from "~/server/invoke";
 
-export type { WishlistItem } from "@decocms/apps/vtex/loaders/wishlist";
+export type { WishlistItem } from "@decocms/apps-vtex/loaders/wishlist";
 
 export const { useWishlist, resetWishlist } = createUseWishlist({ invoke });
 `;
@@ -98,7 +98,7 @@ function generateGenericUseUser(): string {
   return `/**
  * User Hook — wire to invoke.site.loaders for your platform's user API.
  *
- * VTEX sites get a real factory from @decocms/apps/vtex/hooks/createUseUser;
+ * VTEX sites get a real factory from @decocms/apps-vtex/hooks/createUseUser;
  * see migration template hooks.ts for the canonical five-line shim.
  */
 import { signal } from "~/sdk/signal";
@@ -125,7 +125,7 @@ function generateGenericUseWishlist(): string {
   return `/**
  * Wishlist Hook — wire to invoke.site.loaders/actions for your platform.
  *
- * VTEX sites get a real factory from @decocms/apps/vtex/hooks/createUseWishlist;
+ * VTEX sites get a real factory from @decocms/apps-vtex/hooks/createUseWishlist;
  * see migration template hooks.ts for the canonical five-line shim.
  */
 import { signal } from "~/sdk/signal";

package/scripts/migrate/templates/lib-utils.test.ts

@@ -99,7 +99,7 @@ describe("D3 — generated stubs throw at runtime", () => {
   it("vtex-transform.toProduct throws and points at the canonical path", () => {
     const src = LIB_TEMPLATES["src/lib/vtex-transform.ts"];
     expect(src).toMatch(/throw new Error/);
-    expect(src).toMatch(/@decocms\/apps\/vtex\/utils\/transform/);
+    expect(src).toMatch(/@decocms\/apps-vtex\/utils\/transform/);
     expect(src).toMatch(/\[deco-migrate\]/);
   });
 
@@ -117,7 +117,7 @@ describe("D3 — generated stubs throw at runtime", () => {
     const src = LIB_TEMPLATES["src/lib/vtex-segment.ts"];
     expect(src).toMatch(/getSegmentFromBag[\s\S]*?throw new Error/);
     expect(src).toMatch(/withSegmentCookie[\s\S]*?throw new Error/);
-    expect(src).toMatch(/@decocms\/apps\/vtex\/utils\/segment/);
+    expect(src).toMatch(/@decocms\/apps-vtex\/utils\/segment/);
   });
 
   it("non-stub helpers stay implemented (negative check — no throw)", () => {

package/scripts/migrate/templates/lib-utils.ts

@@ -46,11 +46,11 @@ export function selectImportedLibTemplates(
 //
 // Each thrown message points at the canonical replacement so the fix
 // is mechanical. `deco-post-cleanup --fix` automates the swap.
-const LIB_VTEX_TRANSFORM = `import type { Product } from "@decocms/apps/commerce/types";
+const LIB_VTEX_TRANSFORM = `import type { Product } from "@decocms/apps-commerce/types";
 
 const STUB =
   "[deco-migrate] \`~/lib/vtex-transform.toProduct\` is a generated stub. " +
-  "Replace with: import { toProduct } from '@decocms/apps/vtex/utils/transform' " +
+  "Replace with: import { toProduct } from '@decocms/apps-vtex/utils/transform' " +
   "(canonical signature: \`toProduct(product, sku, level, options)\`). " +
   "Run \`deco-post-cleanup --fix\` or see the deco-to-tanstack-migration skill " +
   "(post-migration-cleanup § 5).";
@@ -119,13 +119,13 @@ const LIB_VTEX_SEGMENT = `// Per the migration tooling policy (D3): both these s
 const STUB_GET_SEGMENT_FROM_BAG =
   "[deco-migrate] \`~/lib/vtex-segment.getSegmentFromBag\` is a generated " +
   "stub. Refactor: read cookies via \`request.headers.get('cookie')\` then " +
-  "call \`buildSegmentFromCookies()\` from '@decocms/apps/vtex/utils/segment'. " +
+  "call \`buildSegmentFromCookies()\` from '@decocms/apps-vtex/utils/segment'. " +
   "The bag-based lookup mechanism does not exist on TanStack Start.";
 
 const STUB_WITH_SEGMENT_COOKIE =
   "[deco-migrate] \`~/lib/vtex-segment.withSegmentCookie\` is a generated " +
   "stub. Replace with: import { withSegmentCookie } from " +
-  "'@decocms/apps/vtex/utils/segment' (canonical signature: " +
+  "'@decocms/apps-vtex/utils/segment' (canonical signature: " +
   "\`withSegmentCookie(segment, headers?)\`). Run \`deco-post-cleanup --fix\` " +
   "or see the deco-to-tanstack-migration skill.";