storyblok 4.19.2 → 4.20.0-alpha.1

package/dist/index.mjs

@@ -26,6 +26,7 @@ import { Octokit } from 'octokit';
 import { pipeline as pipeline$1 } from 'node:stream/promises';
 import { Buffer } from 'node:buffer';
 import Storyblok from 'storyblok-js-client';
+import { createTwoFilesPatch } from 'diff';
 
 const commands = {
   LOGIN: "login",
@@ -41,7 +42,8 @@ const commands = {
   LOGS: "logs",
   REPORTS: "reports",
   ASSETS: "assets",
-  STORIES: "stories"
+  STORIES: "stories",
+  SCHEMA: "schema"
 };
 const colorPalette = {
   PRIMARY: "#8d60ff",
@@ -61,7 +63,8 @@ const colorPalette = {
   LOGS: "#4ade80",
   REPORTS: "#4ade80",
   ASSETS: "#f97316",
-  STORIES: "#a185ff"
+  STORIES: "#a185ff",
+  SCHEMA: "#e91e63"
 };
 const regions = {
   EU: "eu",
@@ -695,6 +698,8 @@ const API_ACTIONS = {
   pull_component_internal_tags: "Failed to pull component internal tags",
   push_component: "Failed to push component",
   push_component_group: "Failed to push component group",
+  push_component_folder: "Failed to create component folder",
+  delete_component_folder: "Failed to delete component folder",
   push_component_preset: "Failed to push component preset",
   push_component_internal_tag: "Failed to push component internal tag",
   update_component: "Failed to update component",
@@ -702,6 +707,7 @@ const API_ACTIONS = {
   update_component_group: "Failed to update component group",
   update_component_preset: "Failed to update component preset",
   delete_component_preset: "Failed to delete component preset",
+  delete_component: "Failed to delete component",
   pull_stories: "Failed to pull stories",
   pull_story: "Failed to pull story",
   create_story: "Failed to create story",
@@ -729,6 +735,8 @@ const API_ACTIONS = {
   push_datasource: "Failed to push datasource",
   update_datasource: "Failed to update datasource",
   delete_datasource: "Failed to delete datasource",
+  push_datasource_entry: "Failed to push datasource entry",
+  update_datasource_entry: "Failed to update datasource entry",
   delete_datasource_entry: "Failed to delete datasource entry",
   create_space: "Failed to create space",
   pull_spaces: "Failed to pull spaces",
@@ -800,7 +808,11 @@ class APIError extends Error {
     if (this.code === 422) {
       const responseData = this.response?.data;
       if (responseData?.name?.[0] === "has already been taken") {
-        this.message = "A component with this name already exists";
+        if (action === "push_component_folder") {
+          this.message = "A component folder with this name already exists";
+        } else if (action === "push_component" || action === "update_component") {
+          this.message = "A component with this name already exists";
+        }
       }
       Object.entries(responseData || {}).forEach(([key, errors]) => {
         if (Array.isArray(errors)) {
@@ -1078,6 +1090,7 @@ function maskToken(token) {
   const maskedPart = "*".repeat(token.length - 4);
   return `${visiblePart}${maskedPart}`;
 }
+const slugify = (text) => text.toString().toLowerCase().replace(/\s+/g, "-").replace(/[^\w-]+/g, "").replace(/-{2,}/g, "-").replace(/^-+/, "").replace(/-+$/, "");
 function createRegexFromGlob(pattern) {
   return new RegExp(`^${pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/\\\*/g, ".*")}$`);
 }
@@ -1159,6 +1172,25 @@ function getPackageJson() {
   return packageJson$1;
 }
 
+async function fetchAllPages(fetchFunction, extractDataFunction) {
+  const items = [];
+  let page = 1;
+  while (true) {
+    const { data, response } = await fetchFunction(page);
+    const totalHeader = response.headers.get("total");
+    const fetchedItems = extractDataFunction(data);
+    items.push(...fetchedItems);
+    if (!totalHeader) {
+      return items;
+    }
+    const total = Number(totalHeader);
+    if (Number.isNaN(total) || items.length >= total || fetchedItems.length === 0) {
+      return items;
+    }
+    page++;
+  }
+}
+
 const __filename$1 = fileURLToPath(import.meta.url);
 const __dirname$1 = dirname(__filename$1);
 function isRegion(value) {
@@ -1247,6 +1279,10 @@ class UI {
       this.br();
     }
   }
+  /** Plain console.log passthrough — use for preformatted or multi-line text. */
+  log(message) {
+    this.console?.log(message);
+  }
   list(items) {
     for (const item of items) {
       this.console?.log(`  ${item}`);
@@ -2164,14 +2200,14 @@ async function performInteractiveLogin(options) {
   }
 }
 
-const program$e = getProgram();
+const program$f = getProgram();
 const allRegionsText = Object.values(regions).join(",");
-program$e.command(commands.LOGIN).description("Login to the Storyblok CLI").option("-t, --token <token>", "Token to login directly without questions, like for CI environments").option(
+program$f.command(commands.LOGIN).description("Login to the Storyblok CLI").option("-t, --token <token>", "Token to login directly without questions, like for CI environments").option(
   "-r, --region <region>",
   `The region you would like to work in. Please keep in mind that the region must match the region of your space. This region flag will be used for the other cli's commands. You can use the values: ${allRegionsText}.`
 ).action(async (options) => {
   konsola.title(`${commands.LOGIN}`, colorPalette.LOGIN);
-  const verbose = program$e.opts().verbose;
+  const verbose = program$f.opts().verbose;
   const { token, region } = options;
   const { state, updateSession, persistCredentials } = session();
   if (state.isLoggedIn && !state.envLogin) {
@@ -2229,10 +2265,10 @@ program$e.command(commands.LOGIN).description("Login to the Storyblok CLI").opti
   konsola.br();
 });
 
-const program$d = getProgram();
-program$d.command(commands.LOGOUT).description("Logout from the Storyblok CLI").action(async () => {
+const program$e = getProgram();
+program$e.command(commands.LOGOUT).description("Logout from the Storyblok CLI").action(async () => {
   konsola.title(`${commands.LOGOUT}`, colorPalette.LOGOUT);
-  const verbose = program$d.opts().verbose;
+  const verbose = program$e.opts().verbose;
   try {
     const { state } = session();
     if (!state.isLoggedIn || !state.password || !state.region) {
@@ -2279,10 +2315,10 @@ async function openSignupInBrowser(url) {
   }
 }
 
-const program$c = getProgram();
-program$c.command(commands.SIGNUP).description("Sign up for Storyblok").action(async () => {
+const program$d = getProgram();
+program$d.command(commands.SIGNUP).description("Sign up for Storyblok").action(async () => {
   konsola.title(`${commands.SIGNUP}`, colorPalette.SIGNUP);
-  const verbose = program$c.opts().verbose;
+  const verbose = program$d.opts().verbose;
   const { state } = session();
   if (state.isLoggedIn && !state.envLogin) {
     konsola.ok(`You are already logged in. If you want to signup with a different account, please logout first.`);
@@ -2303,10 +2339,10 @@ program$c.command(commands.SIGNUP).description("Sign up for Storyblok").action(a
   konsola.br();
 });
 
-const program$b = getProgram();
-program$b.command(commands.USER).description("Get the current user").action(async () => {
+const program$c = getProgram();
+program$c.command(commands.USER).description("Get the current user").action(async () => {
   konsola.title(`${commands.USER}`, colorPalette.USER);
-  const verbose = program$b.opts().verbose;
+  const verbose = program$c.opts().verbose;
   const { state } = session();
   if (!requireAuthentication(state)) {
     return;
@@ -2334,10 +2370,10 @@ program$b.command(commands.USER).description("Get the current user").action(asyn
   konsola.br();
 });
 
-const program$a = getProgram();
-const componentsCommand = program$a.command(commands.COMPONENTS).alias("comp").description(`Manage your space's block schema`);
+const program$b = getProgram();
+const componentsCommand = program$b.command(commands.COMPONENTS).alias("comp").description(`Manage your space's block schema`);
 
-function isComponent(item) {
+function isComponent$1(item) {
   return "schema" in item;
 }
 function isPreset(item) {
@@ -2371,7 +2407,7 @@ async function loadComponents(directoryPath, options) {
           throw new Error('Internal tag is missing "id"!');
         }
         tagMap.set(item.id, item);
-      } else if (isComponent(item)) {
+      } else if (isComponent$1(item)) {
         const existing = componentMap.get(item.name);
         if (existing) {
           duplicates.push(`Component "${item.name}" found in both "${existing.file}" and "${file}"`);
@@ -2407,44 +2443,20 @@ To fix this, either:
 }
 
 const DEFAULT_COMPONENTS_FILENAME = "components";
-const DEFAULT_GROUPS_FILENAME = "groups";
+const DEFAULT_GROUPS_FILENAME$1 = "groups";
 const DEFAULT_PRESETS_FILENAME = "presets";
 const DEFAULT_TAGS_FILENAME = "tags";
 
-async function fetchAllPages(fetchFunction, extractDataFunction) {
-  const items = [];
-  let page = 1;
-  while (true) {
-    const { data, response } = await fetchFunction(page);
-    const totalHeader = response.headers.get("total");
-    const fetchedItems = extractDataFunction(data);
-    items.push(...fetchedItems);
-    if (!totalHeader) {
-      return items;
-    }
-    const total = Number(totalHeader);
-    if (Number.isNaN(total) || items.length >= total || fetchedItems.length === 0) {
-      return items;
-    }
-    page++;
-  }
-}
-
 const fetchComponents = async (spaceId) => {
   try {
     const client = getMapiClient();
-    return await fetchAllPages(
-      (page) => client.components.list({
-        path: {
-          space_id: Number(spaceId)
-        },
-        query: {
-          page
-        },
-        throwOnError: true
-      }),
-      (data) => data?.components ?? []
-    );
+    const { data } = await client.components.list({
+      path: {
+        space_id: Number(spaceId)
+      },
+      throwOnError: true
+    });
+    return data?.components ?? [];
   } catch (error) {
     handleAPIError("pull_components", error);
   }
@@ -2452,19 +2464,16 @@ const fetchComponents = async (spaceId) => {
 const fetchComponent = async (spaceId, componentName) => {
   try {
     const client = getMapiClient();
-    const matches = await fetchAllPages(
-      (page) => client.components.list({
-        path: {
-          space_id: Number(spaceId)
-        },
-        query: {
-          page,
-          search: componentName
-        },
-        throwOnError: true
-      }),
-      (data) => data?.components ?? []
-    );
+    const { data } = await client.components.list({
+      path: {
+        space_id: Number(spaceId)
+      },
+      query: {
+        search: componentName
+      },
+      throwOnError: true
+    });
+    const matches = data?.components ?? [];
     return matches.find((c) => c.name === componentName);
   } catch (error) {
     handleAPIError("pull_components", error, `Failed to fetch component ${componentName}`);
@@ -2531,7 +2540,7 @@ const saveComponentsToFiles = async (space, spaceData, options) => {
           const presetsFilePath = join(resolvedPath, suffix ? `${sanitizedName}.${DEFAULT_PRESETS_FILENAME}.${suffix}.json` : `${sanitizedName}.${DEFAULT_PRESETS_FILENAME}.json`);
           await saveToFile(presetsFilePath, JSON.stringify(componentPresets, null, 2));
         }
-        const groupsFilePath = join(resolvedPath, suffix ? `${DEFAULT_GROUPS_FILENAME}.${suffix}.json` : `${DEFAULT_GROUPS_FILENAME}.json`);
+        const groupsFilePath = join(resolvedPath, suffix ? `${DEFAULT_GROUPS_FILENAME$1}.${suffix}.json` : `${DEFAULT_GROUPS_FILENAME$1}.json`);
         await saveToFile(groupsFilePath, JSON.stringify(groups, null, 2));
         const internalTagsFilePath = join(resolvedPath, suffix ? `${DEFAULT_TAGS_FILENAME}.${suffix}.json` : `${DEFAULT_TAGS_FILENAME}.json`);
         await saveToFile(internalTagsFilePath, JSON.stringify(internalTags, null, 2));
@@ -2541,7 +2550,7 @@ const saveComponentsToFiles = async (space, spaceData, options) => {
     const componentsFilePath = join(resolvedPath, suffix ? `${filename}.${suffix}.json` : `${filename}.json`);
     await saveToFile(componentsFilePath, JSON.stringify(components, null, 2));
     if (groups.length > 0) {
-      const groupsFilePath = join(resolvedPath, suffix ? `${DEFAULT_GROUPS_FILENAME}.${suffix}.json` : `${DEFAULT_GROUPS_FILENAME}.json`);
+      const groupsFilePath = join(resolvedPath, suffix ? `${DEFAULT_GROUPS_FILENAME$1}.${suffix}.json` : `${DEFAULT_GROUPS_FILENAME$1}.json`);
       await saveToFile(groupsFilePath, JSON.stringify(groups, null, 2));
     }
     if (presets.length > 0) {
@@ -2557,6 +2566,27 @@ const saveComponentsToFiles = async (space, spaceData, options) => {
   }
 };
 
+function isSchemaField$1(value) {
+  return typeof value === "object" && value !== null && "type" in value;
+}
+function toWritableSchema(schema) {
+  if (!schema) {
+    return void 0;
+  }
+  const result = {};
+  for (const [key, value] of Object.entries(schema)) {
+    if (isSchemaField$1(value)) {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+function toRequestTagIds(tagIds) {
+  if (!tagIds) {
+    return void 0;
+  }
+  return tagIds.map((id) => Number(id));
+}
 const pushComponent = async (space, component) => {
   try {
     const client = getMapiClient();
@@ -2591,10 +2621,23 @@ const updateComponent = async (space, componentId, component) => {
   }
 };
 const upsertComponent = async (space, component, existingId) => {
+  const { name, display_name, schema, is_root, is_nestable, component_group_uuid, color, icon, preview_field, internal_tag_ids } = component;
+  const payload = {
+    name,
+    display_name: display_name ?? void 0,
+    schema: toWritableSchema(schema),
+    is_root,
+    is_nestable,
+    component_group_uuid: component_group_uuid ?? void 0,
+    color: color ?? void 0,
+    icon: icon ?? void 0,
+    preview_field: preview_field ?? void 0,
+    internal_tag_ids: toRequestTagIds(internal_tag_ids)
+  };
   if (existingId) {
-    return await updateComponent(space, existingId, component);
+    return await updateComponent(space, existingId, payload);
   } else {
-    return await pushComponent(space, component);
+    return await pushComponent(space, payload);
   }
 };
 const pushComponentGroup = async (space, componentGroup) => {
@@ -2646,7 +2689,14 @@ const pushComponentPreset = async (space, preset) => {
         space_id: Number(space)
       },
       body: {
-        preset
+        preset: {
+          ...preset,
+          preset: preset.preset ?? void 0,
+          image: preset.image ?? void 0,
+          color: preset.color ?? void 0,
+          icon: preset.icon ?? void 0,
+          description: preset.description ?? void 0
+        }
       },
       throwOnError: true
     });
@@ -2663,7 +2713,14 @@ const updateComponentPreset = async (space, presetId, preset) => {
         space_id: Number(space)
       },
       body: {
-        preset
+        preset: {
+          ...preset,
+          preset: preset.preset ?? void 0,
+          image: preset.image ?? void 0,
+          color: preset.color ?? void 0,
+          icon: preset.icon ?? void 0,
+          description: preset.description ?? void 0
+        }
       },
       throwOnError: true
     });
@@ -2697,7 +2754,7 @@ const pushComponentInternalTag = async (space, componentInternalTag) => {
       path: {
         space_id: Number(space)
       },
-      body: componentInternalTag,
+      body: { internal_tag: componentInternalTag },
       throwOnError: true
     });
     return data.internal_tag;
@@ -2712,7 +2769,7 @@ const updateComponentInternalTag = async (space, tagId, componentInternalTag) =>
       path: {
         space_id: Number(space)
       },
-      body: componentInternalTag,
+      body: { internal_tag: componentInternalTag },
       throwOnError: true
     });
     return data.internal_tag;
@@ -3389,7 +3446,7 @@ function filterSpaceData(spaceData, selectors) {
     if (filter && !minimatch(component.name, filter)) {
       return false;
     }
-    if (groupUuids && !(component.component_group_uuid !== void 0 && groupUuids.has(component.component_group_uuid))) {
+    if (groupUuids && !(component.component_group_uuid != null && groupUuids.has(component.component_group_uuid))) {
       return false;
     }
     if (tagIds) {
@@ -3453,7 +3510,7 @@ function resolveGroupSelector(groups, selector) {
         while (p && !visited.has(p)) {
           visited.add(p);
           parts.unshift(nameOf(p) ?? p);
-          p = byUuid.get(p)?.parent_uuid;
+          p = byUuid.get(p)?.parent_uuid ?? null;
         }
         return parts.join("/");
       });
@@ -4057,16 +4114,14 @@ const fetchSpace = async (spaceId) => {
     handleAPIError("pull_spaces", error, `Failed to fetch space ${spaceId}`);
   }
 };
-const createSpace = async (space) => {
+const createSpace = async (space, query) => {
   try {
-    const { in_org, assign_partner, ...spaceData } = space;
     const client = getMapiClient();
     const { data } = await client.spaces.create({
       body: {
-        space: spaceData,
-        ...in_org && { in_org },
-        ...assign_partner && { assign_partner }
-      }
+        space
+      },
+      query
     });
     return data?.space;
   } catch (error) {
@@ -4077,10 +4132,10 @@ const createSpace = async (space) => {
 const fetchLanguages = async (spaceId) => {
   try {
     const space = await fetchSpace(spaceId);
-    if (space?.default_lang_name !== void 0 && space?.languages?.length) {
+    if (space?.default_lang_name && space?.languages?.length) {
       return {
-        default_lang_name: space?.default_lang_name,
-        languages: space?.languages
+        default_lang_name: space.default_lang_name,
+        languages: space.languages
       };
     }
   } catch (error) {
@@ -4100,8 +4155,8 @@ const saveLanguagesToFile = async (space, internationalizationOptions, options)
   }
 };
 
-const program$9 = getProgram();
-const languagesCommand = program$9.command(commands.LANGUAGES).alias("lang").description(`Manage your space's languages`);
+const program$a = getProgram();
+const languagesCommand = program$a.command(commands.LANGUAGES).alias("lang").description(`Manage your space's languages`);
 const pullCmd$3 = languagesCommand.command("pull").description(`Download your space's languages schema as json`).option("-f, --filename <filename>", "filename to save the file as <filename>.<suffix>.json").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. languages.<suffix>.json). By default, the space ID is used.").option("-s, --space <space>", "space ID");
 pullCmd$3.action(async (options, command) => {
   konsola.title(`${commands.LANGUAGES}`, colorPalette.LANGUAGES);
@@ -4147,8 +4202,8 @@ pullCmd$3.action(async (options, command) => {
   konsola.br();
 });
 
-const program$8 = getProgram();
-const migrationsCommand = program$8.command(commands.MIGRATIONS).alias("mig").description(`Manage your space's migrations`);
+const program$9 = getProgram();
+const migrationsCommand = program$9.command(commands.MIGRATIONS).alias("mig").description(`Manage your space's migrations`);
 
 const getMigrationTemplate = () => {
   return `export default function (block) {
@@ -4252,7 +4307,7 @@ const fetchStories = async (spaceId, params) => {
 const fetchStory = async (spaceId, storyId) => {
   try {
     const client = getMapiClient();
-    const { data } = await client.stories.get(storyId, {
+    const { data } = await client.stories.get(Number(storyId), {
       path: {
         space_id: Number(spaceId)
       },
@@ -4297,9 +4352,11 @@ const updateStory = async (spaceId, storyId, payload) => {
           ...payload.story,
           // StoryUpdate2 expects `parent_id?: number`; normalize null → undefined.
           parent_id: payload.story.parent_id ?? void 0
-        },
-        force_update: payload.force_update === "1" ? "1" : "0",
-        ...payload.publish ? { publish: payload.publish } : {}
+        }
+      },
+      query: {
+        force_update: payload.force_update === "1",
+        ...payload.publish ? { publish: Boolean(payload.publish) } : {}
       },
       throwOnError: true
     });
@@ -4396,6 +4453,35 @@ const prefetchTargetStoriesByKeys = async (spaceId, keys, options) => {
   return result;
 };
 
+function parseFilterQuery(input) {
+  const trimmed = input.trim();
+  if (!trimmed) {
+    return {};
+  }
+  if (trimmed.startsWith("{")) {
+    return JSON.parse(trimmed);
+  }
+  const result = {};
+  for (const clause of trimmed.split("&")) {
+    if (!clause) {
+      continue;
+    }
+    const eq = clause.indexOf("=");
+    if (eq === -1) {
+      continue;
+    }
+    const path = clause.slice(0, eq);
+    const value = clause.slice(eq + 1);
+    const keys = [...path.matchAll(/\[([^\]]+)\]/g)].map((match) => match[1]);
+    if (keys.length < 2) {
+      continue;
+    }
+    const [field, operation] = keys;
+    result[field] = { ...result[field], [operation]: value };
+  }
+  return result;
+}
+
 const PIPELINE_BACKPRESSURE_MULTIPLIER = 2;
 const DEFAULT_PIPELINE_BACKPRESSURE = 12;
 function createPipelineBackpressureLock(limit) {
@@ -4419,16 +4505,13 @@ const ERROR_CODES = {
 async function* storiesIterator(spaceId, params, onTotal) {
   try {
     let perPage = 500;
-    const transformedParams = {
-      ...params
-    };
-    if (params?.componentName && typeof params.componentName === "string") {
-      transformedParams.contain_component = params.componentName;
-      delete transformedParams.componentName;
+    const { componentName, query, ...rest } = params ?? {};
+    const transformedParams = { ...rest };
+    if (componentName) {
+      transformedParams.contain_component = componentName;
     }
-    if (params?.query && typeof params.query === "string") {
-      transformedParams.filter_query = params.query.startsWith("filter_query") ? params.query : `filter_query${params.query}`;
-      delete transformedParams.query;
+    if (query) {
+      transformedParams.filter_query = parseFilterQuery(query);
     }
     const result = await fetchStories(spaceId, {
       ...transformedParams,
@@ -4753,8 +4836,8 @@ class MigrationStream extends Transform {
             id: story.id,
             name: story.name || "",
             content: story.content,
-            published: story.published,
-            unpublished_changes: story.unpublished_changes
+            published: story.published ?? void 0,
+            unpublished_changes: story.unpublished_changes ?? void 0
           },
           migrationTimestamp: this.timestamp,
           migrationNames
@@ -4770,8 +4853,8 @@ class MigrationStream extends Transform {
           storyId: story.id,
           name: story.name,
           content: storyContent,
-          published: story.published,
-          unpublished_changes: story.unpublished_changes
+          published: story.published ?? void 0,
+          unpublished_changes: story.unpublished_changes ?? void 0
         };
       } else if (processed && !contentChanged) {
         this.results.skipped.push({
@@ -4913,7 +4996,6 @@ class UpdateStream extends Writable {
       const payload = {
         story: {
           content,
-          id: storyId,
           name: storyName
         },
         force_update: "1"
@@ -5162,7 +5244,6 @@ rollbackCmd.action(async (migrationFile, _options, command) => {
         const payload = {
           story: {
             content: story.content,
-            id: story.storyId,
             name: story.name
           },
           force_update: "1"
@@ -5202,8 +5283,8 @@ rollbackCmd.action(async (migrationFile, _options, command) => {
   }
 });
 
-const program$7 = getProgram();
-const typesCommand = program$7.command(commands.TYPES).alias("ts").description(`Generate types d.ts for your component schemas`);
+const program$8 = getProgram();
+const typesCommand = program$8.command(commands.TYPES).alias("ts").description(`Generate types d.ts for your component schemas`);
 
 const getAssetJSONSchema = (title) => ({
   $id: "#/asset",
@@ -6233,7 +6314,7 @@ const deleteDatasourceEntry = async (spaceId, entryId) => {
     handleAPIError("delete_datasource_entry", error, `Failed to delete datasource entry ${entryId}`);
   }
 };
-function isDatasource(item) {
+function isDatasource$1(item) {
   return typeof item === "object" && item !== null && "slug" in item && typeof item.slug === "string";
 }
 const readDatasourcesFiles = async (options) => {
@@ -6266,7 +6347,7 @@ const readDatasourcesFiles = async (options) => {
       continue;
     }
     for (const item of data) {
-      if (isDatasource(item)) {
+      if (isDatasource$1(item)) {
         const existing = datasourceMap.get(item.slug);
         if (existing) {
           duplicates.push(`Datasource "${item.slug}" found in both "${existing.file}" and "${file}"`);
@@ -6366,8 +6447,8 @@ generateCmd.action(async (options, command) => {
   }
 });
 
-const program$6 = getProgram();
-const datasourcesCommand = program$6.command(commands.DATASOURCES).alias("ds").description(`Manage your space's datasources`);
+const program$7 = getProgram();
+const datasourcesCommand = program$7.command(commands.DATASOURCES).alias("ds").description(`Manage your space's datasources`);
 
 const DEFAULT_DATASOURCES_FILENAME = "datasources";
 
@@ -6383,7 +6464,7 @@ const fetchDatasourceEntries = async (spaceId, datasourceId, dimensionId) => {
           datasource_id: datasourceId,
           page,
           // MAPI matches `dimension` against the numeric dimension id.
-          ...dimensionId != null && { dimension: String(dimensionId) }
+          ...dimensionId != null && { dimension: dimensionId }
         },
         throwOnError: true
       }),
@@ -7092,13 +7173,13 @@ async function promptForLogin(verbose) {
     return null;
   }
 }
-const program$5 = getProgram();
-program$5.command(`${commands.CREATE} [project-path]`).alias("c").description(`Scaffold a new project using Storyblok`).option("-t, --template <template>", "technology starter template").option("-b, --blueprint <blueprint>", "[DEPRECATED] use --template instead").option("--skip-space", "skip space creation").option("--token <token>", "Storyblok access token (skip space creation and use this token)").option(
+const program$6 = getProgram();
+program$6.command(`${commands.CREATE} [project-path]`).alias("c").description(`Scaffold a new project using Storyblok`).option("-t, --template <template>", "technology starter template").option("-b, --blueprint <blueprint>", "[DEPRECATED] use --template instead").option("--skip-space", "skip space creation").option("--token <token>", "Storyblok access token (skip space creation and use this token)").option(
   "-r, --region <region>",
   `The region to apply to the generated project template (does not affect space creation).`
 ).action(async (projectPath, options) => {
   ui.title(`${commands.CREATE}`, colorPalette.CREATE);
-  const verbose = program$5.opts().verbose;
+  const verbose = program$6.opts().verbose;
   const { template, blueprint, token } = options;
   if (options.region && !isRegion(options.region)) {
     handleError(new CommandError(`The provided region: ${options.region} is not valid. Please use one of the following values: ${Object.values(regions).join(" | ")}`));
@@ -7271,13 +7352,13 @@ program$5.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
         name: toHumanReadable(projectName),
         domain: blueprintDomain
       };
+      const createSpaceQuery = {};
       if (whereToCreateSpace === "org") {
-        spaceToCreate.org = userData.org;
-        spaceToCreate.in_org = true;
+        createSpaceQuery.in_org = true;
       } else if (whereToCreateSpace === "partner") {
-        spaceToCreate.assign_partner = true;
+        createSpaceQuery.assign_partner = true;
       }
-      createdSpace = await createSpace(spaceToCreate);
+      createdSpace = await createSpace(spaceToCreate, createSpaceQuery);
       spinnerSpace.succeed(`Space "${chalk.hex(colorPalette.PRIMARY)(toHumanReadable(projectName))}" created successfully`);
       if (createdSpace?.first_token) {
         await handleEnvFileCreation(resolvedPath, createdSpace.first_token, region, technologyTemplate);
@@ -7317,8 +7398,8 @@ program$5.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
   ui.br();
 });
 
-const program$4 = getProgram();
-const logsCommand = program$4.command(commands.LOGS).alias("lg").description(`Inspect and manage logs.`);
+const program$5 = getProgram();
+const logsCommand = program$5.command(commands.LOGS).alias("lg").description(`Inspect and manage logs.`);
 
 const listCmd$1 = logsCommand.command("list").description("List logs").option("-s, --space <space>", "space ID");
 listCmd$1.action(async (_options, command) => {
@@ -7343,8 +7424,8 @@ pruneCmd$1.action(async (options, command) => {
   ui.info(`Deleted ${deletedFilesCount} log file${deletedFilesCount === 1 ? "" : "s"}`);
 });
 
-const program$3 = getProgram();
-const reportsCommand = program$3.command(commands.REPORTS).alias("rp").description("Inspect and manage reports.");
+const program$4 = getProgram();
+const reportsCommand = program$4.command(commands.REPORTS).alias("rp").description("Inspect and manage reports.");
 
 const listCmd = reportsCommand.command("list").description("List reports").option("-s, --space <space>", "space ID");
 listCmd.action(async (_options, command) => {
@@ -7369,8 +7450,8 @@ pruneCmd.action(async (options, command) => {
   ui.info(`Deleted ${deletedFilesCount} report file${deletedFilesCount === 1 ? "" : "s"}`);
 });
 
-const program$2 = getProgram();
-const assetsCommand = program$2.command(commands.ASSETS).description(`Manage your space's assets`);
+const program$3 = getProgram();
+const assetsCommand = program$3.command(commands.ASSETS).description(`Manage your space's assets`);
 
 const fetchAssets = async ({ spaceId, params }) => {
   try {
@@ -7418,7 +7499,7 @@ const createAssetInternalTag = async (spaceId, name) => {
     const client = getMapiClient();
     const { data } = await client.internalTags.create({
       path: { space_id: Number(spaceId) },
-      body: { name, object_type: "asset" },
+      body: { internal_tag: { name, object_type: "asset" } },
       throwOnError: true
     });
     const tag = data?.internal_tag;
@@ -7542,7 +7623,7 @@ const updateAsset = async (id, asset, { spaceId, fileBuffer }) => {
 const createAsset = async (asset, fileBuffer, { spaceId }) => {
   try {
     const client = getMapiClient();
-    const { id: _id, ...assetBody } = asset;
+    const { id: _id, filename: _filename, ...assetBody } = asset;
     return await client.assets.create({
       body: assetBody,
       file: fileBuffer,
@@ -7762,6 +7843,26 @@ const parseAssetData = (raw) => {
     throw new Error(`Invalid --data JSON: ${toError(maybeError).message}`);
   }
 };
+const toAssetUpload = (partial, shortFilename) => {
+  const nullToUndef = (value) => value ?? void 0;
+  return {
+    id: partial.id,
+    filename: partial.filename,
+    short_filename: shortFilename,
+    asset_folder_id: nullToUndef(partial.asset_folder_id),
+    ext_id: nullToUndef(partial.ext_id),
+    alt: nullToUndef(partial.alt),
+    copyright: nullToUndef(partial.copyright),
+    title: nullToUndef(partial.title),
+    source: nullToUndef(partial.source),
+    expire_at: nullToUndef(partial.expire_at),
+    publish_at: nullToUndef(partial.publish_at),
+    focus: nullToUndef(partial.focus),
+    is_private: nullToUndef(partial.is_private),
+    internal_tag_ids: partial.internal_tag_ids,
+    meta_data: nullToUndef(partial.meta_data)
+  };
+};
 const getSidecarFilename = (assetBinaryPath) => {
   return join(dirname(assetBinaryPath), `${basename(assetBinaryPath, extname(assetBinaryPath))}.json`);
 };
@@ -7790,7 +7891,7 @@ const isRemoteSource = (assetBinaryPath) => {
     return false;
   }
 };
-const isValidManifestEntry = (entry) => Boolean(typeof entry.old_id === "number" && typeof entry.new_id === "number" && entry.old_filename && entry.new_filename);
+const isValidManifestEntry = (entry) => Boolean(typeof entry.old_id === "number" && typeof entry.new_id === "number" && entry.new_filename);
 const loadAssetMap = async (manifestFile) => {
   const manifest = await loadManifest(manifestFile);
   const entries = manifest.filter(isValidManifestEntry).map((e) => [
@@ -8219,8 +8320,10 @@ const readLocalAssetsStream = ({
           const sidecar = await loadSidecarAssetData(binaryFilePath);
           const shortFilename = sidecar.short_filename || (sidecar.filename ? basename(sidecar.filename) : void 0) || file;
           const asset = {
-            ...sidecar,
-            short_filename: shortFilename
+            ...toAssetUpload(sidecar, shortFilename),
+            // Carry the read-only tag detail for source→target tag-name
+            // translation in `processAsset`; it is stripped before the API call.
+            ...sidecar.internal_tags_list ? { internal_tags_list: sidecar.internal_tags_list } : {}
           };
           const fileBuffer = await readFile$1(binaryFilePath);
           const sidecarPath = getSidecarFilename(binaryFilePath);
@@ -8304,7 +8407,7 @@ const mapInternalTagIds = (sourceIds, sourceTags, assetInternalTagsByName, onUnm
     const sourceName = sourceNamesById.get(sourceId);
     const targetId = typeof sourceName === "string" ? assetInternalTagsByName.get(sourceName) : void 0;
     if (typeof targetId === "number") {
-      mapped.push(String(targetId));
+      mapped.push(targetId);
     } else {
       onUnmappedTag?.({ sourceId, name: sourceName });
     }
@@ -8358,12 +8461,13 @@ const processAsset = async ({
     if (maps.resolveSharedTagIds) {
       return maps.resolveSharedTagIds(sourceIds, sourceTags);
     }
-    return maps.assetInternalTagsByName ? mapInternalTagIds(sourceIds, sourceTags, maps.assetInternalTagsByName, onUnmappedTag) : (sourceIds ?? []).map((id) => String(id));
+    return maps.assetInternalTagsByName ? mapInternalTagIds(sourceIds, sourceTags, maps.assetInternalTagsByName, onUnmappedTag) : (sourceIds ?? []).map((id) => Number(id));
   };
   let newRemoteAsset;
   let status;
   if (remoteAsset) {
-    const updateTagIds = "internal_tag_ids" in localAsset ? await resolveInternalTagIds(localAsset.internal_tag_ids) : remoteAsset.internal_tag_ids;
+    const updateTagIds = localAsset.internal_tag_ids ? await resolveInternalTagIds(localAsset.internal_tag_ids) : remoteAsset.internal_tag_ids;
+    const nullToUndef = (v) => v ?? void 0;
     const updatePayload = {
       asset_folder_id: remoteFolderId,
       alt: "alt" in localAsset ? localAsset.alt : remoteAsset.alt,
@@ -8372,25 +8476,29 @@ const processAsset = async ({
       source: "source" in localAsset ? localAsset.source : remoteAsset.source,
       is_private: "is_private" in localAsset ? localAsset.is_private : remoteAsset.is_private,
       focus: "focus" in localAsset ? localAsset.focus : remoteAsset.focus,
-      expire_at: "expire_at" in localAsset ? localAsset.expire_at : remoteAsset.expire_at,
-      publish_at: "publish_at" in localAsset ? localAsset.publish_at : remoteAsset.publish_at,
+      expire_at: nullToUndef("expire_at" in localAsset ? localAsset.expire_at : remoteAsset.expire_at),
+      publish_at: nullToUndef("publish_at" in localAsset ? localAsset.publish_at : remoteAsset.publish_at),
       internal_tag_ids: updateTagIds,
-      meta_data: "meta_data" in localAsset ? localAsset.meta_data : remoteAsset.meta_data
+      meta_data: nullToUndef("meta_data" in localAsset ? localAsset.meta_data : remoteAsset.meta_data)
     };
     await transports.updateAsset(
       remoteAsset.id,
       { ...updatePayload, short_filename: remoteAsset.short_filename },
       fileBuffer
     );
-    newRemoteAsset = { ...remoteAsset, ...updatePayload };
+    newRemoteAsset = {
+      ...remoteAsset,
+      ...updatePayload,
+      is_private: updatePayload.is_private ?? remoteAsset.is_private
+    };
     status = "updated";
   } else if (hasProp(localAsset, "short_filename")) {
-    const { internal_tags_list: _internalTagsList, internal_tag_ids: _sourceTagIds, ...rest } = localAsset;
-    const mappedTagIds = "internal_tag_ids" in localAsset ? await resolveInternalTagIds(localAsset.internal_tag_ids) : void 0;
-    const size = hasProp(rest, "size") ? rest.size : hasProp(localAsset, "filename") ? extractAssetSizeFromFilename(localAsset.filename) : void 0;
+    const mappedTagIds = localAsset.internal_tag_ids ? await resolveInternalTagIds(localAsset.internal_tag_ids) : void 0;
+    const size = hasProp(localAsset, "size") ? localAsset.size : hasProp(localAsset, "filename") ? extractAssetSizeFromFilename(localAsset.filename) : void 0;
+    const { internal_tag_ids: _sourceTagIds, ...uploadBase } = toAssetUpload(localAsset, localAsset.short_filename);
     const createPayload = {
-      ...rest,
-      asset_folder_id: remoteFolderId,
+      ...uploadBase,
+      asset_folder_id: remoteFolderId ?? void 0,
       ...mappedTagIds !== void 0 ? { internal_tag_ids: mappedTagIds } : {},
       ...size !== void 0 ? { size } : {}
     };
@@ -8506,7 +8614,7 @@ const makeSharedTagResolver = ({ spaceId, libraryId }) => {
         }
       }
       if (sharedId !== void 0) {
-        remapped.push(String(sharedId));
+        remapped.push(sharedId);
       }
     }
     return remapped;
@@ -8916,8 +9024,8 @@ const traverseAndMapBySchema = (data, {
   const dataNew = { ...data };
   for (const [fieldName, fieldValue] of Object.entries(data)) {
     const fieldSchema = schema[fieldName.replace(/__i18n__.*/, "")];
-    const fieldType = fieldSchema && typeof fieldSchema === "object" && "type" in fieldSchema && fieldSchema.type;
-    const fieldRefMapper = typeof fieldType === "string" && fieldRefMappers2[fieldType];
+    const fieldType = fieldSchema && typeof fieldSchema === "object" && "type" in fieldSchema ? fieldSchema.type : void 0;
+    const fieldRefMapper = typeof fieldType === "string" ? fieldRefMappers2[fieldType] : void 0;
     if (fieldRefMapper) {
       dataNew[fieldName] = fieldRefMapper(fieldValue, {
         schema: fieldSchema,
@@ -8982,6 +9090,9 @@ const richtextFieldRefMapper = (data, { schemas, maps, fieldRefMappers: fieldRef
   fieldRefMappers: fieldRefMappers2
 });
 const multilinkFieldRefMapper = (data, { maps }) => {
+  if (!data || typeof data !== "object") {
+    return data;
+  }
   if (data.linktype !== "story") {
     return data;
   }
@@ -9001,6 +9112,9 @@ const bloksFieldRefMapper = (data, { schemas, maps, fieldRefMappers: fieldRefMap
   }));
 };
 const assetFieldRefMapper = (data, { maps }) => {
+  if (!data || typeof data !== "object") {
+    return data;
+  }
   const mappedAsset = typeof data.id === "number" ? maps.assets?.get(data.id) : void 0;
   if (!mappedAsset) {
     return data;
@@ -9018,7 +9132,7 @@ const multiassetFieldRefMapper = (data, options) => {
   return data.map((d) => assetFieldRefMapper(d, options));
 };
 const optionsFieldRefMapper = (data, { schema, maps }) => {
-  if (schema.source !== "internal_stories" || !Array.isArray(data)) {
+  if (!schema || !("source" in schema) || schema.source !== "internal_stories" || !Array.isArray(data)) {
     return data;
   }
   return data.map((d) => maps.stories?.get(d) || d);
@@ -9911,11 +10025,7 @@ pushCmd$1.action(async (assetInput, options, command) => {
     const sourceBasename = isRemoteSource(assetBinaryPath) ? basename(new URL(assetBinaryPath).pathname) : basename(assetBinaryPath);
     const shortFilename = options.shortFilename || assetDataPartial.short_filename || sourceBasename;
     const folderId = options.folder ? Number(options.folder) : void 0;
-    assetData = {
-      ...assetDataPartial,
-      short_filename: shortFilename,
-      asset_folder_id: folderId
-    };
+    assetData = { ...toAssetUpload(assetDataPartial, shortFilename), asset_folder_id: folderId };
   }
   try {
     for (const scope of scopes) {
@@ -10123,8 +10233,8 @@ transferCmd.action(async (assetIds, options, command) => {
   process.exitCode = summary.failed > 0 ? 1 : 0;
 });
 
-const program$1 = getProgram();
-const storiesCommand = program$1.command(commands.STORIES).description(`Manage your space's stories`);
+const program$2 = getProgram();
+const storiesCommand = program$2.command(commands.STORIES).description(`Manage your space's stories`);
 
 const pullCmd = storiesCommand.command("pull").option("-s, --space <space>", "space ID").option("-d, --dry-run", "Preview changes without applying them to Storyblok").option("-q, --query <query>", 'Filter stories by content attributes using Storyblok filter query syntax. Example: --query="[highlighted][in]=true"').option("--starts-with <path>", 'Filter stories by path. Example: --starts-with="/en/blog/"').description(`Download your space's stories as separate json files.`);
 pullCmd.action(async (options, command) => {
@@ -10160,7 +10270,7 @@ pullCmd.action(async (options, command) => {
       fetchStoriesStream({
         spaceId: space,
         params: {
-          filter_query: options.query,
+          filter_query: options.query ? parseFilterQuery(options.query) : void 0,
           starts_with: options.startsWith
         },
         setTotalPages: (totalPages) => {
@@ -10629,6 +10739,2337 @@ pushCmd.action(async (options, command) => {
   }
 });
 
+const program$1 = getProgram();
+const schemaCommand = program$1.command(commands.SCHEMA).description(`Manage your space's schema from code`);
+
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+const COMPONENT_STRIP_KEYS = /* @__PURE__ */ new Set([
+  "id",
+  "created_at",
+  "updated_at",
+  "real_name",
+  // API-computed display/technical name, read-only
+  "preset_id",
+  // Instance-level preset selection, not part of schema definition
+  "all_presets",
+  // Computed list of presets, managed via /presets API
+  "internal_tags_list",
+  // Read-only expanded form of internal_tag_ids ({id, name} objects)
+  "content_type_asset_preview",
+  // Read-only, not in ComponentCreate/ComponentUpdate
+  "image",
+  // Read-only preview image URL
+  "preview_tmpl",
+  // Read-only preview template
+  "metadata",
+  // Not in current API types, stripped defensively
+  "component_group_uuid"
+  // UI grouping; stripped by default — kept for diffing only when a block opts into the group escape hatch
+]);
+const DATASOURCE_STRIP_KEYS = /* @__PURE__ */ new Set(["id", "created_at", "updated_at"]);
+const DATASOURCE_DIMENSION_STRIP_KEYS = /* @__PURE__ */ new Set(["id", "datasource_id", "created_at", "updated_at"]);
+const DATASOURCE_DEFAULTS = {
+  dimensions: []
+};
+const COMPONENT_DEFAULTS = {
+  display_name: "",
+  description: "",
+  color: "",
+  icon: "",
+  preview_field: "",
+  internal_tag_ids: []
+};
+function applyDefaults(entity, defaults) {
+  const result = { ...entity };
+  for (const [key, defaultValue] of Object.entries(defaults)) {
+    if (result[key] === void 0 || result[key] === null) {
+      Object.assign(result, { [key]: defaultValue });
+    }
+  }
+  return result;
+}
+const INDENT = "  ";
+class RawCode {
+  constructor(code) {
+    this.code = code;
+  }
+}
+function quoteString(value) {
+  const escaped = JSON.stringify(value).slice(1, -1).replace(/\\"/g, '"').replace(/'/g, "\\'");
+  return `'${escaped}'`;
+}
+function formatValue(value, depth) {
+  const indent = INDENT.repeat(depth);
+  const innerIndent = INDENT.repeat(depth + 1);
+  if (value === null || value === void 0) {
+    return String(value);
+  }
+  if (value instanceof RawCode) {
+    return value.code;
+  }
+  if (typeof value === "string") {
+    return quoteString(value);
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  if (Array.isArray(value)) {
+    if (value.length === 0) {
+      return "[]";
+    }
+    const items = value.map((item) => `${innerIndent}${formatValue(item, depth + 1)},`);
+    return `[
+${items.join("\n")}
+${indent}]`;
+  }
+  if (typeof value === "object") {
+    const entries = Object.entries(value).filter(([, v]) => v !== void 0 && v !== null).sort(([a], [b]) => a.localeCompare(b));
+    if (entries.length === 0) {
+      return "{}";
+    }
+    const props = entries.map(
+      ([key, val]) => `${innerIndent}${key}: ${formatValue(val, depth + 1)},`
+    );
+    return `{
+${props.join("\n")}
+${indent}}`;
+  }
+  return String(value);
+}
+function fileTimestamp(iso) {
+  return iso.replace(/\D/g, "").slice(0, 14);
+}
+function displayPath(filePath, userPath) {
+  return userPath && isAbsolute(userPath) ? filePath : relative(process.cwd(), filePath);
+}
+function stripKeys(obj, keysToStrip) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (!keysToStrip.has(key) && value !== void 0 && value !== null) {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+
+function buildGroupPathByUuid(folders) {
+  const byUuid = new Map(folders.map((folder) => [folder.uuid, folder]));
+  const cache = /* @__PURE__ */ new Map();
+  function pathFor(uuid, visited) {
+    if (!uuid) {
+      return [];
+    }
+    const cached = cache.get(uuid);
+    if (cached) {
+      return cached;
+    }
+    const folder = byUuid.get(uuid);
+    if (!folder) {
+      return [];
+    }
+    if (visited.has(uuid)) {
+      return [];
+    }
+    visited.add(uuid);
+    const path = [...pathFor(folder.parent_uuid, visited), slugify(folder.name)];
+    cache.set(uuid, path);
+    return path;
+  }
+  for (const folder of folders) {
+    pathFor(folder.uuid, /* @__PURE__ */ new Set());
+  }
+  return cache;
+}
+function slugifyPath(displayPath) {
+  return displayPath.split("/").map((segment) => slugify(segment)).filter(Boolean).join("/");
+}
+function expandFolderPath(displayPath) {
+  const segments = displayPath.split("/").map((segment) => ({ name: segment, slug: slugify(segment) })).filter((segment) => segment.slug !== "");
+  const result = [];
+  let parentPath = null;
+  for (const { name, slug } of segments) {
+    const path = parentPath ? `${parentPath}/${slug}` : slug;
+    result.push({ name, path, parentPath });
+    parentPath = path;
+  }
+  return result;
+}
+
+function mapFieldToWire(field) {
+  const { name, allow, datasource, ...rest } = field;
+  const value = { ...rest };
+  if (allow !== void 0 && Array.isArray(allow)) {
+    const folderPaths = allow.filter((entry) => isRecord(entry) && typeof entry.folder === "string").map((entry) => slugifyPath(entry.folder));
+    const blockNames = allow.filter((entry) => typeof entry === "string");
+    if (folderPaths.length > 0) {
+      value.component_group_whitelist = folderPaths;
+      if (rest.type === "bloks" || rest.type === "richtext") {
+        value.restrict_components = true;
+        value.restrict_type = "groups";
+      }
+    } else {
+      value.component_whitelist = blockNames;
+      if (rest.type === "bloks") {
+        value.restrict_components = true;
+        value.restrict_type = "";
+      }
+    }
+  } else if (allow !== void 0) {
+    value.component_whitelist = allow;
+    if (rest.type === "bloks") {
+      value.restrict_components = true;
+      value.restrict_type = "";
+    }
+  }
+  if (datasource !== void 0) {
+    value.datasource_slug = datasource;
+  }
+  return { name: typeof name === "string" ? name : "", value };
+}
+function mapBlockToWire(block) {
+  const { fields, folder, ...rest } = block;
+  const schema = {};
+  if (Array.isArray(fields)) {
+    for (const field of fields) {
+      if (!isRecord(field)) {
+        continue;
+      }
+      const { name, value } = mapFieldToWire(field);
+      if (name) {
+        schema[name] = value;
+      }
+    }
+  }
+  return {
+    ...rest,
+    ...folder !== void 0 && { folder: typeof folder === "string" ? slugifyPath(folder) : null },
+    schema
+  };
+}
+function mapDatasourceToWire(datasource) {
+  return datasource;
+}
+
+function isComponent(value) {
+  return isRecord(value) && typeof value.name === "string" && Array.isArray(value.fields);
+}
+function isDatasource(value) {
+  return isRecord(value) && typeof value.name === "string" && typeof value.slug === "string" && !Array.isArray(value.fields);
+}
+function isFolder(value) {
+  return isRecord(value) && typeof value.name === "string" && typeof value.path === "string" && !Array.isArray(value.fields) && !("slug" in value);
+}
+function buildLocalFolders(registered, derived) {
+  const byPath = /* @__PURE__ */ new Map();
+  const add = (displayPath, registeredLeaf) => {
+    const expanded = expandFolderPath(displayPath);
+    expanded.forEach((entry, i) => {
+      const isLeaf = i === expanded.length - 1;
+      const isRegisteredEntry = registeredLeaf && isLeaf;
+      const existing = byPath.get(entry.path);
+      if (!existing) {
+        byPath.set(entry.path, { folder: entry, isRegistered: isRegisteredEntry });
+        return;
+      }
+      if (isRegisteredEntry && existing.isRegistered && existing.folder.name !== entry.name) {
+        throw new CommandError(`Conflicting folder names for path "${entry.path}": "${existing.folder.name}" vs "${entry.name}"`);
+      }
+      if (isRegisteredEntry && !existing.isRegistered) {
+        byPath.set(entry.path, { folder: entry, isRegistered: true });
+      }
+    });
+  };
+  for (const path of registered) {
+    add(path, true);
+  }
+  for (const path of derived) {
+    add(path, false);
+  }
+  const folders = [...byPath.values()].map((v) => v.folder).sort((a, b) => a.path.split("/").length - b.path.split("/").length || a.path.localeCompare(b.path));
+  const leafToPath = /* @__PURE__ */ new Map();
+  for (const folder of folders) {
+    const leaf = folder.path.split("/").pop() ?? folder.path;
+    const existing = leafToPath.get(leaf);
+    if (existing !== void 0 && existing !== folder.path) {
+      throw new CommandError(
+        `Duplicate folder name "${leaf}" (folders "${existing}" and "${folder.path}"): Storyblok group names must be unique per space, even under different parents.`
+      );
+    }
+    leafToPath.set(leaf, folder.path);
+  }
+  return folders;
+}
+function isSchemaObject(value) {
+  return isRecord(value) && ("blocks" in value || "datasources" in value || "folders" in value);
+}
+function emptySchemaData() {
+  return { components: [], folders: [], datasources: [] };
+}
+function classifyExports(moduleExports) {
+  const data = emptySchemaData();
+  const seenComponents = /* @__PURE__ */ new Set();
+  const seenDatasources = /* @__PURE__ */ new Set();
+  const registered = [];
+  const derived = [];
+  function harvestComponentPaths(value) {
+    if (typeof value.folder === "string") {
+      derived.push(value.folder);
+    }
+    if (Array.isArray(value.fields)) {
+      for (const field of value.fields) {
+        if (!isRecord(field) || !Array.isArray(field.allow)) {
+          continue;
+        }
+        for (const entry of field.allow) {
+          if (isRecord(entry) && typeof entry.folder === "string") {
+            derived.push(entry.folder);
+          }
+        }
+      }
+    }
+  }
+  function collect(value) {
+    if (isComponent(value)) {
+      harvestComponentPaths(value);
+      if (seenComponents.has(value.name)) {
+        return;
+      }
+      seenComponents.add(value.name);
+      data.components.push(mapBlockToWire(value));
+    } else if (isFolder(value)) {
+      registered.push(value.path);
+    } else if (isDatasource(value)) {
+      if (seenDatasources.has(value.name)) {
+        return;
+      }
+      seenDatasources.add(value.name);
+      data.datasources.push(mapDatasourceToWire(value));
+    }
+  }
+  for (const value of Object.values(moduleExports)) {
+    if (isSchemaObject(value)) {
+      for (const group of Object.values(value)) {
+        if (isRecord(group)) {
+          for (const entity of Object.values(group)) {
+            collect(entity);
+          }
+        }
+      }
+    } else {
+      collect(value);
+    }
+  }
+  data.folders = buildLocalFolders(registered, derived);
+  return data;
+}
+async function loadSchema(entryPath) {
+  const { createJiti } = await import('jiti');
+  const jiti = createJiti(import.meta.url, { interopDefault: true });
+  const { resolve } = await import('pathe');
+  const entryAbs = resolve(entryPath);
+  const entryMod = await jiti.import(entryAbs);
+  return classifyExports(entryMod);
+}
+
+function sortSchemaByPos$1(schema) {
+  const entries = Object.entries(schema).filter(([key]) => key !== "_uid" && key !== "component").sort(([, a], [, b]) => {
+    const posA = typeof a.pos === "number" ? a.pos : Infinity;
+    const posB = typeof b.pos === "number" ? b.pos : Infinity;
+    return posA - posB;
+  });
+  return Object.fromEntries(
+    entries.map(([key, field]) => {
+      const { id, ...rest } = field;
+      if (rest.restrict_type === "") {
+        delete rest.restrict_type;
+      }
+      return [key, rest];
+    })
+  );
+}
+const FOLDER_UNGROUPED = "__FOLDER_UNGROUPED__";
+function serializeComponent(component, options = {}) {
+  const stripSet = options.includeGroupUuid ? new Set([...COMPONENT_STRIP_KEYS].filter((key) => key !== "component_group_uuid")) : COMPONENT_STRIP_KEYS;
+  const clean = stripKeys(component, stripSet);
+  if (clean.schema && typeof clean.schema === "object") {
+    clean.schema = sortSchemaByPos$1(clean.schema);
+  }
+  const ordered = {};
+  if (clean.name !== void 0) {
+    ordered.name = clean.name;
+  }
+  if (clean.display_name !== void 0) {
+    ordered.display_name = clean.display_name;
+  }
+  if (clean.is_root !== void 0) {
+    ordered.is_root = clean.is_root;
+  }
+  if (clean.is_nestable !== void 0) {
+    ordered.is_nestable = clean.is_nestable;
+  }
+  if ("folder" in component) {
+    ordered.folder = component.folder === null ? FOLDER_UNGROUPED : component.folder;
+  }
+  const handled = /* @__PURE__ */ new Set(["name", "display_name", "is_root", "is_nestable", "folder", "schema"]);
+  for (const [key, value] of Object.entries(clean).sort(([a], [b]) => a.localeCompare(b))) {
+    if (!handled.has(key)) {
+      ordered[key] = value;
+    }
+  }
+  if (clean.schema !== void 0) {
+    ordered.schema = clean.schema;
+  }
+  return `defineBlock(${formatValue(ordered, 0)})`.replace(`folder: '${FOLDER_UNGROUPED}'`, "folder: null");
+}
+function serializeDatasource(datasource) {
+  const clean = stripKeys(datasource, DATASOURCE_STRIP_KEYS);
+  if (Array.isArray(clean.dimensions)) {
+    clean.dimensions = clean.dimensions.map(
+      (dim) => typeof dim === "object" && dim !== null ? stripKeys(dim, DATASOURCE_DIMENSION_STRIP_KEYS) : dim
+    );
+  }
+  const ordered = {};
+  if (clean.name !== void 0) {
+    ordered.name = clean.name;
+  }
+  if (clean.slug !== void 0) {
+    ordered.slug = clean.slug;
+  }
+  const handled = /* @__PURE__ */ new Set(["name", "slug"]);
+  for (const [key, value] of Object.entries(clean).sort(([a], [b]) => a.localeCompare(b))) {
+    if (!handled.has(key)) {
+      ordered[key] = value;
+    }
+  }
+  return `defineDatasource(${formatValue(ordered, 0)})`;
+}
+
+function translateGroupWhitelist(schema, uuidToPath) {
+  if (!isRecord(schema)) {
+    return schema;
+  }
+  const result = {};
+  for (const [fieldName, field] of Object.entries(schema)) {
+    if (isRecord(field) && Array.isArray(field.component_group_whitelist)) {
+      result[fieldName] = {
+        ...field,
+        component_group_whitelist: field.component_group_whitelist.map((entry) => typeof entry === "string" ? uuidToPath.get(entry) ?? entry : entry)
+      };
+    } else {
+      result[fieldName] = field;
+    }
+  }
+  return result;
+}
+function diffEntity(type, name, localSerialized, remoteSerialized) {
+  if (!remoteSerialized && localSerialized) {
+    return { type, name, action: "create", diff: null, local: null, remote: null };
+  }
+  if (remoteSerialized && !localSerialized) {
+    return { type, name, action: "stale", diff: null, local: null, remote: null };
+  }
+  if (localSerialized === remoteSerialized) {
+    return { type, name, action: "unchanged", diff: null, local: null, remote: null };
+  }
+  const patch = createTwoFilesPatch(
+    `remote/${name}`,
+    `local/${name}`,
+    remoteSerialized,
+    localSerialized,
+    "remote",
+    "local"
+  );
+  return { type, name, action: "update", diff: patch, local: null, remote: null };
+}
+function diffSchema(local, remote) {
+  const diffs = [];
+  const groupPathByUuid = buildGroupPathByUuid([...remote.componentFolders.values()]);
+  const uuidToPath = /* @__PURE__ */ new Map();
+  for (const [uuid, segments] of groupPathByUuid) {
+    uuidToPath.set(uuid, segments.join("/"));
+  }
+  const remoteFolderPaths = new Set(uuidToPath.values());
+  const localFolderPaths = new Set(local.folders.map((f) => f.path));
+  for (const folder of local.folders) {
+    const action = remoteFolderPaths.has(folder.path) ? "unchanged" : "create";
+    diffs.push({ type: "folder", name: folder.path, action, diff: null, local: null, remote: null });
+  }
+  for (const path of remoteFolderPaths) {
+    if (!localFolderPaths.has(path)) {
+      diffs.push({ type: "folder", name: path, action: "stale", diff: null, local: null, remote: null });
+    }
+  }
+  const processedComponentNames = /* @__PURE__ */ new Set();
+  for (const comp of local.components) {
+    processedComponentNames.add(comp.name);
+    const remoteComp = remote.components.get(comp.name);
+    const includeGroupUuid = typeof comp.component_group_uuid === "string";
+    const localForDiff = { ...comp };
+    const remoteForDiff = remoteComp ? { ...remoteComp } : void 0;
+    if ("folder" in comp) {
+      if (remoteForDiff) {
+        const uuid = remoteForDiff.component_group_uuid;
+        remoteForDiff.folder = typeof uuid === "string" && uuid ? uuidToPath.get(uuid) ?? null : null;
+      }
+    } else {
+      delete localForDiff.folder;
+      if (remoteForDiff) {
+        delete remoteForDiff.folder;
+      }
+    }
+    localForDiff.schema = translateGroupWhitelist(localForDiff.schema, uuidToPath);
+    if (remoteForDiff) {
+      remoteForDiff.schema = translateGroupWhitelist(remoteForDiff.schema, uuidToPath);
+    }
+    const localSerialized = serializeComponent(applyDefaults(localForDiff, COMPONENT_DEFAULTS), { includeGroupUuid });
+    const remoteSerialized = remoteForDiff ? serializeComponent(applyDefaults(remoteForDiff, COMPONENT_DEFAULTS), { includeGroupUuid }) : null;
+    diffs.push(diffEntity("component", comp.name, localSerialized, remoteSerialized));
+  }
+  for (const [name] of remote.components) {
+    if (!processedComponentNames.has(name)) {
+      diffs.push(diffEntity("component", name, null, "stale"));
+    }
+  }
+  const processedDatasourceNames = /* @__PURE__ */ new Set();
+  for (const ds of local.datasources) {
+    processedDatasourceNames.add(ds.name);
+    const remoteDs = remote.datasources.get(ds.name);
+    const localSerialized = serializeDatasource(applyDefaults(ds, DATASOURCE_DEFAULTS));
+    const remoteSerialized = remoteDs ? serializeDatasource(applyDefaults(remoteDs, DATASOURCE_DEFAULTS)) : null;
+    diffs.push(diffEntity("datasource", ds.name, localSerialized, remoteSerialized));
+  }
+  for (const [name] of remote.datasources) {
+    if (!processedDatasourceNames.has(name)) {
+      diffs.push(diffEntity("datasource", name, null, "stale"));
+    }
+  }
+  return {
+    diffs,
+    creates: diffs.filter((d) => d.action === "create").length,
+    updates: diffs.filter((d) => d.action === "update").length,
+    unchanged: diffs.filter((d) => d.action === "unchanged").length,
+    stale: diffs.filter((d) => d.action === "stale").length
+  };
+}
+
+async function fetchRemoteSchema(spaceId) {
+  const client = getMapiClient();
+  const spaceIdNum = Number(spaceId);
+  const [componentsRes, foldersRes, rawDatasources] = await Promise.all([
+    client.components.list({ path: { space_id: spaceIdNum }, throwOnError: true }),
+    client.componentFolders.list({ path: { space_id: spaceIdNum }, throwOnError: true }),
+    fetchAllPages(
+      (page) => client.datasources.list({ path: { space_id: spaceIdNum }, query: { page }, throwOnError: true }),
+      (data) => data?.datasources ?? []
+    )
+  ]);
+  const rawComponents = componentsRes.data?.components ?? [];
+  const rawComponentFolders = foldersRes.data?.component_groups ?? [];
+  const remote = {
+    components: new Map(rawComponents.map((c) => [c.name, c])),
+    componentFolders: new Map(rawComponentFolders.map((f) => [f.name, f])),
+    datasources: new Map(rawDatasources.map((d) => [d.name, d]))
+  };
+  return { remote, rawComponents, rawComponentFolders, rawDatasources };
+}
+
+function isSchemaField(value) {
+  return isRecord(value) && "type" in value;
+}
+function toSchemaRecord(schema) {
+  const result = {};
+  for (const [key, value] of Object.entries(schema)) {
+    if (key === "_uid" || key === "component" || !isSchemaField(value)) {
+      continue;
+    }
+    result[key] = value;
+  }
+  return result;
+}
+function buildComponentPayload(input) {
+  if (!isRecord(input)) {
+    return { name: "" };
+  }
+  return {
+    name: typeof input.name === "string" ? input.name : "",
+    // Fields in COMPONENT_DEFAULTS are always sent with their reset value so that
+    // removing a field from the local schema actually clears it on the API.
+    // (Root-level fields are additive on MAPI update — omitting preserves the old value.)
+    display_name: typeof input.display_name === "string" ? input.display_name : "",
+    description: typeof input.description === "string" ? input.description : "",
+    color: typeof input.color === "string" ? input.color : "",
+    icon: typeof input.icon === "string" ? input.icon : "",
+    preview_field: typeof input.preview_field === "string" ? input.preview_field : "",
+    internal_tag_ids: Array.isArray(input.internal_tag_ids) ? input.internal_tag_ids : [],
+    // Conditionally sent: only included when explicitly set in local schema
+    ...isRecord(input.schema) && { schema: toSchemaRecord(input.schema) },
+    ...typeof input.is_root === "boolean" && { is_root: input.is_root },
+    ...typeof input.is_nestable === "boolean" && { is_nestable: input.is_nestable },
+    // Forward the group membership only when the key is present on input: a
+    // string sets the group, an explicit `null` clears it. Unmanaged components
+    // (key absent) omit it so their remote group is left untouched.
+    ..."component_group_uuid" in input && (typeof input.component_group_uuid === "string" || input.component_group_uuid === null) && { component_group_uuid: input.component_group_uuid }
+  };
+}
+function toComponentCreate(input) {
+  return buildComponentPayload(input);
+}
+function toComponentUpdate(input) {
+  return buildComponentPayload(input);
+}
+function toDatasourceCreate(input) {
+  if (!isRecord(input)) {
+    return { name: "", slug: "" };
+  }
+  const result = {
+    name: typeof input.name === "string" ? input.name : "",
+    slug: typeof input.slug === "string" ? input.slug : ""
+  };
+  if (Array.isArray(input.dimensions)) {
+    result.dimensions_attributes = input.dimensions.filter((d) => isRecord(d) && typeof d.name === "string" && typeof d.entry_value === "string").map((d) => ({
+      name: d.name,
+      entry_value: d.entry_value
+    }));
+  }
+  return result;
+}
+function toDatasourceUpdate(input, remote) {
+  const base = toDatasourceCreate(input);
+  const localDims = base.dimensions_attributes ?? [];
+  const remoteDims = remote.dimensions ?? [];
+  if (remoteDims.length === 0) {
+    return base;
+  }
+  const localKeys = new Set(localDims.map((d) => `${d.name}::${d.entry_value}`));
+  const destroyEntries = remoteDims.filter((rd) => rd.id != null && !localKeys.has(`${rd.name}::${rd.entry_value}`)).map((rd) => ({ id: rd.id, _destroy: true }));
+  if (destroyEntries.length > 0) {
+    return {
+      ...base,
+      dimensions_attributes: [...localDims, ...destroyEntries]
+    };
+  }
+  return base;
+}
+
+function resolveGroupRefs(comp, groupByPath) {
+  const { folder, ...rest } = comp;
+  const resolved = { ...rest };
+  if (typeof folder === "string") {
+    const group = groupByPath.get(folder);
+    if (!group) {
+      throw new CommandError(
+        `Unknown folder path "${folder}" for component "${comp.name}": no matching component group exists. Folder creation runs before component push, so this indicates an internal inconsistency.`
+      );
+    }
+    resolved.component_group_uuid = group.uuid;
+  } else if (folder === null) {
+    resolved.component_group_uuid = null;
+  }
+  if (isRecord(resolved.schema)) {
+    const schema = {};
+    for (const [key, field] of Object.entries(resolved.schema)) {
+      if (isRecord(field) && Array.isArray(field.component_group_whitelist)) {
+        schema[key] = {
+          ...field,
+          component_group_whitelist: field.component_group_whitelist.map((path) => typeof path === "string" ? groupByPath.get(path)?.uuid ?? path : path)
+        };
+      } else {
+        schema[key] = field;
+      }
+    }
+    resolved.schema = schema;
+  }
+  return resolved;
+}
+function buildGroupByPath(remote) {
+  const remoteFolders = [...remote.componentFolders.values()];
+  const groupPathByUuid = buildGroupPathByUuid(remoteFolders);
+  const groupByPath = /* @__PURE__ */ new Map();
+  for (const folder of remoteFolders) {
+    const segments = groupPathByUuid.get(folder.uuid);
+    if (segments?.length) {
+      groupByPath.set(segments.join("/"), { id: folder.id, uuid: folder.uuid });
+    }
+  }
+  return groupByPath;
+}
+function formatDiffOutput(result, options) {
+  const lines = [];
+  const byType = {
+    component: [],
+    datasource: [],
+    folder: []
+  };
+  for (const diff of result.diffs) {
+    byType[diff.type].push(diff);
+  }
+  const willDelete = options?.delete ?? false;
+  const icons = {
+    create: chalk.green("+"),
+    update: chalk.yellow("~"),
+    unchanged: chalk.dim("="),
+    stale: chalk.red("-")
+  };
+  const sections = [
+    ["Folders", byType.folder],
+    ["Components", byType.component],
+    ["Datasources", byType.datasource]
+  ];
+  for (const [label, diffs] of sections) {
+    if (diffs.length === 0) {
+      continue;
+    }
+    lines.push(chalk.bold(label));
+    for (const diff of diffs) {
+      const icon = icons[diff.action] ?? " ";
+      const name = diff.action === "stale" ? chalk.red(diff.name) : diff.name;
+      const actionLabel = diff.action === "stale" && willDelete ? "delete" : diff.action;
+      lines.push(`  ${icon} ${name} ${chalk.dim(`(${actionLabel})`)}`);
+      if (diff.diff) {
+        for (const line of diff.diff.split("\n")) {
+          if (line.startsWith("+") && !line.startsWith("+++")) {
+            lines.push(`    ${chalk.green(line)}`);
+          } else if (line.startsWith("-") && !line.startsWith("---")) {
+            lines.push(`    ${chalk.red(line)}`);
+          }
+        }
+      }
+    }
+    lines.push("");
+  }
+  const summary = [
+    result.creates > 0 ? chalk.green(`${result.creates} to create`) : null,
+    result.updates > 0 ? chalk.yellow(`${result.updates} to update`) : null,
+    result.unchanged > 0 ? chalk.dim(`${result.unchanged} unchanged`) : null,
+    result.stale > 0 ? chalk.red(`${result.stale} ${willDelete ? "to delete" : "stale"}`) : null
+  ].filter(Boolean).join(", ");
+  lines.push(`Summary: ${summary}`);
+  return lines.join("\n");
+}
+async function executePush(spaceId, local, remote, diffResult, options) {
+  const client = getMapiClient();
+  const spaceIdNum = Number(spaceId);
+  let created = 0;
+  let updated = 0;
+  let deleted = 0;
+  const groupByPath = buildGroupByPath(remote);
+  const foldersByPath = new Map(local.folders.map((f) => [f.path, f]));
+  const folderCreates = diffResult.diffs.filter((d) => d.type === "folder" && d.action === "create").sort((a, b) => a.name.split("/").length - b.name.split("/").length);
+  for (const diff of folderCreates) {
+    const localFolder = foldersByPath.get(diff.name);
+    if (!localFolder) {
+      continue;
+    }
+    const parent = localFolder.parentPath ? groupByPath.get(localFolder.parentPath) : void 0;
+    let createdGroup;
+    try {
+      const res = await client.componentFolders.create({
+        path: { space_id: spaceIdNum },
+        body: { component_group: { name: localFolder.name, parent_id: parent?.id ?? null } },
+        throwOnError: true
+      });
+      createdGroup = res.data?.component_group;
+    } catch (error) {
+      handleAPIError("push_component_folder", error, `Failed to create folder ${localFolder.name}`);
+    }
+    if (createdGroup?.id == null || !createdGroup.uuid) {
+      throw new CommandError(
+        `Folder "${localFolder.name}" was created but the Management API response did not include an id and uuid; blocks that reference this folder cannot be resolved.`
+      );
+    }
+    groupByPath.set(localFolder.path, { id: createdGroup.id, uuid: createdGroup.uuid });
+    created++;
+  }
+  const componentDiffs = diffResult.diffs.filter((d) => d.type === "component");
+  const resolvedComponents = /* @__PURE__ */ new Map();
+  for (const diff of componentDiffs) {
+    if (diff.action !== "create" && diff.action !== "update") {
+      continue;
+    }
+    const localComp = local.components.find((c) => c.name === diff.name);
+    if (localComp) {
+      resolvedComponents.set(diff.name, resolveGroupRefs(localComp, groupByPath));
+    }
+  }
+  const componentResults = await Promise.allSettled(
+    componentDiffs.map(async (diff) => {
+      const resolvedComp = resolvedComponents.get(diff.name);
+      if (diff.action === "create" && resolvedComp) {
+        await client.components.create({
+          path: { space_id: spaceIdNum },
+          body: { component: toComponentCreate(resolvedComp) },
+          throwOnError: true
+        });
+        return "created";
+      }
+      if (diff.action === "update" && resolvedComp) {
+        const existing = remote.components.get(diff.name);
+        if (existing?.id) {
+          await client.components.update(existing.id, {
+            path: { space_id: spaceIdNum },
+            body: { component: toComponentUpdate(resolvedComp) },
+            throwOnError: true
+          });
+          return "updated";
+        }
+      }
+    })
+  );
+  for (let i = 0; i < componentResults.length; i++) {
+    const result = componentResults[i];
+    const diff = componentDiffs[i];
+    if (result.status === "fulfilled") {
+      if (result.value === "created") {
+        created++;
+      } else if (result.value === "updated") {
+        updated++;
+      }
+    } else {
+      const eventId = diff.action === "create" ? "push_component" : "update_component";
+      handleAPIError(eventId, result.reason, `Failed to ${diff.action} component ${diff.name}`);
+    }
+  }
+  const datasourceDiffs = diffResult.diffs.filter((d) => d.type === "datasource");
+  const datasourceResults = await Promise.allSettled(
+    datasourceDiffs.map(async (diff) => {
+      const localDs = local.datasources.find((d) => d.name === diff.name);
+      if (diff.action === "create" && localDs) {
+        await client.datasources.create({
+          path: { space_id: spaceIdNum },
+          body: { datasource: toDatasourceCreate(localDs) },
+          throwOnError: true
+        });
+        return "created";
+      }
+      if (diff.action === "update" && localDs) {
+        const existing = remote.datasources.get(diff.name);
+        if (existing?.id) {
+          await client.datasources.update(existing.id, {
+            path: { space_id: spaceIdNum },
+            body: { datasource: toDatasourceUpdate(localDs, existing) },
+            throwOnError: true
+          });
+          return "updated";
+        }
+      }
+    })
+  );
+  for (let i = 0; i < datasourceResults.length; i++) {
+    const result = datasourceResults[i];
+    const diff = datasourceDiffs[i];
+    if (result.status === "fulfilled") {
+      if (result.value === "created") {
+        created++;
+      } else if (result.value === "updated") {
+        updated++;
+      }
+    } else {
+      const eventId = diff.action === "create" ? "push_datasource" : "update_datasource";
+      handleAPIError(eventId, result.reason, `Failed to ${diff.action} datasource ${diff.name}`);
+    }
+  }
+  if (options.delete) {
+    const deleteErrors = [];
+    const staleComponents = diffResult.diffs.filter((d) => d.type === "component" && d.action === "stale");
+    const deleteComponentResults = await Promise.allSettled(
+      staleComponents.map(async (diff) => {
+        const existing = remote.components.get(diff.name);
+        if (existing?.id) {
+          await client.components.delete(existing.id, {
+            path: { space_id: spaceIdNum },
+            throwOnError: true
+          });
+          return true;
+        }
+      })
+    );
+    for (let i = 0; i < deleteComponentResults.length; i++) {
+      const result = deleteComponentResults[i];
+      if (result.status === "fulfilled") {
+        if (result.value) {
+          deleted++;
+        }
+      } else {
+        deleteErrors.push({ action: "delete_component", reason: result.reason, message: `Failed to delete component ${staleComponents[i].name}` });
+      }
+    }
+    const staleDatasources = diffResult.diffs.filter((d) => d.type === "datasource" && d.action === "stale");
+    const deleteDatasourceResults = await Promise.allSettled(
+      staleDatasources.map(async (diff) => {
+        const existing = remote.datasources.get(diff.name);
+        if (existing?.id) {
+          await client.datasources.delete(existing.id, {
+            path: { space_id: spaceIdNum },
+            throwOnError: true
+          });
+          return true;
+        }
+      })
+    );
+    for (let i = 0; i < deleteDatasourceResults.length; i++) {
+      const result = deleteDatasourceResults[i];
+      if (result.status === "fulfilled") {
+        if (result.value) {
+          deleted++;
+        }
+      } else {
+        deleteErrors.push({ action: "delete_datasource", reason: result.reason, message: `Failed to delete datasource ${staleDatasources[i].name}` });
+      }
+    }
+    const staleFolders = diffResult.diffs.filter((d) => d.type === "folder" && d.action === "stale").sort((a, b) => b.name.split("/").length - a.name.split("/").length);
+    for (const diff of staleFolders) {
+      const group = groupByPath.get(diff.name);
+      if (!group) {
+        deleteErrors.push({
+          action: "delete_component_folder",
+          reason: new Error(`No component group resolved for stale folder path "${diff.name}".`),
+          message: `Failed to delete folder ${diff.name}`
+        });
+        continue;
+      }
+      try {
+        await client.componentFolders.delete(group.id, {
+          path: { space_id: spaceIdNum },
+          throwOnError: true
+        });
+        deleted++;
+      } catch (error) {
+        deleteErrors.push({ action: "delete_component_folder", reason: error, message: `Failed to delete folder ${diff.name}` });
+      }
+    }
+    if (deleteErrors.length > 0) {
+      const first = deleteErrors[0];
+      const suffix = deleteErrors.length > 1 ? ` (and ${deleteErrors.length - 1} more delete error(s))` : "";
+      handleAPIError(first.action, first.reason, `${first.message}${suffix}`);
+    }
+  }
+  return { created, updated, deleted };
+}
+function buildChangesetEntries(diffResult, local, remote, options) {
+  const changes = [];
+  const remoteFolders = [...remote.componentFolders.values()];
+  const folderPathByUuid = buildGroupPathByUuid(remoteFolders);
+  const remoteFolderByPath = /* @__PURE__ */ new Map();
+  for (const folder of remoteFolders) {
+    const segments = folderPathByUuid.get(folder.uuid);
+    if (segments?.length) {
+      remoteFolderByPath.set(segments.join("/"), folder);
+    }
+  }
+  for (const diff of diffResult.diffs) {
+    if (diff.action === "unchanged") {
+      continue;
+    }
+    if (diff.action === "stale" && !options.delete) {
+      continue;
+    }
+    const action = diff.action === "stale" ? "delete" : diff.action;
+    let remoteSrc;
+    let localSrc;
+    if (diff.type === "component") {
+      remoteSrc = remote.components.get(diff.name);
+      localSrc = local.components.find((c) => c.name === diff.name);
+    } else if (diff.type === "datasource") {
+      remoteSrc = remote.datasources.get(diff.name);
+      localSrc = local.datasources.find((d) => d.name === diff.name);
+    } else if (diff.type === "folder") {
+      remoteSrc = remoteFolderByPath.get(diff.name);
+      localSrc = local.folders.find((f) => f.path === diff.name);
+    }
+    changes.push({
+      type: diff.type,
+      name: diff.name,
+      action,
+      ...remoteSrc && { before: { ...remoteSrc } },
+      ...localSrc && { after: { ...localSrc } }
+    });
+  }
+  return changes;
+}
+
+async function ensureDir(dir) {
+  await mkdir(dir, { recursive: true });
+}
+async function saveChangeset(basePath, data) {
+  const dir = join(basePath, "schema", "changesets");
+  await ensureDir(dir);
+  const fileName = `${fileTimestamp(data.timestamp)}.json`;
+  const filePath = join(dir, fileName);
+  await writeFile(filePath, JSON.stringify(data, null, 2), "utf-8");
+  return filePath;
+}
+
+const SENTINEL_FIELDS = /* @__PURE__ */ new Set(["_uid", "component"]);
+function classifyFieldChanges(remoteSchema, localSchema) {
+  const removed = [];
+  const added = [];
+  const typeChanged = [];
+  const requiredAdded = [];
+  const requiredChanged = [];
+  for (const [field, remoteField] of Object.entries(remoteSchema)) {
+    if (SENTINEL_FIELDS.has(field)) {
+      continue;
+    }
+    if (typeof remoteField.type !== "string") {
+      continue;
+    }
+    if (!(field in localSchema)) {
+      removed.push({ field, type: remoteField.type });
+    }
+  }
+  for (const [field, localField] of Object.entries(localSchema)) {
+    if (SENTINEL_FIELDS.has(field)) {
+      continue;
+    }
+    if (typeof localField.type !== "string") {
+      continue;
+    }
+    if (!(field in remoteSchema)) {
+      if (localField.required) {
+        requiredAdded.push({ field, type: localField.type });
+      } else {
+        added.push({ field, type: localField.type, required: false });
+      }
+    } else {
+      const remoteField = remoteSchema[field];
+      if (typeof remoteField?.type !== "string") {
+        continue;
+      }
+      if (remoteField.type !== localField.type) {
+        typeChanged.push({ field, oldType: remoteField.type, newType: localField.type });
+      }
+      if (localField.required && !remoteField.required) {
+        requiredChanged.push({ field, type: localField.type });
+      }
+    }
+  }
+  return { removed, added, typeChanged, requiredAdded, requiredChanged };
+}
+function longestCommonSubstring(a, b) {
+  let maxLen = 0;
+  for (let i = 0; i < a.length; i++) {
+    for (let j = 0; j < b.length; j++) {
+      let len = 0;
+      while (i + len < a.length && j + len < b.length && a[i + len] === b[j + len]) {
+        len++;
+      }
+      if (len > maxLen) {
+        maxLen = len;
+      }
+    }
+  }
+  return maxLen;
+}
+function nameSimilarity(a, b) {
+  const longer = Math.max(a.length, b.length);
+  if (longer === 0) {
+    return 1;
+  }
+  return longestCommonSubstring(a, b) / longer;
+}
+function detectRenames(removed, added) {
+  const renames = [];
+  const usedRemoved = /* @__PURE__ */ new Set();
+  const usedAdded = /* @__PURE__ */ new Set();
+  const addedByType = /* @__PURE__ */ new Map();
+  for (const addedField of added) {
+    if (!addedByType.has(addedField.type)) {
+      addedByType.set(addedField.type, []);
+    }
+    addedByType.get(addedField.type).push(addedField);
+  }
+  const isSinglePair = removed.length === 1 && added.length === 1;
+  for (const removedField of removed) {
+    const candidates = addedByType.get(removedField.type) ?? [];
+    const availableCandidates = candidates.filter((c) => !usedAdded.has(c.field));
+    if (availableCandidates.length === 0) {
+      continue;
+    }
+    let bestCandidate = availableCandidates[0];
+    let bestScore = nameSimilarity(removedField.field, bestCandidate.field);
+    for (let i = 1; i < availableCandidates.length; i++) {
+      const score = nameSimilarity(removedField.field, availableCandidates[i].field);
+      if (score > bestScore) {
+        bestScore = score;
+        bestCandidate = availableCandidates[i];
+      }
+    }
+    if (!isSinglePair && bestScore < 0.3) {
+      continue;
+    }
+    renames.push({ oldField: removedField.field, newField: bestCandidate.field, fieldType: removedField.type });
+    usedRemoved.add(removedField.field);
+    usedAdded.add(bestCandidate.field);
+  }
+  const unmatchedRemoved = removed.filter((r) => !usedRemoved.has(r.field));
+  const unmatchedAdded = added.filter((a) => !usedAdded.has(a.field));
+  return { renames, unmatchedRemoved, unmatchedAdded };
+}
+function analyzeBreakingChanges(diffResult, local, remote) {
+  const results = [];
+  const updatedComponents = diffResult.diffs.filter(
+    (d) => d.type === "component" && d.action === "update"
+  );
+  for (const diff of updatedComponents) {
+    const localComp = local.components.find((c) => c.name === diff.name);
+    const remoteComp = remote.components.get(diff.name);
+    if (!localComp?.schema || !remoteComp?.schema) {
+      continue;
+    }
+    const classification = classifyFieldChanges(
+      remoteComp.schema,
+      localComp.schema
+    );
+    const changes = [];
+    const { renames, unmatchedRemoved } = detectRenames(classification.removed, classification.added);
+    for (const rename of renames) {
+      changes.push({ kind: "rename", field: rename.newField, oldField: rename.oldField });
+    }
+    for (const removed of unmatchedRemoved) {
+      changes.push({ kind: "removed", field: removed.field });
+    }
+    for (const tc of classification.typeChanged) {
+      changes.push({ kind: "type_changed", field: tc.field, oldType: tc.oldType, newType: tc.newType });
+    }
+    for (const ra of classification.requiredAdded) {
+      changes.push({ kind: "required_added", field: ra.field, fieldType: ra.type });
+    }
+    for (const rc of classification.requiredChanged) {
+      changes.push({ kind: "required_changed", field: rc.field, fieldType: rc.type });
+    }
+    if (changes.length > 0) {
+      results.push({ componentName: diff.name, changes });
+    }
+  }
+  return results;
+}
+
+const COMPATIBLE_TYPES = /* @__PURE__ */ new Set(["text:textarea", "textarea:text"]);
+function defaultForType(fieldType) {
+  switch (fieldType) {
+    case "text":
+    case "textarea":
+    case "markdown":
+      return `''`;
+    case "number":
+      return "0";
+    case "boolean":
+      return "false";
+    default:
+      return null;
+  }
+}
+function typeConversion(field, oldType, newType) {
+  const key = `${oldType}:${newType}`;
+  if (COMPATIBLE_TYPES.has(key)) {
+    return null;
+  }
+  const accessor = `block.${field}`;
+  switch (key) {
+    case "text:number":
+      return `${accessor} = Number(${accessor}) || 0;`;
+    case "number:text":
+      return `${accessor} = String(${accessor});`;
+    case "text:boolean":
+      return `${accessor} = !!${accessor};`;
+    case "boolean:text":
+      return `${accessor} = String(${accessor});`;
+    default:
+      return `${accessor}; // TODO: convert from ${oldType} to ${newType}`;
+  }
+}
+function renderMigrationCode(changes) {
+  const lines = [];
+  lines.push("  // Review this migration before running it against your space.");
+  lines.push("  // Generated migrations are scaffolds and may need manual adjustments.");
+  lines.push("  // Example rename migration:");
+  lines.push("  // block.new_field = block.old_field;");
+  lines.push("  // delete block.old_field;");
+  lines.push("");
+  for (const change of changes) {
+    switch (change.kind) {
+      case "rename":
+        lines.push(`  // Rename: ${change.oldField} \u2192 ${change.field}`);
+        lines.push(`  if ('${change.oldField}' in block) {`);
+        lines.push(`    block.${change.field} = block.${change.oldField};`);
+        lines.push(`    delete block.${change.oldField};`);
+        lines.push(`  }`);
+        break;
+      case "removed":
+        if (change.renameHint) {
+          lines.push(`  // If '${change.field}' was renamed to '${change.renameHint.newField}', uncomment:`);
+          lines.push(`  // block.${change.renameHint.newField} = block.${change.field};`);
+        } else {
+          lines.push(`  // Removed field: ${change.field}`);
+        }
+        lines.push(`  delete block.${change.field};`);
+        break;
+      case "type_changed": {
+        const conversion = typeConversion(change.field, change.oldType, change.newType);
+        if (conversion) {
+          lines.push(`  // Type change: ${change.field} (${change.oldType} \u2192 ${change.newType})`);
+          lines.push(`  ${conversion}`);
+        }
+        break;
+      }
+      case "required_added": {
+        const defaultValue = defaultForType(change.fieldType);
+        lines.push(`  // New required field: ${change.field} (${change.fieldType})`);
+        if (defaultValue !== null) {
+          lines.push(`  // TODO: provide a meaningful default value`);
+          lines.push(`  block.${change.field} = block.${change.field} ?? ${defaultValue};`);
+        } else {
+          lines.push(`  // TODO: provide a default value appropriate for the '${change.fieldType}' type`);
+          lines.push(`  // block.${change.field} = block.${change.field} ?? <default>;`);
+        }
+        break;
+      }
+      case "required_changed": {
+        const defaultValue = defaultForType(change.fieldType);
+        lines.push(`  // Field is now required: ${change.field} (${change.fieldType})`);
+        lines.push(`  // Existing stories may have null/undefined values \u2014 provide a default for those.`);
+        if (defaultValue !== null) {
+          lines.push(`  // TODO: provide a meaningful default value`);
+          lines.push(`  block.${change.field} = block.${change.field} ?? ${defaultValue};`);
+        } else {
+          lines.push(`  // TODO: provide a default value appropriate for the '${change.fieldType}' type`);
+          lines.push(`  // block.${change.field} = block.${change.field} ?? <default>;`);
+        }
+        break;
+      }
+    }
+    lines.push("");
+  }
+  const body = lines.length > 0 ? `
+${lines.join("\n")}` : "\n";
+  return `export default function (block) {${body}  return block;
+}
+`;
+}
+async function writeMigrationFile(options) {
+  const { spaceId, componentName, code, timestamp, basePath } = options;
+  const dir = resolvePath(basePath, `migrations/${spaceId}`);
+  await mkdir(dir, { recursive: true });
+  const fileName = `${componentName}.${fileTimestamp(timestamp)}.js`;
+  const filePath = join(dir, fileName);
+  await writeFile(filePath, code, "utf-8");
+  return filePath;
+}
+
+const DEFAULT_GROUPS_FILENAME = "groups.json";
+const CONSOLIDATED_COMPONENTS_FILENAME = "components.json";
+function sanitizeForLocalWrite(component) {
+  const { folder, ...rest } = component;
+  if (isRecord(rest.schema)) {
+    const schema = {};
+    for (const [key, field] of Object.entries(rest.schema)) {
+      if (isRecord(field) && "component_group_whitelist" in field) {
+        const { component_group_whitelist, restrict_components, ...fieldRest } = field;
+        if (fieldRest.restrict_type === "groups") {
+          delete fieldRest.restrict_type;
+        }
+        schema[key] = fieldRest;
+      } else {
+        schema[key] = field;
+      }
+    }
+    rest.schema = schema;
+  }
+  return rest;
+}
+async function writeLocalComponents({
+  space,
+  basePath,
+  resolved,
+  diffResult,
+  deleteRemoved,
+  ui,
+  logger
+}) {
+  const componentsDir = resolveCommandPath(directories.components, space, basePath);
+  const consolidatedPath = join(componentsDir, CONSOLIDATED_COMPONENTS_FILENAME);
+  if (await fileExists(consolidatedPath)) {
+    ui.warn(
+      `A consolidated ${CONSOLIDATED_COMPONENTS_FILENAME} exists at ${displayPath(componentsDir, basePath)}. Per-component files will still be written, but the consolidated file may shadow them when stories push validates schemas. Delete it or run \`storyblok components pull --separate-files\` to regenerate.`
+    );
+  }
+  for (const component of resolved.components) {
+    const filePath = join(componentsDir, `${sanitizeFilename(component.name || "")}.json`);
+    await saveToFile(filePath, JSON.stringify(sanitizeForLocalWrite(component), null, 2));
+  }
+  const groupsPath = join(componentsDir, DEFAULT_GROUPS_FILENAME);
+  if (await fileExists(groupsPath)) {
+    try {
+      await unlink(groupsPath);
+      logger.info("Removed stale local groups file", { path: displayPath(groupsPath, basePath) });
+    } catch (error) {
+      if (error.code !== "ENOENT") {
+        throw error;
+      }
+    }
+  }
+  if (deleteRemoved) {
+    const staleComponents = diffResult.diffs.filter(
+      (d) => d.type === "component" && d.action === "stale"
+    );
+    for (const stale of staleComponents) {
+      const filePath = join(componentsDir, `${sanitizeFilename(stale.name)}.json`);
+      try {
+        await unlink(filePath);
+        logger.info("Removed stale local component file", { path: displayPath(filePath, basePath) });
+      } catch (error) {
+        if (error.code !== "ENOENT") {
+          throw error;
+        }
+      }
+    }
+  }
+  logger.info("Wrote local component files", {
+    space,
+    componentsWritten: resolved.components.length
+  });
+}
+
+schemaCommand.command("push <entry-file>").description("Push local TypeScript schema and datasource definitions to a Storyblok space").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage").option("--dry-run", "Show diffs without applying changes", false).option("--delete", "Delete remote entities not present in local schema", false).option("--migrations", "Generate scaffold migration files for breaking changes", true).addOption(new Option("--no-migrations", "Skip migration generation for breaking changes")).option("--write-components", "Write component schemas as local JSON files after push (also removes local files for components deleted via --delete)", true).addOption(new Option("--no-write-components", "Skip writing local component files")).action(async (entryFile, options, command) => {
+  const ui = getUI();
+  const logger = getLogger();
+  const reporter = getReporter();
+  const { space, path: basePath, verbose } = command.optsWithGlobals();
+  const { state } = session();
+  ui.title(commands.SCHEMA, colorPalette.SCHEMA, "Pushing schema...");
+  logger.info("Schema push started", { entryFile, space });
+  if (!requireAuthentication(state, verbose)) {
+    return;
+  }
+  if (!space) {
+    handleError(new CommandError("Please provide the space as argument --space SPACE_ID."), verbose);
+    return;
+  }
+  const summary = { total: 0, succeeded: 0, failed: 0 };
+  try {
+    const loadSpinner = ui.createSpinner("Resolving schema...");
+    let local;
+    try {
+      local = await loadSchema(entryFile);
+    } catch (maybeError) {
+      loadSpinner.failed("Failed to resolve schema");
+      handleError(toError(maybeError), verbose);
+      return;
+    }
+    loadSpinner.succeed(`Found: ${local.components.length} components, ${local.folders.length} folders, ${local.datasources.length} datasources`);
+    const totalLocal = local.components.length + local.datasources.length + local.folders.length;
+    if (totalLocal === 0) {
+      ui.warn("No components, folders, or datasources found in the entry file. Verify the file exports schema definitions.");
+      return;
+    }
+    const remoteSpinner = ui.createSpinner(`Fetching remote state from space ${space}...`);
+    let remoteResult;
+    try {
+      remoteResult = await fetchRemoteSchema(space);
+    } catch (maybeError) {
+      remoteSpinner.failed("Failed to fetch remote schema");
+      handleError(toError(maybeError), verbose);
+      return;
+    }
+    const { remote, rawComponents, rawComponentFolders, rawDatasources } = remoteResult;
+    remoteSpinner.succeed(`Remote: ${remote.components.size} components, ${remote.datasources.size} datasources`);
+    const diffResult = diffSchema(local, remote);
+    ui.br();
+    ui.log(formatDiffOutput(diffResult, { delete: options.delete }));
+    if (options.migrations) {
+      const breakingChanges = analyzeBreakingChanges(diffResult, local, remote);
+      if (breakingChanges.length > 0) {
+        const totalChanges = breakingChanges.reduce((sum, c) => sum + c.changes.length, 0);
+        ui.br();
+        ui.warn(`${totalChanges} breaking change(s) detected in ${breakingChanges.length} component(s).`);
+        ui.info("Generated migrations are scaffolds. Review and adjust them before running `storyblok migrations run`.");
+        if (!options.dryRun) {
+          const explicitMigrations = command.getOptionValueSource("migrations") === "cli";
+          const shouldGenerate = explicitMigrations || await confirm({
+            message: "Generate migration files for breaking changes?",
+            default: true
+          });
+          if (shouldGenerate) {
+            const migrationTimestamp = (/* @__PURE__ */ new Date()).toISOString();
+            const resolvedBase = resolvePath(basePath, "");
+            for (const comp of breakingChanges) {
+              const renames = comp.changes.filter((c) => c.kind === "rename");
+              if (renames.length > 0 && explicitMigrations) {
+                for (const r of renames) {
+                  if (r.kind === "rename") {
+                    ui.log(`  Assumed rename in '${comp.componentName}': ${r.oldField} \u2192 ${r.field}`);
+                  }
+                }
+              }
+              if (renames.length > 0 && !explicitMigrations) {
+                ui.br();
+                ui.log(`Detected renames in '${comp.componentName}':`);
+                for (const r of renames) {
+                  if (r.kind === "rename") {
+                    ui.log(`  ${r.oldField} \u2192 ${r.field}`);
+                  }
+                }
+                const renameConfirmed = await confirm({
+                  message: "Are these renames correct?",
+                  default: true
+                });
+                if (!renameConfirmed) {
+                  comp.changes = comp.changes.map((c) => {
+                    if (c.kind === "rename") {
+                      return { kind: "removed", field: c.oldField, renameHint: { newField: c.field } };
+                    }
+                    return c;
+                  });
+                }
+              }
+              const code = renderMigrationCode(comp.changes);
+              const path = await writeMigrationFile({
+                spaceId: space,
+                componentName: comp.componentName,
+                code,
+                timestamp: migrationTimestamp,
+                basePath: resolvedBase
+              });
+              const migrationPath = displayPath(path, basePath);
+              logger.info("Migration generated", { component: comp.componentName, path: migrationPath });
+              ui.log(`  Generated: ${migrationPath}`);
+            }
+            ui.br();
+            ui.info(`Run migrations when ready: storyblok migrations run --space ${space}`);
+          }
+        }
+      }
+    }
+    if (options.delete) {
+      const deletedComponents = diffResult.diffs.filter((d) => d.type === "component" && d.action === "stale");
+      for (const comp of deletedComponents) {
+        ui.warn(`Component '${comp.name}' will be deleted. Stories using it will have out-of-schema content.`);
+      }
+      const staleFolders = diffResult.diffs.filter((d) => d.type === "folder" && d.action === "stale");
+      if (staleFolders.length > 0) {
+        const uuidByPath = /* @__PURE__ */ new Map();
+        for (const [uuid, segments] of buildGroupPathByUuid([...remote.componentFolders.values()])) {
+          uuidByPath.set(segments.join("/"), uuid);
+        }
+        const staleComponentNames = new Set(
+          diffResult.diffs.filter((d) => d.type === "component" && d.action === "stale").map((d) => d.name)
+        );
+        for (const folder of staleFolders) {
+          const uuid = uuidByPath.get(folder.name);
+          if (!uuid) {
+            continue;
+          }
+          const count = [...remote.components.values()].filter((c) => c.component_group_uuid === uuid && !staleComponentNames.has(c.name)).length;
+          if (count > 0) {
+            ui.warn(`Folder '${folder.name}' will be deleted; ${count} component(s) inside will be ungrouped.`);
+          }
+        }
+      }
+    }
+    if (diffResult.stale > 0 && !options.delete) {
+      ui.warn(`${diffResult.stale} stale entity(s) exist remotely but not in schema. Use --delete to remove.`);
+    }
+    if (options.dryRun) {
+      ui.info("Dry run \u2014 no changes applied.");
+      logger.info("Dry run completed", { creates: diffResult.creates, updates: diffResult.updates });
+      return;
+    }
+    const resolvedPath = resolvePath(basePath, "");
+    const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+    const changesetPath = await saveChangeset(resolvedPath, {
+      timestamp,
+      spaceId: Number(space),
+      remote: { components: rawComponents, componentFolders: rawComponentFolders, datasources: rawDatasources },
+      changes: buildChangesetEntries(diffResult, local, remote, { delete: options.delete })
+    });
+    logger.info("Changeset saved", { path: displayPath(changesetPath, basePath) });
+    const nothingToPush = diffResult.creates === 0 && diffResult.updates === 0 && (!options.delete || diffResult.stale === 0);
+    if (nothingToPush) {
+      ui.ok("Everything up to date \u2014 nothing to push.");
+    } else {
+      const pushSpinner = ui.createSpinner("Pushing schema...");
+      let result;
+      try {
+        result = await executePush(space, local, remote, diffResult, { delete: options.delete });
+      } catch (error) {
+        pushSpinner.failed("Failed to push schema");
+        throw error;
+      }
+      summary.total = result.created + result.updated + result.deleted;
+      summary.succeeded = summary.total;
+      pushSpinner.succeed(`Pushed ${result.created} creations, ${result.updated} updates${result.deleted > 0 ? `, ${result.deleted} deletions` : ""}.`);
+    }
+    if (options.writeComponents) {
+      try {
+        await writeLocalComponents({
+          space,
+          basePath,
+          resolved: local,
+          diffResult,
+          deleteRemoved: options.delete,
+          ui,
+          logger
+        });
+      } catch (writeError) {
+        ui.warn(`Failed to write local component files: ${toError(writeError).message}`);
+        logger.warn("Failed to write local component files", { error: toError(writeError).message });
+      }
+    }
+  } catch (maybeError) {
+    summary.failed += 1;
+    handleError(toError(maybeError), verbose);
+  } finally {
+    logger.info("Schema push finished", { summary });
+    reporter.addSummary("schemaPushResults", summary);
+    reporter.finalize();
+  }
+});
+
+const FIELD_STRIP_KEYS = /* @__PURE__ */ new Set(["id", "pos"]);
+function toCamelCaseIdentifier(str) {
+  const camel = slugify(str).replace(/^[_-]+/, "").replace(/[_-]+(.)/g, (_, char) => char.toUpperCase());
+  if (!camel) {
+    return "_";
+  }
+  return /^\d/.test(camel) ? `_${camel}` : camel;
+}
+function toKebabCase(str) {
+  return str.replace(/[\s_]+/g, "-").replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
+}
+function componentVarName(name) {
+  return `${toCamelCaseIdentifier(name)}Block`;
+}
+function datasourceVarName(name) {
+  return `${toCamelCaseIdentifier(name)}Datasource`;
+}
+function folderVarName(name) {
+  return `${toCamelCaseIdentifier(name)}Folder`;
+}
+function resolveVarNames(rawNames, baseVarName) {
+  const used = /* @__PURE__ */ new Set();
+  return rawNames.map((raw) => {
+    const base = baseVarName(raw);
+    let candidate = base;
+    let n = 2;
+    while (used.has(candidate)) {
+      candidate = `${base}${n++}`;
+    }
+    used.add(candidate);
+    return candidate;
+  });
+}
+function resolveFileNames(baseNames, dirKeys) {
+  const usedByDir = /* @__PURE__ */ new Map();
+  return baseNames.map((base, i) => {
+    const dir = dirKeys?.[i] ?? "";
+    let used = usedByDir.get(dir);
+    if (!used) {
+      used = /* @__PURE__ */ new Set();
+      usedByDir.set(dir, used);
+    }
+    let candidate = base;
+    let n = 2;
+    while (used.has(candidate)) {
+      candidate = `${base}-${n++}`;
+    }
+    used.add(candidate);
+    return candidate;
+  });
+}
+function componentFileName(name) {
+  return toKebabCase(name);
+}
+function datasourceFileName(datasource) {
+  return toKebabCase(datasource.slug || datasource.name);
+}
+function resolveComponents(components, segmentsByIndex) {
+  const varNames = resolveVarNames(components.map((c) => c.name), componentVarName);
+  const fileNames = resolveFileNames(
+    components.map((c) => componentFileName(c.name)),
+    segmentsByIndex.map((segments) => segments.join("/"))
+  );
+  return components.map((component, i) => ({
+    component,
+    varName: varNames[i],
+    fileName: fileNames[i],
+    segments: segmentsByIndex[i]
+  }));
+}
+function resolveDatasources(datasources) {
+  const varNames = resolveVarNames(datasources.map((d) => d.name), datasourceVarName);
+  const fileNames = resolveFileNames(datasources.map((d) => datasourceFileName(d)));
+  return datasources.map((datasource, i) => ({
+    datasource,
+    varName: varNames[i],
+    fileName: fileNames[i]
+  }));
+}
+function resolveFolders(folders) {
+  const pathByUuid = buildGroupPathByUuid(folders);
+  const ordered = [...folders].sort((a, b) => (pathByUuid.get(a.uuid)?.length ?? 0) - (pathByUuid.get(b.uuid)?.length ?? 0));
+  const varNames = resolveVarNames(ordered.map((f) => f.name), folderVarName);
+  return ordered.map((folder, i) => ({
+    folder,
+    varName: varNames[i],
+    segments: pathByUuid.get(folder.uuid) ?? []
+  }));
+}
+function resolveGroupWhitelistRefs(whitelist, folderVarByUuid) {
+  if (!folderVarByUuid || !Array.isArray(whitelist) || whitelist.length === 0) {
+    return void 0;
+  }
+  const vars = whitelist.map((uuid) => typeof uuid === "string" ? folderVarByUuid.get(uuid) : void 0);
+  if (!vars.every((v) => typeof v === "string")) {
+    return void 0;
+  }
+  return vars.map((v) => new RawCode(v));
+}
+function toDslField(field, folderVarByUuid) {
+  const { component_whitelist, component_group_whitelist, datasource_slug, restrict_components, restrict_type, ...rest } = field;
+  const out = { ...rest };
+  const groupRefs = resolveGroupWhitelistRefs(component_group_whitelist, folderVarByUuid);
+  const hasBlockNames = Array.isArray(component_whitelist) && component_whitelist.length > 0;
+  if (hasBlockNames) {
+    out.allow = component_whitelist;
+  } else if (groupRefs) {
+    out.allow = groupRefs;
+  } else if (component_group_whitelist !== void 0) {
+    out.component_group_whitelist = component_group_whitelist;
+    if (restrict_components !== void 0) {
+      out.restrict_components = restrict_components;
+    }
+    if (restrict_type !== void 0) {
+      out.restrict_type = restrict_type;
+    }
+  }
+  if (datasource_slug !== void 0) {
+    out.datasource = datasource_slug;
+  }
+  return out;
+}
+function omitEmptyArrays(obj) {
+  const out = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (Array.isArray(value) && value.length === 0) {
+      continue;
+    }
+    out[key] = value;
+  }
+  return out;
+}
+function generateFieldCode(fieldName, fieldData, depth, folderVarByUuid) {
+  const clean = omitEmptyArrays(toDslField(stripKeys(fieldData, FIELD_STRIP_KEYS), folderVarByUuid));
+  return `defineField(${quoteString(fieldName)}, ${formatValue(clean, depth)})`;
+}
+function collectWhitelistFolderVars(schema, folderVarByUuid) {
+  const vars = /* @__PURE__ */ new Set();
+  for (const field of Object.values(schema)) {
+    if (!isRecord(field)) {
+      continue;
+    }
+    const refs = resolveGroupWhitelistRefs(field.component_group_whitelist, folderVarByUuid);
+    if (refs) {
+      refs.forEach((ref) => vars.add(ref.code));
+    }
+  }
+  return [...vars].sort();
+}
+function sortSchemaByPos(schema) {
+  return Object.entries(schema).filter(([key]) => key !== "_uid" && key !== "component").sort(([, a], [, b]) => {
+    const posA = typeof a.pos === "number" ? a.pos : Infinity;
+    const posB = typeof b.pos === "number" ? b.pos : Infinity;
+    return posA - posB;
+  });
+}
+function generateFoldersFile(resolved) {
+  const varByUuid = new Map(resolved.map((r) => [r.folder.uuid, r.varName]));
+  const lines = ["import { defineFolder } from '@storyblok/schema';", ""];
+  for (const { folder, varName } of resolved) {
+    const parentVar = folder.parent_uuid ? varByUuid.get(folder.parent_uuid) : void 0;
+    lines.push(`export const ${varName} = defineFolder({`);
+    lines.push(`${INDENT}name: ${quoteString(folder.name)},`);
+    if (parentVar) {
+      lines.push(`${INDENT}parent: ${parentVar},`);
+    }
+    lines.push("});");
+    lines.push("");
+  }
+  return lines.join("\n");
+}
+function generateComponentFile(component, varName, folderRef, folderVarByUuid) {
+  const lines = [];
+  lines.push("import {");
+  lines.push("  defineBlock,");
+  lines.push("  defineField,");
+  lines.push("} from '@storyblok/schema';");
+  lines.push("");
+  const blockDepth = folderRef?.segments.length ?? 0;
+  const schema = isRecord(component.schema) ? component.schema : {};
+  const folderVars = [.../* @__PURE__ */ new Set([
+    ...folderRef ? [folderRef.varName] : [],
+    ...collectWhitelistFolderVars(schema, folderVarByUuid)
+  ])].sort();
+  if (folderVars.length > 0) {
+    const rel = "../".repeat(blockDepth + 1);
+    lines.push(`import { ${folderVars.join(", ")} } from '${rel}folders';`);
+    lines.push("");
+  }
+  const resolvedVarName = varName ?? componentVarName(component.name);
+  lines.push(`export const ${resolvedVarName} = defineBlock({`);
+  const clean = omitEmptyArrays(stripKeys(component, COMPONENT_STRIP_KEYS));
+  delete clean.component_group_uuid;
+  const orderedKeys = [];
+  if (clean.name !== void 0) {
+    orderedKeys.push("name");
+  }
+  if (clean.display_name !== void 0) {
+    orderedKeys.push("display_name");
+  }
+  if (clean.is_root !== void 0) {
+    orderedKeys.push("is_root");
+  }
+  if (clean.is_nestable !== void 0) {
+    orderedKeys.push("is_nestable");
+  }
+  const prefixKeyCount = orderedKeys.length;
+  const handled = /* @__PURE__ */ new Set(["name", "display_name", "is_root", "is_nestable", "schema"]);
+  for (const key of Object.keys(clean).sort()) {
+    if (!handled.has(key)) {
+      orderedKeys.push(key);
+    }
+  }
+  orderedKeys.forEach((key, i) => {
+    lines.push(`${INDENT}${key}: ${formatValue(clean[key], 1)},`);
+    if (folderRef && i === prefixKeyCount - 1) {
+      lines.push(`${INDENT}folder: ${folderRef.varName},`);
+    }
+  });
+  if (folderRef && prefixKeyCount === 0) {
+    lines.push(`${INDENT}folder: ${folderRef.varName},`);
+  }
+  if (clean.schema && typeof clean.schema === "object") {
+    const schema2 = clean.schema;
+    const sortedFields = sortSchemaByPos(schema2);
+    if (sortedFields.length > 0) {
+      lines.push(`${INDENT}fields: [`);
+      for (const [fieldName, fieldData] of sortedFields) {
+        const fieldCode = generateFieldCode(fieldName, fieldData, 2, folderVarByUuid);
+        lines.push(`${INDENT}${INDENT}${fieldCode},`);
+      }
+      lines.push(`${INDENT}],`);
+    } else {
+      lines.push(`${INDENT}fields: [],`);
+    }
+  }
+  lines.push("});");
+  lines.push("");
+  return lines.join("\n");
+}
+function generateDatasourceFile(datasource, varName) {
+  const lines = [];
+  lines.push("import { defineDatasource } from '@storyblok/schema';");
+  lines.push("");
+  const resolvedVarName = varName ?? datasourceVarName(datasource.name);
+  lines.push(`export const ${resolvedVarName} = defineDatasource({`);
+  const clean = stripKeys(datasource, DATASOURCE_STRIP_KEYS);
+  if (clean.name !== void 0) {
+    lines.push(`${INDENT}name: ${formatValue(clean.name, 1)},`);
+  }
+  if (clean.slug !== void 0) {
+    lines.push(`${INDENT}slug: ${formatValue(clean.slug, 1)},`);
+  }
+  const handled = /* @__PURE__ */ new Set(["name", "slug"]);
+  for (const [key, value] of Object.entries(clean).sort(([a], [b]) => a.localeCompare(b))) {
+    if (!handled.has(key)) {
+      lines.push(`${INDENT}${key}: ${formatValue(value, 1)},`);
+    }
+  }
+  lines.push("});");
+  lines.push("");
+  return lines.join("\n");
+}
+function generateSchemaFile(components, datasources, folders = []) {
+  const lines = [];
+  lines.push("import { defineSchema } from '@storyblok/schema';");
+  lines.push("import type { Schema as InferSchema, Story as InferStory } from '@storyblok/schema';");
+  lines.push("import type { MapiStory as InferStoryMapi } from '@storyblok/schema';");
+  lines.push("");
+  for (const { varName, fileName, segments } of components) {
+    const subPath = segments.length > 0 ? `${segments.join("/")}/` : "";
+    lines.push(`import { ${varName} } from './blocks/${subPath}${fileName}';`);
+  }
+  for (const { varName, fileName } of datasources) {
+    lines.push(`import { ${varName} } from './datasources/${fileName}';`);
+  }
+  if (folders.length > 0) {
+    lines.push(`import { ${folders.map((f) => f.varName).join(", ")} } from './folders';`);
+  }
+  lines.push("");
+  lines.push("export const schema = defineSchema({");
+  if (components.length > 0) {
+    lines.push("  blocks: {");
+    for (const { varName } of components) {
+      lines.push(`    ${varName},`);
+    }
+    lines.push("  },");
+  }
+  if (datasources.length > 0) {
+    lines.push("  datasources: {");
+    for (const { varName } of datasources) {
+      lines.push(`    ${varName},`);
+    }
+    lines.push("  },");
+  }
+  if (folders.length > 0) {
+    lines.push("  folders: {");
+    for (const { varName } of folders) {
+      lines.push(`    ${varName},`);
+    }
+    lines.push("  },");
+  }
+  lines.push("});");
+  lines.push("");
+  lines.push("export type Schema = InferSchema<typeof schema>;");
+  lines.push("export type Blocks = Schema['blocks'];");
+  lines.push("export type Story = InferStory<Blocks>;");
+  lines.push("export type StoryMapi = InferStoryMapi<Blocks>;");
+  lines.push("");
+  return lines.join("\n");
+}
+
+async function writeFileWithDirs(filePath, content) {
+  const dir = dirname(filePath);
+  await mkdir(dir, { recursive: true });
+  await writeFile(filePath, content, "utf-8");
+}
+async function writeSchemaFiles(targetPath, components, componentFolders, datasources) {
+  const writtenFiles = [];
+  const groupPathByUuid = buildGroupPathByUuid(componentFolders);
+  const componentSegments = components.map(
+    (comp) => comp.component_group_uuid ? groupPathByUuid.get(comp.component_group_uuid) ?? [] : []
+  );
+  const resolvedComponents = resolveComponents(components, componentSegments);
+  const resolvedDatasources = resolveDatasources(datasources);
+  const resolvedFolders = resolveFolders(componentFolders);
+  const folderByUuid = new Map(resolvedFolders.map((r) => [r.folder.uuid, r]));
+  const folderVarByUuid = new Map([...folderByUuid].map(([uuid, r]) => [uuid, r.varName]));
+  for (const { component, varName, fileName, segments } of resolvedComponents) {
+    const filePath = join(targetPath, "blocks", ...segments, `${fileName}.ts`);
+    const folder = component.component_group_uuid ? folderByUuid.get(component.component_group_uuid) : void 0;
+    const folderRef = folder && { varName: folder.varName, segments };
+    await writeFileWithDirs(filePath, generateComponentFile(component, varName, folderRef, folderVarByUuid));
+    writtenFiles.push(filePath);
+  }
+  for (const { datasource, varName, fileName } of resolvedDatasources) {
+    const filePath = join(targetPath, "datasources", `${fileName}.ts`);
+    await writeFileWithDirs(filePath, generateDatasourceFile(datasource, varName));
+    writtenFiles.push(filePath);
+  }
+  if (resolvedFolders.length > 0) {
+    const foldersPath = join(targetPath, "folders.ts");
+    await writeFileWithDirs(foldersPath, generateFoldersFile(resolvedFolders));
+    writtenFiles.push(foldersPath);
+  }
+  const schemaPath = join(targetPath, "schema.ts");
+  await writeFileWithDirs(schemaPath, generateSchemaFile(resolvedComponents, resolvedDatasources, resolvedFolders));
+  writtenFiles.push(schemaPath);
+  return writtenFiles;
+}
+
+async function isTargetEmpty(targetPath) {
+  try {
+    const entries = await readdir(targetPath);
+    return entries.every((entry) => entry.startsWith("."));
+  } catch (maybeError) {
+    const error = maybeError;
+    if (error?.code === "ENOENT") {
+      return true;
+    }
+    throw error;
+  }
+}
+schemaCommand.command("init").description("Initialize a local code-driven schema workspace from an existing Storyblok space (one-time bootstrap)").option("-s, --space <space>", "space ID").option("--out-dir <dir>", "Output directory for generated bootstrap files", ".storyblok/schema").action(async (options, command) => {
+  const ui = getUI();
+  const logger = getLogger();
+  const reporter = getReporter();
+  const { space, verbose } = command.optsWithGlobals();
+  const { state } = session();
+  ui.title(commands.SCHEMA, colorPalette.SCHEMA, "Initializing schema...");
+  logger.info("Schema init started", { space });
+  if (!requireAuthentication(state, verbose)) {
+    return;
+  }
+  if (!space) {
+    handleError(new CommandError("Please provide the space as argument --space SPACE_ID."), verbose);
+    return;
+  }
+  const targetPath = resolve(options.outDir);
+  const targetDisplayPath = displayPath(targetPath, options.outDir);
+  if (!await isTargetEmpty(targetPath)) {
+    handleError(
+      new CommandError(`Target directory ${targetDisplayPath} is not empty. \`schema init\` is a one-time bootstrap and refuses to overwrite existing files. Use \`schema push\` for ongoing changes, or remove the directory to re-bootstrap.`),
+      verbose
+    );
+    return;
+  }
+  const summary = { total: 0, succeeded: 0, failed: 0 };
+  try {
+    const fetchSpinner = ui.createSpinner(`Fetching schema from space ${space}...`);
+    let fetchResult;
+    try {
+      fetchResult = await fetchRemoteSchema(space);
+    } catch (maybeError) {
+      fetchSpinner.failed("Failed to fetch remote schema");
+      handleError(toError(maybeError), verbose);
+      return;
+    }
+    const { rawComponents, rawComponentFolders, rawDatasources } = fetchResult;
+    fetchSpinner.succeed(`Found: ${rawComponents.length} components, ${rawComponentFolders.length} component folders, ${rawDatasources.length} datasources`);
+    const writeSpinner = ui.createSpinner(`Generating TypeScript files to ${targetDisplayPath}...`);
+    const writtenFiles = await writeSchemaFiles(targetPath, rawComponents, rawComponentFolders, rawDatasources);
+    summary.total = writtenFiles.length;
+    summary.succeeded = writtenFiles.length;
+    writeSpinner.succeed(`Generated ${writtenFiles.length} files`);
+    ui.list(writtenFiles.map((file) => displayPath(file, options.outDir)));
+    ui.warn("`schema init` is a one-time bootstrap step for adopting an existing space. Review generated files before continuing.");
+    ui.info("After bootstrapping, keep your local schema as the source of truth and use `schema push` for ongoing changes.");
+    ui.info("Make sure `@storyblok/schema` is installed in the project that imports these files (e.g. `pnpm add @storyblok/schema`).");
+  } catch (maybeError) {
+    summary.failed += 1;
+    handleError(toError(maybeError), verbose);
+  } finally {
+    logger.info("Schema init finished", { summary });
+    reporter.addSummary("schemaInitResults", summary);
+    reporter.finalize();
+  }
+});
+
+const API_ASSIGNED_FIELDS = [
+  "id",
+  "created_at",
+  "updated_at",
+  "real_name",
+  "all_presets",
+  "image",
+  "uuid"
+];
+function stripApiFields(payload) {
+  const result = { ...payload };
+  for (const field of API_ASSIGNED_FIELDS) {
+    delete result[field];
+  }
+  return result;
+}
+async function listChangesets(basePath) {
+  const dir = join(basePath, "schema", "changesets");
+  if (!await fileExists(dir)) {
+    return [];
+  }
+  const files = await readDirectory(dir);
+  return files.filter((f) => f.endsWith(".json")).sort().reverse().map((f) => join(dir, f));
+}
+async function loadChangeset(filePath) {
+  const content = await readFile$1(filePath, "utf-8");
+  return JSON.parse(content);
+}
+function buildRollbackOps(changeset) {
+  if (changeset.changes.length === 0) {
+    return [];
+  }
+  return changeset.changes.map((entry) => {
+    switch (entry.action) {
+      case "create":
+        return { type: entry.type, name: entry.name, action: "delete", payload: {} };
+      case "update":
+        return { type: entry.type, name: entry.name, action: "update", payload: entry.before ?? {} };
+      case "delete":
+        return { type: entry.type, name: entry.name, action: "create", payload: entry.before ?? {} };
+      default:
+        return { type: entry.type, name: entry.name, action: entry.action, payload: {} };
+    }
+  });
+}
+function rollbackAction(original) {
+  switch (original) {
+    case "create":
+      return "delete";
+    case "update":
+      return "update";
+    case "delete":
+      return "create";
+  }
+}
+function formatRollbackOutput(changes) {
+  const byType = {
+    folder: [],
+    component: [],
+    datasource: []
+  };
+  for (const entry of changes) {
+    byType[entry.type]?.push(entry);
+  }
+  const icons = {
+    create: chalk.green("+"),
+    update: chalk.yellow("~"),
+    delete: chalk.red("-")
+  };
+  const lines = [];
+  const sections = [
+    ["Folders", byType.folder],
+    ["Components", byType.component],
+    ["Datasources", byType.datasource]
+  ];
+  for (const [label, entries] of sections) {
+    if (entries.length === 0) {
+      continue;
+    }
+    lines.push(chalk.bold(label));
+    for (const entry of entries) {
+      const action = rollbackAction(entry.action);
+      const icon = icons[action] ?? " ";
+      const name = action === "delete" ? chalk.red(entry.name) : entry.name;
+      lines.push(`  ${icon} ${name} ${chalk.dim(`(${action})`)}`);
+      if (entry.action === "update" && entry.before && entry.after) {
+        let fromStr;
+        let toStr;
+        if (entry.type === "component") {
+          fromStr = serializeComponent(applyDefaults(entry.after, COMPONENT_DEFAULTS));
+          toStr = serializeComponent(applyDefaults(entry.before, COMPONENT_DEFAULTS));
+        } else if (entry.type === "datasource") {
+          fromStr = serializeDatasource(entry.after);
+          toStr = serializeDatasource(entry.before);
+        } else {
+          continue;
+        }
+        if (fromStr !== toStr) {
+          const patch = createTwoFilesPatch(
+            `current/${entry.name}`,
+            `restore/${entry.name}`,
+            fromStr,
+            toStr,
+            "current",
+            "restore"
+          );
+          for (const line of patch.split("\n")) {
+            if (line.startsWith("+") && !line.startsWith("+++")) {
+              lines.push(`    ${chalk.green(line)}`);
+            } else if (line.startsWith("-") && !line.startsWith("---")) {
+              lines.push(`    ${chalk.red(line)}`);
+            }
+          }
+        }
+      }
+    }
+    lines.push("");
+  }
+  return lines.join("\n").trimEnd();
+}
+function buildGroupRefByPath(remote) {
+  const folders = [...remote.componentFolders.values()];
+  const pathByUuid = buildGroupPathByUuid(folders);
+  const byPath = /* @__PURE__ */ new Map();
+  for (const folder of folders) {
+    const segments = pathByUuid.get(folder.uuid);
+    if (segments?.length) {
+      byPath.set(segments.join("/"), { id: folder.id, uuid: folder.uuid });
+    }
+  }
+  return byPath;
+}
+function parentPathOf(path) {
+  const segments = path.split("/");
+  return segments.length > 1 ? segments.slice(0, -1).join("/") : null;
+}
+function remapGroupUuids(payload, uuidMap) {
+  if (uuidMap.size === 0) {
+    return payload;
+  }
+  const result = { ...payload };
+  if (typeof result.component_group_uuid === "string") {
+    result.component_group_uuid = uuidMap.get(result.component_group_uuid) ?? result.component_group_uuid;
+  }
+  if (isRecord(result.schema)) {
+    const schema = {};
+    for (const [key, field] of Object.entries(result.schema)) {
+      if (isRecord(field) && Array.isArray(field.component_group_whitelist)) {
+        schema[key] = {
+          ...field,
+          component_group_whitelist: field.component_group_whitelist.map((uuid) => typeof uuid === "string" ? uuidMap.get(uuid) ?? uuid : uuid)
+        };
+      } else {
+        schema[key] = field;
+      }
+    }
+    result.schema = schema;
+  }
+  return result;
+}
+async function executeRollback(spaceId, ops, remote) {
+  const client = getMapiClient();
+  const spaceIdNum = Number(spaceId);
+  let created = 0;
+  let updated = 0;
+  let deleted = 0;
+  const componentOps = ops.filter((op) => op.type === "component");
+  const datasourceOps = ops.filter((op) => op.type === "datasource");
+  const folderOps = ops.filter((op) => op.type === "folder");
+  const groupRefByPath = buildGroupRefByPath(remote);
+  const groupUuidMap = /* @__PURE__ */ new Map();
+  const folderCreates = folderOps.filter((o) => o.action === "create").sort((a, b) => a.name.split("/").length - b.name.split("/").length);
+  for (const op of folderCreates) {
+    const existing = groupRefByPath.get(op.name);
+    const oldUuid = typeof op.payload.uuid === "string" ? op.payload.uuid : void 0;
+    if (existing) {
+      if (oldUuid) {
+        groupUuidMap.set(oldUuid, existing.uuid);
+      }
+      continue;
+    }
+    const parentPath = parentPathOf(op.name);
+    const parentId = parentPath ? groupRefByPath.get(parentPath)?.id ?? null : null;
+    const name = typeof op.payload.name === "string" ? op.payload.name : op.name.split("/").pop() ?? op.name;
+    try {
+      const res = await client.componentFolders.create({
+        path: { space_id: spaceIdNum },
+        body: { component_group: { name, parent_id: parentId } },
+        throwOnError: true
+      });
+      const group = res.data?.component_group;
+      if (group?.id != null && group.uuid) {
+        groupRefByPath.set(op.name, { id: group.id, uuid: group.uuid });
+        if (oldUuid) {
+          groupUuidMap.set(oldUuid, group.uuid);
+        }
+        created++;
+      }
+    } catch (error) {
+      handleAPIError("push_component_folder", error, `Failed to recreate folder ${op.name}`);
+    }
+  }
+  for (const op of componentOps.filter((o) => o.action !== "delete")) {
+    if (op.action === "create") {
+      const payload = toComponentCreate(remapGroupUuids(stripApiFields(op.payload), groupUuidMap));
+      try {
+        await client.components.create({
+          path: { space_id: spaceIdNum },
+          body: { component: payload },
+          throwOnError: true
+        });
+        created++;
+      } catch (error) {
+        handleAPIError("push_component", error, `Failed to create component ${op.name}`);
+      }
+    } else if (op.action === "update") {
+      const existing = remote.components.get(op.name);
+      if (existing?.id) {
+        const payload = toComponentUpdate(remapGroupUuids(stripApiFields(op.payload), groupUuidMap));
+        try {
+          await client.components.update(existing.id, {
+            path: { space_id: spaceIdNum },
+            body: { component: payload },
+            throwOnError: true
+          });
+          updated++;
+        } catch (error) {
+          handleAPIError("update_component", error, `Failed to update component ${op.name}`);
+        }
+      }
+    }
+  }
+  for (const op of datasourceOps.filter((o) => o.action !== "delete")) {
+    if (op.action === "create") {
+      const payload = toDatasourceCreate(stripApiFields(op.payload));
+      try {
+        await client.datasources.create({
+          path: { space_id: spaceIdNum },
+          body: { datasource: payload },
+          throwOnError: true
+        });
+        created++;
+      } catch (error) {
+        handleAPIError("push_datasource", error, `Failed to create datasource ${op.name}`);
+      }
+    } else if (op.action === "update") {
+      const existing = remote.datasources.get(op.name);
+      if (existing?.id) {
+        const payload = toDatasourceUpdate(stripApiFields(op.payload), existing);
+        try {
+          await client.datasources.update(existing.id, {
+            path: { space_id: spaceIdNum },
+            body: { datasource: payload },
+            throwOnError: true
+          });
+          updated++;
+        } catch (error) {
+          handleAPIError("update_datasource", error, `Failed to update datasource ${op.name}`);
+        }
+      }
+    }
+  }
+  for (const op of datasourceOps.filter((o) => o.action === "delete")) {
+    const existing = remote.datasources.get(op.name);
+    if (existing?.id) {
+      try {
+        await client.datasources.delete(existing.id, {
+          path: { space_id: spaceIdNum },
+          throwOnError: true
+        });
+        deleted++;
+      } catch (error) {
+        handleAPIError("delete_datasource", error, `Failed to delete datasource ${op.name}`);
+      }
+    }
+  }
+  for (const op of componentOps.filter((o) => o.action === "delete")) {
+    const existing = remote.components.get(op.name);
+    if (existing?.id) {
+      try {
+        await client.components.delete(existing.id, {
+          path: { space_id: spaceIdNum },
+          throwOnError: true
+        });
+        deleted++;
+      } catch (error) {
+        handleAPIError("delete_component", error, `Failed to delete component ${op.name}`);
+      }
+    }
+  }
+  const folderDeletes = folderOps.filter((o) => o.action === "delete").sort((a, b) => b.name.split("/").length - a.name.split("/").length);
+  for (const op of folderDeletes) {
+    const ref = groupRefByPath.get(op.name);
+    if (!ref) {
+      continue;
+    }
+    try {
+      await client.componentFolders.delete(ref.id, {
+        path: { space_id: spaceIdNum },
+        throwOnError: true
+      });
+      deleted++;
+    } catch (error) {
+      handleAPIError("delete_component_folder", error, `Failed to delete folder ${op.name}`);
+    }
+  }
+  return { created, updated, deleted };
+}
+
+schemaCommand.command("rollback [changeset-file]").description("Roll back a Storyblok space to the state captured in a changeset").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage").option("--dry-run", "Show what would be undone without applying changes", false).option("--yes", "Skip confirmation prompt", false).option("--latest", "Automatically select the most recent changeset", false).action(async (changesetFile, options, command) => {
+  const ui = getUI();
+  const logger = getLogger();
+  const reporter = getReporter();
+  const { space, path: basePath, verbose } = command.optsWithGlobals();
+  const { state } = session();
+  ui.title(commands.SCHEMA, colorPalette.SCHEMA, "Rolling back schema...");
+  logger.info("Schema rollback started", { changesetFile, space });
+  if (!requireAuthentication(state, verbose)) {
+    return;
+  }
+  if (!space) {
+    handleError(new CommandError("Please provide the space as argument --space SPACE_ID."), verbose);
+    return;
+  }
+  const summary = { total: 0, succeeded: 0, failed: 0 };
+  try {
+    const resolvedBase = resolvePath(basePath, "");
+    let resolvedFile;
+    if (changesetFile) {
+      resolvedFile = changesetFile;
+    } else if (options.latest) {
+      const available = await listChangesets(resolvedBase);
+      if (available.length === 0) {
+        ui.warn("No changesets found. Run `schema push` first to create one.");
+        return;
+      }
+      resolvedFile = available[0];
+      ui.info(`Using latest changeset: ${basename(resolvedFile)}`);
+    } else {
+      const available = await listChangesets(resolvedBase);
+      if (available.length === 0) {
+        ui.warn("No changesets found. Run `schema push` first to create one.");
+        return;
+      }
+      resolvedFile = await select({
+        message: "Select a changeset to roll back:",
+        choices: available.map((f) => ({ name: basename(f), value: f }))
+      });
+    }
+    let changeset;
+    try {
+      changeset = await loadChangeset(resolvedFile);
+    } catch (maybeError) {
+      handleError(toError(maybeError), verbose);
+      return;
+    }
+    logger.info("Changeset loaded", { file: resolvedFile, changes: changeset.changes.length });
+    const ops = buildRollbackOps(changeset);
+    if (ops.length === 0) {
+      ui.ok("Changeset has no changes \u2014 nothing to roll back.");
+      return;
+    }
+    ui.br();
+    ui.log(formatRollbackOutput(changeset.changes));
+    if (options.dryRun) {
+      ui.info("Dry run \u2014 no changes applied.");
+      logger.info("Dry run completed", { ops: ops.length });
+      return;
+    }
+    if (!options.yes) {
+      const confirmed = await confirm({
+        message: `Apply rollback of ${ops.length} change(s) from ${basename(resolvedFile)}?`,
+        default: false
+      });
+      if (!confirmed) {
+        ui.info("Rollback cancelled.");
+        return;
+      }
+    }
+    const remoteSpinner = ui.createSpinner(`Fetching current remote state from space ${space}...`);
+    let remoteResult;
+    try {
+      remoteResult = await fetchRemoteSchema(space);
+    } catch (maybeError) {
+      remoteSpinner.failed("Failed to fetch remote schema");
+      handleError(toError(maybeError), verbose);
+      return;
+    }
+    const { remote } = remoteResult;
+    remoteSpinner.succeed(`Remote: ${remote.components.size} components, ${remote.componentFolders.size} component folders, ${remote.datasources.size} datasources`);
+    const rollbackSpinner = ui.createSpinner("Applying rollback...");
+    let result;
+    try {
+      result = await executeRollback(space, ops, remote);
+    } catch (error) {
+      rollbackSpinner.failed("Failed to apply rollback");
+      throw error;
+    }
+    summary.total = result.created + result.updated + result.deleted;
+    summary.succeeded = summary.total;
+    rollbackSpinner.succeed(`Rolled back: ${result.created} created, ${result.updated} updated, ${result.deleted} deleted.`);
+    const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+    const rollbackChangesetPath = await saveChangeset(resolvedBase, {
+      timestamp,
+      spaceId: Number(space),
+      remote: { components: remoteResult.rawComponents, componentFolders: remoteResult.rawComponentFolders, datasources: remoteResult.rawDatasources },
+      changes: ops.map((op) => ({
+        type: op.type,
+        name: op.name,
+        action: op.action,
+        ...Object.keys(op.payload).length > 0 && { after: op.payload }
+      }))
+    });
+    logger.info("Rollback changeset saved", { path: displayPath(rollbackChangesetPath, basePath) });
+  } catch (maybeError) {
+    summary.failed += 1;
+    handleError(toError(maybeError), verbose);
+  } finally {
+    logger.info("Schema rollback finished", { summary });
+    reporter.addSummary("schemaRollbackResults", summary);
+    reporter.finalize();
+  }
+});
+
 const program = getProgram();
 konsola.br();
 konsola.br();