@contentful/experience-design-system-cli 2.23.2-dev-build-8b2cfc9.0 → 2.23.2-dev-build-5146e8a.0

package/README.md

@@ -214,6 +214,7 @@ Pass `--select-prompt-path <path>` and/or `--generate-prompt-path <path>` to swa
 | `--host <url>`                    | `https://api.contentful.com`           | Override API base URL                                                                                        |
 | `--on-conflict <mode>`            | _(prompt via `<SaveConflictGate>`)_    | Headless conflict resolution when a file already exists at the save path: `overwrite`, `skip`, or `fail`. Bypasses the wizard's interactive save-conflict gate. Mutex with `--no-save`. |
 | `--print-prompt`                  | —                                      | Print the generate prompt to stdout and exit. Replaces the prompt-print semantics of `--dry-run`.            |
+| `--allow-deletions`               | off (non-destructive)                  | Allow the push to delete remote ComponentTypes/DesignTokens missing from the manifest. Default skips them instead of deleting. Forwarded to headless subprocess pushes and `--push-from-run`. |
 | `--dry-run`                       | _(deprecated)_                         | Deprecated alias for `--print-prompt`. Emits a stderr deprecation notice; prompt-print semantics will be removed in a future release. |
 
 ### Run-picker at wizard start
@@ -418,7 +419,7 @@ experiences apply select  --space-id <id> --environment-id <env> --session <id>
 experiences apply push    --space-id <id> --environment-id <env> --session <id> [--yes]
 ```
 
-Shared flags: `--components`, `--tokens`, `--session`, `--space-id`, `--environment-id`, `--cma-token`, `--host`, `--viewports`. `apply preview` adds `--include-unchanged`. `apply select` adds `--select-all`, `--select`, `--deselect`, `--force`. `apply push` adds `--yes`, `--verbose`, `--force`, `--dry-run`.
+Shared flags: `--components`, `--tokens`, `--session`, `--space-id`, `--environment-id`, `--cma-token`, `--host`, `--viewports`. `apply preview` adds `--include-unchanged`. `apply select` adds `--select-all`, `--select`, `--deselect`, `--force`, `--allow-deletions`. `apply push` adds `--yes`, `--verbose`, `--force`, `--dry-run`, `--allow-deletions`. By default, remote ComponentTypes and DesignTokens missing from the pushed manifest are skipped, not deleted; pass `--allow-deletions` to restore the prior delete behavior.
 
 Design tokens are written first (component types may reference token kinds). Each entity write is recorded in the session database atomically — interrupted pushes resume from where they left off.
 
@@ -450,29 +451,6 @@ Wizard run history is separate: `~/.config/experiences/runs.json`.
 
 ---
 
-## Usage data
-
-The CLI collects **anonymous usage data** to help us understand which commands are used and where the import workflow succeeds or fails. This data does **not** include your source code, file paths, credentials, prompts, or any content you author.
-
-What may be included:
-
-- Command name and duration
-- CLI, Node.js, and operating-system version
-- Anonymous session identifiers that link steps within a single import run
-- Structural counts (for example, how many components were extracted or accepted)
-- Space and environment IDs you pass on the command line
-- Contentful request IDs from API responses (to correlate failures with server logs)
-
-You can turn this off at any time:
-
-```bash
-DISABLE_ANALYTICS=1 experiences import --project ./my-app
-```
-
-Setting `DISABLE_ANALYTICS` to any value disables collection for that invocation.
-
----
-
 ## Development
 
 ```bash

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.23.2-dev-build-8b2cfc9.0",
+  "version": "2.23.2-dev-build-5146e8a.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -41,7 +41,6 @@
     "@contentful/experience-design-system-extraction": "workspace:*",
     "@contentful/experience-design-system-generation": "workspace:*",
     "@contentful/experience-design-system-types": "workspace:*",
-    "@segment/analytics-node": "^3.0.0",
     "commander": "^13.1.0",
     "ink": "^4.4.1",
     "react": "^18.3.1",

package/dist/src/analyze/command.js

@@ -24,7 +24,6 @@ import { DEFAULT_AGENT_NAME, isAgentName, runAgent, } from '@contentful/experien
 import { readExperiencesCredentials } from '../credentials-store.js';
 import { buildAnalyzeViewRows, partitionGlobalWarnings } from './build-analyze-view-rows.js';
 import { getInteractiveTerminalSupport } from '../lib/terminal-capabilities.js';
-import { bindAnalyticsSession, emitSessionStarted, enrichCommandResult } from '../analytics/index.js';
 import { getDebugLogger } from '../lib/debug-logger.js';
 const SCANNED_FILE_EXTENSIONS = new Set(['.astro', '.js', '.jsx', '.svelte', '.ts', '.tsx', '.vue']);
 /**
@@ -265,8 +264,6 @@ export function registerAnalyzeCommand(program) {
             inputPath: projectRoot,
             outDir,
         });
-        await bindAnalyticsSession(sessionId);
-        await emitSessionStarted('analyze_extract');
         const stepId = createStep(db, sessionId, 'analyze extract', {
             project: projectRoot,
         });
@@ -540,7 +537,6 @@ export function registerAnalyzeCommand(program) {
         storeSlotCycles(db, sessionId, withBreaks);
         storeScannedFiles(db, sessionId, sourceFiles.map((f) => relative(projectRoot, f)));
         updateStep(db, stepId, 'complete', { sessionId });
-        enrichCommandResult({ extracted_component_count: validatedComponents.length });
         db.close();
         const allWarnings = [...extraction.warnings, ...filterWarnings];
         const { rows: componentRows, totalErrors } = buildAnalyzeViewRows(filteredComponents, validatedComponents, allWarnings);

package/dist/src/apply/api-client.d.ts

@@ -45,9 +45,6 @@ export declare class ImportApiClient {
     private spaceId;
     private environmentId;
     private retry;
-    private lastRequestId?;
-    getLastRequestId(): string | undefined;
-    private noteRequestId;
     constructor(opts: ApiClientOptions);
     private base;
     private headers;
@@ -55,7 +52,10 @@ export declare class ImportApiClient {
     validateToken(): Promise<void>;
     checkPreflight(): Promise<void>;
     previewImport(manifest: ManifestPayload): Promise<ServerPreviewResponse>;
-    applyImport(manifest: ManifestPayload, acknowledgeBreakingChanges: boolean): Promise<ApplyOperationResponse>;
+    applyImport(manifest: ManifestPayload, options: {
+        acknowledgeBreakingChanges: boolean;
+        allowDeletions?: boolean;
+    }): Promise<ApplyOperationResponse>;
     pollOperation(operationId: string, opts?: {
         intervalMs?: number;
         maxIntervalMs?: number;

package/dist/src/apply/api-client.js

@@ -180,15 +180,6 @@ export class ImportApiClient {
     spaceId;
     environmentId;
     retry;
-    lastRequestId;
-    getLastRequestId() {
-        return this.lastRequestId;
-    }
-    noteRequestId(response) {
-        const requestId = response.headers.get('x-contentful-request-id');
-        if (requestId)
-            this.lastRequestId = requestId;
-    }
     constructor(opts) {
         this.host = toApiHost(opts.host);
         this.token = opts.cmaToken;
@@ -246,10 +237,8 @@ export class ImportApiClient {
                 await this.retry.sleep(delayMs);
                 continue;
             }
-            if (!isTransientStatus(result.response.status)) {
-                this.noteRequestId(result.response);
+            if (!isTransientStatus(result.response.status))
                 return result;
-            }
             if (attempt === this.retry.maxAttempts) {
                 const body = stringifyError(result.error);
                 const guidance = `The ${phase} request failed after ${attempt} attempts because the service remained unavailable. ` +
@@ -284,7 +273,6 @@ export class ImportApiClient {
         // false positives that don't apply to the design-systems API authorization path.
         const url = `${this.host}/users/me`;
         const res = await request(url, { token: this.token });
-        this.noteRequestId(res);
         if (res.status === 401) {
             throw new ApiError('CMA token is invalid or revoked', res.status, await res.text());
         }
@@ -310,7 +298,6 @@ export class ImportApiClient {
         catch {
             return; // network error — don't block; the real call will surface it
         }
-        this.noteRequestId(res);
         if (res.ok)
             return;
         if (res.status >= 500)
@@ -348,12 +335,14 @@ export class ImportApiClient {
         debug.event('apply', 'preview.ok', { status: result.response.status, durationMs: Date.now() - startedAt });
         return sanitizePreviewResponse(parsed);
     }
-    async applyImport(manifest, acknowledgeBreakingChanges) {
+    async applyImport(manifest, options) {
+        const { acknowledgeBreakingChanges, allowDeletions = false } = options;
         const debug = getDebugLogger();
         const startedAt = Date.now();
         debug.event('apply', 'apply.request', {
             url: `${this.base()}/design_systems/imports/apply`,
             acknowledgeBreakingChanges,
+            allowDeletions,
         });
         let result;
         try {
@@ -361,7 +350,7 @@ export class ImportApiClient {
                 baseUrl: this.host,
                 headers: this.headers(),
                 path: { spaceId: this.spaceId, environmentId: this.environmentId },
-                body: { ...manifest, acknowledgeBreakingChanges },
+                body: { ...manifest, acknowledgeBreakingChanges, allowDeletions },
                 parseAs: 'json',
             });
         }

package/dist/src/apply/command.js

@@ -12,13 +12,11 @@ import { ServerPreviewApp, ServerPreviewConfirm, ServerApplyProgress, ServerAppl
 import { SelectView, makeSelectKey } from './tui/SelectView.js';
 import { buildPostPushUrl } from '../lib/contentful-urls.js';
 import { resolveCompositionMode } from '../lib/composition-mode.js';
-import { addArtifactInputOptions, addCompositionOptions, addContentfulTargetOptions, addSelectionOptions, } from '../lib/command-options.js';
+import { addAllowDeletionsOption, addArtifactInputOptions, addCompositionOptions, addContentfulTargetOptions, addSelectionOptions, } from '../lib/command-options.js';
 import { stripAllowedComponents } from '../import/strip-allowed-components.js';
 import { readExperiencesCredentials } from '../credentials-store.js';
 import { getInteractiveTerminalSupport, requireInteractiveTerminal } from '../lib/terminal-capabilities.js';
-import { bindAnalyticsSessionId, completeActiveCommand, failActiveCommand, recordApplyOutcome, recordContentfulContext, } from '../analytics/index.js';
 function die(message) {
-    void failActiveCommand({ exit_code: 1 });
     process.stderr.write(`${message}\n`);
     process.exit(1);
 }
@@ -433,12 +431,6 @@ export function registerApplyCommand(program) {
             throw e;
         }
         const { components, tokens, client } = inputs;
-        const spaceId = opts.spaceId;
-        const environmentId = opts.environmentId;
-        await bindAnalyticsSessionId(opts.session, {
-            space_key: spaceId,
-            environment_key: environmentId,
-        });
         try {
             await client.validateToken();
         }
@@ -458,7 +450,8 @@ export function registerApplyCommand(program) {
                 die(`Error: ${formatApiError(e)}`);
             throw e;
         }
-        recordContentfulContext(client, spaceId, environmentId);
+        const spaceId = opts.spaceId;
+        const environmentId = opts.environmentId;
         if (getInteractiveTerminalSupport().supported) {
             const { waitUntilExit } = render(createElement(ServerPreviewApp, {
                 preview,
@@ -476,6 +469,7 @@ export function registerApplyCommand(program) {
     addArtifactInputOptions(pushCmd);
     addContentfulTargetOptions(pushCmd);
     addCompositionOptions(pushCmd);
+    addAllowDeletionsOption(pushCmd);
     pushCmd
         .option('--yes', 'Skip interactive confirmation')
         .option('--verbose', 'Show all entity progress including skipped/unchanged')
@@ -497,12 +491,6 @@ export function registerApplyCommand(program) {
             throw e;
         }
         const { components, tokens, client } = inputs;
-        const spaceId = opts.spaceId;
-        const environmentId = opts.environmentId;
-        await bindAnalyticsSessionId(opts.session, {
-            space_key: spaceId,
-            environment_key: environmentId,
-        });
         assertNoSlotCycles(components);
         try {
             await client.validateToken();
@@ -522,6 +510,8 @@ export function registerApplyCommand(program) {
                 die(`Error: ${formatApiError(e, opts.verbose)}`);
             throw e;
         }
+        const spaceId = opts.spaceId;
+        const environmentId = opts.environmentId;
         if (opts.dryRun) {
             if (isTTY) {
                 const { waitUntilExit } = render(createElement(ServerPreviewApp, {
@@ -558,7 +548,10 @@ export function registerApplyCommand(program) {
             }
             let operation;
             try {
-                operation = await client.applyImport(manifest, breakingWithImpact || opts.force === true);
+                operation = await client.applyImport(manifest, {
+                    acknowledgeBreakingChanges: breakingWithImpact || opts.force === true,
+                    allowDeletions: opts.allowDeletions === true,
+                });
             }
             catch (e) {
                 if (e instanceof ApiError)
@@ -575,14 +568,8 @@ export function registerApplyCommand(program) {
                 throw e;
             }
             const summary = buildApplyOutput(operation, spaceId, environmentId, opts.host);
-            recordApplyOutcome(client, spaceId, environmentId, operation);
             process.stdout.write(JSON.stringify(summary, null, 2) + '\n');
-            const exitCode = operation.sys.status === 'succeeded' ? 0 : 1;
-            if (exitCode === 0)
-                await completeActiveCommand();
-            else
-                await failActiveCommand({ exit_code: exitCode });
-            process.exit(exitCode);
+            process.exit(operation.sys.status === 'succeeded' ? 0 : 1);
             return;
         }
         await new Promise((resolvePromise) => {
@@ -594,7 +581,10 @@ export function registerApplyCommand(program) {
                 }));
                 let operation;
                 try {
-                    operation = await client.applyImport(manifest, acknowledge);
+                    operation = await client.applyImport(manifest, {
+                        acknowledgeBreakingChanges: acknowledge,
+                        allowDeletions: opts.allowDeletions === true,
+                    });
                 }
                 catch (e) {
                     if (e instanceof ApiError) {
@@ -657,6 +647,7 @@ export function registerApplyCommand(program) {
     addContentfulTargetOptions(selectCmd);
     addCompositionOptions(selectCmd);
     addSelectionOptions(selectCmd);
+    addAllowDeletionsOption(selectCmd);
     selectCmd.option('--force', 'Skip confirmation for breaking changes').action(async (opts) => {
         const nonInteractive = opts.selectAll || (opts.select ?? []).length > 0 || (opts.deselect ?? []).length > 0;
         if (!nonInteractive) {
@@ -724,7 +715,10 @@ export function registerApplyCommand(program) {
             }
             let operation;
             try {
-                operation = await client.applyImport(filteredManifest, hasBreaking || opts.force === true);
+                operation = await client.applyImport(filteredManifest, {
+                    acknowledgeBreakingChanges: hasBreaking || opts.force === true,
+                    allowDeletions: opts.allowDeletions === true,
+                });
             }
             catch (e) {
                 if (e instanceof ApiError)
@@ -766,7 +760,10 @@ export function registerApplyCommand(program) {
                 }));
                 let operation;
                 try {
-                    operation = await client.applyImport(filteredManifest, hasBreaking);
+                    operation = await client.applyImport(filteredManifest, {
+                        acknowledgeBreakingChanges: hasBreaking,
+                        allowDeletions: opts.allowDeletions === true,
+                    });
                 }
                 catch (e) {
                     if (e instanceof ApiError) {

package/dist/src/import/command.js

@@ -4,7 +4,7 @@ import { resolveAutoFilter } from './auto-filter-resolve.js';
 import { resolveAgent, resolveModel } from './agent-model-resolve.js';
 import { addAgentModelOptions } from '../lib/agent-model-options.js';
 import { resolveCompositionMode } from '../lib/composition-mode.js';
-import { addCompositionOptions } from '../lib/command-options.js';
+import { addAllowDeletionsOption, addCompositionOptions } from '../lib/command-options.js';
 import { isConflictMode } from '../runs/save-path-resolver.js';
 import { readExperiencesCredentials } from '../credentials-store.js';
 import { DEFAULT_CONFIGURED_HOST, toConfiguredHost } from '../host-utils.js';
@@ -46,6 +46,7 @@ export function registerImportCommand(program) {
         .option('--print-prompt', 'Print the generate components prompt without invoking the agent. Replaces the legacy --dry-run prompt-print behaviour on this command.')
         .option('--auto-accept-scope', 'Accept all extracted components without prompting (for scripted/non-TTY callers)');
     addCompositionOptions(cmd);
+    addAllowDeletionsOption(cmd);
     cmd
         .option('--composition-map <path>', 'Consume a hand-authored parent→children interchange map (implies --composite)')
         .option('--composition-agent', 'Opt into agentic mapping resolution when deterministic sources find no groups (implies --composite)')
@@ -136,6 +137,7 @@ export function registerImportCommand(program) {
                     ...(opts.host ? { host: opts.host } : {}),
                     interactive: interactiveTerminalSupported,
                     ...(opts.force ? { force: true } : {}),
+                    ...(opts.allowDeletions ? { allowDeletions: true } : {}),
                 });
                 return;
             }
@@ -166,6 +168,7 @@ export function registerImportCommand(program) {
                     ...(opts.saveAsNew ? { saveAsNew: true } : {}),
                     ...(opts.outDir ? { outDir: opts.outDir } : {}),
                     ...(opts.force ? { force: true } : {}),
+                    ...(opts.allowDeletions ? { allowDeletions: true } : {}),
                 });
                 return;
             }
@@ -297,6 +300,7 @@ export function registerImportCommand(program) {
                 selectPromptPath: opts.selectPromptPath ?? creds.selectPromptPath,
                 generatePromptPath: opts.generatePromptPath ?? creds.generatePromptPath,
                 ...(opts.rawTokens ? { initialRawTokensPath: resolve(opts.rawTokens) } : {}),
+                allowDeletions: opts.allowDeletions === true,
                 ...pickerProps,
             }));
             unmountInk = unmount;
@@ -357,6 +361,7 @@ export function registerImportCommand(program) {
             dryRun: dryRunForward,
             selectPromptPath: opts.selectPromptPath,
             autoRejectCycles: opts.autoRejectCycles ?? false,
+            allowDeletions: opts.allowDeletions ?? false,
             compositionMode: headlessCompositionMode,
             ...(opts.compositionMap ? { compositionMap: opts.compositionMap } : {}),
             ...(opts.compositionAgent ? { compositionAgent: true } : {}),

package/dist/src/import/orchestrator.d.ts

@@ -26,6 +26,7 @@ export interface PipelineOptions {
     selectPromptPath?: string;
     /** When true, auto-reject cycle participants and retry push instead of surfacing an error. */
     autoRejectCycles?: boolean;
+    allowDeletions?: boolean;
     compositionMode?: CompositionMode;
     compositionMap?: string;
     compositionAgent?: boolean;

package/dist/src/import/orchestrator.js

@@ -7,7 +7,6 @@ import { detectSlotCycles, formatSlotCycleReport } from '../apply/command.js';
 import { PREVIEW_ERROR_PREFIX, VALIDATION_FAILED_CODE, parsePreviewValidationErrors } from '../apply/api-client.js';
 import { buildPostPushUrl } from '../lib/contentful-urls.js';
 import { getDebugLogger, debugEnvForSubprocess } from '../lib/debug-logger.js';
-import { bindAnalyticsSession, emitSessionStarted } from '../analytics/index.js';
 function findCliPath() {
     return join(fileURLToPath(import.meta.url), '..', '..', '..', '..', 'bin', 'cli.js');
 }
@@ -17,7 +16,7 @@ async function runStep(args, cliPath, env = {}, streamStderr = false) {
     debug.event('import', 'subprocess.spawn', { cliPath, args });
     return new Promise((res) => {
         const child = execFile('node', [cliPath, ...args], {
-            env: debugEnvForSubprocess({ ...process.env, ...env, EDS_IMPORT_PIPELINE: '1' }),
+            env: debugEnvForSubprocess({ ...process.env, ...env }),
         });
         let stdout = '';
         let stderr = '';
@@ -109,10 +108,6 @@ export async function runPipeline(opts, progressWriter, cliPathOverride) {
         inputPath: projectRoot,
         outDir,
     });
-    await bindAnalyticsSession(sessionId, {
-        ...(opts.spaceId ? { space_key: opts.spaceId, environment_key: opts.environmentId } : {}),
-    });
-    await emitSessionStarted('import');
     progressWriter(`Experience Design System CLI — Pipeline Import`);
     progressWriter(`Project:     ${projectRoot}`);
     progressWriter(`Output:      ${outDir}`);
@@ -423,6 +418,8 @@ export async function runPipeline(opts, progressWriter, cliPathOverride) {
             pushArgs.push('--host', opts.host);
         if (opts.verbose)
             pushArgs.push('--verbose');
+        if (opts.allowDeletions)
+            pushArgs.push('--allow-deletions');
         pushArgs.push('--yes');
         const pushStepId = createStep(db, sessionId, 'apply push', {
             components: componentsPath,

package/dist/src/import/tui/WizardApp.d.ts

@@ -66,5 +66,6 @@ export type WizardAppProps = {
     initialRawTokensPath?: string;
     initialRuns?: RunRecord[];
     onRunPicked?: (selection: RunPickerSelection) => void;
+    allowDeletions?: boolean;
 };
-export declare function WizardApp({ initialSpaceId, initialEnvironmentId, initialCmaToken, initialHost, initialAgent, initialModel, initialProjectPath, host, autoAcceptScope, autoRejectCycles, compositionMode, compositionMap, compositionAgent, compositionAgentMode, compositionRefresh, generateMap, promptOverrides, noCache, autoFilter, livePreview, noPush, noSave, outDirOverride, onConflictMode, selectPromptPath, generatePromptPath, seedExtractSessionId, seedGenerateSessionId, seedTokenSessionId, seedTokensPath, initialStep, initialRawTokensPath, initialRuns, onRunPicked, }?: WizardAppProps): React.ReactElement;
+export declare function WizardApp({ initialSpaceId, initialEnvironmentId, initialCmaToken, initialHost, initialAgent, initialModel, initialProjectPath, host, autoAcceptScope, autoRejectCycles, compositionMode, compositionMap, compositionAgent, compositionAgentMode, compositionRefresh, generateMap, promptOverrides, noCache, autoFilter, livePreview, noPush, noSave, outDirOverride, onConflictMode, selectPromptPath, generatePromptPath, seedExtractSessionId, seedGenerateSessionId, seedTokenSessionId, seedTokensPath, initialStep, initialRawTokensPath, initialRuns, onRunPicked, allowDeletions, }?: WizardAppProps): React.ReactElement;

package/dist/src/import/tui/WizardApp.js

@@ -138,7 +138,7 @@ function logStep(entry) {
     appendFileSync(WIZARD_LOG, line);
     getDebugLogger().event('wizard', 'step', entry);
 }
-export function WizardApp({ initialSpaceId = '', initialEnvironmentId = 'master', initialCmaToken = '', initialHost, initialAgent, initialModel, initialProjectPath, host, autoAcceptScope = false, autoRejectCycles = false, compositionMode = 'atomic', compositionMap, compositionAgent = false, compositionAgentMode, compositionRefresh = false, generateMap, promptOverrides, noCache = false, autoFilter = true, livePreview = true, noPush = false, noSave = false, outDirOverride, onConflictMode, selectPromptPath, generatePromptPath, seedExtractSessionId, seedGenerateSessionId, seedTokenSessionId, seedTokensPath, initialStep, initialRawTokensPath, initialRuns, onRunPicked, } = {}) {
+export function WizardApp({ initialSpaceId = '', initialEnvironmentId = 'master', initialCmaToken = '', initialHost, initialAgent, initialModel, initialProjectPath, host, autoAcceptScope = false, autoRejectCycles = false, compositionMode = 'atomic', compositionMap, compositionAgent = false, compositionAgentMode, compositionRefresh = false, generateMap, promptOverrides, noCache = false, autoFilter = true, livePreview = true, noPush = false, noSave = false, outDirOverride, onConflictMode, selectPromptPath, generatePromptPath, seedExtractSessionId, seedGenerateSessionId, seedTokenSessionId, seedTokensPath, initialStep, initialRawTokensPath, initialRuns, onRunPicked, allowDeletions = false, } = {}) {
     const defaultConfiguredHost = toConfiguredHost(host || process.env['EDS_HOST']) ?? DEFAULT_CONFIGURED_HOST;
     const resolveWizardHost = (hostValue) => hostValue || defaultConfiguredHost;
     const { stdout } = useStdout();
@@ -986,7 +986,7 @@ export function WizardApp({ initialSpaceId = '', initialEnvironmentId = 'master'
                 environmentId,
                 host: resolvedHost,
             });
-            let operation = await client.applyImport(manifest, acknowledgeBreakingChanges);
+            let operation = await client.applyImport(manifest, { acknowledgeBreakingChanges, allowDeletions });
             try {
                 logStep({
                     applyResponse: {

package/dist/src/index.js

@@ -1,11 +1,7 @@
 import { createProgram } from './program.js';
-import { failActiveCommand } from './analytics/index.js';
 createProgram()
     .parseAsync()
-    .catch(async (err) => {
-    await failActiveCommand({
-        error_name: err instanceof Error ? err.name : 'Error',
-    });
+    .catch((err) => {
     process.stderr.write(`Error: ${err instanceof Error ? err.message : String(err)}\n`);
     process.exit(1);
 });

package/dist/src/lib/command-options.d.ts

@@ -3,3 +3,4 @@ export declare function addArtifactInputOptions(cmd: Command): Command;
 export declare function addContentfulTargetOptions(cmd: Command): Command;
 export declare function addCompositionOptions(cmd: Command): Command;
 export declare function addSelectionOptions(cmd: Command): Command;
+export declare function addAllowDeletionsOption(cmd: Command): Command;

package/dist/src/lib/command-options.js

@@ -25,3 +25,6 @@ export function addSelectionOptions(cmd) {
         .option('--select <pattern>', 'Select entities by ID pattern (repeatable)', collectOptionValue, [])
         .option('--deselect <pattern>', 'Deselect entities by ID pattern (repeatable)', collectOptionValue, []);
 }
+export function addAllowDeletionsOption(cmd) {
+    return cmd.option('--allow-deletions', 'Allow the push to delete remote ComponentTypes/DesignTokens missing from the manifest (default: skip them)');
+}

package/dist/src/program.js

@@ -12,7 +12,6 @@ import { registerImportCommand } from './import/command.js';
 import { registerSetupCommand } from './setup/command.js';
 import { registerRunsCommand } from './runs/ls-command.js';
 import { beginCommand } from './lib/debug-preamble.js';
-import { completeActiveCommand, noteCommandStart, registerAnalyticsExitHook } from './analytics/index.js';
 const require = createRequire(import.meta.url);
 const pkg = require('../package.json');
 /**
@@ -74,7 +73,6 @@ export function createProgram() {
     // and a bright-green "debug logs at <path>" banner is printed to stderr.
     program.option('--debug', 'Write a JSONL trace of every decision to ~/.contentful/experience-design-system-cli/debug/');
     program.option('--no-debug', 'Force debug logging off (overrides EDSI_DEBUG and persisted setup preference)');
-    registerAnalyticsExitHook();
     program.hook('preAction', async (_thisCommand, actionCommand) => {
         // Merge opts from actionCommand and all ancestors — root-level --debug
         // set alongside a subcommand ends up on the root command's opts, not the
@@ -91,12 +89,7 @@ export function createProgram() {
         const chain = [];
         for (let c = actionCommand; c && c.parent; c = c.parent)
             chain.unshift(c.name());
-        const commandChain = chain.join(' ') || actionCommand.name();
-        noteCommandStart(commandChain);
-        await beginCommand(commandChain, { ...(debug !== undefined ? { debug } : {}) });
-    });
-    program.hook('postAction', async () => {
-        await completeActiveCommand();
+        await beginCommand(chain.join(' ') || actionCommand.name(), { ...(debug !== undefined ? { debug } : {}) });
     });
     return program;
 }

package/dist/src/runs/modify-launcher.d.ts

@@ -26,5 +26,7 @@ export type ModifyLauncherInput = {
     initialHost?: string;
     /** Pre-fill CMA token (from credentials.json / env). */
     initialCmaToken?: string;
+    /** From `--allow-deletions` flag. Forwarded to wizard's push step. */
+    allowDeletions?: boolean;
 };
 export declare function launchModifyWizard(input: ModifyLauncherInput): Promise<void>;

package/dist/src/runs/modify-launcher.js

@@ -35,6 +35,8 @@ export async function launchModifyWizard(input) {
         props.initialHost = input.initialHost;
     if (input.initialCmaToken)
         props.initialCmaToken = input.initialCmaToken;
+    if (input.allowDeletions !== undefined)
+        props.allowDeletions = input.allowDeletions;
     const { waitUntilExit } = render(createElement(WizardApp, props));
     await waitUntilExit();
 }

package/dist/src/runs/push-helpers.d.ts

@@ -15,6 +15,7 @@ export type PushSessionOptions = {
     environmentId: string;
     cmaToken: string;
     host?: string;
+    allowDeletions?: boolean;
 };
 /**
  * Push a recorded pipeline.db session's components + tokens to Contentful by

package/dist/src/runs/push-helpers.js

@@ -60,6 +60,9 @@ export async function pushRunSession(opts) {
     if (opts.host) {
         args.push('--host', opts.host);
     }
+    if (opts.allowDeletions) {
+        args.push('--allow-deletions');
+    }
     const r = await runCli(args);
     if (r.exitCode === 0)
         return { ok: true };

package/dist/src/runs/replay-helpers.d.ts

@@ -16,6 +16,8 @@ export type ReplayRunOptions = {
     interactive?: boolean;
     /** When true, bypass the source/saved-file staleness check. */
     force?: boolean;
+    /** From `--allow-deletions` flag. Forwarded verbatim to the pushed session's apply request. */
+    allowDeletions?: boolean;
     /**
      * Test seam: replace the interactive prompt with a deterministic resolver.
      * The CLI surface never sets this; only used by tests.
@@ -57,6 +59,8 @@ export type ModifyRunOptions = {
     outDir?: string;
     /** When true, bypass the source/saved-file staleness check. */
     force?: boolean;
+    /** From `--allow-deletions` flag. Forwarded through the modify wizard's push step. */
+    allowDeletions?: boolean;
 };
 /**
  * Re-open the wizard with a prior run's extract/generate session pre-populated

package/dist/src/runs/replay-helpers.js

@@ -83,6 +83,7 @@ export async function replayRun(opts) {
         environmentId,
         cmaToken,
         ...(host ? { host } : {}),
+        ...(opts.allowDeletions ? { allowDeletions: true } : {}),
     });
     if (!result.ok) {
         throw new Error(result.error);
@@ -98,6 +99,7 @@ export async function replayRun(opts) {
             environmentId,
             cmaToken,
             ...(host ? { host } : {}),
+            ...(opts.allowDeletions ? { allowDeletions: true } : {}),
         });
         if (!tokenResult.ok) {
             throw new Error(tokenResult.error);
@@ -157,5 +159,6 @@ export async function modifyRun(opts) {
         ...(mergedEnvironmentId ? { initialEnvironmentId: mergedEnvironmentId } : {}),
         ...(mergedHost ? { initialHost: mergedHost } : {}),
         ...(mergedCmaToken ? { initialCmaToken: mergedCmaToken } : {}),
+        ...(opts.allowDeletions !== undefined ? { allowDeletions: opts.allowDeletions } : {}),
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.23.2-dev-build-8b2cfc9.0",
+  "version": "2.23.2-dev-build-5146e8a.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -28,16 +28,15 @@
     "prompts/"
   ],
   "dependencies": {
-    "@segment/analytics-node": "^3.0.0",
     "commander": "^13.1.0",
     "ink": "^4.4.1",
     "react": "^18.3.1",
     "react-devtools-core": "^4.19.1",
     "react-dom": "^18.3.1",
-    "@contentful/experience-design-system-client": "2.23.2-dev-build-8b2cfc9.0",
-    "@contentful/experience-design-system-extraction": "2.23.2-dev-build-8b2cfc9.0",
-    "@contentful/experience-design-system-generation": "2.23.2-dev-build-8b2cfc9.0",
-    "@contentful/experience-design-system-types": "2.23.2-dev-build-8b2cfc9.0"
+    "@contentful/experience-design-system-client": "2.23.2-dev-build-5146e8a.0",
+    "@contentful/experience-design-system-types": "2.23.2-dev-build-5146e8a.0",
+    "@contentful/experience-design-system-generation": "2.23.2-dev-build-5146e8a.0",
+    "@contentful/experience-design-system-extraction": "2.23.2-dev-build-5146e8a.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",

package/dist/src/analytics/apply.d.ts

@@ -1,6 +0,0 @@
-import type { ApplyOperationResponse } from '@contentful/experience-design-system-types';
-import type { ImportApiClient } from '../apply/api-client.js';
-/** Record apply/preview API outcomes on the active command. */
-export declare function recordApplyOutcome(client: ImportApiClient, spaceId: string, environmentId: string, operation: ApplyOperationResponse): void;
-/** Record Contentful target context without an apply operation (e.g. preview-only). */
-export declare function recordContentfulContext(client: ImportApiClient, spaceId: string, environmentId: string): void;

package/dist/src/analytics/apply.js

@@ -1,30 +0,0 @@
-import { enrichCommandResult, setCommandContext } from './tracker.js';
-function countWriteResult(items, entityType) {
-    const subset = items.filter((item) => item.entityType === entityType);
-    return {
-        created_count: subset.filter((item) => item.action === 'create' && item.status === 'succeeded').length,
-        updated_count: subset.filter((item) => item.action === 'update' && item.status === 'succeeded').length,
-        failed_count: subset.filter((item) => item.status === 'failed').length,
-    };
-}
-/** Record apply/preview API outcomes on the active command. */
-export function recordApplyOutcome(client, spaceId, environmentId, operation) {
-    setCommandContext({
-        space_key: spaceId,
-        environment_key: environmentId,
-        x_contentful_request_id: client.getLastRequestId(),
-    });
-    enrichCommandResult({
-        dsi_operation_id: operation.sys.id,
-        component_type_result: countWriteResult(operation.items ?? [], 'ComponentType'),
-        design_token_result: countWriteResult(operation.items ?? [], 'DesignToken'),
-    });
-}
-/** Record Contentful target context without an apply operation (e.g. preview-only). */
-export function recordContentfulContext(client, spaceId, environmentId) {
-    setCommandContext({
-        space_key: spaceId,
-        environment_key: environmentId,
-        x_contentful_request_id: client.getLastRequestId(),
-    });
-}

package/dist/src/analytics/client.d.ts

@@ -1,3 +0,0 @@
-export declare function cliVersion(): string;
-export declare function analyticsEnabled(): boolean;
-export declare function trackEvent(event: string, properties: Record<string, unknown>, anonymousId: string): Promise<void>;

package/dist/src/analytics/client.js

@@ -1,39 +0,0 @@
-import { createRequire } from 'node:module';
-import { Analytics } from '@segment/analytics-node';
-const require = createRequire(import.meta.url);
-const pkg = require('../../package.json');
-// Anonymous usage telemetry for the CLI. Disabled when DISABLE_ANALYTICS is set
-// or when no write key is configured. Never blocks command execution.
-export function cliVersion() {
-    return pkg.version;
-}
-export function analyticsEnabled() {
-    return !process.env.DISABLE_ANALYTICS && Boolean(resolveWriteKey());
-}
-function resolveWriteKey() {
-    const key = (process.env.SEGMENT_WRITE_KEY ?? '').trim();
-    return key.length > 0 ? key : undefined;
-}
-export async function trackEvent(event, properties, anonymousId) {
-    if (!analyticsEnabled())
-        return;
-    const writeKey = resolveWriteKey();
-    if (!writeKey)
-        return;
-    try {
-        const client = new Analytics({ writeKey });
-        client.on('error', () => {
-            /* never block the CLI on telemetry errors */
-        });
-        client.track({
-            event,
-            properties,
-            anonymousId,
-            timestamp: new Date(),
-        });
-        await client.closeAndFlush();
-    }
-    catch {
-        // Telemetry must never affect CLI exit codes or output.
-    }
-}

package/dist/src/analytics/index.d.ts

@@ -1,6 +0,0 @@
-export { analyticsEnabled, cliVersion, trackEvent } from './client.js';
-export { normalizeCommand } from './normalize.js';
-export { getOsName } from './os.js';
-export { bindAnalyticsSession, bindAnalyticsSessionId, completeActiveCommand, emitSessionStarted, enrichCommandResult, failActiveCommand, getBoundSessionId, noteCommandStart, registerAnalyticsExitHook, resetAnalyticsStateForTests, setCommandContext, } from './tracker.js';
-export { recordApplyOutcome, recordContentfulContext } from './apply.js';
-export type { CommandCompletion, CommandContext, CommandFailure, DsiCliCommand, EntryCommand, OsName, WriteResult, } from './types.js';

package/dist/src/analytics/index.js

@@ -1,5 +0,0 @@
-export { analyticsEnabled, cliVersion, trackEvent } from './client.js';
-export { normalizeCommand } from './normalize.js';
-export { getOsName } from './os.js';
-export { bindAnalyticsSession, bindAnalyticsSessionId, completeActiveCommand, emitSessionStarted, enrichCommandResult, failActiveCommand, getBoundSessionId, noteCommandStart, registerAnalyticsExitHook, resetAnalyticsStateForTests, setCommandContext, } from './tracker.js';
-export { recordApplyOutcome, recordContentfulContext } from './apply.js';

package/dist/src/analytics/normalize.d.ts

@@ -1,3 +0,0 @@
-import type { DsiCliCommand } from './types.js';
-/** Map a Commander command chain (e.g. "apply push") to a tracked command id, if any. */
-export declare function normalizeCommand(commandChain: string): DsiCliCommand | undefined;

package/dist/src/analytics/normalize.js

@@ -1,17 +0,0 @@
-const COMMAND_MAP = {
-    'analyze extract': 'analyze_extract',
-    'analyze select': 'analyze_select',
-    'generate components': 'generate_components',
-    'generate tokens': 'generate_tokens',
-    'generate edit': 'generate_edit',
-    'apply preview': 'apply_preview',
-    'apply select': 'apply_select',
-    'apply push': 'apply_push',
-    'print components': 'print_components',
-    'print tokens': 'print_tokens',
-    import: 'import',
-};
-/** Map a Commander command chain (e.g. "apply push") to a tracked command id, if any. */
-export function normalizeCommand(commandChain) {
-    return COMMAND_MAP[commandChain];
-}

package/dist/src/analytics/os.d.ts

@@ -1,2 +0,0 @@
-import type { OsName } from './types.js';
-export declare function getOsName(): OsName;

package/dist/src/analytics/os.js

@@ -1,13 +0,0 @@
-const OS_NAMES = {
-    android: 'Android',
-    aix: 'Linux',
-    darwin: 'macOS',
-    freebsd: 'Linux',
-    linux: 'Linux',
-    openbsd: 'Linux',
-    sunos: 'Linux',
-    win32: 'Windows',
-};
-export function getOsName() {
-    return OS_NAMES[process.platform] ?? 'other';
-}

package/dist/src/analytics/tracker.d.ts

@@ -1,19 +0,0 @@
-import type { CommandCompletion, CommandContext, CommandFailure, EntryCommand } from './types.js';
-/** Record the start of a tracked command. Invoked is deferred until a session is bound. */
-export declare function noteCommandStart(commandChain: string): void;
-/** Bind a session id, minting one when the command has no pipeline session. */
-export declare function bindAnalyticsSessionId(sessionId: string | undefined, context?: CommandContext): Promise<string>;
-/** Attach Contentful target context for the active command. */
-export declare function setCommandContext(context: CommandContext): void;
-/** Merge optional completion fields before the terminal event fires. */
-export declare function enrichCommandResult(fields: CommandCompletion): void;
-export declare function getBoundSessionId(): string | undefined;
-/** Bind the pipeline session and emit invoked once both command and session are known. */
-export declare function bindAnalyticsSession(id: string, context?: CommandContext): Promise<void>;
-/** Emit session_started once per new pipeline head. */
-export declare function emitSessionStarted(entryCommand: EntryCommand): Promise<void>;
-export declare function completeActiveCommand(): Promise<void>;
-export declare function failActiveCommand(fields?: CommandFailure): Promise<void>;
-/** Best-effort terminal event when the process exits without a clean postAction hook. */
-export declare function registerAnalyticsExitHook(): void;
-export declare function resetAnalyticsStateForTests(): void;

package/dist/src/analytics/tracker.js

@@ -1,157 +0,0 @@
-import { cliVersion, trackEvent } from './client.js';
-import { generateSessionId } from '../session/session-id.js';
-import { normalizeCommand } from './normalize.js';
-import { getOsName } from './os.js';
-let pending = null;
-let sessionId;
-let sessionStartedEmitted = false;
-function isPipelineStep() {
-    return process.env.EDS_IMPORT_PIPELINE === '1';
-}
-function buildBaseProps(command) {
-    return {
-        dsi_session_id: sessionId,
-        command,
-        ...(isPipelineStep() ? { is_pipeline_step: true } : {}),
-    };
-}
-function mergeContext(target, source) {
-    if (source.space_key !== undefined)
-        target.space_key = source.space_key;
-    if (source.environment_key !== undefined)
-        target.environment_key = source.environment_key;
-    if (source.x_contentful_request_id !== undefined) {
-        target.x_contentful_request_id = source.x_contentful_request_id;
-    }
-}
-/** Record the start of a tracked command. Invoked is deferred until a session is bound. */
-export function noteCommandStart(commandChain) {
-    const command = normalizeCommand(commandChain);
-    if (!command)
-        return;
-    pending = {
-        command,
-        startedAt: Date.now(),
-        invoked: false,
-        terminalEmitted: false,
-        context: {},
-        completion: {},
-    };
-}
-/** Bind a session id, minting one when the command has no pipeline session. */
-export async function bindAnalyticsSessionId(sessionId, context) {
-    const id = sessionId ?? generateSessionId();
-    await bindAnalyticsSession(id, context);
-    return id;
-}
-/** Attach Contentful target context for the active command. */
-export function setCommandContext(context) {
-    if (!pending)
-        return;
-    mergeContext(pending.context, context);
-    mergeContext(pending.completion, context);
-}
-/** Merge optional completion fields before the terminal event fires. */
-export function enrichCommandResult(fields) {
-    if (!pending)
-        return;
-    Object.assign(pending.completion, fields);
-    mergeContext(pending.context, fields);
-}
-export function getBoundSessionId() {
-    return sessionId;
-}
-/** Bind the pipeline session and emit invoked once both command and session are known. */
-export async function bindAnalyticsSession(id, context) {
-    sessionId = id;
-    if (context)
-        setCommandContext(context);
-    await emitInvokedIfReady();
-}
-/** Emit session_started once per new pipeline head. */
-export async function emitSessionStarted(entryCommand) {
-    if (!sessionId || sessionStartedEmitted)
-        return;
-    sessionStartedEmitted = true;
-    await trackEvent('dsi_cli_session_started', {
-        dsi_session_id: sessionId,
-        entry_command: entryCommand,
-        cli_version: cliVersion(),
-        node_version: process.version,
-        os_name: getOsName(),
-    }, sessionId);
-    await emitInvokedIfReady();
-}
-async function emitInvokedIfReady() {
-    if (!pending || pending.invoked || !sessionId)
-        return;
-    pending.invoked = true;
-    await trackEvent('dsi_cli_command_invoked', {
-        ...buildBaseProps(pending.command),
-        ...pending.context,
-    }, sessionId);
-}
-export async function completeActiveCommand() {
-    if (!pending || pending.terminalEmitted || !sessionId || !pending.invoked)
-        return;
-    pending.terminalEmitted = true;
-    const durationMs = Date.now() - pending.startedAt;
-    await trackEvent('dsi_cli_command_completed', {
-        ...buildBaseProps(pending.command),
-        ...pending.context,
-        ...pending.completion,
-        outcome: 'ok',
-        duration_ms: durationMs,
-    }, sessionId);
-}
-export async function failActiveCommand(fields = {}) {
-    if (!pending || pending.terminalEmitted || !sessionId || !pending.invoked)
-        return;
-    pending.terminalEmitted = true;
-    const durationMs = Date.now() - pending.startedAt;
-    const outcome = fields.exit_code === 130 ? 'interrupted' : 'error';
-    await trackEvent('dsi_cli_command_failed', {
-        ...buildBaseProps(pending.command),
-        ...pending.context,
-        ...fields,
-        outcome,
-        duration_ms: durationMs,
-    }, sessionId);
-}
-let exitHookRegistered = false;
-/** Best-effort terminal event when the process exits without a clean postAction hook. */
-export function registerAnalyticsExitHook() {
-    if (exitHookRegistered)
-        return;
-    exitHookRegistered = true;
-    process.on('exit', (code) => {
-        if (!pending || pending.terminalEmitted || !sessionId || !pending.invoked)
-            return;
-        const durationMs = Date.now() - pending.startedAt;
-        const outcome = code === 0 ? 'ok' : code === 130 ? 'interrupted' : 'error';
-        const event = code === 0 ? 'dsi_cli_command_completed' : 'dsi_cli_command_failed';
-        const props = code === 0
-            ? {
-                ...buildBaseProps(pending.command),
-                ...pending.context,
-                ...pending.completion,
-                outcome: 'ok',
-                duration_ms: durationMs,
-            }
-            : {
-                ...buildBaseProps(pending.command),
-                ...pending.context,
-                outcome: outcome === 'interrupted' ? 'interrupted' : 'error',
-                duration_ms: durationMs,
-                exit_code: code,
-            };
-        // Synchronous best-effort — async flush cannot run on 'exit'.
-        void trackEvent(event, props, sessionId);
-    });
-}
-export function resetAnalyticsStateForTests() {
-    pending = null;
-    sessionId = undefined;
-    sessionStartedEmitted = false;
-    exitHookRegistered = false;
-}

package/dist/src/analytics/types.d.ts

@@ -1,29 +0,0 @@
-/** Tracked CLI commands — closed set aligned with the published event schema. */
-export type DsiCliCommand = 'analyze_extract' | 'analyze_select' | 'generate_components' | 'generate_tokens' | 'generate_edit' | 'apply_preview' | 'apply_select' | 'apply_push' | 'print_components' | 'print_tokens' | 'import';
-export type EntryCommand = 'analyze_extract' | 'import';
-export type OsName = 'macOS' | 'Linux' | 'Windows' | 'Android' | 'other';
-export type WriteResult = {
-    created_count: number;
-    updated_count: number;
-    failed_count: number;
-};
-export type CommandContext = {
-    space_key?: string;
-    environment_key?: string;
-    x_contentful_request_id?: string;
-};
-export type CommandCompletion = CommandContext & {
-    dsi_operation_id?: string;
-    extracted_component_count?: number;
-    accepted_component_count?: number;
-    component_type_result?: WriteResult;
-    design_token_result?: WriteResult;
-};
-export type CommandFailure = CommandContext & {
-    dsi_operation_id?: string;
-    error_name?: string;
-    error_code?: string;
-    http_status_code?: number;
-    x_contentful_request_id?: string;
-    exit_code?: number;
-};

package/dist/src/analytics/types.js

@@ -1 +0,0 @@
-export {};