@contentful/experience-design-system-cli 2.23.2-dev-build-8b2cfc9.0 → 2.23.2-dev-build-09d87bb.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. Without this flag, preview responses suppress the removed-entity list and return a count instead; interactive confirm screens show an opt-out toggle (never opt-in) only when the flag is passed. 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-09d87bb.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/analyze/select/tui/App.js

@@ -80,7 +80,10 @@ export function App({ sessionId, artifactsRoot, reviewRoot }) {
             if (!manifest.componentsManifest)
                 manifest.componentsManifest = {};
             const client = new ImportApiClient({ cmaToken, spaceId, environmentId });
-            const preview = await client.previewImport(manifest);
+            // This preview is display-only (component-picker annotations); it never
+            // triggers an apply, so always request the full diff to keep the
+            // existing "removed" annotation working.
+            const preview = await client.previewImport(manifest, true);
             const annotations = {};
             for (const item of preview.components.new) {
                 const name = item.name ?? '';

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

@@ -45,17 +45,17 @@ export declare class ImportApiClient {
     private spaceId;
     private environmentId;
     private retry;
-    private lastRequestId?;
-    getLastRequestId(): string | undefined;
-    private noteRequestId;
     constructor(opts: ApiClientOptions);
     private base;
     private headers;
     private requestWithRetry;
     validateToken(): Promise<void>;
     checkPreflight(): Promise<void>;
-    previewImport(manifest: ManifestPayload): Promise<ServerPreviewResponse>;
-    applyImport(manifest: ManifestPayload, acknowledgeBreakingChanges: boolean): Promise<ApplyOperationResponse>;
+    previewImport(manifest: ManifestPayload, allowDeletions?: boolean): Promise<ServerPreviewResponse>;
+    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)
@@ -320,19 +307,20 @@ export class ImportApiClient {
             return; // legacy backend without the endpoint
         throw new ApiError(`preflight failed: ${res.status}`, res.status, body);
     }
-    async previewImport(manifest) {
+    async previewImport(manifest, allowDeletions = false) {
         const debug = getDebugLogger();
         const startedAt = Date.now();
         debug.event('apply', 'preview.request', {
             url: `${this.base()}/design_systems/imports/preview`,
             componentCount: manifest.components?.length ?? 0,
             tokenCount: manifest.designTokens?.length ?? 0,
+            allowDeletions,
         });
         const result = await this.requestWithRetry('preview', PREVIEW_ERROR_PREFIX, () => designSystemImportSourcelessPreview({
             baseUrl: this.host,
             headers: this.headers(),
             path: { spaceId: this.spaceId, environmentId: this.environmentId },
-            body: manifest,
+            body: { ...manifest, allowDeletions },
             parseAs: 'json',
         }));
         if (!result.response.ok) {
@@ -348,12 +336,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 +351,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,12 +450,14 @@ 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,
                 spaceId,
                 environmentId,
+                allowDeletions: false,
             }));
             await waitUntilExit();
         }
@@ -476,6 +470,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 +492,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();
@@ -515,19 +504,22 @@ export function registerApplyCommand(program) {
         const manifest = buildManifest(components, tokens);
         let preview;
         try {
-            preview = await client.previewImport(manifest);
+            preview = await client.previewImport(manifest, opts.allowDeletions === true);
         }
         catch (e) {
             if (e instanceof ApiError)
                 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, {
                     preview,
                     spaceId,
                     environmentId,
+                    allowDeletions: opts.allowDeletions === true,
                 }));
                 await waitUntilExit();
             }
@@ -558,7 +550,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,18 +570,12 @@ 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) => {
-            const runApply = async (acknowledge) => {
+            const runApply = async (acknowledge, applyDeletions) => {
                 instance.rerender(createElement(ServerApplyProgress, {
                     spaceId,
                     environmentId,
@@ -594,7 +583,10 @@ export function registerApplyCommand(program) {
                 }));
                 let operation;
                 try {
-                    operation = await client.applyImport(manifest, acknowledge);
+                    operation = await client.applyImport(manifest, {
+                        acknowledgeBreakingChanges: acknowledge,
+                        allowDeletions: applyDeletions,
+                    });
                 }
                 catch (e) {
                     if (e instanceof ApiError) {
@@ -642,8 +634,9 @@ export function registerApplyCommand(program) {
                 spaceId,
                 environmentId,
                 breakingWithImpact,
-                onConfirm: (acknowledge) => {
-                    void runApply(acknowledge);
+                allowDeletions: opts.allowDeletions === true,
+                onConfirm: (acknowledge, applyDeletions) => {
+                    void runApply(acknowledge, applyDeletions);
                 },
                 onCancel: () => {
                     process.exit(0);
@@ -657,6 +650,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) {
@@ -686,7 +680,7 @@ export function registerApplyCommand(program) {
         const fullManifest = buildManifest(components, tokens);
         let preview;
         try {
-            preview = await client.previewImport(fullManifest);
+            preview = await client.previewImport(fullManifest, opts.allowDeletions === true);
         }
         catch (e) {
             if (e instanceof ApiError)
@@ -724,7 +718,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 +763,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/apply/preview-utils.d.ts

@@ -7,6 +7,10 @@ import type { ServerPreviewResponse } from '@contentful/experience-design-system
  *     would be a pure no-op (INTEG-4411 refined guard).
  *
  * A push that produces ANY entry in ANY bucket — including a rejection that
- * removes a server-side component — is NOT empty.
+ * removes a server-side component — is NOT empty. Note the server hides
+ * removals entirely (empty removed[]) unless the preview was fetched with
+ * allowDeletions: true, so "empty" here also correctly describes a preview
+ * with pending-but-hidden deletions: pushing without --allow-deletions is a
+ * genuine no-op in that case too, since the apply gate hides them the same way.
  */
 export declare function isEmptyPreview(preview: ServerPreviewResponse): boolean;

package/dist/src/apply/preview-utils.js

@@ -6,7 +6,11 @@
  *     would be a pure no-op (INTEG-4411 refined guard).
  *
  * A push that produces ANY entry in ANY bucket — including a rejection that
- * removes a server-side component — is NOT empty.
+ * removes a server-side component — is NOT empty. Note the server hides
+ * removals entirely (empty removed[]) unless the preview was fetched with
+ * allowDeletions: true, so "empty" here also correctly describes a preview
+ * with pending-but-hidden deletions: pushing without --allow-deletions is a
+ * genuine no-op in that case too, since the apply gate hides them the same way.
  */
 export function isEmptyPreview(preview) {
     const { components, tokens, taxonomies } = preview;

package/dist/src/apply/tui/ServerApplyView.d.ts

@@ -5,16 +5,19 @@ interface ServerPreviewConfirmProps {
     spaceId: string;
     environmentId: string;
     breakingWithImpact: boolean;
-    onConfirm: (acknowledge: boolean) => void;
+    /** The value the preview was actually fetched with. */
+    allowDeletions: boolean;
+    onConfirm: (acknowledge: boolean, allowDeletions: boolean) => void;
     onCancel: () => void;
 }
-export declare function ServerPreviewConfirm({ preview, spaceId, environmentId, breakingWithImpact, onConfirm, onCancel, }: ServerPreviewConfirmProps): React.ReactElement;
+export declare function ServerPreviewConfirm({ preview, spaceId, environmentId, breakingWithImpact, allowDeletions: fetchedAllowDeletions, onConfirm, onCancel, }: ServerPreviewConfirmProps): React.ReactElement;
 interface ServerPreviewAppProps {
     preview: ServerPreviewResponse;
     spaceId: string;
     environmentId: string;
+    allowDeletions: boolean;
 }
-export declare function ServerPreviewApp({ preview, spaceId, environmentId }: ServerPreviewAppProps): React.ReactElement;
+export declare function ServerPreviewApp({ preview, spaceId, environmentId, allowDeletions, }: ServerPreviewAppProps): React.ReactElement;
 interface ServerApplyProgressProps {
     spaceId: string;
     environmentId: string;

package/dist/src/apply/tui/ServerApplyView.js

@@ -1,23 +1,32 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
 import { ServerPreviewView } from './ServerPreviewView.js';
 import { buildPostPushUrl } from '../../lib/contentful-urls.js';
 import { formatEdsiError } from '../../lib/error-parser.js';
-export function ServerPreviewConfirm({ preview, spaceId, environmentId, breakingWithImpact, onConfirm, onCancel, }) {
+export function ServerPreviewConfirm({ preview, spaceId, environmentId, breakingWithImpact, allowDeletions: fetchedAllowDeletions, onConfirm, onCancel, }) {
+    const [allowDeletions, setAllowDeletions] = useState(fetchedAllowDeletions);
+    const removedCount = preview.components.removed.length + preview.tokens.removed.length;
     useInput((input, key) => {
-        if (key.return)
-            onConfirm(breakingWithImpact);
+        if (key.return) {
+            onConfirm(breakingWithImpact, allowDeletions);
+            return;
+        }
+        if ((input === 'x' || input === 'X') && fetchedAllowDeletions && removedCount > 0) {
+            setAllowDeletions((prev) => !prev);
+            return;
+        }
         if (key.escape || input === 'q')
             onCancel();
     });
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(ServerPreviewView, { preview: preview, spaceId: spaceId, environmentId: environmentId }), _jsxs(Box, { paddingX: 2, flexDirection: "column", children: [breakingWithImpact && (_jsxs(Text, { color: "red", bold: true, children: [' ', "\u26A0 Breaking changes will affect downstream entities. Press Enter to acknowledge and apply."] })), _jsxs(Text, { children: [' ', "Press ", _jsx(Text, { bold: true, children: "Enter" }), " to apply, ", _jsx(Text, { bold: true, children: "Esc" }), " to cancel"] })] })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(ServerPreviewView, { preview: preview, spaceId: spaceId, environmentId: environmentId, allowDeletions: allowDeletions }), _jsxs(Box, { paddingX: 2, flexDirection: "column", children: [breakingWithImpact && (_jsxs(Text, { color: "red", bold: true, children: [' ', "\u26A0 Breaking changes will affect downstream entities. Press Enter to acknowledge and apply."] })), allowDeletions && removedCount > 0 && (_jsxs(Text, { color: "red", bold: true, children: [' ', "\u26A0 ", removedCount, " missing ", removedCount === 1 ? 'entity' : 'entities', " will be permanently deleted. Press Enter to confirm."] })), fetchedAllowDeletions && removedCount > 0 && (_jsxs(Text, { dimColor: true, children: [" [x] ", allowDeletions ? '[✓]' : '[ ]', " Allow deletions"] })), _jsxs(Text, { children: [' ', "Press ", _jsx(Text, { bold: true, children: "Enter" }), " to apply, ", _jsx(Text, { bold: true, children: "Esc" }), " to cancel"] })] })] }));
 }
-export function ServerPreviewApp({ preview, spaceId, environmentId }) {
+export function ServerPreviewApp({ preview, spaceId, environmentId, allowDeletions, }) {
     useInput((input, key) => {
         if (key.escape || input === 'q')
             process.exit(0);
     });
-    return _jsx(ServerPreviewView, { preview: preview, spaceId: spaceId, environmentId: environmentId });
+    return (_jsx(ServerPreviewView, { preview: preview, spaceId: spaceId, environmentId: environmentId, allowDeletions: allowDeletions }));
 }
 export function ServerApplyProgress({ spaceId, environmentId, status, operationId, error, }) {
     useInput((_input, key) => {

package/dist/src/apply/tui/ServerPreviewView.d.ts

@@ -4,6 +4,7 @@ interface ServerPreviewViewProps {
     preview: ServerPreviewResponse;
     spaceId: string;
     environmentId: string;
+    allowDeletions: boolean;
 }
-export declare function ServerPreviewView({ preview, spaceId, environmentId }: ServerPreviewViewProps): React.ReactElement;
+export declare function ServerPreviewView({ preview, spaceId, environmentId, allowDeletions, }: ServerPreviewViewProps): React.ReactElement;
 export {};

package/dist/src/apply/tui/ServerPreviewView.js

@@ -13,11 +13,11 @@ function DraftWarning({ hasDraft }) {
         return null;
     return _jsx(Text, { color: "yellow", children: " \u26A1 has pending draft changes" });
 }
-export function ServerPreviewView({ preview, spaceId, environmentId }) {
+export function ServerPreviewView({ preview, spaceId, environmentId, allowDeletions, }) {
     const { components, tokens } = preview;
     const totalComponents = components.new.length + components.changed.length + components.unchanged.length + components.removed.length;
     const totalTokens = tokens.new.length + tokens.changed.length + tokens.unchanged.length + tokens.removed.length;
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [_jsxs(Text, { bold: true, children: ["Preview \u2014 ", environmentId, " @ ", spaceId] }), _jsx(Text, { children: " " }), totalComponents > 0 && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { bold: true, children: [" Component Types (", totalComponents, " total)"] }), _jsxs(Text, { color: "green", children: [" \u2746 ", components.new.length, " to create"] }), _jsxs(Text, { color: "yellow", children: [" ~ ", components.changed.length, " to update"] }), _jsxs(Text, { color: "red", children: [" \u2717 ", components.removed.length, " to remove"] }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", components.unchanged.length, " unchanged"] }), components.changed.map((item, i) => (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellow", children: [" ~ ", item.current.name] }), _jsx(DraftWarning, { hasDraft: item.hasPendingDraftChanges })] }), _jsx(BreakingBadge, { item: item })] }, i))), _jsx(Text, { children: " " })] })), totalTokens > 0 && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { bold: true, children: [" Design Tokens (", totalTokens, " total)"] }), _jsxs(Text, { color: "green", children: [" \u2746 ", tokens.new.length, " to create"] }), _jsxs(Text, { color: "yellow", children: [" ~ ", tokens.changed.length, " to update"] }), _jsxs(Text, { color: "red", children: [" \u2717 ", tokens.removed.length, " to remove"] }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", tokens.unchanged.length, " unchanged"] }), tokens.changed
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [_jsxs(Text, { bold: true, children: ["Preview \u2014 ", environmentId, " @ ", spaceId] }), _jsx(Text, { children: " " }), totalComponents > 0 && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { bold: true, children: [" Component Types (", totalComponents, " total)"] }), _jsxs(Text, { color: "green", children: [" \u2746 ", components.new.length, " to create"] }), _jsxs(Text, { color: "yellow", children: [" ~ ", components.changed.length, " to update"] }), _jsxs(Text, { color: allowDeletions ? 'red' : 'yellow', children: [' ', allowDeletions ? '✗' : '⊘', " ", components.removed.length, " to ", allowDeletions ? 'delete' : 'skip'] }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", components.unchanged.length, " unchanged"] }), components.changed.map((item, i) => (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellow", children: [" ~ ", item.current.name] }), _jsx(DraftWarning, { hasDraft: item.hasPendingDraftChanges })] }), _jsx(BreakingBadge, { item: item })] }, i))), _jsx(Text, { children: " " })] })), totalTokens > 0 && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { bold: true, children: [" Design Tokens (", totalTokens, " total)"] }), _jsxs(Text, { color: "green", children: [" \u2746 ", tokens.new.length, " to create"] }), _jsxs(Text, { color: "yellow", children: [" ~ ", tokens.changed.length, " to update"] }), _jsxs(Text, { color: allowDeletions ? 'red' : 'yellow', children: [' ', allowDeletions ? '✗' : '⊘', " ", tokens.removed.length, " to ", allowDeletions ? 'delete' : 'skip'] }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", tokens.unchanged.length, " unchanged"] }), tokens.changed
                         .filter((t) => t.hasPendingDraftChanges)
-                        .map((item, i) => (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellow", children: [" ~ ", item.current.name] }), _jsx(DraftWarning, { hasDraft: true })] }, i))), _jsx(Text, { children: " " })] })), _jsx(Text, { dimColor: true, children: " Press Q to exit." })] }));
+                        .map((item, i) => (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: "yellow", children: [" ~ ", item.current.name] }), _jsx(DraftWarning, { hasDraft: true })] }, i))), _jsx(Text, { children: " " })] })), !allowDeletions && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "yellow", children: " \u2298 Deletions are hidden by default \u2014 rerun with --allow-deletions to see them." }) })), _jsx(Text, { dimColor: true, children: " Press Q to exit." })] }));
 }

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;