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

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,6 +45,9 @@ export declare class ImportApiClient {
     private spaceId;
     private environmentId;
     private retry;
+    private lastRequestId?;
+    getLastRequestId(): string | undefined;
+    private noteRequestId;
     constructor(opts: ApiClientOptions);
     private base;
     private headers;

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)

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<{

package/dist/src/apply/command.js

@@ -16,9 +16,10 @@ import { addAllowDeletionsOption, addArtifactInputOptions, addCompositionOptions
 import { stripAllowedComponents } from '../import/strip-allowed-components.js';
 import { readExperiencesCredentials } from '../credentials-store.js';
 import { getInteractiveTerminalSupport, requireInteractiveTerminal } from '../lib/terminal-capabilities.js';
-function die(message) {
+import { bindAnalyticsSessionId, exitWithAnalytics, failureFromApiError, recordApplyOutcome, recordContentfulContext, } from '../analytics/index.js';
+async function die(message, fields = {}) {
     process.stderr.write(`${message}\n`);
-    process.exit(1);
+    return exitWithAnalytics(1, fields);
 }
 async function pathExists(p) {
     return access(p)
@@ -27,7 +28,7 @@ async function pathExists(p) {
 }
 async function assertFileExists(flag, p) {
     if (!(await pathExists(p)))
-        die(`Error: file not found: ${p} (from ${flag})`);
+        return await die(`Error: file not found: ${p} (from ${flag})`);
 }
 async function readJsonFile(flag, p) {
     let text;
@@ -35,13 +36,13 @@ async function readJsonFile(flag, p) {
         text = await readFile(p, 'utf8');
     }
     catch {
-        die(`Error: file not found: ${p} (from ${flag})`);
+        return await die(`Error: file not found: ${p} (from ${flag})`);
     }
     try {
         return JSON.parse(text);
     }
     catch {
-        die(`Error: ${flag} is not valid JSON: ${p}`);
+        return await die(`Error: ${flag} is not valid JSON: ${p}`);
     }
 }
 const IGNORE_TOKEN_DIRS = new Set(['node_modules', 'dist', 'build', '.next', '.nuxt', '.git']);
@@ -83,12 +84,12 @@ export async function readTokensFromPath(flag, p) {
         s = await stat(p);
     }
     catch {
-        die(`Error: file not found: ${p} (from ${flag})`);
+        return await die(`Error: file not found: ${p} (from ${flag})`);
     }
     if (s.isDirectory()) {
         const files = await collectJsonFiles(p);
         if (files.length === 0)
-            die(`Error: no .json files found in directory: ${p} (from ${flag})`);
+            return await die(`Error: no .json files found in directory: ${p} (from ${flag})`);
         const merged = {};
         for (const file of files.sort()) {
             let text;
@@ -111,36 +112,36 @@ export async function readTokensFromPath(flag, p) {
         }
         const { valid, errors } = validateDTCG(merged);
         if (!valid)
-            die(`Error: ${flag} contains invalid token types:\n${errors.map((e) => `  ${e.path}: ${e.message}`).join('\n')}`);
+            return await die(`Error: ${flag} contains invalid token types:\n${errors.map((e) => `  ${e.path}: ${e.message}`).join('\n')}`);
         return flattenDTCG(merged, '');
     }
     const raw = await readJsonFile(flag, p);
     if (typeof raw !== 'object' || raw === null || Array.isArray(raw)) {
-        die(`Error: ${flag} is not valid JSON: expected an object`);
+        return await die(`Error: ${flag} is not valid JSON: expected an object`);
     }
     const { valid, errors } = validateDTCG(raw);
     if (!valid)
-        die(`Error: ${flag} contains invalid token types:\n${errors.map((e) => `  ${e.path}: ${e.message}`).join('\n')}`);
+        return await die(`Error: ${flag} contains invalid token types:\n${errors.map((e) => `  ${e.path}: ${e.message}`).join('\n')}`);
     return flattenDTCG(raw, '');
 }
 async function resolveSharedInputs(opts) {
     if (!opts.components && !opts.tokens && !opts.session) {
-        die('Error: at least one of --components, --tokens, or --session is required');
+        return await die('Error: at least one of --components, --tokens, or --session is required');
     }
     if (opts.session && opts.components) {
-        die('Error: --session and --components are mutually exclusive');
+        return await die('Error: --session and --components are mutually exclusive');
     }
     const spaceId = opts.spaceId ?? process.env.CONTENTFUL_SPACE_ID;
     const environmentId = opts.environmentId ?? process.env.CONTENTFUL_ENVIRONMENT_ID;
     if (!spaceId)
-        die('Error: --space-id is required (or set CONTENTFUL_SPACE_ID)');
+        return await die('Error: --space-id is required (or set CONTENTFUL_SPACE_ID)');
     if (!environmentId)
-        die('Error: --environment-id is required (or set CONTENTFUL_ENVIRONMENT_ID)');
+        return await die('Error: --environment-id is required (or set CONTENTFUL_ENVIRONMENT_ID)');
     opts.spaceId = spaceId;
     opts.environmentId = environmentId;
     const cmaToken = opts.cmaToken ?? process.env.CONTENTFUL_MANAGEMENT_TOKEN;
     if (!cmaToken) {
-        die('Error: CMA token is required. Pass --cma-token or set CONTENTFUL_MANAGEMENT_TOKEN');
+        return await die('Error: CMA token is required. Pass --cma-token or set CONTENTFUL_MANAGEMENT_TOKEN');
     }
     if (opts.components)
         await assertFileExists('--components', opts.components);
@@ -154,14 +155,14 @@ async function resolveSharedInputs(opts) {
             db.close();
         }
         if (components.length === 0) {
-            die(`Error: session '${opts.session}' has no generated components. Run generate components first.`);
+            return await die(`Error: session '${opts.session}' has no generated components. Run generate components first.`);
         }
     }
     else if (opts.components) {
         const raw = await readJsonFile('--components', opts.components);
         const result = validateCDF(raw);
         if (!result.valid) {
-            die(`Error: --components failed schema validation: ${result.errors.map((e) => e.message).join(', ')}`);
+            return await die(`Error: --components failed schema validation: ${result.errors.map((e) => e.message).join(', ')}`);
         }
         components = result.components;
     }
@@ -213,12 +214,12 @@ export function formatSlotCycleReport(cycles) {
     }
     return lines;
 }
-export function assertNoSlotCycles(components) {
+export async function assertNoSlotCycles(components) {
     const cycles = detectSlotCycles(components);
     if (cycles.length === 0)
         return;
     process.stderr.write(formatSlotCycleReport(cycles).join('\n') + '\n');
-    process.exit(1);
+    await exitWithAnalytics(1);
 }
 export function extractComponentsFromManifest(manifest) {
     const componentsManifest = manifest?.componentsManifest;
@@ -427,18 +428,24 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${formatApiError(e)}`);
+                return await die(`Error: ${formatApiError(e)}`, failureFromApiError(e));
             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();
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${formatApiError(e)}`);
+                return await die(`Error: ${formatApiError(e)}`, failureFromApiError(e));
             const cause = e instanceof Error && e.cause instanceof Error ? e.cause.message : '';
-            die(`Error: unable to connect to API host${cause ? `: ${cause}` : ''}`);
+            return await die(`Error: unable to connect to API host${cause ? `: ${cause}` : ''}`);
         }
         const manifest = buildManifest(components, tokens);
         let preview;
@@ -447,11 +454,10 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${formatApiError(e)}`);
+                return await die(`Error: ${formatApiError(e)}`, failureFromApiError(e));
             throw e;
         }
-        const spaceId = opts.spaceId;
-        const environmentId = opts.environmentId;
+        recordContentfulContext(client, spaceId, environmentId);
         if (getInteractiveTerminalSupport().supported) {
             const { waitUntilExit } = render(createElement(ServerPreviewApp, {
                 preview,
@@ -463,7 +469,7 @@ export function registerApplyCommand(program) {
         }
         else {
             process.stdout.write(JSON.stringify(buildPreviewOutput(preview, spaceId, environmentId), null, 2) + '\n');
-            process.exit(0);
+            await exitWithAnalytics(0);
         }
     });
     const pushCmd = applyCmd.command('push').description('Write component types and design tokens to Contentful ExO');
@@ -480,7 +486,7 @@ export function registerApplyCommand(program) {
         const isTTY = getInteractiveTerminalSupport().supported;
         if (!isTTY && !opts.yes) {
             process.stderr.write('Error: apply push requires --yes in non-interactive mode\n');
-            process.exit(1);
+            await exitWithAnalytics(1);
         }
         let inputs;
         try {
@@ -488,17 +494,23 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${formatApiError(e, opts.verbose)}`);
+                return await die(`Error: ${formatApiError(e, opts.verbose)}`, failureFromApiError(e));
             throw e;
         }
         const { components, tokens, client } = inputs;
-        assertNoSlotCycles(components);
+        const spaceId = opts.spaceId;
+        const environmentId = opts.environmentId;
+        await bindAnalyticsSessionId(opts.session, {
+            space_key: spaceId,
+            environment_key: environmentId,
+        });
+        await assertNoSlotCycles(components);
         try {
             await client.validateToken();
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${formatApiError(e, opts.verbose)}`);
+                return await die(`Error: ${formatApiError(e, opts.verbose)}`, failureFromApiError(e));
             throw e;
         }
         const manifest = buildManifest(components, tokens);
@@ -508,11 +520,10 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${formatApiError(e, opts.verbose)}`);
+                return await die(`Error: ${formatApiError(e, opts.verbose)}`, failureFromApiError(e));
             throw e;
         }
-        const spaceId = opts.spaceId;
-        const environmentId = opts.environmentId;
+        recordContentfulContext(client, spaceId, environmentId);
         if (opts.dryRun) {
             if (isTTY) {
                 const { waitUntilExit } = render(createElement(ServerPreviewApp, {
@@ -526,7 +537,7 @@ export function registerApplyCommand(program) {
             else {
                 process.stdout.write(JSON.stringify(buildPreviewOutput(preview, spaceId, environmentId), null, 2) + '\n');
             }
-            process.exit(0);
+            await exitWithAnalytics(0);
         }
         if (isEmptyPreview(preview)) {
             if (isTTY && !opts.yes) {
@@ -535,14 +546,14 @@ export function registerApplyCommand(program) {
             else {
                 process.stdout.write(JSON.stringify(buildPreviewOutput(preview, spaceId, environmentId), null, 2) + '\n');
             }
-            process.exit(0);
+            await exitWithAnalytics(0);
         }
         const breakingWithImpact = hasBreakingChangesWithImpact(preview);
         if (!isTTY || opts.yes) {
             if (breakingWithImpact && !opts.force) {
                 process.stderr.write('Error: breaking changes with downstream impact detected. Use --force to acknowledge.\n');
                 process.stdout.write(JSON.stringify(buildPreviewOutput(preview, spaceId, environmentId), null, 2) + '\n');
-                process.exit(1);
+                await exitWithAnalytics(1);
             }
             const verbose = opts.verbose ?? false;
             if (verbose) {
@@ -557,7 +568,7 @@ export function registerApplyCommand(program) {
             }
             catch (e) {
                 if (e instanceof ApiError)
-                    die(`Error: ${formatApiError(e, opts.verbose)}`);
+                    return await die(`Error: ${formatApiError(e, opts.verbose)}`, failureFromApiError(e));
                 throw e;
             }
             process.stderr.write(`Apply operation started: ${operation.sys.id}\n`);
@@ -566,12 +577,14 @@ export function registerApplyCommand(program) {
             }
             catch (e) {
                 if (e instanceof ApiError)
-                    die(`Error: ${formatApiError(e, opts.verbose)}`);
+                    return await die(`Error: ${formatApiError(e, opts.verbose)}`, failureFromApiError(e));
                 throw e;
             }
             const summary = buildApplyOutput(operation, spaceId, environmentId, opts.host);
+            recordApplyOutcome(client, spaceId, environmentId, operation);
             process.stdout.write(JSON.stringify(summary, null, 2) + '\n');
-            process.exit(operation.sys.status === 'succeeded' ? 0 : 1);
+            const exitCode = operation.sys.status === 'succeeded' ? 0 : 1;
+            await exitWithAnalytics(exitCode);
             return;
         }
         await new Promise((resolvePromise) => {
@@ -621,6 +634,7 @@ export function registerApplyCommand(program) {
                     }
                     throw e;
                 }
+                recordApplyOutcome(client, spaceId, environmentId, operation);
                 instance.rerender(createElement(ServerApplyDone, {
                     operation,
                     spaceId,
@@ -639,7 +653,7 @@ export function registerApplyCommand(program) {
                     void runApply(acknowledge, applyDeletions);
                 },
                 onCancel: () => {
-                    process.exit(0);
+                    void exitWithAnalytics(0);
                 },
             }));
             void instance.waitUntilExit().then(() => resolvePromise());
@@ -664,17 +678,17 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${formatApiError(e)}`);
+                return await die(`Error: ${formatApiError(e)}`, failureFromApiError(e));
             throw e;
         }
         const { components, tokens, client } = inputs;
-        assertNoSlotCycles(components);
+        await assertNoSlotCycles(components);
         try {
             await client.validateToken();
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${formatApiError(e)}`);
+                return await die(`Error: ${formatApiError(e)}`, failureFromApiError(e));
             throw e;
         }
         const fullManifest = buildManifest(components, tokens);
@@ -684,21 +698,26 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${formatApiError(e)}`);
+                return await die(`Error: ${formatApiError(e)}`, failureFromApiError(e));
             throw e;
         }
         const spaceId = opts.spaceId;
         const environmentId = opts.environmentId;
+        await bindAnalyticsSessionId(opts.session, {
+            space_key: spaceId,
+            environment_key: environmentId,
+        });
+        recordContentfulContext(client, spaceId, environmentId);
         const entities = getSelectableEntities(preview);
         if (entities.length === 0) {
             process.stderr.write('Nothing to change — design system is up to date.\n');
-            process.exit(0);
+            await exitWithAnalytics(0);
         }
         if (nonInteractive) {
             const selectedKeys = resolveNonInteractiveSelection(entities, opts);
             if (selectedKeys.size === 0) {
                 process.stderr.write('No entities matched selection criteria.\n');
-                process.exit(0);
+                await exitWithAnalytics(0);
             }
             const selectedComponentKeys = new Set();
             const selectedTokenPaths = new Set();
@@ -714,7 +733,7 @@ export function registerApplyCommand(program) {
             const hasBreaking = entities.some((e) => e.isBreaking && selectedKeys.has(makeSelectKey(e.kind, e.id)));
             if (hasBreaking && !opts.force) {
                 process.stderr.write('Error: selection includes breaking changes. Use --force to acknowledge.\n');
-                process.exit(1);
+                await exitWithAnalytics(1);
             }
             let operation;
             try {
@@ -725,7 +744,7 @@ export function registerApplyCommand(program) {
             }
             catch (e) {
                 if (e instanceof ApiError)
-                    die(`Error: ${formatApiError(e)}`);
+                    return await die(`Error: ${formatApiError(e)}`, failureFromApiError(e));
                 throw e;
             }
             process.stderr.write(`Apply operation started: ${operation.sys.id}\n`);
@@ -734,12 +753,13 @@ export function registerApplyCommand(program) {
             }
             catch (e) {
                 if (e instanceof ApiError)
-                    die(`Error: ${formatApiError(e)}`);
+                    return await die(`Error: ${formatApiError(e)}`, failureFromApiError(e));
                 throw e;
             }
             const summary = buildApplyOutput(operation, spaceId, environmentId, opts.host);
+            recordApplyOutcome(client, spaceId, environmentId, operation);
             process.stdout.write(JSON.stringify(summary, null, 2) + '\n');
-            process.exit(operation.sys.status === 'succeeded' ? 0 : 1);
+            await exitWithAnalytics(operation.sys.status === 'succeeded' ? 0 : 1);
             return;
         }
         await new Promise((resolvePromise) => {
@@ -801,6 +821,7 @@ export function registerApplyCommand(program) {
                     }
                     throw e;
                 }
+                recordApplyOutcome(client, spaceId, environmentId, operation);
                 instance.rerender(createElement(ServerApplyDone, {
                     operation,
                     spaceId,

package/dist/src/generate/command.js

@@ -14,6 +14,7 @@ import { hashPromptForSkill } from '../session/cache-keys.js';
 import { getRefineArtifactsRoot, getRefineSessionPaths } from '../analyze/select/persistence.js';
 import { readExperiencesCredentials } from '../credentials-store.js';
 import { addAgentModelOptions } from '../lib/agent-model-options.js';
+import { bindAnalyticsSessionId, exitWithAnalytics } from '../analytics/index.js';
 const execFileAsync = promisify(execFile);
 const DEFAULT_TIMEOUT_MS = Number(process.env.EDS_AGENT_TIMEOUT_MS ?? 3 * 60 * 1000);
 const DEFAULT_COMPONENT_CONCURRENCY = 10;
@@ -23,7 +24,8 @@ const invoker = createLocalCliAgentInvoker({
 });
 function die(message) {
     process.stderr.write(`${message}\n`);
-    process.exit(1);
+    void exitWithAnalytics(1);
+    throw new Error('exit');
 }
 async function pathExists(p) {
     return access(p)
@@ -276,7 +278,8 @@ 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);
+            void exitWithAnalytics(1);
+            throw new Error('exit');
         }
         return row.id;
     }
@@ -340,6 +343,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     let allComponents;
     if (skill === 'components') {
         sessionId = resolveSessionId(opts.session);
+        await bindAnalyticsSessionId(sessionId);
         const acceptedNames = await loadAcceptedNames(sessionId);
         const db = openPipelineDb();
         try {
@@ -396,7 +400,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
             skillPathOverride: generatePromptPath,
         });
         process.stdout.write(prompt + '\n');
-        process.exit(0);
+        await exitWithAnalytics(0);
     }
     const binary = resolveBinary(agent);
     if (!(await assertBinaryInPath(binary))) {
@@ -405,7 +409,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
             skill,
             sessionId: sessionId ?? '',
         });
-        process.exit(1);
+        await exitWithAnalytics(1);
     }
     if (skill === 'components' && allComponents && sessionId) {
         const db = openPipelineDb();
@@ -471,6 +475,8 @@ async function runGenerateSkill(skill, opts, verbose = false) {
                     resolvedSessionId = newId;
                 }
             }
+            sessionId = resolvedSessionId;
+            await bindAnalyticsSessionId(resolvedSessionId);
             const tokenPromptHash = await hashPromptForSkill('tokens');
             // Check cache before invoking agent
             if (!noCache) {
@@ -483,12 +489,12 @@ async function runGenerateSkill(skill, opts, verbose = false) {
                     // Skip agent invocation — jump to view
                     const viewResult = { skill, agent, sessionId: sessionId ?? '' };
                     if (process.stdout.isTTY) {
-                        const { waitUntilExit } = render(createElement(GenerateView, { result: viewResult, onExit: () => process.exit(0) }));
+                        const { waitUntilExit } = render(createElement(GenerateView, { result: viewResult, onExit: () => void exitWithAnalytics(0) }));
                         await waitUntilExit();
                     }
                     else {
                         process.stdout.write(`generate complete\nskill: ${skill}\nagent: ${agent}\nsession=${sessionId ?? ''}\n`);
-                        process.exit(0);
+                        await exitWithAnalytics(0);
                     }
                     return;
                 }
@@ -523,7 +529,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
                 process.stderr.write(`Error: agent produced no set_token calls.\n` +
                     `Run with --dry-run to inspect the prompt.\n\n` +
                     `Agent output:\n${result.stdout}\n`);
-                process.exit(1);
+                await exitWithAnalytics(1);
             }
             if (tokenWarnings.length > 0) {
                 process.stderr.write(`Warnings:\n${tokenWarnings.map((w) => `  ${w}`).join('\n')}\n`);
@@ -548,13 +554,13 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     if (process.stdout.isTTY) {
         const { waitUntilExit } = render(createElement(GenerateView, {
             result: viewResult,
-            onExit: () => process.exit(0),
+            onExit: () => void exitWithAnalytics(0),
         }));
         await waitUntilExit();
     }
     else {
         process.stdout.write(`generate complete\nskill: ${skill}\nagent: ${agent}\nsession=${sessionId ?? ''}\n`);
-        process.exit(0);
+        await exitWithAnalytics(0);
     }
 }
 function addAgentFlags(cmd) {

package/dist/src/generate/edit/command.js

@@ -99,6 +99,7 @@ async function runNonInteractive(opts, skill) {
     process.stderr.write(`Accepted: ${accepted.length}  Rejected: ${rejected.length}\n`);
 }
 export function registerGenerateEditCommand(parent, skill) {
+    // TODO(analytics): bindAnalyticsSessionId when generate edit ships — tracked in schema as generate_edit.
     parent
         .command('edit')
         .description(`Review and correct generate ${skill} output before pushing`)