@contentful/experience-design-system-cli 2.18.1-dev-build-b4ecc99.0 → 2.18.1-dev-build-180092e.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.18.1-dev-build-b4ecc99.0",
+  "version": "2.18.1-dev-build-180092e.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",
@@ -51,11 +51,11 @@
     "@tsconfig/node24": "^24.0.3",
     "@types/node": "^24.0.3",
     "@types/react": "^18.3.24",
-    "eslint": "^9.39.5",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.6",
+    "eslint-plugin-prettier": "^5.5.4",
     "ink-testing-library": "^4.0.0",
-    "typescript-eslint": "^8.66.0",
+    "typescript-eslint": "^8.52.0",
     "vitest": "^4.0.16"
   },
   "repository": {

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-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/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/tui/WizardApp.js

@@ -50,7 +50,7 @@ import { mergeAiDecisions } from './merge-ai-decisions.js';
 import { FinalReviewHost } from './final-review-host.js';
 import { runScopeGate } from './runScopeGate.js';
 import { buildAutoFilterErrorTail } from './auto-filter-error.js';
-import { checkAgentAuth } from '../../generate/agent-runner.js';
+import { checkAgentAuth } from '@contentful/experience-design-system-generation';
 import { normalizePath } from '../path-utils.js';
 import { DEFAULT_CONFIGURED_HOST, toConfiguredHost } from '../../host-utils.js';
 import { writeExperiencesCredentials } from '../../credentials-store.js';

package/dist/src/lib/agent-model-options.js

@@ -1,4 +1,4 @@
-import { AGENT_NAMES } from './agent-names.js';
+import { AGENT_NAMES } from '@contentful/experience-design-system-generation';
 export const AGENT_DESCRIPTION = `Agent to use: ${AGENT_NAMES.join(', ')} (defaults to value saved by experiences setup)`;
 export const MODEL_DESCRIPTION = 'Model to use (defaults to a lightweight per-agent model; override with EDS_AGENT_MODEL_<AGENT>)';
 /**

package/dist/src/session/cache-keys.d.ts

@@ -1,4 +1,4 @@
-import { type Skill } from '../generate/prompt-builder.js';
+import { type Skill } from '@contentful/experience-design-system-generation';
 /** sha256 hex of a string. Stable across runs. */
 export declare function hashContent(content: string): string;
 /** sha256 hex of a file's UTF-8 content. */

package/dist/src/session/cache-keys.js

@@ -10,7 +10,7 @@
 import { createHash } from 'node:crypto';
 import { readFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
-import { resolveSkillPath } from '../generate/prompt-builder.js';
+import { resolveSkillPath } from '@contentful/experience-design-system-generation';
 /** sha256 hex of a string. Stable across runs. */
 export function hashContent(content) {
     return createHash('sha256').update(content).digest('hex');

package/dist/src/session/db.d.ts

@@ -1,7 +1,7 @@
 import { DatabaseSync } from 'node:sqlite';
 import type { RawComponentDefinition } from '../types.js';
 import type { CDFComponentEntry, DTCGTokenEntry, DTCGTokenGroup } from '@contentful/experience-design-system-types';
-import type { ToolCall, TokenToolCall } from '../generate/agent-runner.js';
+import type { ToolCall, TokenToolCall } from '@contentful/experience-design-system-generation';
 import type { ComponentTypeSummary } from '@contentful/experience-design-system-types';
 import type { SlotCycle, SlotEdge } from '../analyze/cycle-detection.js';
 export type StepStatus = 'pending' | 'complete' | 'failed' | 'interrupted';

package/dist/src/session/db.js

@@ -1433,7 +1433,7 @@ export async function getCliCacheVersion() {
         return _cliCacheVersionCache;
     try {
         const { hashContent } = await import('./cache-keys.js');
-        const { resolveSkillPath } = await import('../generate/prompt-builder.js');
+        const { resolveSkillPath } = await import('@contentful/experience-design-system-generation');
         const skills = ['components', 'tokens', 'select'];
         const parts = [];
         for (const s of skills) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.18.1-dev-build-b4ecc99.0",
+  "version": "2.18.1-dev-build-180092e.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -25,7 +25,6 @@
   "files": [
     "bin/",
     "dist/",
-    "skills/",
     "prompts/"
   ],
   "dependencies": {
@@ -34,19 +33,20 @@
     "react": "^18.3.1",
     "react-devtools-core": "^4.19.1",
     "react-dom": "^18.3.1",
-    "@contentful/experience-design-system-client": "2.18.1-dev-build-b4ecc99.0",
-    "@contentful/experience-design-system-extraction": "2.18.1-dev-build-b4ecc99.0",
-    "@contentful/experience-design-system-types": "2.18.1-dev-build-b4ecc99.0"
+    "@contentful/experience-design-system-generation": "2.18.1-dev-build-180092e.0",
+    "@contentful/experience-design-system-extraction": "2.18.1-dev-build-180092e.0",
+    "@contentful/experience-design-system-types": "2.18.1-dev-build-180092e.0",
+    "@contentful/experience-design-system-client": "2.18.1-dev-build-180092e.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.3",
     "@types/node": "^24.0.3",
     "@types/react": "^18.3.24",
-    "eslint": "^9.39.5",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.6",
+    "eslint-plugin-prettier": "^5.5.4",
     "ink-testing-library": "^4.0.0",
-    "typescript-eslint": "^8.66.0",
+    "typescript-eslint": "^8.52.0",
     "vitest": "^4.0.16"
   },
   "repository": {

package/dist/src/generate/agent-runner.d.ts

@@ -1,125 +0,0 @@
-import type { AgentName } from '../lib/agent-names.js';
-export { AGENT_NAMES, isAgentName, type AgentName } from '../lib/agent-names.js';
-export interface AgentRunResult {
-    exitCode: number;
-    stdout: string;
-    stderr: string;
-    timedOut: boolean;
-}
-export interface ClassifyPropCall {
-    tool: 'classify_prop';
-    prop: string;
-    cdf_type: string;
-    cdf_category: 'content' | 'design' | 'state';
-    values?: string[];
-    token_kind?: string;
-    required?: boolean;
-    description?: string;
-    default?: string | boolean;
-    /** Internal LLM rationale; not customer-facing. Persisted to raw_props.rationale. */
-    reason?: string;
-}
-export interface ExcludePropCall {
-    tool: 'exclude_prop';
-    prop: string;
-    reason: string;
-}
-export interface ClassifyComponentCall {
-    tool: 'classify_component';
-    description?: string;
-    /**
-     * Component-level rationale strings. Surfaced by the `I` ComponentRationalePanel.
-     * Each field is optional; missing fields leave existing DB values untouched
-     * (sparse update semantics in applyToolCalls).
-     */
-    rationale?: {
-        description?: string;
-        props?: string;
-        slots?: string;
-    };
-}
-export interface ClassifySlotCall {
-    tool: 'classify_slot';
-    slot: string;
-    required?: boolean;
-    allowed_components?: string[];
-    description?: string;
-    /** Per-slot rationale; persisted to raw_slots.rationale. */
-    rationale?: string;
-}
-export type ToolCall = ClassifyPropCall | ExcludePropCall | ClassifyComponentCall | ClassifySlotCall;
-export interface SelectComponentCall {
-    tool: 'select_component';
-    name: string;
-    reason?: string;
-    confidence?: number;
-}
-export interface RejectComponentCall {
-    tool: 'reject_component';
-    name: string;
-    reason?: string;
-    confidence?: number;
-}
-export type SelectToolCall = SelectComponentCall | RejectComponentCall;
-export interface ParsedSelectToolCalls {
-    calls: SelectToolCall[];
-    warnings: string[];
-}
-export declare function parseSelectToolCallLines(stdout: string): ParsedSelectToolCalls;
-export interface SetTokenCall {
-    tool: 'set_token';
-    path: string;
-    type: string;
-    value: unknown;
-    description?: string;
-}
-export interface SetGroupCall {
-    tool: 'set_group';
-    path: string;
-    description?: string;
-}
-export type TokenToolCall = SetTokenCall | SetGroupCall;
-export interface ParsedTokenToolCalls {
-    calls: TokenToolCall[];
-    warnings: string[];
-}
-export interface ParsedToolCalls {
-    calls: ToolCall[];
-    warnings: string[];
-}
-export declare function parseToolCallLines(stdout: string): ParsedToolCalls;
-export declare function parseTokenToolCallLines(stdout: string): ParsedTokenToolCalls;
-export declare function resolveBinary(agent: AgentName): string;
-/**
- * Resolve the model for an agent. Explicit flag/creds value wins, then a
- * per-agent `EDS_AGENT_MODEL_<AGENT>` env override (mirrors the
- * `EDS_AGENT_BINARY_<AGENT>` pattern), otherwise the lightweight default for
- * that agent.
- */
-export declare function resolveAgentModel(agent: AgentName, explicit?: string): string;
-export declare function buildArgs(agent: AgentName, prompt: string, model?: string, promptViaStdin?: boolean): string[];
-export declare function runAgent(options: {
-    agent: AgentName;
-    prompt: string;
-    interactive: boolean;
-    timeoutMs: number;
-    model?: string;
-    onOutput?: (chunk: string) => void;
-    /**
-     * Deliver the prompt on stdin instead of as an argv positional. Required for
-     * large prompts (e.g. the composition resolver inlining candidate files),
-     * which overflow ARG_MAX when passed as an argument. Non-interactive only.
-     */
-    promptViaStdin?: boolean;
-}): Promise<AgentRunResult>;
-export type AgentAuthStatus = 'ok' | 'unauthenticated' | 'not-found';
-export declare function checkAgentAuth(agent: AgentName): Promise<AgentAuthStatus>;
-/**
- * Build a diagnostic string from a failed agent run, surfacing the agent's own
- * stderr (or stdout, when stderr is empty) so callers never emit a context-free
- * "agent failed". Callers only invoke this on a failed run: either a non-zero
- * exit, or a zero exit that produced no tool calls. A non-zero exit is reported
- * as such; a zero exit is therefore the "produced no tool calls" case.
- */
-export declare function describeAgentFailure(result: AgentRunResult, maxDetail?: number): string;
-export declare function extractSentinelOutput(stdout: string): string | null | 'multiple';