storyblok 4.17.9 → 4.17.10

package/dist/config/index.d.mts

@@ -221,7 +221,9 @@ type DeepPartial<T> = T extends object ? {
 
 interface ApiConfig {
     maxRetries: number;
-    maxConcurrency: number;
+    rateLimit: number;
+    /** @deprecated Use `rateLimit` instead. @todo(next-major): Remove this field. */
+    maxConcurrency?: number;
 }
 interface LogConsoleConfig {
     enabled: boolean;

package/dist/config/index.d.ts

@@ -221,7 +221,9 @@ type DeepPartial<T> = T extends object ? {
 
 interface ApiConfig {
     maxRetries: number;
-    maxConcurrency: number;
+    rateLimit: number;
+    /** @deprecated Use `rateLimit` instead. @todo(next-major): Remove this field. */
+    maxConcurrency?: number;
 }
 interface LogConsoleConfig {
     enabled: boolean;

package/dist/config/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../src/lib/config/types.ts"],"sourcesContent":["import type { RegionCode } from '../../constants';\nimport type { Command, Option } from 'commander';\nimport type { CommandOptions } from '../../types';\nimport type { PullComponentsOptions } from '../../commands/components/pull/constants';\nimport type { PushComponentsOptions } from '../../commands/components/push/constants';\nimport type { PullDatasourcesOptions } from '../../commands/datasources/pull/constants';\nimport type { PushDatasourcesOptions } from '../../commands/datasources/push/constants';\nimport type { DeleteDatasourceOptions } from '../../commands/datasources/delete/constants';\nimport type { MigrationsGenerateOptions } from '../../commands/migrations/generate/constants';\nimport type { MigrationsRunOptions } from '../../commands/migrations/run/constants';\nimport type { MigrationsRollbackOptions } from '../../commands/migrations/rollback/types';\nimport type { GenerateTypesOptions } from '../../commands/types/generate/constants';\nimport type { PullLanguagesOptions } from '../../commands/languages/constants';\nimport type { PullAssetsOptions } from '../../commands/assets/pull/types';\nimport type { PushAssetsOptions } from '../../commands/assets/push/types';\nimport type { PullStoriesOptions } from '../../commands/stories/pull/types';\nimport type { PushStoriesOptions } from '../../commands/stories/push/types';\nimport type { PruneLogsOptions } from '../../commands/logs/prune/types';\nimport type { PruneReportsOptions } from '../../commands/reports/prune/types';\nimport type { DeepPartial } from '../../utils/types';\n\nexport type PlainObject = Record<string, any>;\n\nexport interface ApiConfig {\n  maxRetries: number;\n  maxConcurrency: number;\n}\n\nexport interface LogConsoleConfig {\n  enabled: boolean;\n  level: string;\n}\n\nexport interface LogFileConfig {\n  enabled: boolean;\n  level: string;\n  maxFiles: number;\n}\n\nexport interface LogConfig {\n  console: LogConsoleConfig;\n  file: LogFileConfig;\n}\n\nexport interface ReportConfig {\n  enabled: boolean;\n  maxFiles: number;\n}\n\nexport interface UiConfig {\n  enabled: boolean;\n}\n\nexport interface GlobalConfig {\n  region?: RegionCode;\n  space?: number | string;\n  path?: string;\n  api: ApiConfig;\n  log: LogConfig;\n  report: ReportConfig;\n  ui: UiConfig;\n  verbose: boolean;\n}\n\nexport interface ResolvedCliConfig extends GlobalConfig {\n  [key: string]: any;\n}\n\ntype StripCommandOption<T> = T extends CommandOptions ? Omit<T, keyof CommandOptions> : T;\ntype CommandConfig<T> = Partial<StripCommandOption<T>>;\n\nexport interface SharedConfigOptions {\n  space?: number | string;\n  path?: string;\n}\n\nexport interface CommandOptionsMap {\n  components: { pull: PullComponentsOptions; push: PushComponentsOptions };\n  datasources: { pull: PullDatasourcesOptions; push: PushDatasourcesOptions; delete: DeleteDatasourceOptions };\n  migrations: { generate: MigrationsGenerateOptions; run: MigrationsRunOptions; rollback: MigrationsRollbackOptions };\n  types: { generate: GenerateTypesOptions };\n  languages: { pull: PullLanguagesOptions };\n  assets: { pull: PullAssetsOptions; push: PushAssetsOptions };\n  stories: { pull: PullStoriesOptions; push: PushStoriesOptions };\n  logs: { list: Record<string, never>; prune: PruneLogsOptions };\n  reports: { list: Record<string, never>; prune: PruneReportsOptions };\n}\n\ntype SubcommandConfig<T> = SharedConfigOptions & CommandConfig<T>;\n\ntype ModuleConfig<Subs extends Record<string, any>> = SharedConfigOptions & {\n  [K in keyof Subs]?: SubcommandConfig<Subs[K]>;\n};\n\nexport type ModulesConfig = {\n  [K in keyof CommandOptionsMap]?: ModuleConfig<CommandOptionsMap[K]>;\n};\n\nexport type ComponentsModuleConfig = ModulesConfig['components'];\nexport type DatasourcesModuleConfig = ModulesConfig['datasources'];\nexport type MigrationsModuleConfig = ModulesConfig['migrations'];\nexport type TypesModuleConfig = ModulesConfig['types'];\nexport type LanguagesModuleConfig = ModulesConfig['languages'];\nexport type AssetsModuleConfig = ModulesConfig['assets'];\nexport type StoriesModuleConfig = ModulesConfig['stories'];\nexport type LogsModuleConfig = ModulesConfig['logs'];\nexport type ReportsModuleConfig = ModulesConfig['reports'];\n\nexport interface StoryblokConfig extends DeepPartial<GlobalConfig> {\n  modules?: ModulesConfig;\n}\n\nexport function defineConfig<T extends StoryblokConfig>(config: T): T {\n  return config;\n}\n\nexport type OptionParser<T> = (value: string, previous?: T) => T;\n\nexport interface GlobalOptionDefinition<T = unknown> {\n  flags: string;\n  description: string;\n  defaultValue?: T;\n  parser?: OptionParser<T>;\n}\n\nexport interface ConfigLocation {\n  cwd: string;\n  configFile: string;\n}\n\nexport type CommanderOption = Option;\nexport type CommanderCommand = Command;\n"],"names":[],"mappings":"AAgHO,SAAS,aAAwC,MAAA,EAAc;AACpE,EAAA,OAAO,MAAA;AACT;;;;"}
+{"version":3,"file":"index.mjs","sources":["../../src/lib/config/types.ts"],"sourcesContent":["import type { RegionCode } from '../../constants';\nimport type { Command, Option } from 'commander';\nimport type { CommandOptions } from '../../types';\nimport type { PullComponentsOptions } from '../../commands/components/pull/constants';\nimport type { PushComponentsOptions } from '../../commands/components/push/constants';\nimport type { PullDatasourcesOptions } from '../../commands/datasources/pull/constants';\nimport type { PushDatasourcesOptions } from '../../commands/datasources/push/constants';\nimport type { DeleteDatasourceOptions } from '../../commands/datasources/delete/constants';\nimport type { MigrationsGenerateOptions } from '../../commands/migrations/generate/constants';\nimport type { MigrationsRunOptions } from '../../commands/migrations/run/constants';\nimport type { MigrationsRollbackOptions } from '../../commands/migrations/rollback/types';\nimport type { GenerateTypesOptions } from '../../commands/types/generate/constants';\nimport type { PullLanguagesOptions } from '../../commands/languages/constants';\nimport type { PullAssetsOptions } from '../../commands/assets/pull/types';\nimport type { PushAssetsOptions } from '../../commands/assets/push/types';\nimport type { PullStoriesOptions } from '../../commands/stories/pull/types';\nimport type { PushStoriesOptions } from '../../commands/stories/push/types';\nimport type { PruneLogsOptions } from '../../commands/logs/prune/types';\nimport type { PruneReportsOptions } from '../../commands/reports/prune/types';\nimport type { DeepPartial } from '../../utils/types';\n\nexport type PlainObject = Record<string, any>;\n\nexport interface ApiConfig {\n  maxRetries: number;\n  rateLimit: number;\n  /** @deprecated Use `rateLimit` instead. @todo(next-major): Remove this field. */\n  maxConcurrency?: number;\n}\n\nexport interface LogConsoleConfig {\n  enabled: boolean;\n  level: string;\n}\n\nexport interface LogFileConfig {\n  enabled: boolean;\n  level: string;\n  maxFiles: number;\n}\n\nexport interface LogConfig {\n  console: LogConsoleConfig;\n  file: LogFileConfig;\n}\n\nexport interface ReportConfig {\n  enabled: boolean;\n  maxFiles: number;\n}\n\nexport interface UiConfig {\n  enabled: boolean;\n}\n\nexport interface GlobalConfig {\n  region?: RegionCode;\n  space?: number | string;\n  path?: string;\n  api: ApiConfig;\n  log: LogConfig;\n  report: ReportConfig;\n  ui: UiConfig;\n  verbose: boolean;\n}\n\nexport interface ResolvedCliConfig extends GlobalConfig {\n  [key: string]: any;\n}\n\ntype StripCommandOption<T> = T extends CommandOptions ? Omit<T, keyof CommandOptions> : T;\ntype CommandConfig<T> = Partial<StripCommandOption<T>>;\n\nexport interface SharedConfigOptions {\n  space?: number | string;\n  path?: string;\n}\n\nexport interface CommandOptionsMap {\n  components: { pull: PullComponentsOptions; push: PushComponentsOptions };\n  datasources: { pull: PullDatasourcesOptions; push: PushDatasourcesOptions; delete: DeleteDatasourceOptions };\n  migrations: { generate: MigrationsGenerateOptions; run: MigrationsRunOptions; rollback: MigrationsRollbackOptions };\n  types: { generate: GenerateTypesOptions };\n  languages: { pull: PullLanguagesOptions };\n  assets: { pull: PullAssetsOptions; push: PushAssetsOptions };\n  stories: { pull: PullStoriesOptions; push: PushStoriesOptions };\n  logs: { list: Record<string, never>; prune: PruneLogsOptions };\n  reports: { list: Record<string, never>; prune: PruneReportsOptions };\n}\n\ntype SubcommandConfig<T> = SharedConfigOptions & CommandConfig<T>;\n\ntype ModuleConfig<Subs extends Record<string, any>> = SharedConfigOptions & {\n  [K in keyof Subs]?: SubcommandConfig<Subs[K]>;\n};\n\nexport type ModulesConfig = {\n  [K in keyof CommandOptionsMap]?: ModuleConfig<CommandOptionsMap[K]>;\n};\n\nexport type ComponentsModuleConfig = ModulesConfig['components'];\nexport type DatasourcesModuleConfig = ModulesConfig['datasources'];\nexport type MigrationsModuleConfig = ModulesConfig['migrations'];\nexport type TypesModuleConfig = ModulesConfig['types'];\nexport type LanguagesModuleConfig = ModulesConfig['languages'];\nexport type AssetsModuleConfig = ModulesConfig['assets'];\nexport type StoriesModuleConfig = ModulesConfig['stories'];\nexport type LogsModuleConfig = ModulesConfig['logs'];\nexport type ReportsModuleConfig = ModulesConfig['reports'];\n\nexport interface StoryblokConfig extends DeepPartial<GlobalConfig> {\n  modules?: ModulesConfig;\n}\n\nexport function defineConfig<T extends StoryblokConfig>(config: T): T {\n  return config;\n}\n\nexport type OptionParser<T> = (value: string, previous?: T) => T;\n\nexport interface GlobalOptionDefinition<T = unknown> {\n  flags: string;\n  description: string;\n  defaultValue?: T;\n  parser?: OptionParser<T>;\n}\n\nexport interface ConfigLocation {\n  cwd: string;\n  configFile: string;\n}\n\nexport type CommanderOption = Option;\nexport type CommanderCommand = Command;\n"],"names":[],"mappings":"AAkHO,SAAS,aAAwC,MAAA,EAAc;AACpE,EAAA,OAAO,MAAA;AACT;;;;"}

package/dist/index.mjs

@@ -186,7 +186,7 @@ const BASE_GLOBAL_CONFIG = {
   path: void 0,
   api: {
     maxRetries: 3,
-    maxConcurrency: 6
+    rateLimit: 6
   },
   log: {
     console: {
@@ -445,10 +445,16 @@ const GLOBAL_OPTION_DEFINITIONS = [
     defaultValue: DEFAULT_GLOBAL_CONFIG.api.maxRetries,
     parser: parseNumber
   },
+  {
+    flags: "--api-rate-limit <number>",
+    description: "Maximum MAPI requests per second (default: 6)",
+    defaultValue: DEFAULT_GLOBAL_CONFIG.api.rateLimit,
+    parser: parseNumber
+  },
+  // @todo(next-major): Remove deprecated --api-max-concurrency flag.
   {
     flags: "--api-max-concurrency <number>",
-    description: "Maximum concurrent API requests executed by the CLI",
-    defaultValue: DEFAULT_GLOBAL_CONFIG.api.maxConcurrency,
+    description: "[Deprecated] Use --api-rate-limit instead.",
     parser: parseNumber
   },
   // Boolean flags that default to true need both positive and negative forms
@@ -564,6 +570,11 @@ async function resolveConfig(thisCommand, ancestry) {
   const knownModuleKeys = getModuleNames(root);
   for (const layer of layers) {
     const { modules, ...globalLayer } = layer;
+    if (globalLayer.api?.maxConcurrency !== void 0) {
+      console.warn("[storyblok] Config option `api.maxConcurrency` is deprecated. Use `api.rateLimit` instead.");
+      globalLayer.api.rateLimit = globalLayer.api.maxConcurrency;
+      delete globalLayer.api.maxConcurrency;
+    }
     mergeDeep(globalResolved, globalLayer);
     if (modules && isPlainObject(modules)) {
       warnUnknownModuleKeys(modules, knownModuleKeys);
@@ -571,6 +582,12 @@ async function resolveConfig(thisCommand, ancestry) {
     }
   }
   applyCliOverrides(commandChain, globalResolved, localResolved);
+  const globalResolvedApi = globalResolved.api;
+  if (globalResolvedApi?.maxConcurrency !== void 0) {
+    console.warn("[storyblok] CLI flag `--api-max-concurrency` is deprecated. Use `--api-rate-limit` instead.");
+    globalResolvedApi.rateLimit = globalResolvedApi.maxConcurrency;
+    delete globalResolvedApi.maxConcurrency;
+  }
   const resolved = structuredClone(defaultConfig);
   mergeDeep(resolved, globalResolved);
   Object.assign(resolved, localResolved);
@@ -696,6 +713,8 @@ const API_ACTIONS = {
   push_asset_folder: "Failed to push asset folder",
   push_asset_create: "Failed to create asset",
   push_asset_update: "Failed to update asset",
+  pull_asset_internal_tags: "Failed to pull asset internal tags",
+  push_asset_internal_tag: "Failed to push asset internal tag",
   pull_datasources: "Failed to pull datasources",
   push_datasource: "Failed to push datasource",
   update_datasource: "Failed to update datasource",
@@ -1832,7 +1851,7 @@ function createMapiClient(options) {
   const { api } = getActiveConfig();
   return createManagementApiClient({
     ...options,
-    rateLimit: options.rateLimit ?? (api.maxConcurrency > 0 ? { maxConcurrency: api.maxConcurrency } : false)
+    rateLimit: options.rateLimit ?? (api.rateLimit > 0 ? api.rateLimit : false)
   });
 }
 function getMapiClient(options) {
@@ -3573,17 +3592,17 @@ class ProgressDisplay {
 }
 const progressDisplay = new ProgressDisplay();
 
-async function processAllResources(graph, space, maxConcurrency = getActiveConfig().api.maxConcurrency) {
+async function processAllResources(graph, space, backpressure = getActiveConfig().api.rateLimit) {
   const levels = determineProcessingOrder(graph);
   const results = { successful: [], failed: [] };
   const totalResources = levels.reduce((sum, level) => sum + level.nodes.length, 0);
   progressDisplay.start(totalResources);
   for (const level of levels) {
     if (level.isCyclic) {
-      const cyclicResults = await processCyclicLevel(level, graph, space, maxConcurrency);
+      const cyclicResults = await processCyclicLevel(level, graph, space, backpressure);
       mergeResults(results, cyclicResults);
     } else {
-      const levelResults = await processLevel(level.nodes, graph, space, maxConcurrency);
+      const levelResults = await processLevel(level.nodes, graph, space, backpressure);
       mergeResults(results, levelResults);
     }
   }
@@ -3598,12 +3617,12 @@ async function processAllResources(graph, space, maxConcurrency = getActiveConfi
   });
   return results;
 }
-async function processCyclicLevel(level, graph, space, maxConcurrency) {
+async function processCyclicLevel(level, graph, space, backpressure) {
   progressDisplay.clearProgress();
   console.log(`
 \u{1F504} Detected circular dependencies: ${level.nodes.map((id) => id.replace("component:", "")).join(", ")}`);
   await createStubComponents(level.nodes, graph, space);
-  return await processLevel(level.nodes, graph, space, maxConcurrency);
+  return await processLevel(level.nodes, graph, space, backpressure);
 }
 async function createStubComponents(nodeIds, graph, space) {
   const missingComponents = [];
@@ -3643,17 +3662,17 @@ function createMinimalStubComponent(name) {
     // Minimal empty schema
   };
 }
-async function processLevel(level, graph, space, maxConcurrency) {
+async function processLevel(level, graph, space, backpressure) {
   for (const nodeId of level) {
     const node = graph.nodes.get(nodeId);
     node.resolveReferences(graph);
   }
-  const semaphore = Array.from({ length: maxConcurrency }, () => null);
+  const semaphore = Array.from({ length: backpressure }, () => null);
   const promises = [];
   for (let i = 0; i < level.length; i++) {
     const nodeId = level[i];
-    const slotIndex = i % maxConcurrency;
-    if (i >= maxConcurrency && semaphore[slotIndex]) {
+    const slotIndex = i % backpressure;
+    if (i >= backpressure && semaphore[slotIndex]) {
       await semaphore[slotIndex];
     }
     const promise = processNode(nodeId, graph, space);
@@ -3734,11 +3753,11 @@ function getResourceTypeColor(type) {
   }
 }
 
-async function pushWithDependencyGraph(space, spaceState, maxConcurrency = getActiveConfig().api.maxConcurrency) {
+async function pushWithDependencyGraph(space, spaceState, backpressure = getActiveConfig().api.rateLimit) {
   const context = { spaceState };
   const graph = buildDependencyGraph(context);
   validateGraph(graph);
-  const results = await processAllResources(graph, space, maxConcurrency);
+  const results = await processAllResources(graph, space, backpressure);
   return results;
 }
 
@@ -4255,6 +4274,14 @@ const prefetchTargetStoriesByKeys = async (spaceId, keys, options) => {
   return result;
 };
 
+const PIPELINE_BACKPRESSURE_MULTIPLIER = 2;
+const DEFAULT_PIPELINE_BACKPRESSURE = 12;
+function createPipelineBackpressureLock(limit) {
+  const rateLimit = getActiveConfig().api.rateLimit;
+  const n = (rateLimit > 0 ? rateLimit * PIPELINE_BACKPRESSURE_MULTIPLIER : DEFAULT_PIPELINE_BACKPRESSURE);
+  return new Sema(n);
+}
+
 const ERROR_CODES = {
   MIGRATION_APPLY_TO_STORY_ERROR: "MIGRATION_APPLY_TO_STORY_ERROR",
   MIGRATION_CREATE_STORIES_PIPELINE_ERROR: "MIGRATION_CREATE_STORIES_PIPELINE_ERROR",
@@ -4319,14 +4346,13 @@ async function* storiesIterator(spaceId, params, onTotal) {
   }
 }
 class StoriesStream extends Transform {
-  constructor(spaceId, batchSize, onProgress) {
+  constructor(spaceId, onProgress) {
     super({
       objectMode: true
     });
     this.spaceId = spaceId;
-    this.batchSize = batchSize;
     this.onProgress = onProgress;
-    this.semaphore = new Sema(this.batchSize);
+    this.semaphore = createPipelineBackpressureLock();
   }
   semaphore;
   async _transform(chunk, _encoding, callback) {
@@ -4354,13 +4380,12 @@ class StoriesStream extends Transform {
 const createStoriesStream = async ({
   spaceId,
   params,
-  batchSize = 100,
   onTotal,
   onProgress
 }) => {
   const iterator = storiesIterator(spaceId, params, onTotal);
   const listStoriesStream = Readable.from(iterator);
-  return pipeline(listStoriesStream, new StoriesStream(spaceId, batchSize, onProgress), (err) => {
+  return pipeline(listStoriesStream, new StoriesStream(spaceId, onProgress), (err) => {
     if (err) {
       console.error(err);
       getLogger().error(err.message, { errorCode: ERROR_CODES.MIGRATION_CREATE_STORIES_PIPELINE_ERROR });
@@ -4739,16 +4764,14 @@ class UpdateStream extends Writable {
       objectMode: true
     });
     this.options = options;
-    this.batchSize = options.batchSize || 10;
     this.results = {
       successful: [],
       failed: [],
       totalProcessed: 0
     };
-    this.semaphore = new Sema(this.batchSize);
+    this.semaphore = createPipelineBackpressureLock();
   }
   results;
-  batchSize;
   semaphore;
   async _write(chunk, _encoding, callback) {
     try {
@@ -4904,7 +4927,6 @@ runCmd.action(async (componentName, options, command) => {
         query,
         starts_with: startsWith
       },
-      batchSize: 12,
       onTotal: (total) => {
         storiesProgress.setTotal(total);
         migrationsProgress.setTotal(total);
@@ -4930,7 +4952,6 @@ runCmd.action(async (componentName, options, command) => {
       space,
       publish,
       dryRun,
-      batchSize: 12,
       onProgress: () => {
         updateProgress.increment();
       }
@@ -6412,7 +6433,8 @@ pushCmd$2.action(async (datasourceName, options, command) => {
         return;
       }
     } else if (filter) {
-      spaceState.local.datasources = spaceState.local.datasources.filter((datasource) => datasource.name.includes(filter));
+      const isGlobPattern = /[*?[\]{}!]/.test(filter);
+      spaceState.local.datasources = spaceState.local.datasources.filter((datasource) => isGlobPattern ? minimatch(datasource.name, filter) : datasource.name.includes(filter));
       if (!spaceState.local.datasources.length) {
         handleError(new CommandError(`No datasources found matching pattern "${filter}".`), verbose);
         return;
@@ -7109,6 +7131,41 @@ const fetchAssets = async ({ spaceId, params }) => {
     handleAPIError("pull_assets", toError(maybeError));
   }
 };
+const fetchAssetInternalTagsByName = async (spaceId) => {
+  try {
+    const client = getMapiClient();
+    const tags = await fetchAllPages(
+      (page) => client.internalTags.list({
+        path: { space_id: Number(spaceId) },
+        query: { page, by_object_type: "asset" },
+        throwOnError: true
+      }),
+      (data) => data?.internal_tags ?? []
+    );
+    return new Map(
+      tags.filter((tag) => typeof tag?.id === "number" && typeof tag?.name === "string").map((tag) => [tag.name, tag.id])
+    );
+  } catch (maybeError) {
+    handleAPIError("pull_asset_internal_tags", toError(maybeError));
+  }
+};
+const createAssetInternalTag = async (spaceId, name) => {
+  try {
+    const client = getMapiClient();
+    const { data } = await client.internalTags.create({
+      path: { space_id: Number(spaceId) },
+      body: { name, object_type: "asset" },
+      throwOnError: true
+    });
+    const tag = data?.internal_tag;
+    if (typeof tag?.id !== "number" || typeof tag?.name !== "string") {
+      throw new TypeError("Created internal tag is missing an id or name");
+    }
+    return { id: tag.id, name: tag.name };
+  } catch (maybeError) {
+    handleAPIError("push_asset_internal_tag", toError(maybeError), `Failed to create internal asset tag "${name}"`);
+  }
+};
 const downloadFile = async (filename) => {
   const response = await fetch(filename);
   if (!response.ok) {
@@ -7312,8 +7369,55 @@ const getFolderFilename = (folder) => {
   const baseName = sanitizedName || folder.uuid;
   return `${baseName}_${folder.uuid}.json`;
 };
+const internalTagNamesFromAssets = (assets) => {
+  const names = /* @__PURE__ */ new Set();
+  for (const asset of assets) {
+    for (const tag of asset.internal_tags_list ?? []) {
+      if (typeof tag?.name === "string" && tag.name.length > 0) {
+        names.add(tag.name);
+      }
+    }
+  }
+  return [...names];
+};
+const collectAssetInternalTagNames = async (directoryPath) => {
+  const files = await readdir(directoryPath);
+  const binaryFiles = files.filter((file) => SUPPORTED_ASSET_EXTENSIONS.has(extname(file).toLowerCase()));
+  const sidecars = await Promise.all(
+    binaryFiles.map((file) => loadSidecarAssetData(join(directoryPath, file)))
+  );
+  return internalTagNamesFromAssets(sidecars);
+};
+const ensureAssetInternalTags = async ({
+  sourceTagNames,
+  targetTagsByName,
+  createTag,
+  onTagCreated,
+  onTagCreateError
+}) => {
+  const tagsByName = new Map(targetTagsByName);
+  const missing = [...new Set(sourceTagNames)].filter((name) => !tagsByName.has(name));
+  for (const name of missing) {
+    try {
+      const created = await createTag(name);
+      if (created) {
+        tagsByName.set(created.name, created.id);
+        onTagCreated?.(created.name);
+      }
+    } catch (maybeError) {
+      onTagCreateError?.(name, toError(maybeError));
+    }
+  }
+  return tagsByName;
+};
 
-const apiConcurrencyLock$1 = new Sema(12);
+let _pipelineSlot$1 = null;
+const getPipelineSlot$1 = () => {
+  if (!_pipelineSlot$1) {
+    _pipelineSlot$1 = createPipelineBackpressureLock();
+  }
+  return _pipelineSlot$1;
+};
 const fetchAssetsStream = ({
   spaceId,
   params = {},
@@ -7370,7 +7474,7 @@ const downloadAssetStream = ({
   return new Transform({
     objectMode: true,
     async transform(asset, _encoding, callback) {
-      await apiConcurrencyLock$1.acquire();
+      await getPipelineSlot$1().acquire();
       const task = downloadAssetFile(asset, { assetToken, region }).then((fileBuffer) => {
         if (!fileBuffer) {
           throw new Error("Invalid asset file!");
@@ -7381,7 +7485,7 @@ const downloadAssetStream = ({
         onAssetError?.(toError(maybeError), asset);
       }).finally(() => {
         onIncrement?.();
-        apiConcurrencyLock$1.release();
+        getPipelineSlot$1().release();
         processing.delete(task);
       });
       processing.add(task);
@@ -7409,7 +7513,7 @@ const writeAssetStream = ({
   return new Writable({
     objectMode: true,
     async write(payload, _encoding, callback) {
-      await apiConcurrencyLock$1.acquire();
+      await getPipelineSlot$1().acquire();
       const task = (async () => {
         try {
           await writeAsset(payload.asset, payload.fileBuffer);
@@ -7421,7 +7525,7 @@ const writeAssetStream = ({
       processing.add(task);
       task.finally(() => {
         onIncrement?.();
-        apiConcurrencyLock$1.release();
+        getPipelineSlot$1().release();
         processing.delete(task);
       });
       callback();
@@ -7468,7 +7572,7 @@ const writeAssetFolderStream = ({
   return new Writable({
     objectMode: true,
     async write(folder, _encoding, callback) {
-      await apiConcurrencyLock$1.acquire();
+      await getPipelineSlot$1().acquire();
       const task = (async () => {
         try {
           await writeAssetFolder(folder);
@@ -7480,7 +7584,7 @@ const writeAssetFolderStream = ({
       processing.add(task);
       task.finally(() => {
         onIncrement?.();
-        apiConcurrencyLock$1.release();
+        getPipelineSlot$1().release();
         processing.delete(task);
       });
       callback();
@@ -7676,6 +7780,29 @@ const makeAppendAssetFolderManifestFSTransport = ({ manifestFile }) => async (lo
     created_at: createdAt
   }));
 };
+const mapInternalTagIds = (sourceIds, sourceTags, assetInternalTagsByName, onUnmappedTag) => {
+  if (!sourceIds || sourceIds.length === 0) {
+    return [];
+  }
+  const sourceNamesById = /* @__PURE__ */ new Map();
+  for (const tag of sourceTags ?? []) {
+    if (typeof tag?.id === "number" && typeof tag.name === "string") {
+      sourceNamesById.set(tag.id, tag.name);
+    }
+  }
+  const mapped = [];
+  for (const raw of sourceIds) {
+    const sourceId = Number(raw);
+    const sourceName = sourceNamesById.get(sourceId);
+    const targetId = typeof sourceName === "string" ? assetInternalTagsByName.get(sourceName) : void 0;
+    if (typeof targetId === "number") {
+      mapped.push(String(targetId));
+    } else {
+      onUnmappedTag?.({ sourceId, name: sourceName });
+    }
+  }
+  return mapped;
+};
 const makeGetAssetAPITransport = ({ spaceId }) => async (assetId) => {
   const { data, response } = await getMapiClient().assets.get(assetId, {
     path: {
@@ -7714,11 +7841,14 @@ const processAsset = async ({
   assetBinaryPath,
   assetPath,
   transports,
-  maps
+  maps,
+  onUnmappedTag
 }) => {
   const remoteFolderId = localAsset.asset_folder_id && (maps.assetFolders.get(localAsset.asset_folder_id) || localAsset.asset_folder_id);
   const remoteAssetId = hasId(localAsset) ? maps.assets.get(localAsset.id)?.new.id || localAsset.id : void 0;
   const remoteAsset = remoteAssetId ? await transports.getAsset(remoteAssetId) : null;
+  const sourceTags = localAsset.internal_tags_list;
+  const resolveInternalTagIds = (sourceIds) => maps.assetInternalTagsByName ? mapInternalTagIds(sourceIds, sourceTags, maps.assetInternalTagsByName, onUnmappedTag) : (sourceIds ?? []).map((id) => String(id));
   let newRemoteAsset;
   let status;
   if (remoteAsset) {
@@ -7732,7 +7862,7 @@ const processAsset = async ({
       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,
+      internal_tag_ids: "internal_tag_ids" in localAsset ? resolveInternalTagIds(localAsset.internal_tag_ids) : remoteAsset.internal_tag_ids,
       meta_data: "meta_data" in localAsset ? localAsset.meta_data : remoteAsset.meta_data
     };
     await transports.updateAsset(
@@ -7743,9 +7873,12 @@ const processAsset = async ({
     newRemoteAsset = { ...remoteAsset, ...updatePayload };
     status = "updated";
   } else if (hasShortFilename(localAsset)) {
+    const { internal_tags_list: _internalTagsList, internal_tag_ids: _sourceTagIds, ...rest } = localAsset;
+    const mappedTagIds = "internal_tag_ids" in localAsset ? resolveInternalTagIds(localAsset.internal_tag_ids) : void 0;
     const createPayload = {
-      ...localAsset,
-      asset_folder_id: remoteFolderId
+      ...rest,
+      asset_folder_id: remoteFolderId,
+      ...mappedTagIds !== void 0 ? { internal_tag_ids: mappedTagIds } : {}
     };
     newRemoteAsset = await transports.createAsset(createPayload, fileBuffer);
     status = "created";
@@ -7763,13 +7896,14 @@ const upsertAssetStream = ({
   maps,
   onIncrement,
   onAssetSuccess,
-  onAssetError
+  onAssetError,
+  onUnmappedTag
 }) => {
   const processing = /* @__PURE__ */ new Set();
   return new Writable({
     objectMode: true,
     async write({ asset: localAsset, context }, _encoding, callback) {
-      await apiConcurrencyLock$1.acquire();
+      await getPipelineSlot$1().acquire();
       const task = (async () => {
         try {
           const { remoteAsset } = await processAsset({
@@ -7778,7 +7912,8 @@ const upsertAssetStream = ({
             assetBinaryPath: context.assetBinaryPath,
             assetPath: context.assetPath,
             transports,
-            maps
+            maps,
+            onUnmappedTag
           });
           onAssetSuccess?.(localAsset, remoteAsset);
         } catch (maybeError) {
@@ -7788,7 +7923,7 @@ const upsertAssetStream = ({
       processing.add(task);
       task.finally(() => {
         onIncrement?.();
-        apiConcurrencyLock$1.release();
+        getPipelineSlot$1().release();
         processing.delete(task);
       });
       callback();
@@ -8111,7 +8246,13 @@ const storyRefMapper = (story, { schemas, maps }) => {
   };
 };
 
-const apiConcurrencyLock = new Sema(12);
+let _pipelineSlot = null;
+const getPipelineSlot = () => {
+  if (!_pipelineSlot) {
+    _pipelineSlot = createPipelineBackpressureLock();
+  }
+  return _pipelineSlot;
+};
 const fetchStoriesStream = ({
   spaceId,
   params = {},
@@ -8167,7 +8308,7 @@ const fetchStoryStream = ({
   return new Transform({
     objectMode: true,
     async transform(listStory, _encoding, callback) {
-      await apiConcurrencyLock.acquire();
+      await getPipelineSlot().acquire();
       const task = fetchStory(spaceId, listStory.id.toString()).then((story) => {
         if (typeof story === "undefined") {
           throw new TypeError("Invalid story!");
@@ -8178,7 +8319,7 @@ const fetchStoryStream = ({
         onStoryError?.(toError(maybeError), listStory);
       }).finally(() => {
         onIncrement?.();
-        apiConcurrencyLock.release();
+        getPipelineSlot().release();
         processing.delete(task);
       });
       processing.add(task);
@@ -8347,7 +8488,7 @@ const createStoriesForLevel = async ({
   onStoryError
 }) => {
   const processEntry = async (entry) => {
-    await apiConcurrencyLock.acquire();
+    await getPipelineSlot().acquire();
     try {
       const mappedStoryId = maps.stories?.get(entry.id);
       const mappedRemoteStory = mappedStoryId ? existingTargetStories.byId.get(Number(mappedStoryId)) : void 0;
@@ -8394,7 +8535,7 @@ const createStoriesForLevel = async ({
     } catch (maybeError) {
       onStoryError?.(toError(maybeError), entry);
     } finally {
-      apiConcurrencyLock.release();
+      getPipelineSlot().release();
     }
   };
   const folders = level.filter((e) => e.is_folder);
@@ -8451,7 +8592,7 @@ const writeStoryStream = ({
   return new Writable({
     objectMode: true,
     async write(mappedLocalStory, _encoding, callback) {
-      await apiConcurrencyLock.acquire();
+      await getPipelineSlot().acquire();
       const task = (async () => {
         try {
           const remoteStory = await transports.writeStory(mappedLocalStory);
@@ -8464,7 +8605,7 @@ const writeStoryStream = ({
       processing.add(task);
       task.finally(() => {
         onIncrement?.();
-        apiConcurrencyLock.release();
+        getPipelineSlot().release();
         processing.delete(task);
       });
       callback();
@@ -8677,7 +8818,8 @@ const upsertAssetsPipeline = async ({
   logger,
   maps,
   transports,
-  ui
+  ui,
+  onUnmappedTag
 }) => {
   const assetProgress = ui.createProgressBar({ title: "Assets...".padEnd(PROGRESS_BAR_PADDING) });
   const summary = { total: 0, succeeded: 0, failed: 0 };
@@ -8711,6 +8853,7 @@ const upsertAssetsPipeline = async ({
   steps.push(upsertAssetStream({
     transports,
     maps,
+    onUnmappedTag,
     onIncrement: () => assetProgress.increment(),
     onAssetSuccess: (localAssetResult, remoteAsset) => {
       if ("id" in localAssetResult && localAssetResult.id) {
@@ -8930,12 +9073,34 @@ pushCmd$1.action(async (assetInput, options, command) => {
     } : makeUpdateAssetAPITransport({ spaceId: targetSpace });
     const assetManifestTransport = options.dryRun ? () => Promise.resolve() : makeAppendAssetManifestFSTransport({ manifestFile });
     const cleanupAssetTransport = options.cleanup && !options.dryRun ? makeCleanupAssetFSTransport() : () => Promise.resolve();
+    let assetInternalTagsByName = fromSpace === targetSpace ? void 0 : await fetchAssetInternalTagsByName(targetSpace);
+    if (assetInternalTagsByName && !options.dryRun) {
+      const sourceTagNames = assetBinaryPath ? internalTagNamesFromAssets(assetData ? [assetData] : []) : await collectAssetInternalTagNames(assetsDirectoryPath);
+      const createdTagLabels = [];
+      assetInternalTagsByName = await ensureAssetInternalTags({
+        sourceTagNames,
+        targetTagsByName: assetInternalTagsByName,
+        createTag: (name) => createAssetInternalTag(targetSpace, name),
+        onTagCreated: (name) => createdTagLabels.push(name),
+        onTagCreateError: (name, error) => logger.warn(`Failed to create internal asset tag "${name}"`, { error: error.message })
+      });
+      if (createdTagLabels.length > 0) {
+        const labels = [...createdTagLabels].sort((a, b) => a.localeCompare(b));
+        const message = `Created ${labels.length} internal asset tag${labels.length === 1 ? "" : "s"} in target space: ${labels.join(", ")}`;
+        ui.info(message);
+        logger.info(message, { createdTags: labels });
+      }
+    }
+    const unmappedTagLabels = /* @__PURE__ */ new Set();
+    const onUnmappedTag = ({ sourceId, name }) => {
+      unmappedTagLabels.add(name ?? `#${sourceId}`);
+    };
     summaries.push(...await upsertAssetsPipeline({
       assetBinaryPath,
       assetData,
       directoryPath: assetsDirectoryPath,
       logger,
-      maps,
+      maps: { ...maps, assetInternalTagsByName },
       transports: {
         getAsset: getAssetTransport,
         createAsset: createAssetTransport,
@@ -8943,8 +9108,15 @@ pushCmd$1.action(async (assetInput, options, command) => {
         appendAssetManifest: assetManifestTransport,
         cleanupAsset: cleanupAssetTransport
       },
-      ui
+      ui,
+      onUnmappedTag
     }));
+    if (unmappedTagLabels.size > 0) {
+      const labels = [...unmappedTagLabels].sort((a, b) => a.localeCompare(b));
+      const message = `Dropped ${labels.length} unknown internal asset tag${labels.length === 1 ? "" : "s"} not present in target space: ${labels.join(", ")}`;
+      ui.warn(message);
+      logger.warn(message, { unmappedTags: labels });
+    }
     const hasUpdatedFilename = (entry) => "filename" in entry.old && entry.old.filename !== entry.new.filename;
     const hasMetadata = (entry) => "meta_data" in entry.new && entry.new.meta_data;
     const hasUpdatedAssets = maps.assets.values().some((v) => hasUpdatedFilename(v) || hasMetadata(v));