@contentful/experience-design-system-cli 2.23.2-dev-build-09d87bb.0 → 2.23.2-dev-build-753ceef.0

package/dist/src/analyze/select/command.js

@@ -8,6 +8,7 @@ import { loadReviewInput } from './parser.js';
 import { App } from './tui/App.js';
 import { openPipelineDb, loadRawComponents, storeRawComponents, createStep, updateStep } from '../../session/db.js';
 import { validateExtractedComponents, shouldExcludeDueToValidation, formatExclusionWarning, } from '@contentful/experience-design-system-extraction';
+import { bindAnalyticsSessionId, enrichCommandResult, exitWithAnalytics } from '../../analytics/index.js';
 const SAFE_PATH_RE = /^[a-zA-Z0-9_.$[\]=]+$/;
 const PROTO_KEYS = new Set(['__proto__', 'constructor', 'prototype']);
 function applyDotPath(obj, path, value) {
@@ -102,6 +103,7 @@ async function runNonInteractive(snapshot, opts, paths, sessionId) {
         }
         const accepted = snapshot.components.filter((c) => c.status === 'accepted').length;
         const rejected = snapshot.components.filter((c) => c.status === 'rejected').length + (names.length || 0);
+        enrichCommandResult({ accepted_component_count: accepted });
         process.stderr.write(`Accepted: ${accepted}  Rejected: ${rejected}\n`);
         return;
     }
@@ -130,7 +132,7 @@ async function runNonInteractive(snapshot, opts, paths, sessionId) {
             lines.push('');
             lines.push('Re-run with --exclude-invalid to auto-reject these components, or run analyze select interactively to fix them.');
             process.stderr.write(lines.join('\n') + '\n');
-            process.exit(1);
+            await exitWithAnalytics(1);
             return;
         }
     }
@@ -175,14 +177,14 @@ async function runNonInteractive(snapshot, opts, paths, sessionId) {
             const parsed = JSON.parse(raw);
             if (!Array.isArray(parsed)) {
                 process.stderr.write(`Error: --patch file must be a JSON array of patch operations: ${opts.patch}\n`);
-                process.exit(1);
+                await exitWithAnalytics(1);
                 return;
             }
             patchOps = parsed;
         }
         catch {
             process.stderr.write(`Error: cannot read or parse --patch file: ${opts.patch}\n`);
-            process.exit(1);
+            await exitWithAnalytics(1);
             return;
         }
         // Warn on unknown component names
@@ -229,6 +231,7 @@ async function runNonInteractive(snapshot, opts, paths, sessionId) {
             db.close();
         }
     }
+    enrichCommandResult({ accepted_component_count: accepted.length });
     process.stderr.write(`Accepted: ${accepted.length}  Rejected: ${rejected.length}\n`);
 }
 /**
@@ -345,7 +348,7 @@ export async function rejectComponentsByName(sessionId, names, opts = {}) {
     const components = snapshot.components.map((c) => (nameSet.has(c.name) ? { ...c, status: 'rejected' } : c));
     await saveReviewState(paths.statePath, { ...snapshot, components });
 }
-function resolveSessionId(sessionFlag) {
+async function resolveSessionId(sessionFlag) {
     if (sessionFlag)
         return sessionFlag;
     const db = openPipelineDb();
@@ -360,7 +363,7 @@ function resolveSessionId(sessionFlag) {
             .get();
         if (!row) {
             process.stderr.write('Error: no completed analyze extract session found. Run analyze extract first, or pass --session <id>.\n');
-            process.exit(1);
+            return await exitWithAnalytics(1);
         }
         return row.id;
     }
@@ -384,7 +387,8 @@ export function registerAnalyzeEditCommand(program) {
         .option('--exclude-invalid', 'With --select-all: auto-reject components with validation errors instead of failing loud (opt-in bypass for the gate)')
         .option('--exclude-components <names>', 'Comma-separated component names to force-reject, regardless of other selection flags')
         .action(async ({ session: sessionFlag, projectRoot, acceptAll, selectAll, reject, deselect, select, patch, excludeInvalid, excludeComponents, }) => {
-        const sessionId = resolveSessionId(sessionFlag);
+        const sessionId = await resolveSessionId(sessionFlag);
+        await bindAnalyticsSessionId(sessionId);
         const db = openPipelineDb();
         let rawComponentCount = 0;
         try {
@@ -395,7 +399,7 @@ export function registerAnalyzeEditCommand(program) {
         }
         if (rawComponentCount === 0) {
             process.stderr.write(`Error: session '${sessionId}' has no raw components. Run analyze extract first.\n`);
-            process.exit(1);
+            await exitWithAnalytics(1);
             return;
         }
         const artifactsRoot = getRefineArtifactsRoot();
@@ -420,7 +424,7 @@ export function registerAnalyzeEditCommand(program) {
         }
         catch (error) {
             process.stderr.write(`Error: unable to initialize refine session.\n${error instanceof Error ? error.message : String(error)}\n`);
-            process.exit(1);
+            await exitWithAnalytics(1);
             return;
         }
         // Non-interactive path
@@ -465,7 +469,7 @@ export function registerAnalyzeEditCommand(program) {
         });
         if (process.stdout.columns !== undefined && process.stdout.columns < 60) {
             process.stderr.write(`Error: terminal too narrow (${process.stdout.columns} cols). Resize to 60+ columns.\n`);
-            process.exit(1);
+            await exitWithAnalytics(1);
         }
         const { waitUntilExit } = render(createElement(App, {
             sessionId,

package/dist/src/analyze/select/tui/App.js

@@ -80,10 +80,7 @@ export function App({ sessionId, artifactsRoot, reviewRoot }) {
             if (!manifest.componentsManifest)
                 manifest.componentsManifest = {};
             const client = new ImportApiClient({ cmaToken, spaceId, environmentId });
-            // 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 preview = await client.previewImport(manifest);
             const annotations = {};
             for (const item of preview.components.new) {
                 const name = item.name ?? '';

package/dist/src/analyze/select-agent/command.js

@@ -11,6 +11,7 @@ import { buildRepoContextIndex, buildSelectionContext } from './context-builder.
 import { runShowRationale } from './show-rationale.js';
 import { isAbsolute, resolve } from 'node:path';
 import { getDebugLogger } from '../../lib/debug-logger.js';
+import { bindAnalyticsSessionId, enrichCommandResult, exitWithAnalytics } from '../../analytics/index.js';
 import { validateExtractedComponents, shouldExcludeDueToValidation, formatExclusionWarning, } from '@contentful/experience-design-system-extraction';
 const DEFAULT_TIMEOUT_MS = Number(process.env.EDS_AGENT_TIMEOUT_MS ?? 3 * 60 * 1000);
 export const DEFAULT_CONCURRENCY = 10;
@@ -27,7 +28,7 @@ function resolveBatchSize() {
         return DEFAULT_BATCH_SIZE;
     return Math.floor(n);
 }
-function resolveSessionId(sessionFlag) {
+async function resolveSessionId(sessionFlag) {
     if (sessionFlag)
         return sessionFlag;
     const db = openPipelineDb();
@@ -42,7 +43,7 @@ function resolveSessionId(sessionFlag) {
             .get();
         if (!row) {
             process.stderr.write('Error: no completed analyze extract session found. Run analyze extract first, or pass --session <id>.\n');
-            process.exit(1);
+            return await exitWithAnalytics(1);
         }
         return row.id;
     }
@@ -329,7 +330,7 @@ export function registerAnalyzeSelectAgentCommand(program) {
             catch (err) {
                 const message = err instanceof Error ? err.message : String(err);
                 process.stderr.write(`Error: ${message}\n`);
-                process.exit(1);
+                await exitWithAnalytics(1);
                 return;
             }
         }
@@ -338,7 +339,7 @@ export function registerAnalyzeSelectAgentCommand(program) {
         const model = opts.model ?? savedCreds.agentModel;
         if (!agentName || !isAgentName(agentName)) {
             process.stderr.write(`Error: no agent configured. Pass --agent <name> or run experiences setup. Accepted values: ${AGENT_NAMES.join(', ')}\n`);
-            process.exit(1);
+            await exitWithAnalytics(1);
             return;
         }
         const agent = agentName;
@@ -352,7 +353,7 @@ export function registerAnalyzeSelectAgentCommand(program) {
                 .catch(() => false);
             if (!exists) {
                 process.stderr.write(`Error: custom prompt path not found: ${resolvedPath}\n`);
-                process.exit(1);
+                await exitWithAnalytics(1);
                 return;
             }
             if (!selectPromptPath.toLowerCase().endsWith('.md')) {
@@ -360,7 +361,8 @@ export function registerAnalyzeSelectAgentCommand(program) {
             }
             process.stderr.write(formatCustomPromptBanner('select', resolvedPath));
         }
-        const sessionId = resolveSessionId(opts.session);
+        const sessionId = await resolveSessionId(opts.session);
+        await bindAnalyticsSessionId(sessionId);
         const selectionRoot = resolveProjectRoot(sessionId, opts.projectRoot);
         const db = openPipelineDb();
         let rawComponents;
@@ -374,7 +376,7 @@ export function registerAnalyzeSelectAgentCommand(program) {
         }
         if (rawComponents.length === 0) {
             process.stderr.write(`Error: session '${sessionId}' has no raw components. Run analyze extract first.\n`);
-            process.exit(1);
+            await exitWithAnalytics(1);
             return;
         }
         // Re-run validation (not persisted to DB, so always recompute).
@@ -399,7 +401,7 @@ export function registerAnalyzeSelectAgentCommand(program) {
             lines.push('');
             lines.push('Re-run with --exclude-invalid to auto-reject these components, or fix them in source first.');
             process.stderr.write(lines.join('\n') + '\n');
-            process.exit(1);
+            await exitWithAnalytics(1);
             return;
         }
         const componentsForAgent = validatedComponents.filter((comp) => !shouldExcludeDueToValidation(comp));
@@ -426,7 +428,7 @@ export function registerAnalyzeSelectAgentCommand(program) {
         if (opts.dryRun) {
             if (selectionCandidates.length === 0) {
                 process.stderr.write('No valid components to preview — all components were excluded due to validation errors.\n');
-                process.exit(0);
+                await exitWithAnalytics(0);
                 return;
             }
             const first = selectionCandidates[0];
@@ -438,7 +440,7 @@ export function registerAnalyzeSelectAgentCommand(program) {
                 skillPathOverride: selectPromptPath ? resolve(selectPromptPath) : undefined,
             });
             process.stdout.write(prompt + '\n');
-            process.exit(0);
+            await exitWithAnalytics(0);
             return;
         }
         // --no-cache is the global kill-switch; --no-select-cache is the stage-
@@ -504,7 +506,7 @@ export function registerAnalyzeSelectAgentCommand(program) {
         }
         catch (error) {
             process.stderr.write(`Error: unable to initialize select session.\n${error instanceof Error ? error.message : String(error)}\n`);
-            process.exit(1);
+            await exitWithAnalytics(1);
             return;
         }
         const paths = await getRefineSessionPaths(sessionId, artifactsRoot);
@@ -550,6 +552,7 @@ export function registerAnalyzeSelectAgentCommand(program) {
         finally {
             stepDb.close();
         }
+        enrichCommandResult({ accepted_component_count: accepted.length });
         process.stderr.write(`Accepted: ${accepted.length}  Rejected: ${rejected.length}  Needs review: ${unresolved.length}\n`);
     });
 }

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, allowDeletions?: boolean): Promise<ServerPreviewResponse>;
-    applyImport(manifest: ManifestPayload, options: {
-        acknowledgeBreakingChanges: boolean;
-        allowDeletions?: boolean;
-    }): Promise<ApplyOperationResponse>;
+    previewImport(manifest: ManifestPayload): Promise<ServerPreviewResponse>;
+    applyImport(manifest: ManifestPayload, acknowledgeBreakingChanges: boolean): Promise<ApplyOperationResponse>;
     pollOperation(operationId: string, opts?: {
         intervalMs?: number;
         maxIntervalMs?: number;

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

@@ -180,6 +180,15 @@ 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;
@@ -237,8 +246,10 @@ export class ImportApiClient {
                 await this.retry.sleep(delayMs);
                 continue;
             }
-            if (!isTransientStatus(result.response.status))
+            if (!isTransientStatus(result.response.status)) {
+                this.noteRequestId(result.response);
                 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. ` +
@@ -273,6 +284,7 @@ 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());
         }
@@ -298,6 +310,7 @@ 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)
@@ -307,20 +320,19 @@ export class ImportApiClient {
             return; // legacy backend without the endpoint
         throw new ApiError(`preflight failed: ${res.status}`, res.status, body);
     }
-    async previewImport(manifest, allowDeletions = false) {
+    async previewImport(manifest) {
         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, allowDeletions },
+            body: manifest,
             parseAs: 'json',
         }));
         if (!result.response.ok) {
@@ -336,14 +348,12 @@ export class ImportApiClient {
         debug.event('apply', 'preview.ok', { status: result.response.status, durationMs: Date.now() - startedAt });
         return sanitizePreviewResponse(parsed);
     }
-    async applyImport(manifest, options) {
-        const { acknowledgeBreakingChanges, allowDeletions = false } = options;
+    async applyImport(manifest, acknowledgeBreakingChanges) {
         const debug = getDebugLogger();
         const startedAt = Date.now();
         debug.event('apply', 'apply.request', {
             url: `${this.base()}/design_systems/imports/apply`,
             acknowledgeBreakingChanges,
-            allowDeletions,
         });
         let result;
         try {
@@ -351,7 +361,7 @@ export class ImportApiClient {
                 baseUrl: this.host,
                 headers: this.headers(),
                 path: { spaceId: this.spaceId, environmentId: this.environmentId },
-                body: { ...manifest, acknowledgeBreakingChanges, allowDeletions },
+                body: { ...manifest, acknowledgeBreakingChanges },
                 parseAs: 'json',
             });
         }

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

@@ -11,7 +11,7 @@ export declare function formatSlotCycleReport(cycles: ReturnType<typeof findSlot
 export declare function assertNoSlotCycles(components: Array<{
     key: string;
     entry: CDFComponentEntry;
-}>): void;
+}>): Promise<void>;
 export declare function extractComponentsFromManifest(manifest: {
     componentsManifest?: Record<string, unknown>;
 } | null | undefined): Array<{