nextjs-cms 0.9.21 → 0.9.23

package/dist/api/utils/lazy-caller-proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lazy-caller-proxy.d.ts","sourceRoot":"","sources":["../../../src/api/utils/lazy-caller-proxy.ts"],"names":[],"mappings":"AAWA,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAyBzF"}

package/dist/api/utils/lazy-caller-proxy.js

@@ -0,0 +1,36 @@
+const resolveCallerPath = (root, path) => {
+    let current = root;
+    for (const key of path) {
+        if (!current || (typeof current !== 'object' && typeof current !== 'function')) {
+            return undefined;
+        }
+        current = current[key];
+    }
+    return current;
+};
+export function createLazyCallerProxy(getCaller) {
+    const callProcedure = async (path, args) => {
+        const caller = await getCaller();
+        const proc = resolveCallerPath(caller, path);
+        if (typeof proc !== 'function') {
+            throw new Error(`tRPC procedure not found: ${path.join('.')}`);
+        }
+        return proc(...args);
+    };
+    const createCallerProxy = (path = []) => {
+        const proxyTarget = (...args) => callProcedure(path, args);
+        return new Proxy(proxyTarget, {
+            get(_target, prop) {
+                if (prop === 'then')
+                    return undefined;
+                if (typeof prop !== 'string')
+                    return undefined;
+                return createCallerProxy([...path, prop]);
+            },
+            apply(_target, _thisArg, args) {
+                return callProcedure(path, args);
+            },
+        });
+    };
+    return createCallerProxy();
+}

package/dist/api/utils/router-types.d.ts

@@ -0,0 +1,7 @@
+import type { AnyRouter } from '@trpc/server';
+import type { CoreRouters } from '../root.js';
+export type RouterRecord = Record<string, AnyRouter>;
+export type NonConflictingRouterRecord<TUser extends RouterRecord> = Extract<keyof TUser, keyof CoreRouters> extends never ? TUser : {
+    [K in keyof TUser]: K extends keyof CoreRouters ? never : TUser[K];
+};
+//# sourceMappingURL=router-types.d.ts.map

package/dist/api/utils/router-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"router-types.d.ts","sourceRoot":"","sources":["../../../src/api/utils/router-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAE7C,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;AAEpD,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,YAAY,IAC7D,OAAO,CAAC,MAAM,KAAK,EAAE,MAAM,WAAW,CAAC,SAAS,KAAK,GAC/C,KAAK,GACL;KACK,CAAC,IAAI,MAAM,KAAK,GAAG,CAAC,SAAS,MAAM,WAAW,GAAG,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC;CACrE,CAAA"}

package/dist/auth/hooks/index.d.ts

@@ -1,4 +1,3 @@
-import useAxiosPrivate from './useAxiosPrivate.js';
 import useRefreshToken from './useRefreshToken.js';
-export { useAxiosPrivate, useRefreshToken };
+export { useRefreshToken };
 //# sourceMappingURL=index.d.ts.map

package/dist/auth/hooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/auth/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAClD,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/auth/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,eAAe,EAAE,CAAA"}

package/dist/auth/hooks/index.js

@@ -1,3 +1,2 @@
-import useAxiosPrivate from './useAxiosPrivate.js';
 import useRefreshToken from './useRefreshToken.js';
-export { useAxiosPrivate, useRefreshToken };
+export { useRefreshToken };

package/dist/auth/react.d.ts

@@ -3,7 +3,7 @@
  */
 import * as React from 'react';
 import type { Session } from './index.js';
-import useAxiosPrivate from './hooks/useAxiosPrivate.js';
+import useAxiosPrivate from '../api/use-axios-private.js';
 import useRefreshToken from './hooks/useRefreshToken.js';
 export type UpdateSession = (data?: any) => Promise<Session | null>;
 export interface SessionProviderProps {
@@ -109,5 +109,4 @@ export declare function useSession<R extends boolean>(options?: UseSessionOption
  */
 export declare function SessionProvider(props: SessionProviderProps): React.JSX.Element;
 export { useAxiosPrivate, useRefreshToken };
-export { refreshTokenLink } from './trpc';
 //# sourceMappingURL=react.d.ts.map

package/dist/auth/react.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"react.d.ts","sourceRoot":"","sources":["../../src/auth/react.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"react.d.ts","sourceRoot":"","sources":["../../src/auth/react.tsx"],"names":[],"mappings":"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"}

package/dist/auth/react.js

@@ -5,7 +5,7 @@
 import * as React from 'react';
 import { fetchData, now, useOnline } from './lib/client.js';
 import { useRouter } from 'next/navigation';
-import useAxiosPrivate from './hooks/useAxiosPrivate.js';
+import useAxiosPrivate from '../api/use-axios-private.js';
 import useRefreshToken from './hooks/useRefreshToken.js';
 import { setLoginPageLanguageCookie, clearLanguageChangedOnLogin } from '../translations/language-cookie.js';
 export const __AUTH = {
@@ -378,4 +378,3 @@ export function SessionProvider(props) {
     return React.createElement(SessionContext.Provider, { value: value }, children);
 }
 export { useAxiosPrivate, useRefreshToken };
-export { refreshTokenLink } from './trpc';

package/dist/auth/trpc.d.ts

@@ -2,5 +2,5 @@ import type { TRPCLink } from '@trpc/client';
 /**
  * tRPC link that refreshes the token if it's expired
  */
-export declare const refreshTokenLink: () => TRPCLink</*AppRouter*/ any>;
+export declare const refreshTokenLink: () => TRPCLink<any>;
 //# sourceMappingURL=trpc.d.ts.map

package/dist/auth/trpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trpc.d.ts","sourceRoot":"","sources":["../../src/auth/trpc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAM5C;;GAEG;AACH,eAAO,MAAM,gBAAgB,QAAO,QAAQ,CAAC,aAAa,CAAC,GAAG,CA6E7D,CAAA"}
+{"version":3,"file":"trpc.d.ts","sourceRoot":"","sources":["../../src/auth/trpc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAK5C;;GAEG;AACH,eAAO,MAAM,gBAAgB,QAAO,QAAQ,CAAC,GAAG,CA6E/C,CAAA"}

package/dist/auth/trpc.js

@@ -1,5 +1,4 @@
 import { observable } from '@trpc/server/observable';
-// import type { AppRouter } from '../api'
 import { logout, refreshSession } from './react.js';
 /**
  * tRPC link that refreshes the token if it's expired

package/dist/cli/lib/fix-master-admin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix-master-admin.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/fix-master-admin.ts"],"names":[],"mappings":"AAEA,wBAAsB,wBAAwB,kBA2D7C"}
+{"version":3,"file":"fix-master-admin.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/fix-master-admin.ts"],"names":[],"mappings":"AAGA,wBAAsB,wBAAwB,kBAyC7C"}

package/dist/cli/lib/fix-master-admin.js

@@ -1,11 +1,10 @@
-import { getPluginRoutes } from '../../plugins/server.js';
+import { derivePluginName } from '../../plugins/derive.js';
+import { getCMSConfig } from '../../core/config/index.js';
 export async function fixMasterAdminPrivileges() {
     // Lazy import heavy dependencies to avoid eager database connection initialization
     const { SectionFactory } = await import('../../core/factories/index.js');
     const { db } = await import('../../db/client.js');
     const { AdminPrivilegesTable } = await import('../../db/schema.js');
-    // Let's also add privileges for all the sections to the master admin
-    // Loop through the sections to get the section ids for the insertion into the admin_privileges table
     const sections = await SectionFactory.getSectionsSilently();
     const rows = sections.map((section) => ({
         adminId: '1',
@@ -13,33 +12,21 @@ export async function fixMasterAdminPrivileges() {
         operations: 'CUD',
         publisher: '1',
     }));
-    const pluginRoutes = await getPluginRoutes();
-    const pluginNames = new Set(pluginRoutes.map((route) => {
-        return route.pluginName;
-    }));
-    pluginNames.forEach((pluginName) => {
+    // Plugin names are derived from their npm package name — no plugin code is
+    // evaluated, so the CLI never enters server-only-marked import chains.
+    const config = await getCMSConfig();
+    for (const registration of config.plugins ?? []) {
+        if (!registration.package)
+            continue;
         rows.push({
             adminId: '1',
-            sectionName: pluginName,
+            sectionName: derivePluginName(registration.package),
             operations: 'CUD',
             publisher: '1',
         });
-    });
-    /**
-     * Add the admins and logs sections to the privileges
-     */
-    rows.push({
-        adminId: '1',
-        sectionName: 'admins',
-        operations: 'CUD',
-        publisher: '1',
-    });
-    rows.push({
-        adminId: '1',
-        sectionName: 'log',
-        operations: 'CUD',
-        publisher: '1',
-    });
+    }
+    rows.push({ adminId: '1', sectionName: 'admins', operations: 'CUD', publisher: '1' });
+    rows.push({ adminId: '1', sectionName: 'log', operations: 'CUD', publisher: '1' });
     await db
         .insert(AdminPrivilegesTable)
         .values(rows)

package/dist/cli/lib/update-sections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-sections.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/update-sections.ts"],"names":[],"mappings":"AAmzEA,wBAAsB,cAAc,CAAC,SAAS,UAAQ,iBAoBrD"}
+{"version":3,"file":"update-sections.d.ts","sourceRoot":"","sources":["../../../src/cli/lib/update-sections.ts"],"names":[],"mappings":"AAw3EA,wBAAsB,cAAc,CAAC,SAAS,UAAQ,iBAoBrD"}

package/dist/cli/lib/update-sections.js

@@ -192,7 +192,12 @@ function generateFieldSQL(input) {
     else if (!input.defaultValue) {
         fieldSQL += ' DEFAULT NULL';
     }
-    if (input.defaultValue !== null && input.defaultValue !== undefined) {
+    if (input.defaultValue !== null && input.defaultValue !== undefined && input.required) {
+        // Only add sql default when the field is required,
+        // to allow null values in non-required fields
+        // with defaultValue prop set.
+        // Example: Admin cleared the defaultValue of
+        // non-required field and submits.
         fieldSQL += ` DEFAULT '${input.defaultValue}'`;
     }
     return fieldSQL;
@@ -383,6 +388,40 @@ function buildLocaleFieldConfig() {
         order: 0,
     });
 }
+async function createEditorPhotosTable(localized) {
+    await db.execute(sql `
+        CREATE TABLE IF NOT EXISTS \`editor_photos\` (
+            \`photo\` VARCHAR(100) NOT NULL PRIMARY KEY,
+            \`section\` VARCHAR(100) NOT NULL,
+            \`item_id\` VARCHAR(50) NOT NULL,
+            \`field\` VARCHAR(100) NOT NULL,
+            \`meta\` LONGTEXT,
+            ${localized ? sql `\`locale\` VARCHAR(10) NOT NULL,` : sql ``}
+            \`linked\` BOOLEAN DEFAULT false,
+            \`created_at\` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+        )
+    `);
+}
+async function ensureEditorPhotosLocaleColumn(defaultLocaleCode, knownColumns) {
+    let columns = knownColumns ?? (await MysqlTableChecker.getColumns('editor_photos').catch(() => []));
+    if (columns.includes('locale')) {
+        return false;
+    }
+    if (columns.length === 0) {
+        await createEditorPhotosTable(true);
+        columns = await MysqlTableChecker.getColumns('editor_photos').catch(() => []);
+        if (columns.includes('locale')) {
+            log.info(chalk.gray(`  - Created 'editor_photos' table with 'locale' column.`));
+            return true;
+        }
+        throw new Error(`Failed to create 'editor_photos' table with a 'locale' column.`);
+    }
+    await db.execute(sql `ALTER TABLE \`editor_photos\` ADD COLUMN \`locale\` VARCHAR(10) DEFAULT NULL`);
+    await db.execute(sql `UPDATE \`editor_photos\` SET \`locale\` = ${defaultLocaleCode} WHERE \`locale\` IS NULL`);
+    await db.execute(sql `ALTER TABLE \`editor_photos\` MODIFY COLUMN \`locale\` VARCHAR(10) NOT NULL`);
+    log.info(chalk.gray(`  - Added 'locale' column to 'editor_photos' and backfilled existing rows with '${defaultLocaleCode}'.`));
+    return true;
+}
 async function ensureTableRegistryEntry(tableName, sectionName) {
     await db
         .insert(NextJsCmsTablesTable)
@@ -954,22 +993,22 @@ const main = async (s) => {
      * Let's see if the table `__nextjs_cms_tables` exists in the database.
      * If it doesn't, we'll create it using the same schema as `NextJsCmsTablesTable`.
      */
-    await db.execute(sql `
-            CREATE TABLE IF NOT EXISTS __nextjs_cms_tables (
-                name VARCHAR(100) NOT NULL PRIMARY KEY,
-                section VARCHAR(200),
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
-            )
+    await db.execute(sql `
+            CREATE TABLE IF NOT EXISTS __nextjs_cms_tables (
+                name VARCHAR(100) NOT NULL PRIMARY KEY,
+                section VARCHAR(200),
+                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+            )
         `);
     /**
      * Persistent key/value store for CMS-level state that must survive config removal.
      */
-    await db.execute(sql `
-            CREATE TABLE IF NOT EXISTS __nextjs_cms_config (
-                \`key\` VARCHAR(100) NOT NULL PRIMARY KEY,
-                \`value\` LONGTEXT,
-                updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
-            )
+    await db.execute(sql `
+            CREATE TABLE IF NOT EXISTS __nextjs_cms_config (
+                \`key\` VARCHAR(100) NOT NULL PRIMARY KEY,
+                \`value\` LONGTEXT,
+                updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+            )
         `);
     await db.execute(sql `ALTER TABLE \`__nextjs_cms_config\` MODIFY COLUMN \`value\` LONGTEXT`);
     /**
@@ -987,46 +1026,54 @@ const main = async (s) => {
      */
     const RESERVED_TABLE_SUFFIX = '_locales';
     const RESERVED_COLUMN_NAME = 'locale';
-    const reservedNameErrors = [];
+    const configurationErrors = [];
+    const builtSections = sections.map((_s) => {
+        const section = _s.build();
+        section.buildFields();
+        return section;
+    });
+    const managedSectionTables = new Map(builtSections.map((section) => [section.db.table, section.name]));
     /**
      * Insert the sections into the database
      */
-    for (const _s of sections) {
-        const s = _s.build();
-        s.buildFields();
+    for (const s of builtSections) {
         localesTableAssetMetadata.set(s.localesTableName, {
             sectionName: s.name,
             fields: getLocalizedAssetFields(s.fieldConfigs),
         });
         if (s.db.table.endsWith(RESERVED_TABLE_SUFFIX)) {
-            reservedNameErrors.push(`Section '${s.name}': table name '${s.db.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
+            configurationErrors.push(`Section '${s.name}': table name '${s.db.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
         }
         for (const field of s.fields) {
             if (field.name === RESERVED_COLUMN_NAME) {
-                reservedNameErrors.push(`Section '${s.name}', field '${field.name}': field name '${RESERVED_COLUMN_NAME}' is reserved.`);
+                configurationErrors.push(`Section '${s.name}', field '${field.name}': field name '${RESERVED_COLUMN_NAME}' is reserved.`);
             }
             if (field.destinationDb) {
                 if (field.destinationDb.table.endsWith(RESERVED_TABLE_SUFFIX)) {
-                    reservedNameErrors.push(`Section '${s.name}', field '${field.name}': destinationDb.table '${field.destinationDb.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
+                    configurationErrors.push(`Section '${s.name}', field '${field.name}': destinationDb.table '${field.destinationDb.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
                 }
                 if (field.destinationDb.itemIdentifier === RESERVED_COLUMN_NAME ||
                     field.destinationDb.selectIdentifier === RESERVED_COLUMN_NAME) {
-                    reservedNameErrors.push(`Section '${s.name}', field '${field.name}': destinationDb identifier column name '${RESERVED_COLUMN_NAME}' is reserved.`);
+                    configurationErrors.push(`Section '${s.name}', field '${field.name}': destinationDb identifier column name '${RESERVED_COLUMN_NAME}' is reserved.`);
                 }
             }
             if (isExternalSelectDbField(field)) {
+                const ownerSectionName = managedSectionTables.get(field.db.table);
+                if (ownerSectionName) {
+                    configurationErrors.push(`Section '${s.name}', field '${field.name}': db.table '${field.db.table}' belongs to managed section '${ownerSectionName}'. Use the 'section' prop instead of 'db' so update-sections does not treat the section table as an external lookup table.`);
+                }
                 if (field.db.table.endsWith(RESERVED_TABLE_SUFFIX)) {
-                    reservedNameErrors.push(`Section '${s.name}', field '${field.name}': db.table '${field.db.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
+                    configurationErrors.push(`Section '${s.name}', field '${field.name}': db.table '${field.db.table}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
                 }
                 const reservedColumns = [field.db.identifier, field.db.label, field.db.orderBy].filter((column) => column === RESERVED_COLUMN_NAME);
                 if (reservedColumns.length > 0) {
-                    reservedNameErrors.push(`Section '${s.name}', field '${field.name}': db column name '${RESERVED_COLUMN_NAME}' is reserved.`);
+                    configurationErrors.push(`Section '${s.name}', field '${field.name}': db column name '${RESERVED_COLUMN_NAME}' is reserved.`);
                 }
             }
         }
         const galleryForValidation = await s.getGallery();
         if (galleryForValidation?.db.tableName && galleryForValidation.db.tableName.endsWith(RESERVED_TABLE_SUFFIX)) {
-            reservedNameErrors.push(`Section '${s.name}': gallery table '${galleryForValidation.db.tableName}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
+            configurationErrors.push(`Section '${s.name}': gallery table '${galleryForValidation.db.tableName}' ends with reserved suffix '${RESERVED_TABLE_SUFFIX}'.`);
         }
         /**
          * Generate the Drizzle schema for the table
@@ -1335,13 +1382,13 @@ const main = async (s) => {
         }
     }
     /**
-     * Reject the run before any DB write if any section used a reserved name.
+     * Reject the run before schema writes if any section configuration is unsafe.
      */
-    if (reservedNameErrors.length > 0) {
-        s.stop(`update-sections aborted: ${reservedNameErrors.length} reserved-name conflict(s) detected.\n` +
-            reservedNameErrors.map((e) => `  - ${e}`).join('\n') +
-            `\n\nThe suffix '${RESERVED_TABLE_SUFFIX}' and the column name '${RESERVED_COLUMN_NAME}' are reserved for the localization system. Please rename and re-run.`);
-        throw new Error('update-sections: reserved name conflicts detected');
+    if (configurationErrors.length > 0) {
+        s.stop(`update-sections aborted: ${configurationErrors.length} configuration conflict(s) detected.\n` +
+            configurationErrors.map((e) => `  - ${e}`).join('\n') +
+            `\n\nThe suffix '${RESERVED_TABLE_SUFFIX}' and the column name '${RESERVED_COLUMN_NAME}' are reserved for the localization system. Section-managed tables must be referenced with the 'section' prop. Please update cms.config.ts and re-run.`);
+        throw new Error('update-sections: configuration conflicts detected');
     }
     /**
      * Write schema file if schema generation is enabled
@@ -1423,6 +1470,7 @@ const main = async (s) => {
     if (localizationCurrentlyEnabled && cmsConfig.localization) {
         const configLocalizationState = buildStoredEnabledLocalizationState(cmsConfig.localization);
         enableTargetState = configLocalizationState;
+        const storedPendingDisableLocalizationState = storedEnabledLocalizationState?.transition?.type === 'disable' ? storedEnabledLocalizationState : null;
         if (storedEnabledLocalizationState &&
             storedEnabledLocalizationState.defaultLocale !== configLocalizationState.defaultLocale) {
             s.stop(`Aborting. Changing localization defaultLocale is not supported (stored='${storedEnabledLocalizationState.defaultLocale}', config='${configLocalizationState.defaultLocale}'). Revert cms.config.ts and re-run update-sections.`);
@@ -1451,18 +1499,23 @@ const main = async (s) => {
             }
         }
         const needsEditorPhotosMigration = editorPhotosExists && !editorPhotosHasLocale;
-        const shouldRunEnableTransition = storedPendingEnableLocalizationState || !storedEnabledLocalizationState;
+        const shouldRunEnableTransition = storedPendingEnableLocalizationState ||
+            !storedEnabledLocalizationState ||
+            storedPendingDisableLocalizationState;
         if (shouldRunEnableTransition) {
             const affectedList = [...(needsEditorPhotosMigration ? ['editor_photos'] : []), ...affectedLocalizedTables];
             const affectedListText = affectedList.length > 0
                 ? affectedList.map((n) => `  - ${n}`).join('\n')
                 : `  - No existing tables need a locale backfill; update-sections will verify localized tables after sync.`;
             const isEnableRetry = storedPendingEnableLocalizationState?.transition.status === 'pending';
+            const isDisableRecovery = storedPendingDisableLocalizationState?.transition?.status === 'pending';
             s.stop();
             const confirm = await select({
-                message: (isEnableRetry
-                    ? `A previous localization enable attempt did not complete. update-sections will retry setup now.\n\n`
-                    : `It looks like you enabled localization. Your existing data in these tables will be marked as defaultLocale '${configLocalizationState.defaultLocale}':\n`) +
+                message: (isDisableRecovery
+                    ? `A previous localization disable attempt did not complete, but cms.config.ts has localization enabled again. update-sections will repair localization artifacts and clear the pending disable state after verification.\n\n`
+                    : isEnableRetry
+                        ? `A previous localization enable attempt did not complete. update-sections will retry setup now.\n\n`
+                        : `It looks like you enabled localization. Your existing data in these tables will be marked as defaultLocale '${configLocalizationState.defaultLocale}':\n`) +
                     affectedListText +
                     `\n\n${chalk.redBright('WARNING:')} Existing data in these tables MUST already be in '${configLocalizationState.defaultLocale}'. ` +
                     `Changing defaultLocale after this point is not supported. If your data is not in '${configLocalizationState.defaultLocale}', ` +
@@ -1483,22 +1536,12 @@ const main = async (s) => {
                 type: 'enable',
                 status: 'pending',
                 startedAt: storedPendingEnableLocalizationState?.transition.startedAt ?? now,
-                ...(isEnableRetry ? { lastAttemptAt: now } : {}),
+                ...(isEnableRetry || isDisableRecovery ? { lastAttemptAt: now } : {}),
             });
             await writeStoredLocalizationState(enablePendingState);
-            if (needsEditorPhotosMigration) {
-                try {
-                    await db.execute(sql `ALTER TABLE \`editor_photos\` ADD COLUMN \`locale\` VARCHAR(10) DEFAULT NULL`);
-                    await db.execute(sql `UPDATE \`editor_photos\` SET \`locale\` = ${configLocalizationState.defaultLocale} WHERE \`locale\` IS NULL`);
-                    await db.execute(sql `ALTER TABLE \`editor_photos\` MODIFY COLUMN \`locale\` VARCHAR(10) NOT NULL`);
-                    log.info(chalk.gray(`  - Added 'locale' column to 'editor_photos' and backfilled existing rows with '${configLocalizationState.defaultLocale}'.`));
-                }
-                catch (error) {
-                    console.error(chalk.red(`  - Error migrating 'editor_photos' for localization enable:`, error));
-                }
-            }
             s.start();
         }
+        await ensureEditorPhotosLocaleColumn(configLocalizationState.defaultLocale, editorPhotosColumns);
     }
     else if (!localizationCurrentlyEnabled && storedEnabledLocalizationState) {
         /**
@@ -1534,6 +1577,7 @@ const main = async (s) => {
                 `  3. Drop '_locales' tables entirely\n\n` +
                 `Affected tables:\n` +
                 affected.map((t) => `  - ${t.name} (${t.type})`).join('\n') +
+                `\n\n${chalk.redBright('WARNING: This action is irreversible and will permanently delete data and affected tables. It is recommended to make a backup of your data before proceeding.')}` +
                 `\n\nProceed?`,
             options: [
                 { value: 'yes', label: `Yes, that's correct` },