storyblok 4.16.7 → 4.16.9

package/dist/index.mjs

@@ -12,13 +12,13 @@ import { MultiBar, Presets } from 'cli-progress';
 import { Spinner } from '@topcli/spinner';
 import fs, { mkdir, writeFile, access, constants, readFile as readFile$1, appendFile, readdir, unlink } from 'node:fs/promises';
 import filenamify from 'filenamify';
-import { ManagementApiClient, normalizeAssetUrl } from '@storyblok/management-api-client';
-import { RateLimit, Sema } from 'async-sema';
+import { createManagementApiClient, normalizeAssetUrl } from '@storyblok/management-api-client';
 import { select, password, input, confirm } from '@inquirer/prompts';
 import { exec, spawn } from 'node:child_process';
 import { promisify } from 'node:util';
 import { minimatch } from 'minimatch';
 import { Readable, pipeline, Transform, Writable } from 'node:stream';
+import { Sema } from 'async-sema';
 import { hash } from 'ohash';
 import { compile } from 'json-schema-to-typescript';
 import open from 'open';
@@ -381,6 +381,7 @@ function applyCliOverrides(commandChain, globalResolved, localResolved) {
       const value = command.getOptionValue(attrName);
       if (isRoot) {
         setValueAtPath(globalResolved, getOptionPath(option), value);
+        delete localResolved[attrName];
       } else {
         localResolved[attrName] = value;
       }
@@ -412,6 +413,11 @@ function parseNumber(value) {
   return parsed;
 }
 const GLOBAL_OPTION_DEFINITIONS = [
+  {
+    flags: "-p, --path <path>",
+    description: "Base directory for file storage (default: .storyblok)",
+    defaultValue: DEFAULT_GLOBAL_CONFIG.path
+  },
   {
     flags: "--verbose",
     description: "Enable verbose output",
@@ -674,9 +680,7 @@ const API_ACTIONS = {
   pull_asset_folder: "Failed to pull asset folder",
   pull_asset_folders: "Failed to pull asset folders",
   push_asset_folder: "Failed to push asset folder",
-  push_asset_sign: "Failed to sign asset upload",
-  push_asset_upload: "Failed to upload asset",
-  push_asset_finish: "Failed to finish asset upload",
+  push_asset_create: "Failed to create asset",
   push_asset_update: "Failed to update asset",
   pull_datasources: "Failed to pull datasources",
   push_datasource: "Failed to push datasource",
@@ -1787,41 +1791,24 @@ function session() {
 
 let instance = null;
 let storedConfig = null;
-let currentLimiterCapacity = Math.max(1, getActiveConfig().api.maxConcurrency);
-let limiter = RateLimit(currentLimiterCapacity, { uniformDistribution: true });
-function resolveLimiter() {
-  const desiredCapacity = Math.max(1, getActiveConfig().api.maxConcurrency);
-  if (desiredCapacity !== currentLimiterCapacity) {
-    limiter = RateLimit(desiredCapacity, { uniformDistribution: true });
-    currentLimiterCapacity = desiredCapacity;
-  }
-  return limiter;
-}
 function configsAreEqual(config1, config2) {
   return JSON.stringify(config1) === JSON.stringify(config2);
 }
-function applyRateLimit(client) {
-  if (getActiveConfig().api.maxConcurrency > 0) {
-    client.interceptors.request.use(async (request) => {
-      const limit = resolveLimiter();
-      await limit();
-      return request;
-    });
-  }
-}
-function creategetMapiClient(options) {
-  const client = new ManagementApiClient(options);
-  applyRateLimit(client);
-  return client;
+function createMapiClient(options) {
+  const { api } = getActiveConfig();
+  return createManagementApiClient({
+    ...options,
+    rateLimit: options.rateLimit ?? (api.maxConcurrency > 0 ? { maxConcurrency: api.maxConcurrency } : false)
+  });
 }
 function getMapiClient(options) {
   if (!instance && options) {
-    instance = creategetMapiClient(options);
+    instance = createMapiClient(options);
     storedConfig = options;
   } else if (!instance) {
     throw new Error("MAPI client not initialized. Call getMapiClient with configuration first.");
   } else if (options && storedConfig && !configsAreEqual(options, storedConfig)) {
-    instance = creategetMapiClient(options);
+    instance = createMapiClient(options);
     storedConfig = options;
   }
   return instance;
@@ -1859,9 +1846,7 @@ function getProgram() {
       await initializeSession();
       if (state.password) {
         getMapiClient({
-          token: {
-            accessToken: state.password
-          },
+          personalAccessToken: state.password,
           region: state.region ?? resolvedConfig.region
         });
       }
@@ -1938,10 +1923,8 @@ const getStoryblokUrl = (region = "eu") => {
 
 const getUser = async (token, region) => {
   try {
-    const client = creategetMapiClient({
-      token: {
-        accessToken: token
-      },
+    const client = createMapiClient({
+      personalAccessToken: token,
       region
     });
     const { data } = await client.users.me({
@@ -2281,7 +2264,7 @@ const fetchComponents = async (spaceId) => {
     const client = getMapiClient();
     const { data } = await client.components.list({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       throwOnError: true
     });
@@ -2295,7 +2278,7 @@ const fetchComponent = async (spaceId, componentName) => {
     const client = getMapiClient();
     const { data } = await client.components.list({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       query: {
         search: componentName
@@ -2312,7 +2295,7 @@ const fetchComponentGroups = async (spaceId) => {
     const client = getMapiClient();
     const { data } = await client.componentFolders.list({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       }
     });
     return data?.component_groups;
@@ -2325,7 +2308,7 @@ const fetchComponentPresets = async (spaceId) => {
     const client = getMapiClient();
     const { data } = await client.presets.list({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       }
     });
     return data?.presets;
@@ -2338,7 +2321,7 @@ const fetchComponentInternalTags = async (spaceId) => {
     const client = getMapiClient();
     const { data } = await client.internalTags.list({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       }
     });
     return data?.internal_tags?.filter((tag) => tag.object_type === "component");
@@ -2392,7 +2375,7 @@ const pushComponent = async (space, component) => {
     const client = getMapiClient();
     const { data } = await client.components.create({
       path: {
-        space_id: space
+        space_id: Number(space)
       },
       body: {
         component
@@ -2406,10 +2389,9 @@ const pushComponent = async (space, component) => {
 const updateComponent = async (space, componentId, component) => {
   try {
     const client = getMapiClient();
-    const { data } = await client.components.update({
+    const { data } = await client.components.update(componentId, {
       path: {
-        space_id: Number(space),
-        component_id: componentId
+        space_id: Number(space)
       },
       body: {
         component
@@ -2448,10 +2430,9 @@ const pushComponentGroup = async (space, componentGroup) => {
 const updateComponentGroup = async (space, groupId, componentGroup) => {
   try {
     const client = getMapiClient();
-    const { data } = await client.componentFolders.update({
+    const { data } = await client.componentFolders.update(groupId, {
       path: {
-        space_id: Number(space),
-        component_group_id: String(groupId)
+        space_id: Number(space)
       },
       body: {
         component_group: componentGroup
@@ -2490,10 +2471,9 @@ const pushComponentPreset = async (space, preset) => {
 const updateComponentPreset = async (space, presetId, preset) => {
   try {
     const client = getMapiClient();
-    const { data } = await client.presets.update({
+    const { data } = await client.presets.update(presetId, {
       path: {
-        space_id: Number(space),
-        preset_id: presetId
+        space_id: Number(space)
       },
       body: {
         preset
@@ -2515,11 +2495,8 @@ const upsertComponentPreset = async (space, preset, existingId) => {
 const deleteComponentPreset = async (space, presetId) => {
   try {
     const client = getMapiClient();
-    await client.presets.delete({
-      path: {
-        space_id: Number(space),
-        preset_id: presetId
-      },
+    await client.presets.delete(presetId, {
+      path: { space_id: Number(space) },
       throwOnError: true
     });
   } catch (error) {
@@ -2544,10 +2521,9 @@ const pushComponentInternalTag = async (space, componentInternalTag) => {
 const updateComponentInternalTag = async (space, tagId, componentInternalTag) => {
   try {
     const client = getMapiClient();
-    const { data } = await client.internalTags.update({
+    const { data } = await client.internalTags.update(tagId, {
       path: {
-        space_id: Number(space),
-        internal_tag_id: tagId
+        space_id: Number(space)
       },
       body: componentInternalTag,
       throwOnError: true
@@ -2668,7 +2644,7 @@ async function readConsolidatedFiles$1(resolvedPath, suffix) {
   };
 }
 
-const pullCmd$4 = componentsCommand.command("pull [componentName]").option("-f, --filename <filename>", "custom name to be used in file(s) name instead of space id").option("--sf, --separate-files", "Argument to create a single file for each component").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. components.<suffix>.json)").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage").description(`Download your space's components schema as json. Optionally specify a component name to pull a single component.`);
+const pullCmd$4 = componentsCommand.command("pull [componentName]").option("-f, --filename <filename>", "custom name to be used in file(s) name instead of space id").option("--sf, --separate-files", "Argument to create a single file for each component").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. components.<suffix>.json)").option("-s, --space <space>", "space ID").description(`Download your space's components schema as json. Optionally specify a component name to pull a single component.`);
 pullCmd$4.action(async (componentName, options, command) => {
   const ui = getUI();
   const logger = getLogger();
@@ -2794,6 +2770,9 @@ function buildDependencyGraph(context) {
     }
     const compositeKey = `${sourceComponent.name}:${preset.name}`;
     const targetPreset = spaceState.target.presets.get(compositeKey);
+    if (targetPreset && targetPreset.id === void 0) {
+      throw new Error(`Target preset "${preset.name}" is missing an id`);
+    }
     const targetData = targetPreset ? {
       resource: targetPreset,
       id: targetPreset.id
@@ -3288,6 +3267,9 @@ class PresetNode {
     return result;
   }
   updateTargetData(result) {
+    if (result.id === void 0) {
+      throw new Error(`Preset "${this.name}" is missing an id after upsert`);
+    }
     this.targetData = {
       resource: result,
       id: result.id
@@ -3351,8 +3333,8 @@ function collectAllDependencies(components, allComponents, allGroups, allTags) {
   const initialGroupUuids = Array.from(requiredGroupUuids);
   initialGroupUuids.forEach((groupUuid) => collectParentGroups(groupUuid));
   const filteredComponents = allComponents.filter((component) => requiredComponents.has(component.name));
-  const filteredGroups = allGroups.filter((group) => requiredGroupUuids.has(group.uuid));
-  const filteredTags = allTags.filter((tag) => requiredTagIds.has(tag.id));
+  const filteredGroups = allGroups.filter((group) => group.uuid !== void 0 && requiredGroupUuids.has(group.uuid));
+  const filteredTags = allTags.filter((tag) => tag.id !== void 0 && requiredTagIds.has(tag.id));
   return { filteredComponents, filteredGroups, filteredTags };
 }
 function filterSpaceDataByComponent(spaceData, componentName) {
@@ -3588,14 +3570,8 @@ function createMinimalStubComponent(name) {
   return {
     name,
     display_name: name,
-    created_at: (/* @__PURE__ */ new Date()).toISOString(),
-    updated_at: (/* @__PURE__ */ new Date()).toISOString(),
-    id: 0,
-    // Will be set by API
-    schema: {},
+    schema: {}
     // Minimal empty schema
-    internal_tags_list: [],
-    internal_tag_ids: []
   };
 }
 async function processLevel(level, graph, space, maxConcurrency) {
@@ -3697,7 +3673,7 @@ async function pushWithDependencyGraph(space, spaceState, maxConcurrency = getAc
   return results;
 }
 
-const pushCmd$3 = componentsCommand.command("push [componentName]").description(`Push your space's components schema as json`).option("-f, --from <from>", "source space id").option("--fi, --filter <filter>", "glob filter to apply to the components before pushing").option("--sf, --separate-files", "Read from separate files instead of consolidated files", false).option("--su, --suffix <suffix>", "Suffix to add to the component name").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage");
+const pushCmd$3 = componentsCommand.command("push [componentName]").description(`Push your space's components schema as json`).option("-f, --from <from>", "source space id").option("--fi, --filter <filter>", "glob filter to apply to the components before pushing").option("--sf, --separate-files", "Read from separate files instead of consolidated files", false).option("--su, --suffix <suffix>", "Suffix to add to the component name").option("-s, --space <space>", "space ID");
 pushCmd$3.action(async (componentName, options, command) => {
   const ui = getUI();
   const logger = getLogger();
@@ -3865,7 +3841,7 @@ const fetchSpace = async (spaceId) => {
     const client = getMapiClient();
     const { data } = await client.spaces.get({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       throwOnError: true
     });
@@ -3916,7 +3892,7 @@ 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 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").option("-p, --path <path>", "path for file storage");
+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);
   const { space, path, verbose } = command.optsWithGlobals();
@@ -3980,7 +3956,7 @@ const getMigrationTemplate = () => {
 `;
 };
 const generateMigration = async (space, path, component, suffix) => {
-  const resolvedPath = path ? resolve(process.cwd(), path, "migrations", space) : resolvePath(path, `migrations/${space}`);
+  const resolvedPath = resolvePath(path, `migrations/${space}`);
   const fileName = suffix ? `${component.name}.${suffix}.js` : `${component.name}.js`;
   const migrationPath = join(resolvedPath, fileName);
   try {
@@ -3990,7 +3966,7 @@ const generateMigration = async (space, path, component, suffix) => {
   }
 };
 
-const generateCmd$1 = migrationsCommand.command("generate [componentName]").description("Generate a migration file").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. {component-name}.<suffix>.js)").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage");
+const generateCmd$1 = migrationsCommand.command("generate [componentName]").description("Generate a migration file").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. {component-name}.<suffix>.js)").option("-s, --space <space>", "space ID");
 generateCmd$1.action(async (componentName, options, command) => {
   const ui = getUI();
   const logger = getLogger();
@@ -4046,7 +4022,7 @@ const fetchStories = async (spaceId, params) => {
     const client = getMapiClient();
     const { data, response } = await client.stories.list({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       query: {
         ...params,
@@ -4056,7 +4032,7 @@ const fetchStories = async (spaceId, params) => {
       throwOnError: true
     });
     return {
-      stories: data?.stories || [],
+      stories: data.stories || [],
       headers: response.headers
     };
   } catch (error) {
@@ -4066,10 +4042,9 @@ const fetchStories = async (spaceId, params) => {
 const fetchStory = async (spaceId, storyId) => {
   try {
     const client = getMapiClient();
-    const { data } = await client.stories.get({
+    const { data } = await client.stories.get(storyId, {
       path: {
-        space_id: spaceId,
-        story_id: storyId
+        space_id: Number(spaceId)
       },
       throwOnError: true
     });
@@ -4083,10 +4058,14 @@ const createStory = async (spaceId, payload) => {
     const client = getMapiClient();
     const { data } = await client.stories.create({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       body: {
-        story: payload.story,
+        story: {
+          ...payload.story,
+          // StoryCreate2 expects `parent_id?: number`; normalize null → undefined.
+          parent_id: payload.story.parent_id ?? void 0
+        },
         ...payload.publish ? { publish: payload.publish } : {}
       },
       throwOnError: true
@@ -4099,13 +4078,16 @@ const createStory = async (spaceId, payload) => {
 const updateStory = async (spaceId, storyId, payload) => {
   try {
     const client = getMapiClient();
-    const { data } = await client.stories.updateStory({
+    const { data } = await client.stories.update(storyId, {
       path: {
-        space_id: spaceId,
-        story_id: storyId
+        space_id: Number(spaceId)
       },
       body: {
-        story: payload.story,
+        story: {
+          ...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 } : {}
       },
@@ -4353,12 +4335,12 @@ function applyMigrationToAllBlocks(content, migrationFunction, targetComponent)
     }
     if (Array.isArray(content[key])) {
       for (const value of content[key]) {
-        if (value && typeof value === "object") {
+        if (value && typeof value === "object" && "_uid" in value && "component" in value) {
           const blockProcessed = applyMigrationToAllBlocks(value, migrationFunction, targetComponent);
           processed = processed || blockProcessed;
         }
       }
-    } else if (content[key] && typeof content[key] === "object") {
+    } else if (content[key] && typeof content[key] === "object" && "_uid" in content[key] && "component" in content[key]) {
       const blockProcessed = applyMigrationToAllBlocks(content[key], migrationFunction, targetComponent);
       processed = processed || blockProcessed;
     }
@@ -4774,7 +4756,7 @@ class UpdateStream extends Writable {
   }
 }
 
-const runCmd = migrationsCommand.command("run [componentName]").description("Run migrations").option("--fi, --filter <filter>", "glob filter to apply to the components before pushing").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/"').option("--publish <publish>", "Options for publication mode: all | published | published-with-changes").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage");
+const runCmd = migrationsCommand.command("run [componentName]").description("Run migrations").option("--fi, --filter <filter>", "glob filter to apply to the components before pushing").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/"').option("--publish <publish>", "Options for publication mode: all | published | published-with-changes").option("-s, --space <space>", "space ID");
 runCmd.action(async (componentName, options, command) => {
   const ui = getUI();
   const logger = getLogger();
@@ -4897,7 +4879,7 @@ runCmd.action(async (componentName, options, command) => {
   }
 });
 
-const rollbackCmd = migrationsCommand.command("rollback [migrationFile]").description("Rollback a migration").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage");
+const rollbackCmd = migrationsCommand.command("rollback [migrationFile]").description("Rollback a migration").option("-s, --space <space>", "space ID");
 rollbackCmd.action(async (migrationFile, _options, command) => {
   const ui = getUI();
   const logger = getLogger();
@@ -5532,11 +5514,6 @@ const getPropertyTypeAnnotation = (property, prefix, suffix) => {
   }
   if (property.source === "internal_stories") {
     if (property.filter_content_type) {
-      if (typeof property.filter_content_type === "string") {
-        return {
-          tsType: `(${getStoryType(property.filter_content_type, prefix, suffix)} | string )${property.type === "options" ? "[]" : ""}`
-        };
-      }
       return {
         tsType: `(${property.filter_content_type.map((type2) => getStoryType(type2, prefix, suffix)).join(" | ")} | string )${property.type === "options" ? "[]" : ""}`
       };
@@ -5891,7 +5868,7 @@ const pushDatasource = async (spaceId, datasource) => {
     const client = getMapiClient();
     const { data } = await client.datasources.create({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       body: { datasource },
       throwOnError: true
@@ -5904,10 +5881,9 @@ const pushDatasource = async (spaceId, datasource) => {
 const updateDatasource = async (spaceId, datasourceId, datasource) => {
   try {
     const client = getMapiClient();
-    const { data } = await client.datasources.update({
+    const { data } = await client.datasources.update(datasourceId, {
       path: {
-        space_id: spaceId,
-        datasource_id: datasourceId
+        space_id: Number(spaceId)
       },
       body: {
         datasource
@@ -5931,11 +5907,12 @@ const pushDatasourceEntry = async (spaceId, datasourceId, entry, position) => {
     const client = getMapiClient();
     const { data } = await client.datasourceEntries.create({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       body: {
         datasource_entry: {
           ...entry,
+          value: entry.value ?? "",
           datasource_id: datasourceId,
           ...position != null && { position }
         }
@@ -5950,10 +5927,9 @@ const pushDatasourceEntry = async (spaceId, datasourceId, entry, position) => {
 const updateDatasourceEntry = async (spaceId, entryId, entry, position) => {
   try {
     const client = getMapiClient();
-    await client.datasourceEntries.updateDatasourceEntry({
+    await client.datasourceEntries.update(entryId, {
       path: {
-        space_id: spaceId,
-        datasource_entry_id: entryId
+        space_id: Number(spaceId)
       },
       body: {
         datasource_entry: {
@@ -5978,10 +5954,9 @@ const upsertDatasourceEntry = async (space, datasourceId, entry, existingId, pos
 const deleteDatasourceEntry = async (spaceId, entryId) => {
   try {
     const client = getMapiClient();
-    await client.datasourceEntries.delete({
+    await client.datasourceEntries.delete(entryId, {
       path: {
-        space_id: spaceId,
-        datasource_entry_id: entryId
+        space_id: Number(spaceId)
       },
       throwOnError: true
     });
@@ -6061,7 +6036,7 @@ async function readConsolidatedFiles(resolvedPath, suffix) {
 const generateCmd = typesCommand.command("generate").description("Generate types d.ts for your component schemas").option(
   "--filename <name>",
   "Base file name for all component types when generating a single declarations file (e.g. components.d.ts). Ignored when using --separate-files."
-).option("--sf, --separate-files", "Generate one .d.ts file per component instead of a single combined file").option("--strict", "strict mode, no loose typing").option("--type-prefix <prefix>", "prefix to be prepended to all generated component type names").option("--type-suffix <suffix>", "suffix to be appended to all generated component type names").option("--suffix <suffix>", "Components suffix").option("--custom-fields-parser <path>", "Path to the parser file for Custom Field Types").option("--compiler-options <options>", "path to the compiler options from json-schema-to-typescript").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage");
+).option("--sf, --separate-files", "Generate one .d.ts file per component instead of a single combined file").option("--strict", "strict mode, no loose typing").option("--type-prefix <prefix>", "prefix to be prepended to all generated component type names").option("--type-suffix <suffix>", "suffix to be appended to all generated component type names").option("--suffix <suffix>", "Components suffix").option("--custom-fields-parser <path>", "Path to the parser file for Custom Field Types").option("--compiler-options <options>", "path to the compiler options from json-schema-to-typescript").option("-s, --space <space>", "space ID");
 generateCmd.action(async (options, command) => {
   konsola.title(`${commands.TYPES}`, colorPalette.TYPES, "Generating types...");
   const { space, path, verbose, suffix, filename, separateFiles } = command.optsWithGlobals();
@@ -6144,7 +6119,7 @@ const fetchDatasourceEntries = async (spaceId, datasourceId) => {
     return await fetchAllPages(
       (page) => client.datasourceEntries.list({
         path: {
-          space_id: spaceId
+          space_id: Number(spaceId)
         },
         query: {
           datasource_id: datasourceId,
@@ -6164,14 +6139,14 @@ const fetchDatasources = async (spaceId) => {
     const datasources = await fetchAllPages(
       (page) => client.datasources.list({
         path: {
-          space_id: spaceId
+          space_id: Number(spaceId)
         },
         query: {
           page
         },
         throwOnError: true
       }),
-      (data) => data?.datasources || []
+      (data) => data.datasources || []
     );
     const datasourcesWithEntries = await Promise.all(
       datasources.map(async (ds) => {
@@ -6192,14 +6167,14 @@ const fetchDatasource = async (spaceId, datasourceName) => {
     const client = getMapiClient();
     const { data } = await client.datasources.list({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       query: {
         search: datasourceName
       },
       throwOnError: true
     });
-    const found = data?.datasources?.find((d) => d.name === datasourceName);
+    const found = data.datasources?.find((d) => d.name === datasourceName);
     if (!found) {
       return void 0;
     }
@@ -6228,7 +6203,7 @@ const saveDatasourcesToFiles = async (space, datasources, options) => {
   }
 };
 
-const pullCmd$2 = datasourcesCommand.command("pull [datasourceName]").option("-f, --filename <filename>", "custom name to be used in file(s) name instead of space id").option("--sf, --separate-files", "Argument to create a single file for each datasource").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. datasources.<suffix>.json)").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage").description("Pull datasources from your space");
+const pullCmd$2 = datasourcesCommand.command("pull [datasourceName]").option("-f, --filename <filename>", "custom name to be used in file(s) name instead of space id").option("--sf, --separate-files", "Argument to create a single file for each datasource").option("--su, --suffix <suffix>", "suffix to add to the file name (e.g. datasources.<suffix>.json)").option("-s, --space <space>", "space ID").description("Pull datasources from your space");
 pullCmd$2.action(async (datasourceName, options, command) => {
   konsola.title(`${commands.DATASOURCES}`, colorPalette.DATASOURCES, datasourceName ? `Pulling datasource ${datasourceName}...` : "Pulling datasources...");
   const { space, path, verbose } = command.optsWithGlobals();
@@ -6302,7 +6277,7 @@ pullCmd$2.action(async (datasourceName, options, command) => {
   }
 });
 
-const pushCmd$2 = datasourcesCommand.command("push [datasourceName]").description(`Push your space's datasources schema as json`).option("-f, --from <from>", "source space id").option("--fi, --filter <filter>", "glob filter to apply to the datasources before pushing").option("--sf, --separate-files", "Read from separate files instead of consolidated files").option("--su, --suffix <suffix>", "Suffix to add to the datasource name").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage");
+const pushCmd$2 = datasourcesCommand.command("push [datasourceName]").description(`Push your space's datasources schema as json`).option("-f, --from <from>", "source space id").option("--fi, --filter <filter>", "glob filter to apply to the datasources before pushing").option("--sf, --separate-files", "Read from separate files instead of consolidated files").option("--su, --suffix <suffix>", "Suffix to add to the datasource name").option("-s, --space <space>", "space ID");
 pushCmd$2.action(async (datasourceName, options, command) => {
   konsola.title(`${commands.DATASOURCES}`, colorPalette.DATASOURCES, datasourceName ? `Pushing datasource ${datasourceName}...` : "Pushing datasources...");
   const { space, path, verbose } = command.optsWithGlobals();
@@ -6427,10 +6402,9 @@ pushCmd$2.action(async (datasourceName, options, command) => {
 async function deleteDatasource(spaceId, id) {
   try {
     const client = getMapiClient();
-    await client.datasources.delete({
+    await client.datasources.delete(Number(id), {
       path: {
-        space_id: spaceId,
-        datasource_id: Number(id)
+        space_id: Number(spaceId)
       },
       throwOnError: true
     });
@@ -6439,7 +6413,7 @@ async function deleteDatasource(spaceId, id) {
   }
 }
 
-const deleteCmd = datasourcesCommand.command("delete [name]").description("Delete a datasource from your space by name or id").option("--id <id>", "Delete by datasource id instead of name").option("--force", "Skip confirmation prompt for deletion (useful for CI)").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage");
+const deleteCmd = datasourcesCommand.command("delete [name]").description("Delete a datasource from your space by name or id").option("--id <id>", "Delete by datasource id instead of name").option("--force", "Skip confirmation prompt for deletion (useful for CI)").option("-s, --space <space>", "space ID");
 deleteCmd.action(async (name, options, command) => {
   konsola.title(
     `${commands.DATASOURCES}`,
@@ -6912,7 +6886,7 @@ program$5.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
 const program$4 = getProgram();
 const logsCommand = program$4.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").option("-p, --path <path>", "path for file storage");
+const listCmd$1 = logsCommand.command("list").description("List logs").option("-s, --space <space>", "space ID");
 listCmd$1.action(async (_options, command) => {
   const { space, path } = command.optsWithGlobals();
   const ui = getUI();
@@ -6926,7 +6900,7 @@ listCmd$1.action(async (_options, command) => {
   ui.list(logFiles);
 });
 
-const pruneCmd$1 = logsCommand.command("prune").description("Prune logs").option("--keep <number>", "Max number of log files to keep (default `0`, meaning remove all)", Number.parseInt, 0).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage");
+const pruneCmd$1 = logsCommand.command("prune").description("Prune logs").option("--keep <number>", "Max number of log files to keep (default `0`, meaning remove all)", Number.parseInt, 0).option("-s, --space <space>", "space ID");
 pruneCmd$1.action(async (options, command) => {
   const { space, path } = command.optsWithGlobals();
   const ui = getUI();
@@ -6938,7 +6912,7 @@ pruneCmd$1.action(async (options, command) => {
 const program$3 = getProgram();
 const reportsCommand = program$3.command(commands.REPORTS).alias("rp").description("Inspect and manage reports.");
 
-const listCmd = reportsCommand.command("list").description("List reports").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage");
+const listCmd = reportsCommand.command("list").description("List reports").option("-s, --space <space>", "space ID");
 listCmd.action(async (_options, command) => {
   const { space, path } = command.optsWithGlobals();
   const ui = getUI();
@@ -6952,7 +6926,7 @@ listCmd.action(async (_options, command) => {
   ui.list(reportFiles);
 });
 
-const pruneCmd = reportsCommand.command("prune").description("Prune reports").option("--keep <number>", "Max number of report files to keep (default `0`, meaning remove all)", Number.parseInt, 0).option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage");
+const pruneCmd = reportsCommand.command("prune").description("Prune reports").option("--keep <number>", "Max number of report files to keep (default `0`, meaning remove all)", Number.parseInt, 0).option("-s, --space <space>", "space ID");
 pruneCmd.action(async (options, command) => {
   const { space, path } = command.optsWithGlobals();
   const ui = getUI();
@@ -6969,7 +6943,7 @@ const fetchAssets = async ({ spaceId, params }) => {
     const client = getMapiClient();
     const { data, response } = await client.assets.list({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       query: {
         ...params,
@@ -6985,7 +6959,6 @@ const fetchAssets = async ({ spaceId, params }) => {
     };
   } catch (maybeError) {
     handleAPIError("pull_assets", toError(maybeError));
-    throw maybeError;
   }
 };
 const downloadFile = async (filename) => {
@@ -7007,7 +6980,6 @@ const getSignedAssetUrl = async (filename, assetToken, region) => {
     return response.data.asset.signed_url;
   } catch (maybeError) {
     handleAPIError("pull_asset", toError(maybeError));
-    throw maybeError;
   }
 };
 const fetchAssetFolders = async ({ spaceId }) => {
@@ -7015,7 +6987,7 @@ const fetchAssetFolders = async ({ spaceId }) => {
     const client = getMapiClient();
     const { data, response } = await client.assetFolders.list({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       throwOnError: true
     });
@@ -7025,7 +6997,6 @@ const fetchAssetFolders = async ({ spaceId }) => {
     };
   } catch (maybeError) {
     handleAPIError("pull_asset_folders", toError(maybeError));
-    throw maybeError;
   }
 };
 const createAssetFolder = async (folder, {
@@ -7035,7 +7006,7 @@ const createAssetFolder = async (folder, {
     const client = getMapiClient();
     const { data } = await client.assetFolders.create({
       path: {
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       body: { asset_folder: folder },
       throwOnError: true
@@ -7047,18 +7018,16 @@ const createAssetFolder = async (folder, {
     return asset_folder;
   } catch (maybeError) {
     handleAPIError("push_asset_folder", toError(maybeError));
-    throw maybeError;
   }
 };
-const updateAssetFolder = async (folder, {
+const updateAssetFolder = async (id, folder, {
   spaceId
 }) => {
   try {
     const client = getMapiClient();
-    await client.assetFolders.update({
+    await client.assetFolders.update(id, {
       path: {
-        asset_folder_id: folder.id,
-        space_id: spaceId
+        space_id: Number(spaceId)
       },
       body: { asset_folder: folder },
       throwOnError: true
@@ -7066,96 +7035,8 @@ const updateAssetFolder = async (folder, {
     return folder;
   } catch (maybeError) {
     handleAPIError("push_asset_folder", toError(maybeError));
-    throw maybeError;
-  }
-};
-const requestAssetUpload = async (asset, { spaceId }) => {
-  try {
-    const client = getMapiClient();
-    const { data } = await client.assets.upload({
-      path: {
-        space_id: spaceId
-      },
-      body: {
-        // @ts-expect-error Our types are wrong, id is optional but allowed.
-        id: asset.id,
-        filename: asset.short_filename,
-        asset_folder_id: asset.asset_folder_id ?? void 0,
-        is_private: asset.is_private
-      },
-      throwOnError: true
-    });
-    const signedUpload = data;
-    if (!signedUpload?.id || !signedUpload?.post_url || !signedUpload?.fields) {
-      throw new Error("Failed to request signed upload!");
-    }
-    return signedUpload;
-  } catch (maybeError) {
-    handleAPIError("push_asset_sign", toError(maybeError));
-    throw maybeError;
-  }
-};
-const uploadAssetToS3 = async (asset, fileBuffer, {
-  signedUpload
-}) => {
-  if (!signedUpload?.id || !signedUpload?.post_url || !signedUpload?.fields) {
-    throw new Error("Invalid signed upload!");
-  }
-  const formData = new FormData();
-  for (const [key, value] of Object.entries(signedUpload.fields)) {
-    formData.append(key, value);
-  }
-  const contentType = signedUpload.fields["Content-Type"] || "application/octet-stream";
-  formData.append("file", new File([Buffer.from(fileBuffer)], asset.short_filename, { type: contentType }));
-  const response = await fetch(signedUpload.post_url, {
-    method: "POST",
-    body: formData
-  });
-  if (!response.ok) {
-    handleAPIError("push_asset_upload", new Error("Failed to upload asset to storage"));
-    return;
-  }
-  return response;
-};
-const finishAssetUpload = async (assetId, {
-  spaceId
-}) => {
-  try {
-    const client = getMapiClient();
-    await client.assets.finalize({
-      path: {
-        space_id: spaceId,
-        signed_response_object_id: String(assetId)
-      },
-      throwOnError: true
-    });
-    const { data } = await client.assets.get({
-      path: {
-        space_id: spaceId,
-        asset_id: assetId
-      },
-      throwOnError: true
-    });
-    return data;
-  } catch (maybeError) {
-    handleAPIError("push_asset_finish", toError(maybeError));
-    throw maybeError;
   }
 };
-const uploadAsset = async (asset, fileBuffer, { spaceId }) => {
-  const signed = await requestAssetUpload(asset, {
-    spaceId
-  });
-  const uploadResponse = await uploadAssetToS3(asset, fileBuffer, {
-    signedUpload: signed
-  });
-  if (!uploadResponse?.ok) {
-    throw new Error("Error uploading asset to S3!");
-  }
-  return finishAssetUpload(Number(signed.id), {
-    spaceId
-  });
-};
 const sha256 = (data) => {
   const buffer = Buffer.isBuffer(data) ? data : Buffer.from(data);
   return createHash("sha256").update(buffer).digest("hex");
@@ -7170,64 +7051,41 @@ const downloadAssetFile = async (asset, options) => {
   }
   return downloadFile(url);
 };
-const updateAsset = async (asset, fileBuffer, {
-  spaceId
-}) => {
+const updateAsset = async (id, asset, { spaceId, fileBuffer }) => {
   try {
-    const assetWithNewFilename = { ...asset };
-    if (fileBuffer) {
-      const uploadedAsset = await uploadAsset({
-        id: asset.id,
-        asset_folder_id: asset.asset_folder_id,
-        short_filename: asset.short_filename || basename(asset.filename)
-      }, fileBuffer, { spaceId });
-      assetWithNewFilename.filename = uploadedAsset.filename;
-      assetWithNewFilename.short_filename = uploadedAsset.short_filename;
-    }
     const client = getMapiClient();
-    await client.assets.update({
-      path: {
-        space_id: spaceId,
-        asset_id: assetWithNewFilename.id
-      },
-      body: {
-        asset: assetWithNewFilename
-      },
-      throwOnError: true
-    });
-    return assetWithNewFilename;
+    const { short_filename, ...metadata } = asset;
+    if (fileBuffer !== void 0) {
+      if (!short_filename) {
+        throw new Error("short_filename is required when replacing an asset file");
+      }
+      await client.assets.update(id, {
+        path: { space_id: Number(spaceId) },
+        body: { asset: metadata, short_filename },
+        file: fileBuffer
+      });
+    } else {
+      await client.assets.update(id, {
+        path: { space_id: Number(spaceId) },
+        body: { asset: metadata }
+      });
+    }
   } catch (maybeError) {
     handleAPIError("push_asset_update", toError(maybeError));
-    throw maybeError;
   }
 };
 const createAsset = async (asset, fileBuffer, { spaceId }) => {
-  const createdAsset = await uploadAsset({
-    asset_folder_id: asset.asset_folder_id,
-    short_filename: asset.short_filename,
-    alt: asset.alt,
-    title: asset.title,
-    copyright: asset.copyright,
-    source: asset.source,
-    is_private: asset.is_private
-  }, fileBuffer, { spaceId });
-  const hasUpdatableMetadata = Boolean(
-    asset.alt || asset.title || asset.copyright || asset.source || asset.is_private || asset.meta_data && Object.keys(asset.meta_data).length > 0
-  );
-  if (hasUpdatableMetadata) {
-    const updatedAsset = await updateAsset({
-      ...asset,
-      id: createdAsset.id,
-      filename: createdAsset.filename
-    }, null, {
-      spaceId
+  try {
+    const client = getMapiClient();
+    const { id: _id, ...assetBody } = asset;
+    return await client.assets.create({
+      body: assetBody,
+      file: fileBuffer,
+      path: { space_id: Number(spaceId) }
     });
-    if (!updatedAsset) {
-      throw new Error("Updating the created asset failed!");
-    }
-    return updatedAsset;
+  } catch (maybeError) {
+    handleAPIError("push_asset_create", toError(maybeError));
   }
-  return createdAsset;
 };
 
 const parseAssetData = (raw) => {
@@ -7275,15 +7133,14 @@ const isRemoteSource = (assetBinaryPath) => {
 const isValidManifestEntry = (entry) => Boolean(typeof entry.old_id === "number" && typeof entry.new_id === "number" && entry.old_filename && entry.new_filename);
 const loadAssetMap = async (manifestFile) => {
   const manifest = await loadManifest(manifestFile);
-  return new Map([
-    ...manifest.filter(isValidManifestEntry).map((e) => [
-      Number(e.old_id),
-      {
-        old: { id: Number(e.old_id), filename: e.old_filename || "" },
-        new: { id: Number(e.new_id), filename: e.new_filename || "" }
-      }
-    ])
+  const entries = manifest.filter(isValidManifestEntry).map((e) => [
+    Number(e.old_id),
+    {
+      old: { id: Number(e.old_id), filename: e.old_filename || "" },
+      new: { id: Number(e.new_id), filename: e.new_filename || "" }
+    }
   ]);
+  return new Map(entries);
 };
 const loadAssetFolderMap = async (manifestFile) => {
   const manifest = await loadManifest(manifestFile);
@@ -7543,12 +7400,11 @@ const makeCreateAssetFolderAPITransport = ({ spaceId }) => (folder) => createAss
 }, {
   spaceId
 });
-const makeUpdateAssetFolderAPITransport = ({ spaceId }) => (folder) => updateAssetFolder(folder, { spaceId });
+const makeUpdateAssetFolderAPITransport = ({ spaceId }) => (id, folder) => updateAssetFolder(id, folder, { spaceId });
 const makeGetAssetFolderAPITransport = ({ spaceId }) => async (folderId) => {
-  const { data, response } = await getMapiClient().assetFolders.get({
+  const { data, response } = await getMapiClient().assetFolders.get(folderId, {
     path: {
-      asset_folder_id: folderId,
-      space_id: spaceId
+      space_id: Number(spaceId)
     }
   });
   if (!response.ok && response.status !== 404) {
@@ -7576,7 +7432,7 @@ const upsertAssetFolderStream = ({
           parent_id: remoteParentId
         };
         const existingRemoteFolder = await transports.getAssetFolder(remoteFolderId);
-        const newRemoteFolder = existingRemoteFolder ? await transports.updateAssetFolder({ ...upsertFolder, parent_id: remoteParentId !== null ? remoteParentId : void 0 }) : await transports.createAssetFolder(upsertFolder);
+        const newRemoteFolder = existingRemoteFolder ? { id: remoteFolderId, ...await transports.updateAssetFolder(remoteFolderId, { ...upsertFolder, parent_id: remoteParentId !== null ? remoteParentId : void 0 }) } : await transports.createAssetFolder(upsertFolder);
         if (!maps.assetFolders.get(folder.id)) {
           await transports.appendAssetFolderManifest(folder, newRemoteFolder);
         }
@@ -7657,9 +7513,7 @@ const readSingleAssetStream = ({
 const makeCreateAssetAPITransport = ({ spaceId }) => (asset, fileBuffer) => createAsset(asset, fileBuffer, { spaceId });
 const makeUpdateAssetAPITransport = ({
   spaceId
-}) => (asset, fileBuffer) => updateAsset(asset, fileBuffer, {
-  spaceId
-});
+}) => (id, asset, fileBuffer) => updateAsset(id, asset, { spaceId, fileBuffer });
 const makeAppendAssetManifestFSTransport = ({ manifestFile }) => async (localAsset, remoteAsset) => {
   const createdAt = (/* @__PURE__ */ new Date()).toISOString();
   await appendToFile(manifestFile, JSON.stringify({
@@ -7679,10 +7533,9 @@ const makeAppendAssetFolderManifestFSTransport = ({ manifestFile }) => async (lo
   }));
 };
 const makeGetAssetAPITransport = ({ spaceId }) => async (assetId) => {
-  const { data, response } = await getMapiClient().assets.get({
+  const { data, response } = await getMapiClient().assets.get(assetId, {
     path: {
-      space_id: spaceId,
-      asset_id: assetId
+      space_id: Number(spaceId)
     }
   });
   if (!response.ok && response.status !== 404) {
@@ -7712,27 +7565,18 @@ const hasShortFilename = (a) => {
   return !!a && typeof a === "object" && "short_filename" in a && typeof a.short_filename === "string";
 };
 const isDataUnchanged = (localAsset, remoteAsset) => {
-  if (localAsset.asset_folder_id !== remoteAsset.asset_folder_id) {
-    return false;
-  }
-  if (localAsset.alt !== remoteAsset.alt || localAsset.title !== remoteAsset.title || localAsset.copyright !== remoteAsset.copyright || localAsset.source !== remoteAsset.source || localAsset.is_private !== remoteAsset.is_private) {
-    return false;
-  }
-  const localAssetMetadataEntries = Object.entries(localAsset.meta_data || {});
-  const remoteAssetMetadataEntries = Object.entries(remoteAsset.meta_data || {});
-  if (localAssetMetadataEntries.length !== remoteAssetMetadataEntries.length) {
-    return false;
-  }
-  const hasChanges = localAssetMetadataEntries.some(([k, v]) => remoteAsset.meta_data && remoteAsset.meta_data[k] !== v);
-  return !hasChanges;
-};
-const isAssetUnchanged = async (localAsset, remoteAsset, localFileBuffer, downloadAssetFileTransport) => {
-  const remoteFileBuffer = await downloadAssetFileTransport(remoteAsset);
-  const isFileUnchanged = sha256(localFileBuffer) === sha256(remoteFileBuffer);
-  if (!isFileUnchanged) {
-    return false;
+  for (const key of Object.keys(localAsset)) {
+    const local = localAsset[key];
+    const remote = remoteAsset[key];
+    if (typeof local === "object" || typeof remote === "object") {
+      if (JSON.stringify(local) !== JSON.stringify(remote)) {
+        return false;
+      }
+    } else if (local !== remote) {
+      return false;
+    }
   }
-  return isDataUnchanged(localAsset, remoteAsset);
+  return true;
 };
 const makeDownloadAssetFileTransport = ({
   assetToken,
@@ -7753,22 +7597,30 @@ const processAsset = async ({
   let status;
   if (remoteAsset) {
     const updatePayload = {
-      ...remoteAsset,
-      ...localAsset,
-      id: remoteAsset.id,
-      asset_folder_id: remoteFolderId
+      asset_folder_id: remoteFolderId,
+      alt: "alt" in localAsset ? localAsset.alt : remoteAsset.alt,
+      title: "title" in localAsset ? localAsset.title : remoteAsset.title,
+      copyright: "copyright" in localAsset ? localAsset.copyright : remoteAsset.copyright,
+      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,
+      internal_tag_ids: "internal_tag_ids" in localAsset ? localAsset.internal_tag_ids : remoteAsset.internal_tag_ids,
+      meta_data: "meta_data" in localAsset ? localAsset.meta_data : remoteAsset.meta_data
     };
-    const canSkip = await isAssetUnchanged(
-      updatePayload,
-      remoteAsset,
-      fileBuffer,
-      transports.downloadAssetFile
-    );
-    if (canSkip) {
+    const remoteFileBuffer = await transports.downloadAssetFile(remoteAsset);
+    const isFileUnchanged = sha256(fileBuffer) === sha256(remoteFileBuffer);
+    if (isFileUnchanged && isDataUnchanged(updatePayload, remoteAsset)) {
       newRemoteAsset = remoteAsset;
       status = "skipped";
     } else {
-      newRemoteAsset = await transports.updateAsset(updatePayload, fileBuffer);
+      await transports.updateAsset(
+        remoteAsset.id,
+        { ...updatePayload, short_filename: remoteAsset.short_filename },
+        isFileUnchanged ? void 0 : fileBuffer
+      );
+      newRemoteAsset = { ...remoteAsset, ...updatePayload };
       status = "updated";
     }
   } else if (hasShortFilename(localAsset)) {
@@ -7833,7 +7685,7 @@ const upsertAssetStream = ({
   });
 };
 
-const pullCmd$1 = assetsCommand.command("pull").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage").option("-d, --dry-run", "Preview changes without applying them to Storyblok").option("-q, --query <query>", 'Filter assets using Storyblok filter query syntax. Example: --query="search=my-file.jpg&with_tags=tag1,tag2"').option("--asset-token <token>", "Asset token for accessing private assets").description(`Download your space's assets as local files.`);
+const pullCmd$1 = assetsCommand.command("pull").option("-s, --space <space>", "space ID").option("-d, --dry-run", "Preview changes without applying them to Storyblok").option("-q, --query <query>", 'Filter assets using Storyblok filter query syntax. Example: --query="search=my-file.jpg&with_tags=tag1,tag2"').option("--asset-token <token>", "Asset token for accessing private assets").description(`Download your space's assets as local files.`);
 pullCmd$1.action(async (options, command) => {
   const ui = getUI();
   const logger = getLogger();
@@ -8164,7 +8016,7 @@ const storyRefMapper = (story, { schemas, maps }) => {
     }) : story.content,
     id: Number(maps.stories?.get(story.id) ?? story.id),
     uuid: String(maps.stories?.get(story.uuid) ?? story.uuid),
-    parent_id: parentId != null ? Number(parentId) : null,
+    parent_id: parentId != null ? Number(parentId) : 0,
     alternates
   };
   return {
@@ -8482,7 +8334,10 @@ const makeWriteStoryFSTransport = ({ directoryPath }) => async (story) => {
   return story;
 };
 const makeWriteStoryAPITransport = ({ spaceId, publish }) => (mappedLocalStory) => updateStory(spaceId, mappedLocalStory.id, {
-  story: mappedLocalStory,
+  story: {
+    ...mappedLocalStory,
+    parent_id: mappedLocalStory.parent_id ?? void 0
+  },
   publish: publish ?? (isStoryPublishedWithoutChanges(mappedLocalStory) ? 1 : 0)
 });
 const makeCleanupStoryFSTransport = ({ directoryPath, maps }) => {
@@ -8779,7 +8634,7 @@ const mapAssetReferencesInStoriesPipeline = async ({
   return Object.entries(summaries);
 };
 
-const pushCmd$1 = assetsCommand.command("push").argument("[asset]", "path or URL of a single asset to push").option("-s, --space <space>", "space ID").option("-p, --path <path>", "path for file storage").option("-f, --from <from>", "source space id").option("--data <data>", "inline asset data as JSON").option("--short-filename <short-filename>", "override the asset filename").option("--folder <folderId>", "destination asset folder ID").option("--cleanup", "delete local assets and metadata after a successful push (note: does not cleanup manifests)").option("--update-stories", "update file references in stories if necessary", false).option("--asset-token <token>", "asset token for accessing private assets").option("-d, --dry-run", "Preview changes without applying them to Storyblok").description(`Push local assets to a Storyblok space.`);
+const pushCmd$1 = assetsCommand.command("push").argument("[asset]", "path or URL of a single asset to push").option("-s, --space <space>", "space ID").option("-f, --from <from>", "source space id").option("--data <data>", "inline asset data as JSON").option("--short-filename <short-filename>", "override the asset filename").option("--folder <folderId>", "destination asset folder ID").option("--cleanup", "delete local assets and metadata after a successful push (note: does not cleanup manifests)").option("--update-stories", "update file references in stories if necessary", false).option("--asset-token <token>", "asset token for accessing private assets").option("-d, --dry-run", "Preview changes without applying them to Storyblok").description(`Push local assets to a Storyblok space.`);
 pushCmd$1.action(async (assetInput, options, command) => {
   const ui = getUI();
   const logger = getLogger();
@@ -8818,7 +8673,7 @@ pushCmd$1.action(async (assetInput, options, command) => {
     const assetsDirectoryPath = resolveCommandPath(directories.assets, fromSpace, basePath);
     const assetFolderGetTransport = makeGetAssetFolderAPITransport({ spaceId: targetSpace });
     const assetFolderCreateTransport = options.dryRun ? async (folder) => folder : makeCreateAssetFolderAPITransport({ spaceId: targetSpace });
-    const assetFolderUpdateTransport = options.dryRun ? async (folder) => folder : makeUpdateAssetFolderAPITransport({ spaceId: targetSpace });
+    const assetFolderUpdateTransport = options.dryRun ? async (_id, folder) => folder : makeUpdateAssetFolderAPITransport({ spaceId: targetSpace });
     const assetFolderManifestTransport = options.dryRun ? () => Promise.resolve() : makeAppendAssetFolderManifestFSTransport({ manifestFile: folderManifestFile });
     const cleanupAssetFolderTransport = options.cleanup && !options.dryRun ? makeCleanupAssetFolderFSTransport() : () => Promise.resolve();
     summaries.push(...await upsertAssetFoldersPipeline({
@@ -8849,7 +8704,8 @@ pushCmd$1.action(async (assetInput, options, command) => {
     }
     const getAssetTransport = makeGetAssetAPITransport({ spaceId: targetSpace });
     const createAssetTransport = options.dryRun ? async (asset) => asset : makeCreateAssetAPITransport({ spaceId: targetSpace });
-    const updateAssetTransport = options.dryRun ? async (asset) => asset : makeUpdateAssetAPITransport({ spaceId: targetSpace });
+    const updateAssetTransport = options.dryRun ? async () => {
+    } : makeUpdateAssetAPITransport({ spaceId: targetSpace });
     const downloadAssetFileTransport = makeDownloadAssetFileTransport({
       assetToken,
       region
@@ -8925,7 +8781,7 @@ pushCmd$1.action(async (assetInput, options, command) => {
 const program$1 = getProgram();
 const storiesCommand = program$1.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("-p, --path <path>", "base path to store stories (default .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.`);
+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) => {
   const ui = getUI();
   const logger = getLogger();
@@ -9035,7 +8891,7 @@ pullCmd.action(async (options, command) => {
   }
 });
 
-const pushCmd = storiesCommand.command("push").option("-s, --space <space>", "space ID").option("-f, --from <from>", "source space id").option("-p, --path <path>", "base path for stories and components (default .storyblok)").option("-d, --dry-run", "Preview changes without applying them to Storyblok").option("--publish", "Publish stories after pushing").option("--cleanup", "delete local stories after a successful push (note: does not cleanup manifests)").description(`Push local stories to a Storyblok space.`);
+const pushCmd = storiesCommand.command("push").option("-s, --space <space>", "space ID").option("-f, --from <from>", "source space id").option("-d, --dry-run", "Preview changes without applying them to Storyblok").option("--publish", "Publish stories after pushing").option("--cleanup", "delete local stories after a successful push (note: does not cleanup manifests)").description(`Push local stories to a Storyblok space.`);
 pushCmd.action(async (options, command) => {
   const ui = getUI();
   const logger = getLogger();
@@ -9057,8 +8913,9 @@ pushCmd.action(async (options, command) => {
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
+  const pendingWarnings = [];
+  const warnedPlugins = /* @__PURE__ */ new Set();
   const warnAboutCustomPlugins = (fields, story) => {
-    const warnedPlugins = /* @__PURE__ */ new Set();
     for (const field of fields) {
       if (field.type === "custom" && typeof field.field_type === "string") {
         if (warnedPlugins.has(field.field_type)) {
@@ -9066,19 +8923,19 @@ pushCmd.action(async (options, command) => {
         }
         warnedPlugins.add(field.field_type);
         const message = `The custom plugin "${field.field_type}" may contain references that require manual updates.`;
-        ui.warn(message);
+        pendingWarnings.push(message);
         logger.warn(message, { storyId: story.uuid });
       }
     }
   };
+  const missingSchemaWarnings = /* @__PURE__ */ new Set();
   const warnAboutMissingSchemas = (missingSchemas, story) => {
-    const missingSchemaWarnings = /* @__PURE__ */ new Set();
     for (const schemaName of missingSchemas) {
       if (missingSchemaWarnings.has(schemaName)) {
         continue;
       }
       const message = `The component "${schemaName}" was not found. Please run \`storyblok components pull\` to fetch the latest components.`;
-      ui.warn(message);
+      pendingWarnings.push(message);
       logger.warn(message, { storyId: story.uuid });
       missingSchemaWarnings.add(schemaName);
     }
@@ -9181,7 +9038,7 @@ pushCmd.action(async (options, command) => {
     }
     if (summary.creationResults.failed > 0) {
       const message = `${summary.creationResults.failed} ${summary.creationResults.failed === 1 ? "story" : "stories"} failed to create. References to these stories will be left unmapped.`;
-      ui.warn(message);
+      pendingWarnings.push(message);
       logger.warn(message);
     }
     await pipeline$1(
@@ -9253,6 +9110,9 @@ pushCmd.action(async (options, command) => {
   } finally {
     logger.info("Pushing stories finished", summary);
     ui.stopAllProgressBars();
+    for (const warning of pendingWarnings) {
+      ui.warn(warning);
+    }
     const failedStories = Math.max(summary.creationResults.failed, summary.processResults.failed, summary.updateResults.failed);
     ui.info(`Push results: ${summary.creationResults.total} ${summary.creationResults.total === 1 ? "story" : "stories"} pushed, ${failedStories} ${failedStories === 1 ? "story" : "stories"} failed`);
     ui.list([