@contentful/experience-design-system-cli 2.24.0 → 2.24.1-dev-build-58e271c.0

package/dist/src/import/orchestrator.js

@@ -6,17 +6,19 @@ import { openPipelineDb, getOrCreateSession, createStep, updateStep, findLatestS
 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 { getDebugLogger } from '../lib/debug-logger.js';
+import { bindAnalyticsSession, emitSessionStarted } from '../analytics/index.js';
+import { pipelineSubprocessEnv } from '../analytics/env.js';
 function findCliPath() {
     return join(fileURLToPath(import.meta.url), '..', '..', '..', '..', 'bin', 'cli.js');
 }
-async function runStep(args, cliPath, env = {}, streamStderr = false) {
+async function runStep(args, cliPath, analyticsSessionId, env = {}, streamStderr = false) {
     const debug = getDebugLogger();
     const startedAt = Date.now();
     debug.event('import', 'subprocess.spawn', { cliPath, args });
     return new Promise((res) => {
         const child = execFile('node', [cliPath, ...args], {
-            env: debugEnvForSubprocess({ ...process.env, ...env }),
+            env: pipelineSubprocessEnv({ ...process.env, ...env }, analyticsSessionId),
         });
         let stdout = '';
         let stderr = '';
@@ -108,6 +110,10 @@ 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}`);
@@ -159,7 +165,7 @@ export async function runPipeline(opts, progressWriter, cliPathOverride) {
             if (opts.agent)
                 analyzeArgs.push('--agent', opts.agent);
         }
-        const r = await runStep(analyzeArgs, cliPath);
+        const r = await runStep(analyzeArgs, cliPath, sessionId);
         const durationMs = Date.now() - t0;
         if (r.exitCode !== 0) {
             if (r.stderr)
@@ -231,7 +237,7 @@ export async function runPipeline(opts, progressWriter, cliPathOverride) {
                 editArgs.push('--select-all');
             }
         }
-        const rEdit = await runStep(editArgs, cliPath, { FORCE_COLOR: '1' }, useAgentSelect);
+        const rEdit = await runStep(editArgs, cliPath, sessionId, { FORCE_COLOR: '1' }, useAgentSelect);
         const editDurationMs = Date.now() - t0Edit;
         if (rEdit.exitCode !== 0) {
             if (rEdit.stderr && !useAgentSelect)
@@ -292,7 +298,7 @@ export async function runPipeline(opts, progressWriter, cliPathOverride) {
             extractSession: extractSessionId ?? '',
         });
         const t0 = Date.now();
-        const r = await runStep(generateArgs, cliPath, { FORCE_COLOR: '1' }, true);
+        const r = await runStep(generateArgs, cliPath, sessionId, { FORCE_COLOR: '1' }, true);
         const durationMs = Date.now() - t0;
         if (r.exitCode !== 0) {
             updateStep(db, stepId, 'failed', {}, r.stderr);
@@ -355,7 +361,7 @@ export async function runPipeline(opts, progressWriter, cliPathOverride) {
             out: componentsPath,
         });
         const t0 = Date.now();
-        const r = await runStep(printArgs, cliPath);
+        const r = await runStep(printArgs, cliPath, sessionId);
         const durationMs = Date.now() - t0;
         if (r.exitCode !== 0) {
             if (r.stderr)
@@ -425,7 +431,7 @@ export async function runPipeline(opts, progressWriter, cliPathOverride) {
             components: componentsPath,
         });
         const t0 = Date.now();
-        let r = await runStep(pushArgs, cliPath, { FORCE_COLOR: '1' }, true);
+        let r = await runStep(pushArgs, cliPath, sessionId, { FORCE_COLOR: '1' }, true);
         const excludedByRetry = [];
         let validationRetryCount = 0;
         while (validationRetryCount < MAX_VALIDATION_RETRIES && isPreviewValidationError(r) && extractSessionId) {
@@ -442,10 +448,10 @@ export async function runPipeline(opts, progressWriter, cliPathOverride) {
                 '--exclude-components',
                 offenders.join(','),
             ];
-            const rejectResult = await runStep(rejectArgs, cliPath);
+            const rejectResult = await runStep(rejectArgs, cliPath, sessionId);
             if (rejectResult.exitCode !== 0)
                 break;
-            r = await runStep(pushArgs, cliPath, { FORCE_COLOR: '1' }, true);
+            r = await runStep(pushArgs, cliPath, sessionId, { FORCE_COLOR: '1' }, true);
             validationRetryCount++;
         }
         const durationMs = Date.now() - t0;
@@ -480,10 +486,10 @@ export async function runPipeline(opts, progressWriter, cliPathOverride) {
                         '--exclude-components',
                         cycleNames.join(','),
                     ];
-                    const rejectResult = await runStep(rejectArgs, cliPath);
+                    const rejectResult = await runStep(rejectArgs, cliPath, sessionId);
                     if (rejectResult.exitCode === 0) {
                         const retryT0 = Date.now();
-                        const retryR = await runStep(pushArgs, cliPath, { FORCE_COLOR: '1' }, true);
+                        const retryR = await runStep(pushArgs, cliPath, sessionId, { FORCE_COLOR: '1' }, true);
                         const retryDurationMs = Date.now() - t0 + (Date.now() - retryT0);
                         if (isSlotCycleError(retryR)) {
                             const retryReport = extractCycleReport(retryR.stderr);

package/dist/src/index.js

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

package/dist/src/print/command.js

@@ -8,9 +8,10 @@ import { validateDTCGTokenFile } from './validate/validators/dtcg-validator.js';
 import { formatDiagnostics } from './validate/validators/format-errors.js';
 import { ValidateView } from './validate/tui/ValidateView.js';
 import { getInteractiveTerminalSupport } from '../lib/terminal-capabilities.js';
-function die(message) {
+import { bindAnalyticsSessionId, exitWithAnalytics } from '../analytics/index.js';
+async function die(message) {
     process.stderr.write(`${message}\n`);
-    process.exit(1);
+    return exitWithAnalytics(1);
 }
 async function pathExists(p) {
     return access(p)
@@ -21,16 +22,16 @@ async function assertOutIsNotDirectory(outPath) {
     if (await pathExists(outPath)) {
         const s = await stat(outPath);
         if (s.isDirectory())
-            die(`Error: --out must be a file path, not a directory: ${outPath}`);
+            await die(`Error: --out must be a file path, not a directory: ${outPath}`);
     }
 }
-function resolveSession(sessionFlag, command) {
+async function resolveSession(sessionFlag, command) {
     const db = openPipelineDb();
     try {
         const sessionId = sessionFlag ?? findLatestSessionForCommand(db, command);
         if (!sessionId) {
             const hint = command === 'generate components' ? 'generate components' : 'generate tokens';
-            die(`Error: no completed ${hint} session found. Run ${hint} first, or pass --session <id>.`);
+            return await die(`Error: no completed ${hint} session found. Run ${hint} first, or pass --session <id>.`);
         }
         return sessionId;
     }
@@ -85,7 +86,8 @@ export function registerPrintCommand(program) {
         .action(async (opts) => {
         const outPath = resolve(opts.out);
         await assertOutIsNotDirectory(outPath);
-        const sessionId = resolveSession(opts.session, 'generate components');
+        const sessionId = await resolveSession(opts.session, 'generate components');
+        await bindAnalyticsSessionId(sessionId);
         const db = openPipelineDb();
         let components;
         let generateStepStatus = null;
@@ -110,13 +112,13 @@ export function registerPrintCommand(program) {
                 // component was rejected or left unresolved. This is a legitimate
                 // "clear the space" intent, but it's destructive, so require --allow-empty.
                 if (!opts.allowEmpty) {
-                    die(`Error: all ${rejectedCount} generated component${rejectedCount === 1 ? ' was' : 's were'} rejected or left unresolved at final review in session '${sessionId}', so there is nothing to save. Accept at least one component (press [a] on a row, or [A] to accept all), or pass --allow-empty to write an empty manifest that will DELETE all components from the target space on push.`);
+                    await die(`Error: all ${rejectedCount} generated component${rejectedCount === 1 ? ' was' : 's were'} rejected or left unresolved at final review in session '${sessionId}', so there is nothing to save. Accept at least one component (press [a] on a row, or [A] to accept all), or pass --allow-empty to write an empty manifest that will DELETE all components from the target space on push.`);
                 }
                 // Fall through: write an empty-but-present components manifest so a
                 // subsequent push removes every component from the target space.
             }
             else {
-                die(`Error: no generated components in session '${sessionId}'. Run generate components first.`);
+                await die(`Error: no generated components in session '${sessionId}'. Run generate components first.`);
             }
         }
         if (generateStepStatus === 'failed') {
@@ -145,7 +147,8 @@ export function registerPrintCommand(program) {
         .action(async (opts) => {
         const outPath = resolve(opts.out);
         await assertOutIsNotDirectory(outPath);
-        const sessionId = resolveSession(opts.session, 'generate tokens');
+        const sessionId = await resolveSession(opts.session, 'generate tokens');
+        await bindAnalyticsSessionId(sessionId);
         const db = openPipelineDb();
         let result;
         try {
@@ -155,7 +158,7 @@ export function registerPrintCommand(program) {
             db.close();
         }
         if (result.tokens.length === 0) {
-            die(`Error: no generated tokens in session '${sessionId}'. Run generate tokens first.`);
+            await die(`Error: no generated tokens in session '${sessionId}'. Run generate tokens first.`);
         }
         const tree = rebuildDTCGTree(result.groups, result.tokens);
         await mkdir(resolve(outPath, '..'), { recursive: true });
@@ -171,7 +174,7 @@ export function registerPrintCommand(program) {
         .action(async (opts) => {
         if (!opts.components && !opts.tokens) {
             process.stderr.write('Error: at least one of --components or --tokens is required.\n\nUsage: print validate [--components <path>] [--tokens <path>]\n');
-            process.exit(1);
+            await exitWithAnalytics(1);
         }
         const viewResults = [];
         if (opts.components) {
@@ -199,7 +202,7 @@ export function registerPrintCommand(program) {
         if (getInteractiveTerminalSupport().supported) {
             const { waitUntilExit } = render(createElement(ValidateView, {
                 results: viewResults,
-                onExit: () => process.exit(exitCode),
+                onExit: () => void exitWithAnalytics(exitCode),
             }));
             await waitUntilExit();
         }
@@ -212,7 +215,7 @@ export function registerPrintCommand(program) {
             }))
                 .join('\n\n');
             process.stdout.write(output + '\n');
-            process.exit(exitCode);
+            await exitWithAnalytics(exitCode);
         }
     });
 }

package/dist/src/program.js

@@ -12,6 +12,7 @@ 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, flushAnalytics, noteCommandStart } from './analytics/index.js';
 const require = createRequire(import.meta.url);
 const pkg = require('../package.json');
 /**
@@ -89,7 +90,13 @@ export function createProgram() {
         const chain = [];
         for (let c = actionCommand; c && c.parent; c = c.parent)
             chain.unshift(c.name());
-        await beginCommand(chain.join(' ') || actionCommand.name(), { ...(debug !== undefined ? { debug } : {}) });
+        const commandChain = chain.join(' ') || actionCommand.name();
+        noteCommandStart(commandChain);
+        await beginCommand(commandChain, { ...(debug !== undefined ? { debug } : {}) });
+    });
+    program.hook('postAction', async () => {
+        await completeActiveCommand();
+        await flushAnalytics();
     });
     return program;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.24.0",
+  "version": "2.24.1-dev-build-58e271c.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -28,15 +28,16 @@
     "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-extraction": "2.24.0",
-    "@contentful/experience-design-system-types": "2.24.0",
-    "@contentful/experience-design-system-generation": "2.24.0",
-    "@contentful/experience-design-system-client": "2.24.0"
+    "@contentful/experience-design-system-client": "2.24.1-dev-build-58e271c.0",
+    "@contentful/experience-design-system-extraction": "2.24.1-dev-build-58e271c.0",
+    "@contentful/experience-design-system-generation": "2.24.1-dev-build-58e271c.0",
+    "@contentful/experience-design-system-types": "2.24.1-dev-build-58e271c.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",