@contentful/experience-design-system-cli 2.18.1-dev-build-0f85b83.0 → 2.18.1-dev-build-83cbc0a.0

package/README.md

@@ -214,7 +214,6 @@ 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
@@ -419,7 +418,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`, `--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.
+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`.
 
 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.
 

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.18.1-dev-build-0f85b83.0",
+  "version": "2.18.1-dev-build-83cbc0a.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -25,7 +25,6 @@
   "files": [
     "bin/",
     "dist/",
-    "skills/",
     "prompts/"
   ],
   "scripts": {
@@ -40,6 +39,7 @@
   "dependencies": {
     "@contentful/experience-design-system-client": "workspace:*",
     "@contentful/experience-design-system-extraction": "workspace:*",
+    "@contentful/experience-design-system-generation": "workspace:*",
     "@contentful/experience-design-system-types": "workspace:*",
     "commander": "^13.1.0",
     "ink": "^4.4.1",
@@ -48,7 +48,7 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@tsconfig/node24": "^24.0.3",
+    "@tsconfig/node24": "^24.0.4",
     "@types/node": "^24.0.3",
     "@types/react": "^18.3.24",
     "eslint": "^9.39.2",

package/dist/src/analyze/command.js

@@ -19,11 +19,11 @@ import { buildCompositionInputHash } from './composition/composition-cache-key.j
 import { runParserInSandbox } from './composition/agent-parser/sandbox.js';
 import { resolveViaAgentParser } from './composition/agent-parser/resolve-via-parser.js';
 import { parsePromptOverrides, resolvePromptOverride } from '../lib/prompt-overrides.js';
-import { DEFAULT_AGENT_NAME, isAgentName } from '../lib/agent-names.js';
-import { runAgent } from '../generate/agent-runner.js';
+import { DEFAULT_AGENT_NAME, isAgentName, runAgent, } from '@contentful/experience-design-system-generation';
 import { readExperiencesCredentials } from '../credentials-store.js';
 import { buildAnalyzeViewRows, partitionGlobalWarnings } from './build-analyze-view-rows.js';
 import { getInteractiveTerminalSupport } from '../lib/terminal-capabilities.js';
+import { getDebugLogger } from '../lib/debug-logger.js';
 const SCANNED_FILE_EXTENSIONS = new Set(['.astro', '.js', '.jsx', '.svelte', '.ts', '.tsx', '.vue']);
 const IGNORED_DIRECTORY_NAMES = new Set([
     '.git',
@@ -351,9 +351,9 @@ export function registerAnalyzeCommand(program) {
                     const res = await runAgent({
                         agent: resolverAgent,
                         prompt,
-                        interactive: false,
                         timeoutMs: 120_000,
                         promptViaStdin: true,
+                        onDebugEvent: (name, payload) => getDebugLogger().event('agent', name, payload),
                     });
                     lastAgentExitCode = res.exitCode;
                     if (res.exitCode !== 0 && res.stderr.trim()) {

package/dist/src/analyze/composition/parse-map-edges.d.ts

@@ -2,7 +2,7 @@ import type { CompositionEdge } from './interchange-schema.js';
 /**
  * Lenient JSONL parser for the composition-mapping agent's tool-call output
  * (spec T4). Mirrors `parseSelectToolCallLines` / `parseToolCallLines` in
- * `src/generate/agent-runner.ts`: one JSON object per line, each with a `tool`
+ * `@contentful/experience-design-system-generation`'s `agent-runner.ts`: one JSON object per line, each with a `tool`
  * field from a fixed allowlist. A line that fails JSON.parse or validation is
  * DROPPED into `warnings[]` (with a reason) and parsing CONTINUES — no retry,
  * no throw. Non-`{` prose and blank lines are skipped silently.

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

@@ -3,19 +3,21 @@ import { openPipelineDb, loadRawComponents, loadScannedFiles, createStep, update
 import { hashPromptForSkill } from '../../session/cache-keys.js';
 import { appendReviewEvent, getRefineArtifactsRoot, ensureRefineSession, getRefineSessionPaths, saveReviewState, } from '../select/persistence.js';
 import { loadReviewInput } from '../select/parser.js';
-import { buildPrompt } from '../../generate/prompt-builder.js';
-import { formatCustomPromptBanner } from '../../generate/command.js';
-import { AGENT_NAMES, isAgentName, parseSelectToolCallLines, runAgent } from '../../generate/agent-runner.js';
+import { AGENT_NAMES, buildPrompt, createLocalCliAgentInvoker, formatCustomPromptBanner, isAgentName, parseSelectToolCallLines, } from '@contentful/experience-design-system-generation';
 import { access } from 'node:fs/promises';
 import { readExperiencesCredentials } from '../../credentials-store.js';
 import { OutputFormatter, c } from '../../output/format.js';
 import { buildRepoContextIndex, buildSelectionContext } from './context-builder.js';
 import { runShowRationale } from './show-rationale.js';
 import { isAbsolute, resolve } from 'node:path';
+import { getDebugLogger } from '../../lib/debug-logger.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;
 export const DEFAULT_BATCH_SIZE = 5;
+const invoker = createLocalCliAgentInvoker({
+    onDebugEvent: (name, payload) => getDebugLogger().event('agent', name, payload),
+});
 function resolveBatchSize() {
     const raw = process.env.EDS_SELECT_BATCH_SIZE;
     if (!raw)
@@ -109,11 +111,10 @@ async function selectBatch(agent, model, batch, total, verbose, skillPathOverrid
     const formatter = new OutputFormatter(verbose, (s) => {
         outputBuf += s;
     });
-    const result = await runAgent({
+    const result = await invoker.invoke({
         agent,
         model,
         prompt,
-        interactive: false,
         timeoutMs: DEFAULT_TIMEOUT_MS,
         onOutput: (chunk) => formatter.push(chunk),
     });

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

@@ -50,11 +50,8 @@ export declare class ImportApiClient {
     private headers;
     private requestWithRetry;
     validateToken(): 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

@@ -268,20 +268,19 @@ export class ImportApiClient {
             throw new ApiError(`unexpected error validating token: ${res.status}`, res.status, await res.text());
         }
     }
-    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) {
@@ -297,14 +296,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 {
@@ -312,7 +309,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.js

@@ -12,7 +12,7 @@ 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 { addAllowDeletionsOption, addArtifactInputOptions, addCompositionOptions, addContentfulTargetOptions, addSelectionOptions, } from '../lib/command-options.js';
+import { 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';
@@ -457,7 +457,6 @@ export function registerApplyCommand(program) {
                 preview,
                 spaceId,
                 environmentId,
-                allowDeletions: false,
             }));
             await waitUntilExit();
         }
@@ -470,7 +469,6 @@ 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')
@@ -504,7 +502,7 @@ export function registerApplyCommand(program) {
         const manifest = buildManifest(components, tokens);
         let preview;
         try {
-            preview = await client.previewImport(manifest, opts.allowDeletions === true);
+            preview = await client.previewImport(manifest);
         }
         catch (e) {
             if (e instanceof ApiError)
@@ -519,7 +517,6 @@ export function registerApplyCommand(program) {
                     preview,
                     spaceId,
                     environmentId,
-                    allowDeletions: opts.allowDeletions === true,
                 }));
                 await waitUntilExit();
             }
@@ -550,10 +547,7 @@ export function registerApplyCommand(program) {
             }
             let operation;
             try {
-                operation = await client.applyImport(manifest, {
-                    acknowledgeBreakingChanges: breakingWithImpact || opts.force === true,
-                    allowDeletions: opts.allowDeletions === true,
-                });
+                operation = await client.applyImport(manifest, breakingWithImpact || opts.force === true);
             }
             catch (e) {
                 if (e instanceof ApiError)
@@ -575,7 +569,7 @@ export function registerApplyCommand(program) {
             return;
         }
         await new Promise((resolvePromise) => {
-            const runApply = async (acknowledge, applyDeletions) => {
+            const runApply = async (acknowledge) => {
                 instance.rerender(createElement(ServerApplyProgress, {
                     spaceId,
                     environmentId,
@@ -583,10 +577,7 @@ export function registerApplyCommand(program) {
                 }));
                 let operation;
                 try {
-                    operation = await client.applyImport(manifest, {
-                        acknowledgeBreakingChanges: acknowledge,
-                        allowDeletions: applyDeletions,
-                    });
+                    operation = await client.applyImport(manifest, acknowledge);
                 }
                 catch (e) {
                     if (e instanceof ApiError) {
@@ -634,9 +625,8 @@ export function registerApplyCommand(program) {
                 spaceId,
                 environmentId,
                 breakingWithImpact,
-                allowDeletions: opts.allowDeletions === true,
-                onConfirm: (acknowledge, applyDeletions) => {
-                    void runApply(acknowledge, applyDeletions);
+                onConfirm: (acknowledge) => {
+                    void runApply(acknowledge);
                 },
                 onCancel: () => {
                     process.exit(0);
@@ -650,7 +640,6 @@ 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) {
@@ -680,7 +669,7 @@ export function registerApplyCommand(program) {
         const fullManifest = buildManifest(components, tokens);
         let preview;
         try {
-            preview = await client.previewImport(fullManifest, opts.allowDeletions === true);
+            preview = await client.previewImport(fullManifest);
         }
         catch (e) {
             if (e instanceof ApiError)
@@ -718,10 +707,7 @@ export function registerApplyCommand(program) {
             }
             let operation;
             try {
-                operation = await client.applyImport(filteredManifest, {
-                    acknowledgeBreakingChanges: hasBreaking || opts.force === true,
-                    allowDeletions: opts.allowDeletions === true,
-                });
+                operation = await client.applyImport(filteredManifest, hasBreaking || opts.force === true);
             }
             catch (e) {
                 if (e instanceof ApiError)
@@ -763,10 +749,7 @@ export function registerApplyCommand(program) {
                 }));
                 let operation;
                 try {
-                    operation = await client.applyImport(filteredManifest, {
-                        acknowledgeBreakingChanges: hasBreaking,
-                        allowDeletions: opts.allowDeletions === true,
-                    });
+                    operation = await client.applyImport(filteredManifest, hasBreaking);
                 }
                 catch (e) {
                     if (e instanceof ApiError) {

package/dist/src/apply/preview-utils.d.ts

@@ -7,10 +7,6 @@ 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. 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.
+ * removes a server-side component — is NOT empty.
  */
 export declare function isEmptyPreview(preview: ServerPreviewResponse): boolean;

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

@@ -6,11 +6,7 @@
  *     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. 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.
+ * removes a server-side component — is NOT empty.
  */
 export function isEmptyPreview(preview) {
     const { components, tokens, taxonomies } = preview;

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

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

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

@@ -1,32 +1,23 @@
 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, allowDeletions: fetchedAllowDeletions, onConfirm, onCancel, }) {
-    const [allowDeletions, setAllowDeletions] = useState(fetchedAllowDeletions);
-    const removedCount = preview.components.removed.length + preview.tokens.removed.length;
+export function ServerPreviewConfirm({ preview, spaceId, environmentId, breakingWithImpact, onConfirm, onCancel, }) {
     useInput((input, key) => {
-        if (key.return) {
-            onConfirm(breakingWithImpact, allowDeletions);
-            return;
-        }
-        if ((input === 'x' || input === 'X') && fetchedAllowDeletions && removedCount > 0) {
-            setAllowDeletions((prev) => !prev);
-            return;
-        }
+        if (key.return)
+            onConfirm(breakingWithImpact);
         if (key.escape || input === 'q')
             onCancel();
     });
-    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 ? '[✓]' : '[ ]', " Also delete ", removedCount, " ", removedCount === 1 ? 'entity' : 'entities'] })), _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 }), _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"] })] })] }));
 }
-export function ServerPreviewApp({ preview, spaceId, environmentId, allowDeletions, }) {
+export function ServerPreviewApp({ preview, spaceId, environmentId }) {
     useInput((input, key) => {
         if (key.escape || input === 'q')
             process.exit(0);
     });
-    return (_jsx(ServerPreviewView, { preview: preview, spaceId: spaceId, environmentId: environmentId, allowDeletions: allowDeletions }));
+    return _jsx(ServerPreviewView, { preview: preview, spaceId: spaceId, environmentId: environmentId });
 }
 export function ServerApplyProgress({ spaceId, environmentId, status, operationId, error, }) {
     useInput((_input, key) => {

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

@@ -4,7 +4,6 @@ interface ServerPreviewViewProps {
     preview: ServerPreviewResponse;
     spaceId: string;
     environmentId: string;
-    allowDeletions: boolean;
 }
-export declare function ServerPreviewView({ preview, spaceId, environmentId, allowDeletions, }: ServerPreviewViewProps): React.ReactElement;
+export declare function ServerPreviewView({ preview, spaceId, environmentId }: 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, allowDeletions, }) {
+export function ServerPreviewView({ preview, spaceId, environmentId }) {
     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: 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
+    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
                         .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: " " })] })), !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." })] }));
+                        .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." })] }));
 }

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

@@ -1,8 +1,2 @@
 import type { Command } from 'commander';
-/**
- * Feature 8: render the warning banner shown when a custom skill prompt is
- * active. Always cites the bundled invariants that the override bypasses so
- * the operator cannot miss it.
- */
-export declare function formatCustomPromptBanner(skill: 'components' | 'select', path: string): string;
 export declare function registerGenerateCommand(program: Command): void;

package/dist/src/generate/command.js

@@ -4,10 +4,9 @@ import { access, readFile, readdir, stat } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
-import { AGENT_NAMES, describeAgentFailure, isAgentName, parseToolCallLines, parseTokenToolCallLines, resolveBinary, runAgent, } from './agent-runner.js';
+import { AGENT_NAMES, createLocalCliAgentInvoker, describeAgentFailure, formatCustomPromptBanner, formatGenerateProgressLine, isAgentName, parseToolCallLines, parseTokenToolCallLines, resolveBinary, resolveSkillPath, buildPrompt, } from '@contentful/experience-design-system-generation';
 import { OutputFormatter, c } from '../output/format.js';
-import { formatGenerateProgressLine } from './progress.js';
-import { buildPrompt, resolveSkillPath } from './prompt-builder.js';
+import { getDebugLogger } from '../lib/debug-logger.js';
 import { GenerateView } from './tui/GenerateView.js';
 import { registerGenerateEditCommand } from './edit/command.js';
 import { openPipelineDb, loadRawComponents, applyToolCalls, applyTokenToolCalls, computeComponentInputHash, computeTokenInputHash, lookupCache, lookupCacheByEntity, storeCache, copyComponentFromCache, copyTokensFromCache, renameEmptySlots, } from '../session/db.js';
@@ -19,16 +18,9 @@ const execFileAsync = promisify(execFile);
 const DEFAULT_TIMEOUT_MS = Number(process.env.EDS_AGENT_TIMEOUT_MS ?? 3 * 60 * 1000);
 const DEFAULT_COMPONENT_CONCURRENCY = 10;
 const RETRY_BACKOFF_MS = Number(process.env.EDS_RETRY_BACKOFF_MS ?? 5_000);
-/**
- * Feature 8: render the warning banner shown when a custom skill prompt is
- * active. Always cites the bundled invariants that the override bypasses so
- * the operator cannot miss it.
- */
-export function formatCustomPromptBanner(skill, path) {
-    return (`WARNING: Custom prompt active for ${skill}: ${path}\n` +
-        `  Bundled invariants (utility-wrapper rejection, description content rules) do NOT apply.\n` +
-        `  You are responsible for the prompt's correctness.\n`);
-}
+const invoker = createLocalCliAgentInvoker({
+    onDebugEvent: (name, payload) => getDebugLogger().event('agent', name, payload),
+});
 function die(message) {
     process.stderr.write(`${message}\n`);
     process.exit(1);
@@ -191,11 +183,10 @@ async function runOneComponent(agent, model, db, sessionId, component, tokensInl
         const formatter = new OutputFormatter(verbose, (s) => {
             outputBuf += s;
         });
-        const result = await runAgent({
+        const result = await invoker.invoke({
             agent,
             model,
             prompt,
-            interactive: false,
             timeoutMs: DEFAULT_TIMEOUT_MS,
             onOutput: (chunk) => formatter.push(chunk),
         });
@@ -512,11 +503,10 @@ async function runGenerateSkill(skill, opts, verbose = false) {
                 tokenMapInline,
                 outDir: process.cwd(),
             });
-            const result = await runAgent({
+            const result = await invoker.invoke({
                 agent,
                 model,
                 prompt,
-                interactive: false,
                 timeoutMs: DEFAULT_TIMEOUT_MS * 5,
             });
             if (result.timedOut) {

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 { addAllowDeletionsOption, addCompositionOptions } from '../lib/command-options.js';
+import { 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,7 +46,6 @@ 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)')
@@ -137,7 +136,6 @@ export function registerImportCommand(program) {
                     ...(opts.host ? { host: opts.host } : {}),
                     interactive: interactiveTerminalSupported,
                     ...(opts.force ? { force: true } : {}),
-                    ...(opts.allowDeletions ? { allowDeletions: true } : {}),
                 });
                 return;
             }
@@ -168,7 +166,6 @@ export function registerImportCommand(program) {
                     ...(opts.saveAsNew ? { saveAsNew: true } : {}),
                     ...(opts.outDir ? { outDir: opts.outDir } : {}),
                     ...(opts.force ? { force: true } : {}),
-                    ...(opts.allowDeletions ? { allowDeletions: true } : {}),
                 });
                 return;
             }
@@ -300,7 +297,6 @@ 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;
@@ -361,7 +357,6 @@ 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,7 +26,6 @@ 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

@@ -418,8 +418,6 @@ 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,6 +66,5 @@ 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, allowDeletions, }?: 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, }?: WizardAppProps): React.ReactElement;