@decocms/blocks-cli 7.5.1 → 7.5.2

package/scripts/migrate/templates/server-entry.ts

@@ -43,7 +43,7 @@ function generateWorkerEntry(ctx: MigrationContext): string {
  * Cloudflare Worker entry point.
  *
  * Wraps TanStack Start with admin protocol handlers, edge caching, and
- * the @decocms/start observability stack (5.0+, Cloudflare-native):
+ * the @decocms/blocks observability stack (5.0+, Cloudflare-native):
  *   - logs:    console.* -> CF Workers Logs (captured by the platform
  *              when wrangler.jsonc has \`observability.enabled: true\`).
  *              View in the CF dashboard -> Workers & Pages -> <site> ->
@@ -57,27 +57,27 @@ function generateWorkerEntry(ctx: MigrationContext): string {
  *
  * No in-Worker OTLP exporter ships with 5.x — the CF dashboard is the
  * destination. A ClickHouse-collector adapter is scaffolded at
- * @decocms/start/sdk/otelAdapters/clickhouseCollector but throws if
+ * @decocms/blocks/sdk/otelAdapters/clickhouseCollector but throws if
  * called; it'll get a real implementation once the OTel collector
  * gateway lands.
  *
  * To wire wrangler.jsonc with the canonical observability block, run:
- *   npx -p @decocms/start deco-cf-observability --write
+ *   npx -p @decocms/blocks-cli deco-cf-observability --write
  */
 import "./setup";
 import handler, { createServerEntry } from "@tanstack/react-start/server-entry";
-import { createDecoWorkerEntry } from "@decocms/start/sdk/workerEntry";
-import { instrumentWorker } from "@decocms/start/sdk/observability";
+import { createDecoWorkerEntry } from "@decocms/tanstack";
+import { instrumentWorker } from "@decocms/blocks/sdk/observability";
 import {
   handleMeta,
   handleDecofileRead,
   handleDecofileReload,
   handleRender,
   corsHeaders,
-} from "@decocms/start/admin";
+} from "@decocms/blocks-admin";
 ${isCommerce ? `
 // TODO: Uncomment and wire proxy for ${platformLabel}
-// import { shouldProxyTo${capitalize(platformLabel!)}, proxyTo${capitalize(platformLabel!)} } from "@decocms/apps/${platformLabel}/utils/proxy";
+// import { shouldProxyTo${capitalize(platformLabel!)}, proxyTo${capitalize(platformLabel!)} } from "@decocms/apps-${platformLabel}/utils/proxy";
 ` : ""}
 const serverEntry = createServerEntry({ fetch: handler.fetch });
 
@@ -110,23 +110,23 @@ function generateVtexWorkerEntry(ctx: MigrationContext): string {
 
   return `import "./setup";
 import handler, { createServerEntry } from "@tanstack/react-start/server-entry";
-import { createDecoWorkerEntry } from "@decocms/start/sdk/workerEntry";
-import { instrumentWorker } from "@decocms/start/sdk/observability";
+import { createDecoWorkerEntry } from "@decocms/tanstack";
+import { instrumentWorker } from "@decocms/blocks/sdk/observability";
 import {
   handleMeta,
   handleDecofileRead,
   handleDecofileReload,
   handleRender,
   corsHeaders,
-} from "@decocms/start/admin";
-import { shouldProxyToVtex, createVtexCheckoutProxy } from "@decocms/apps/vtex/utils/proxy";
-import { extractVtexContext } from "@decocms/apps/vtex/middleware";
-import { loadRedirects, matchRedirect } from "@decocms/start/sdk/redirects";
-import { withABTesting } from "@decocms/start/sdk/abTesting";
-import { loadBlocks } from "@decocms/start/cms";
+} from "@decocms/blocks-admin";
+import { shouldProxyToVtex, createVtexCheckoutProxy } from "@decocms/apps-vtex/utils/proxy";
+import { extractVtexContext } from "@decocms/apps-vtex/middleware";
+import { loadRedirects, matchRedirect } from "@decocms/blocks/sdk/redirects";
+import { withABTesting } from "@decocms/blocks/sdk/abTesting";
+import { loadBlocks } from "@decocms/blocks/cms";
 
 // ---------------------------------------------------------------------------
-// VTEX checkout proxy — configured via @decocms/apps factory
+// VTEX checkout proxy — configured via @decocms/apps-vtex factory
 // ---------------------------------------------------------------------------
 
 const proxyCheckout = createVtexCheckoutProxy({
@@ -226,7 +226,7 @@ const abTestedWorker = withABTesting(decoWorker, {
 // ---------------------------------------------------------------------------
 // Observability wrap (outermost layer)
 //
-// @decocms/start 5.0+ converged on Cloudflare-native observability:
+// @decocms/blocks 5.0+ converged on Cloudflare-native observability:
 //   - logs:    console.* -> CF Workers Logs (dashboard captures, no
 //              app-side OTLP exporter)
 //   - traces:  @opentelemetry/api global tracer (bridged from
@@ -236,7 +236,7 @@ const abTestedWorker = withABTesting(decoWorker, {
 //              src/sdk/otelAdapters/clickhouseCollector.ts)
 //
 // Wire wrangler.jsonc with the canonical observability block via:
-//   npx -p @decocms/start deco-cf-observability --write
+//   npx -p @decocms/blocks-cli deco-cf-observability --write
 // ---------------------------------------------------------------------------
 export default instrumentWorker(abTestedWorker, {
   serviceName: "${ctx.siteName}",
@@ -246,7 +246,7 @@ export default instrumentWorker(abTestedWorker, {
 
 function generateRouter(): string {
   return `import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { createDecoRouter } from "@decocms/start/sdk/router";
+import { createDecoRouter } from "@decocms/tanstack";
 import { routeTree } from "./routeTree.gen";
 import "./setup";
 
@@ -274,16 +274,16 @@ declare module "@tanstack/react-router" {
 
 function generateRuntime(): string {
   return `/**
- * Runtime invoke proxy — re-exports the framework canonical from @decocms/start/sdk.
+ * Runtime invoke proxy — re-exports the framework canonical from @decocms/blocks/sdk/invoke.
  *
  * The implementation (typed RPC over /deco/invoke, dotted-path proxy, .ts
- * suffix fallback) lives in @decocms/start/sdk/invoke. This file exists so
+ * suffix fallback) lives in @decocms/blocks/sdk/invoke. This file exists so
  * existing site code can keep \`import { invoke } from "~/runtime"\` and
  * \`Runtime.invoke\` shapes without churn.
  *
- * Don't reimplement here — extend @decocms/start/sdk/invoke instead.
+ * Don't reimplement here — extend @decocms/blocks/sdk/invoke instead.
  */
-import { invoke } from "@decocms/start/sdk";
+import { invoke } from "@decocms/blocks/sdk/invoke";
 
 export { invoke };
 
@@ -328,14 +328,14 @@ export const invoke = {} as const;
  */
 import { createServerFn } from "@tanstack/react-start";
 import { getRequestHeader } from "@tanstack/react-start/server";
-import { forwardResponseCookies } from "@decocms/start/sdk/cookiePassthrough";
+import { forwardResponseCookies } from "@decocms/tanstack/sdk/cookiePassthrough";
 import { vtexActions } from "./invoke.gen";
 ${hasVtexAuthLoader ? `import vtexAuthLoader from "../loaders/vtex-auth-loader";\n` : ""}import {
   extractVtexCookiesFromHeader,
   stripCookieDomain,
   performVtexLogout,
   parseVtexAuthJwt,
-} from "@decocms/apps/vtex/utils/authHelpers";
+} from "@decocms/apps-vtex/utils/authHelpers";
 
 export type { OrderForm } from "./invoke.gen";
 
@@ -398,17 +398,17 @@ export const vtexActions = {} as const;
 // Each server function is a top-level const so TanStack Start's compiler
 // can transform createServerFn().handler() into RPC stubs on the client.
 import { createServerFn } from "@tanstack/react-start";
-import { getOrCreateCart, addItemsToCart, updateCartItems, addCouponToCart, simulateCart, getSellersByRegion, setShippingPostalCode, updateOrderFormAttachment } from "@decocms/apps/vtex/actions/checkout";
-import { createSession, editSession } from "@decocms/apps/vtex/actions/session";
-import { createDocument, getDocument, patchDocument, searchDocuments, uploadAttachment } from "@decocms/apps/vtex/actions/masterData";
-import { subscribe } from "@decocms/apps/vtex/actions/newsletter";
-import { notifyMe } from "@decocms/apps/vtex/actions/misc";
-import type { OrderForm } from "@decocms/apps/vtex/types";
-import type { SimulationItem, RegionResult } from "@decocms/apps/vtex/actions/checkout";
-import type { SessionData } from "@decocms/apps/vtex/actions/session";
-import type { CreateDocumentResult, UploadAttachmentOpts } from "@decocms/apps/vtex/actions/masterData";
-import type { SubscribeProps } from "@decocms/apps/vtex/actions/newsletter";
-import type { NotifyMeProps } from "@decocms/apps/vtex/actions/misc";
+import { getOrCreateCart, addItemsToCart, updateCartItems, addCouponToCart, simulateCart, getSellersByRegion, setShippingPostalCode, updateOrderFormAttachment } from "@decocms/apps-vtex/actions/checkout";
+import { createSession, editSession } from "@decocms/apps-vtex/actions/session";
+import { createDocument, getDocument, patchDocument, searchDocuments, uploadAttachment } from "@decocms/apps-vtex/actions/masterData";
+import { subscribe } from "@decocms/apps-vtex/actions/newsletter";
+import { notifyMe } from "@decocms/apps-vtex/actions/misc";
+import type { OrderForm } from "@decocms/apps-vtex/types";
+import type { SimulationItem, RegionResult } from "@decocms/apps-vtex/actions/checkout";
+import type { SessionData } from "@decocms/apps-vtex/actions/session";
+import type { CreateDocumentResult, UploadAttachmentOpts } from "@decocms/apps-vtex/actions/masterData";
+import type { SubscribeProps } from "@decocms/apps-vtex/actions/newsletter";
+import type { NotifyMeProps } from "@decocms/apps-vtex/actions/misc";
 
 function unwrapResult<T>(result: unknown): T {
   if (result && typeof result === "object" && "data" in result) {
@@ -549,7 +549,7 @@ export const vtexActions = {
   notifyMe: $notifyMe as unknown as (ctx: { data: NotifyMeProps }) => Promise<void>,
 } as const;
 
-export type { OrderForm } from "@decocms/apps/vtex/types";
+export type { OrderForm } from "@decocms/apps-vtex/types";
 
 export const invoke = {
   vtex: {

package/scripts/migrate/templates/setup.ts

@@ -93,15 +93,15 @@ import "./cache-config";
 import {
   registerCommerceLoaders,
   applySectionConventions,
-} from "@decocms/start/cms";
-import { createSiteSetup } from "@decocms/start/setup";
-import { setInvokeLoaders } from "@decocms/start/admin";${isVtex ? `
-import { createInstrumentedFetch } from "@decocms/start/sdk/instrumentedFetch";
-import { initVtexFromBlocks, setVtexFetch } from "@decocms/apps/vtex";` : ""}${hasLocationMatcher ? `
+} from "@decocms/blocks/cms";
+import { createSiteSetup } from "@decocms/blocks/setup";
+import { setInvokeLoaders } from "@decocms/blocks-admin";${isVtex ? `
+import { createInstrumentedFetch } from "@decocms/blocks/sdk/instrumentedFetch";
+import { initVtexFromBlocks, setVtexFetch } from "@decocms/apps-vtex";` : ""}${hasLocationMatcher ? `
 import { registerLocationMatcher } from "./matchers/location";` : ""}
 import { blocks as generatedBlocks } from "../.deco/blocks.gen";
 import { sectionMeta, syncComponents, loadingFallbacks } from "../.deco/sections.gen";
-import { PreviewProviders } from "@decocms/start/hooks";
+import { PreviewProviders } from "@decocms/tanstack";
 // @ts-ignore Vite ?url import
 import appCss from "./styles/app.css?url";
 

package/scripts/migrate/templates/types-gen.ts

@@ -5,7 +5,7 @@ export function generateTypeFiles(ctx: MigrationContext): Record<string, string>
 
   // src/types/widgets.ts is no longer generated — the framework owns these
   // string aliases (`ImageWidget`, `HTMLWidget`, …) at
-  // `@decocms/start/types/widgets`, and `transforms/imports.ts` rewrites
+  // `@decocms/blocks/types/widgets`, and `transforms/imports.ts` rewrites
   // `apps/admin/widgets.ts` directly to that path. Schema generation
   // works the same way: the generator matches by type *text*, not module
   // identity (see scripts/generate-schema.ts:WIDGET_TYPE_FORMATS).
@@ -99,7 +99,7 @@ export type AppContext = {
 export type LegacyAppContext = AppContext;
 `;
 
-    files["src/types/vtex-loaders.ts"] = `import type { Product, ProductListingPage } from "@decocms/apps/commerce/types";
+    files["src/types/vtex-loaders.ts"] = `import type { Product, ProductListingPage } from "@decocms/apps-commerce/types";
 
 export interface ProductListProps {
   page: ProductListingPage | null;

package/scripts/migrate/templates/ui-components.ts

@@ -13,7 +13,7 @@ export function generateUiComponents(_ctx: MigrationContext): Record<string, str
   FACTORS,
   type ImageProps,
   type FitOptions,
-} from "@decocms/apps/commerce/components/Image";
+} from "@decocms/blocks/hooks";
 `;
 
   files["src/components/ui/Picture.tsx"] = `import type { ReactNode } from "react";
@@ -22,7 +22,7 @@ import {
   getSrcSet,
   type FitOptions,
   type ImageProps,
-} from "@decocms/apps/commerce/components/Image";
+} from "@decocms/blocks/hooks";
 
 export interface PictureSourceProps {
   src: string;

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

@@ -1,7 +1,14 @@
 import type { MigrationContext } from "../types";
 
+const PLATFORM_PACKAGE: Partial<Record<MigrationContext["platform"], string>> = {
+  vtex: "@decocms/apps-vtex",
+  shopify: "@decocms/apps-shopify",
+  magento: "@decocms/apps-magento",
+};
+
 export function generateViteConfig(ctx: MigrationContext): string {
   const isVtex = ctx.platform === "vtex";
+  const platformDep = PLATFORM_PACKAGE[ctx.platform];
 
   const vtexAccount = ctx.vtexAccount || ctx.siteName.replace(/-migrated$/, "").replace(/-storefront$/, "");
 
@@ -29,7 +36,7 @@ const VTEX_ORIGIN = \`https://\${VTEX_ACCOUNT}.\${VTEX_ENVIRONMENT}.\${VTEX_DOMA
 
   return `import { cloudflare } from "@cloudflare/vite-plugin";
 import { tanstackStart } from "@tanstack/react-start/plugin/vite";
-import { decoVitePlugin } from "@decocms/start/vite";
+import { decoVitePlugin } from "@decocms/tanstack/vite";
 import react from "@vitejs/plugin-react";
 import tailwindcss from "@tailwindcss/vite";
 import { defineConfig } from "vite";
@@ -80,8 +87,10 @@ export default defineConfig({
   },
   resolve: {
     dedupe: [
-      "@decocms/start",
-      "@decocms/apps",
+      "@decocms/blocks",
+      "@decocms/blocks-admin",
+      "@decocms/tanstack",
+      "@decocms/apps-commerce",${platformDep ? `\n      "${platformDep}",` : ""}
       "@tanstack/react-start",
       "@tanstack/react-router",
       "@tanstack/react-start-server",

package/scripts/migrate/transforms/fresh-apis.ts

@@ -165,10 +165,10 @@ export function transformFreshApis(content: string): TransformResult {
   if (result.includes("scriptAsDataURI")) {
     // Ensure useScript is imported
     if (
-      !result.includes('"@decocms/start/sdk/useScript"') &&
-      !result.includes("'@decocms/start/sdk/useScript'")
+      !result.includes('"@decocms/blocks/sdk/useScript"') &&
+      !result.includes("'@decocms/blocks/sdk/useScript'")
     ) {
-      result = `import { useScript } from "@decocms/start/sdk/useScript";\n${result}`;
+      result = `import { useScript } from "@decocms/blocks/sdk/useScript";\n${result}`;
     }
 
     // Transform src={scriptAsDataURI(...)} into dangerouslySetInnerHTML={{ __html: useScript(...) }}
@@ -190,7 +190,7 @@ export function transformFreshApis(content: string): TransformResult {
     notes.push("Replaced scriptAsDataURI with useScript + dangerouslySetInnerHTML");
   }
 
-  // allowCorsFor — not available in @decocms/start, remove usage
+  // allowCorsFor — not available in @decocms/blocks, remove usage
   if (result.includes("allowCorsFor")) {
     result = result.replace(
       /^import\s+\{[^}]*\ballowCorsFor\b[^}]*\}\s+from\s+["'][^"']+["'];?\s*\n?/gm,
@@ -204,7 +204,7 @@ export function transformFreshApis(content: string): TransformResult {
 
   // ctx.response.headers → not available, flag
   if (result.includes("ctx.response")) {
-    notes.push("MANUAL: ctx.response usage found — FnContext in @decocms/start does not have response object");
+    notes.push("MANUAL: ctx.response usage found — FnContext in @decocms/blocks does not have response object");
   }
 
   // { crypto } from "@std/crypto" → use globalThis.crypto (Web Crypto API)

package/scripts/migrate/transforms/imports.ts

@@ -20,7 +20,7 @@ const IMPORT_RULES: Array<[RegExp, string | null]> = [
   [/^"@preact\/signals"$/, `"~/sdk/signal"`],
 
   // Deco framework — hooks need splitting (useDevice, useScript, useSection)
-  [/^"@deco\/deco\/hooks"$/, `"@decocms/start/sdk/useScript"`],
+  [/^"@deco\/deco\/hooks"$/, `"@decocms/blocks/sdk/useScript"`],
   [/^"@deco\/deco\/blocks"$/, `"~/types/deco"`],
   [/^"@deco\/deco\/o11y"$/, null], // logger — use console.log/warn/error instead
   [/^"@deco\/deco\/web"$/, null], // runtime.ts is rewritten
@@ -32,66 +32,66 @@ const IMPORT_RULES: Array<[RegExp, string | null]> = [
   // Widget aliases (ImageWidget, HTMLWidget, ...) are framework-owned —
   // every site has the same type set, and the schema generator detects
   // them via type-text matching, not module identity. Re-export from
-  // @decocms/start/types/widgets so we don't keep a duplicated 8-line
+  // @decocms/blocks/types/widgets so we don't keep a duplicated 8-line
   // file in every site.
-  [/^"apps\/admin\/widgets\.ts"$/, `"@decocms/start/types/widgets"`],
+  [/^"apps\/admin\/widgets\.ts"$/, `"@decocms/blocks/types/widgets"`],
   [/^"apps\/website\/components\/Image\.tsx"$/, `"~/components/ui/Image"`],
   [/^"apps\/website\/components\/Picture\.tsx"$/, `"~/components/ui/Picture"`],
   [/^"apps\/website\/components\/Video\.tsx"$/, `"~/components/ui/Video"`],
   [/^"apps\/website\/components\/Theme\.tsx"$/, `"~/components/ui/Theme"`],
   [/^"apps\/website\/components\/_seo\/[^"]+?"$/, null], // SEO preview — framework-only, remove
   [/^"apps\/website\/components\/([^"]+?)(?:\.tsx?)?"$/, `"~/components/ui/$1"`],
-  [/^"apps\/commerce\/types\.ts"$/, `"@decocms/apps/commerce/types"`],
+  [/^"apps\/commerce\/types\.ts"$/, `"@decocms/apps-commerce/types"`],
   [/^"apps\/commerce\/mod\.ts"$/, `"~/types/commerce-app"`],
-  [/^"apps\/commerce\/types"$/, `"@decocms/apps/commerce/types"`],
+  [/^"apps\/commerce\/types"$/, `"@decocms/apps-commerce/types"`],
 
-  // Apps — VTEX hooks: useUser/useCart/useWishlist → local hooks (react-query based @decocms/apps hooks crash Workers SSR)
+  // Apps — VTEX hooks: useUser/useCart/useWishlist → local hooks (react-query based @decocms/apps-vtex hooks crash Workers SSR)
   [/^"apps\/vtex\/hooks\/useUser(?:\.ts)?"$/, `"~/hooks/useUser"`],
   [/^"apps\/vtex\/hooks\/useCart(?:\.ts)?"$/, `"~/hooks/useCart"`],
   [/^"apps\/vtex\/hooks\/useWishlist(?:\.ts)?"$/, `"~/hooks/useWishlist"`],
-  [/^"apps\/vtex\/hooks\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps/vtex/hooks/$1"`],
-  // Specific VTEX utils that moved to different paths in @decocms/apps
+  [/^"apps\/vtex\/hooks\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps-vtex/hooks/$1"`],
+  // Specific VTEX utils that moved to different paths in @decocms/apps-vtex
   // fetchVTEX (generic fetchSafe + QS sanitization) lives at vtex/utils/fetch in apps-start.
-  [/^"apps\/vtex\/utils\/fetchVTEX(?:\.ts)?"$/, `"@decocms/apps/vtex/utils/fetch"`],
-  [/^"apps\/vtex\/utils\/client(?:\.ts)?"$/, `"@decocms/apps/vtex/client"`],
-  [/^"apps\/vtex\/utils\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps/vtex/utils/$1"`],
-  [/^"apps\/vtex\/actions\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps/vtex/actions/$1"`],
+  [/^"apps\/vtex\/utils\/fetchVTEX(?:\.ts)?"$/, `"@decocms/apps-vtex/utils/fetch"`],
+  [/^"apps\/vtex\/utils\/client(?:\.ts)?"$/, `"@decocms/apps-vtex/client"`],
+  [/^"apps\/vtex\/utils\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps-vtex/utils/$1"`],
+  [/^"apps\/vtex\/actions\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps-vtex/actions/$1"`],
   // Tier B loader path rewrites (apps-start has no `intelligentSearch/`, `legacy/<file>`, or `paths/` subdirs).
   // Intelligent Search loaders moved to inline-loaders/.
   [
     /^"apps\/vtex\/loaders\/intelligentSearch\/productList(?:\.ts)?"$/,
-    `"@decocms/apps/vtex/inline-loaders/productList"`,
+    `"@decocms/apps-vtex/inline-loaders/productList"`,
   ],
   [
     /^"apps\/vtex\/loaders\/intelligentSearch\/productListingPage(?:\.ts)?"$/,
-    `"@decocms/apps/vtex/inline-loaders/productListingPage"`,
+    `"@decocms/apps-vtex/inline-loaders/productListingPage"`,
   ],
   [
     /^"apps\/vtex\/loaders\/intelligentSearch\/productDetailsPage(?:\.ts)?"$/,
-    `"@decocms/apps/vtex/inline-loaders/productDetailsPage"`,
+    `"@decocms/apps-vtex/inline-loaders/productDetailsPage"`,
   ],
   [
     /^"apps\/vtex\/loaders\/intelligentSearch\/suggestions(?:\.ts)?"$/,
-    `"@decocms/apps/vtex/inline-loaders/suggestions"`,
+    `"@decocms/apps-vtex/inline-loaders/suggestions"`,
   ],
   // Legacy product loaders are consolidated into a single file (named exports).
   [
     /^"apps\/vtex\/loaders\/legacy\/(?:productList|productListingPage|productDetailsPage|search|category)(?:\.ts)?"$/,
-    `"@decocms/apps/vtex/loaders/legacy"`,
+    `"@decocms/apps-vtex/loaders/legacy"`,
   ],
   // Path-default loaders (sitemap seeds) don't exist in TanStack Start — paths resolve at request time.
   [/^"apps\/vtex\/loaders\/paths\/(?:[^"]+)(?:\.ts)?"$/, null],
-  [/^"apps\/vtex\/loaders\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps/vtex/loaders/$1"`],
-  [/^"apps\/vtex\/types(?:\.ts)?"$/, `"@decocms/apps/vtex/types"`],
+  [/^"apps\/vtex\/loaders\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps-vtex/loaders/$1"`],
+  [/^"apps\/vtex\/types(?:\.ts)?"$/, `"@decocms/apps-vtex/types"`],
   [/^"apps\/vtex\/mod(?:\.ts)?"$/, `"~/types/vtex-app"`],
   // Apps — Shopify (hooks, utils, actions, loaders)
-  [/^"apps\/shopify\/hooks\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps/shopify/hooks/$1"`],
-  [/^"apps\/shopify\/utils\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps/shopify/utils/$1"`],
-  [/^"apps\/shopify\/actions\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps/shopify/actions/$1"`],
-  [/^"apps\/shopify\/loaders\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps/shopify/loaders/$1"`],
+  [/^"apps\/shopify\/hooks\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps-shopify/hooks/$1"`],
+  [/^"apps\/shopify\/utils\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps-shopify/utils/$1"`],
+  [/^"apps\/shopify\/actions\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps-shopify/actions/$1"`],
+  [/^"apps\/shopify\/loaders\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps-shopify/loaders/$1"`],
   // Apps — commerce (types, SDK, utils)
-  [/^"apps\/commerce\/sdk\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps/commerce/sdk/$1"`],
-  [/^"apps\/commerce\/utils\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps/commerce/utils/$1"`],
+  [/^"apps\/commerce\/sdk\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps-commerce/sdk/$1"`],
+  [/^"apps\/commerce\/utils\/([^"]+?)(?:\.ts)?"$/, `"@decocms/apps-commerce/utils/$1"`],
 
   // Apps — shared utils (STALE, fetchSafe, createHttpClient, etc.)
   [/^"apps\/utils\/fetch(?:\.ts)?"$/, `"~/lib/fetch-utils"`],
@@ -116,7 +116,7 @@ const IMPORT_RULES: Array<[RegExp, string | null]> = [
   [/^"@std\/crypto"$/, null], // Use globalThis.crypto instead
 
   // site/sdk/* → framework equivalents (before the catch-all site/ → ~/ rule)
-  [/^"site\/sdk\/clx(?:\.tsx?)?.*"$/, `"@decocms/start/sdk/clx"`],
+  [/^"site\/sdk\/clx(?:\.tsx?)?.*"$/, `"@decocms/blocks/sdk/clx"`],
   [/^"site\/sdk\/useId(?:\.tsx?)?.*"$/, `"react"`],
   // useOffer and useVariantPossiblities kept as site files (~/sdk/)
   [/^"site\/sdk\/usePlatform(?:\.tsx?)?.*"$/, null],
@@ -127,10 +127,10 @@ const IMPORT_RULES: Array<[RegExp, string | null]> = [
   [/^"~\/account\.json"$/, `"~/constants/account"`],
 
   // $store/ → ~/ (common Deno import map alias for project root)
-  [/^"\$store\/sdk\/clx(?:\.tsx?)?.*"$/, `"@decocms/start/sdk/clx"`],
+  [/^"\$store\/sdk\/clx(?:\.tsx?)?.*"$/, `"@decocms/blocks/sdk/clx"`],
   [/^"\$store\/sdk\/useId(?:\.tsx?)?.*"$/, `"react"`],
   // useOffer and useVariantPossiblities kept as site files (~/sdk/)
-  [/^"\$store\/sdk\/format(?:\.tsx?)?.*"$/, `"@decocms/apps/commerce/sdk/formatPrice"`],
+  [/^"\$store\/sdk\/format(?:\.tsx?)?.*"$/, `"@decocms/apps-commerce/sdk/formatPrice"`],
   [/^"\$store\/sdk\/usePlatform(?:\.tsx?)?.*"$/, null],
   // islands → components (must be before $store catch-all)
   [/^"\$store\/islands\/ui\/([^"]+?)(?:\.tsx?)?"$/, `"~/components/ui/$1"`],
@@ -141,10 +141,10 @@ const IMPORT_RULES: Array<[RegExp, string | null]> = [
   [/^"\$home\/(.+)"$/, `"~/$1"`],
 
   // site/ → ~/
-  [/^"site\/sdk\/clx(?:\.tsx?)?.*"$/, `"@decocms/start/sdk/clx"`],
+  [/^"site\/sdk\/clx(?:\.tsx?)?.*"$/, `"@decocms/blocks/sdk/clx"`],
   [/^"site\/sdk\/useId(?:\.tsx?)?.*"$/, `"react"`],
   // useOffer and useVariantPossiblities kept as site files (~/sdk/)
-  [/^"site\/sdk\/format(?:\.tsx?)?.*"$/, `"@decocms/apps/commerce/sdk/formatPrice"`],
+  [/^"site\/sdk\/format(?:\.tsx?)?.*"$/, `"@decocms/apps-commerce/sdk/formatPrice"`],
   [/^"site\/sdk\/usePlatform(?:\.tsx?)?.*"$/, null],
   // islands → components (must be before site/ catch-all)
   [/^"site\/islands\/ui\/([^"]+?)(?:\.tsx?)?"$/, `"~/components/ui/$1"`],
@@ -155,10 +155,16 @@ const IMPORT_RULES: Array<[RegExp, string | null]> = [
   [/^"~\/islands\/ui\/([^"]+?)(?:\.tsx?)?"$/, `"~/components/ui/$1"`],
   [/^"~\/islands\/([^"]+?)(?:\.tsx?)?"$/, `"~/components/$1"`],
 
-  // @decocms/apps hooks → local hooks (react-query hooks crash Workers SSR at module eval)
+  // @decocms/apps-vtex hooks → local hooks (react-query hooks crash Workers SSR at module eval)
+  // Pre-7.x monolith path — kept for sites whose Deno import map already
+  // aliased directly to the npm specifier instead of the "apps/vtex/..." form.
   [/^"@decocms\/apps\/vtex\/hooks\/useUser"$/, `"~/hooks/useUser"`],
   [/^"@decocms\/apps\/vtex\/hooks\/useCart"$/, `"~/hooks/useCart"`],
   [/^"@decocms\/apps\/vtex\/hooks\/useWishlist"$/, `"~/hooks/useWishlist"`],
+  // Post-7.x split package path — same rationale, current package name.
+  [/^"@decocms\/apps-vtex\/hooks\/useUser"$/, `"~/hooks/useUser"`],
+  [/^"@decocms\/apps-vtex\/hooks\/useCart"$/, `"~/hooks/useCart"`],
+  [/^"@decocms\/apps-vtex\/hooks\/useWishlist"$/, `"~/hooks/useWishlist"`],
 ];
 
 /**
@@ -167,14 +173,14 @@ const IMPORT_RULES: Array<[RegExp, string | null]> = [
  * The key is the ending of the import path, the value is the replacement specifier.
  */
 const RELATIVE_SDK_REWRITES: Array<[RegExp, string]> = [
-  // sdk/clx → @decocms/start/sdk/clx (framework utility)
-  [/(?:\.\.\/)*sdk\/clx(?:\.tsx?)?$/, "@decocms/start/sdk/clx"],
+  // sdk/clx → @decocms/blocks/sdk/clx (framework utility)
+  [/(?:\.\.\/)*sdk\/clx(?:\.tsx?)?$/, "@decocms/blocks/sdk/clx"],
   // sdk/useId → react (useId is built-in in React 19)
   [/(?:\.\.\/)*sdk\/useId(?:\.tsx?)?$/, "react"],
   // sdk/useOffer — kept as-is (sites customize offer logic)
   // sdk/useVariantPossiblities — kept as-is (sites customize variant logic)
-  // sdk/format → @decocms/apps/commerce/sdk/formatPrice
-  [/(?:\.\.\/)*sdk\/format(?:\.tsx?)?$/, "@decocms/apps/commerce/sdk/formatPrice"],
+  // sdk/format → @decocms/apps-commerce/sdk/formatPrice
+  [/(?:\.\.\/)*sdk\/format(?:\.tsx?)?$/, "@decocms/apps-commerce/sdk/formatPrice"],
   // sdk/usePlatform → remove entirely
   [/(?:\.\.\/)*sdk\/usePlatform(?:\.tsx?)?$/, ""],
   // static/adminIcons → deleted (icon loaders need rewriting)
@@ -234,16 +240,16 @@ export function transformImports(
   /**
    * Post-process: split @deco/deco/hooks imports.
    * In the old stack, @deco/deco/hooks exported useDevice, useScript, useSection, etc.
-   * In @decocms/start, useDevice is at @decocms/start/sdk/useDevice.
+   * In @decocms/blocks, useDevice is at @decocms/blocks/sdk/useDevice.
    * After import rewriting, we need to split lines like:
-   *   import { useDevice, useScript } from "@decocms/start/sdk/useScript"
+   *   import { useDevice, useScript } from "@decocms/blocks/sdk/useScript"
    * into:
-   *   import { useDevice } from "@decocms/start/sdk/useDevice"
-   *   import { useScript } from "@decocms/start/sdk/useScript"
+   *   import { useDevice } from "@decocms/blocks/sdk/useDevice"
+   *   import { useScript } from "@decocms/blocks/sdk/useScript"
    */
   function splitDecoHooksImports(code: string): string {
     return code.replace(
-      /^(import\s+(?:type\s+)?\{)([^}]*\buseDevice\b[^}]*)(\}\s+from\s+["']@decocms\/start\/sdk\/useScript["'];?)$/gm,
+      /^(import\s+(?:type\s+)?\{)([^}]*\buseDevice\b[^}]*)(\}\s+from\s+["']@decocms\/blocks\/sdk\/useScript["'];?)$/gm,
       (_match, _prefix, importList, _suffix) => {
         const items = importList.split(",").map((s: string) => s.trim()).filter(Boolean);
         const deviceItems = items.filter((s: string) => s.includes("useDevice"));
@@ -251,10 +257,10 @@ export function transformImports(
 
         const lines: string[] = [];
         if (deviceItems.length > 0) {
-          lines.push(`import { ${deviceItems.join(", ")} } from "@decocms/start/sdk/useDevice";`);
+          lines.push(`import { ${deviceItems.join(", ")} } from "@decocms/blocks/sdk/useDevice";`);
         }
         if (otherItems.length > 0) {
-          lines.push(`import { ${otherItems.join(", ")} } from "@decocms/start/sdk/useScript";`);
+          lines.push(`import { ${otherItems.join(", ")} } from "@decocms/blocks/sdk/useScript";`);
         }
         return lines.join("\n");
       },
@@ -356,7 +362,7 @@ export function transformImports(
   if (afterSplit !== result) {
     result = afterSplit;
     changed = true;
-    notes.push("Split useDevice into separate import from @decocms/start/sdk/useDevice");
+    notes.push("Split useDevice into separate import from @decocms/blocks/sdk/useDevice");
   }
 
   // Rewrite dynamic imports: route through rewriteSpecifier so sdk-specific

package/scripts/migrate/transforms/section-conventions.ts

@@ -8,7 +8,7 @@ import type { SectionMeta, TransformResult } from "../types";
  * Adds section convention exports (sync, eager, layout, cache)
  * to section files based on metadata extracted during analysis.
  *
- * These exports are read by generate-sections.ts in @decocms/start
+ * These exports are read by generate-sections.ts in @decocms/blocks-cli
  * to build the sections.gen.ts registry.
  *
  * The set of section *names* that get hints applied is configurable

package/scripts/migrate/types.ts

@@ -122,7 +122,7 @@ export interface LoaderInfo {
   hasCache: boolean;
   /** Has export const cacheKey */
   hasCacheKey: boolean;
-  /** Maps to a known @decocms/apps equivalent */
+  /** Maps to a known @decocms/apps-* equivalent */
   appsEquivalent: string | null;
   /** Is a custom loader that needs dynamic import in commerce-loaders */
   isCustom: boolean;

package/scripts/migrate-post-cleanup.ts

@@ -8,8 +8,8 @@
  * but turns it into something CI can actually run.
  *
  * Usage (from a migrated site directory):
- *   npx -p @decocms/start deco-post-cleanup
- *   npx -p @decocms/start deco-post-cleanup --json
+ *   npx -p @decocms/blocks-cli deco-post-cleanup
+ *   npx -p @decocms/blocks-cli deco-post-cleanup --json
  *
  * Options:
  *   --source <dir>   Site directory to audit (default: current directory)
@@ -65,13 +65,13 @@ function parseArgs(args: string[]): CliOpts {
 
 function showHelp() {
   console.log(`
-  @decocms/start — Post-Migration Cleanup Audit
+  @decocms/blocks-cli — Post-Migration Cleanup Audit
 
   Scans a migrated site for dead code and obsolete boilerplate that the
   framework now owns. Read-only — prints findings, does not modify files.
 
   Usage:
-    npx -p @decocms/start deco-post-cleanup [options]
+    npx -p @decocms/blocks-cli deco-post-cleanup [options]
 
   Options:
     --source <dir>   Site directory to audit (default: .)
@@ -88,10 +88,10 @@ function showHelp() {
     --help, -h       Show this help
 
   Examples:
-    npx -p @decocms/start deco-post-cleanup
-    npx -p @decocms/start deco-post-cleanup --source ./my-site --json
-    npx -p @decocms/start deco-post-cleanup --fix
-    npx -p @decocms/start deco-post-cleanup --fix --strict   # fail CI if anything left
+    npx -p @decocms/blocks-cli deco-post-cleanup
+    npx -p @decocms/blocks-cli deco-post-cleanup --source ./my-site --json
+    npx -p @decocms/blocks-cli deco-post-cleanup --fix
+    npx -p @decocms/blocks-cli deco-post-cleanup --fix --strict   # fail CI if anything left
 
   See: .agents/skills/deco-to-tanstack-migration/references/post-migration-cleanup.md
   `);