@contentful/experience-design-system-cli 2.15.1-dev-build-074e179.0 → 2.15.1-dev-build-b11e821.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.15.1-dev-build-074e179.0",
+  "version": "2.15.1-dev-build-b11e821.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

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

@@ -306,7 +306,7 @@ export function registerAnalyzeSelectAgentCommand(program) {
         .option('--session <id>', 'Session ID from analyze extract (defaults to most recent)')
         .option('--project-root <path>', 'Project root for resolving component source files')
         .option('--agent <name>', 'Agent to use: claude, codex, opencode, cursor (defaults to value saved by experiences setup)')
-        .option('--model <name>', 'Model to use (defaults to a small/fast model per agent)')
+        .option('--model <name>', 'Model to use (defaults to a cheap per-agent model; override with --model or EDS_AGENT_MODEL_<AGENT>)')
         .option('--verbose', 'Show full agent output including reasoning text')
         .option('--dry-run', 'Print the prompt for the first component without invoking the agent')
         .option('--exclude-invalid', 'Auto-reject components with validation errors instead of failing loud (LLM cannot fix structural issues)')

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

@@ -89,6 +89,14 @@ export interface ParsedToolCalls {
 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 cheap 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;
@@ -105,4 +113,11 @@ export declare function runAgent(options: {
 }): 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" (AIS-392 B1). `exitCode === 0` with no output is treated as the
+ * "produced no tool calls" case.
+ */
+export declare function describeAgentFailure(result: AgentRunResult, maxDetail?: number): string;
 export declare function extractSentinelOutput(stdout: string): string | null | 'multiple';

package/dist/src/generate/agent-runner.js

@@ -211,37 +211,55 @@ const AGENT_BINARIES = {
     opencode: 'opencode',
     cursor: 'cursor-agent',
 };
-// Default to small/fast models for single-component classification — cheap and accurate enough.
+export function resolveBinary(agent) {
+    const envKey = `EDS_AGENT_BINARY_${agent.toUpperCase()}`;
+    const override = process.env[envKey];
+    if (override && override.trim())
+        return override.trim();
+    return AGENT_BINARIES[agent];
+}
+/**
+ * Default models per agent — cheap/fast picks to control cost when no explicit
+ * model is configured. cursor uses `gpt-mini` (verified alias from
+ * GetUsableModels; haiku is not available in cursor's model catalog).
+ */
 const DEFAULT_MODELS = {
     claude: 'haiku',
     codex: 'gpt-5.4-mini', // requires OPENAI_API_KEY; ChatGPT account users must pass --model
     opencode: 'claude-haiku-4-5',
-    cursor: 'claude-3-5-haiku-20241022',
+    cursor: 'gpt-mini', // cursor alias for gpt-5.4-mini-medium; haiku not in cursor's catalog
 };
-export function resolveBinary(agent) {
-    const envKey = `EDS_AGENT_BINARY_${agent.toUpperCase()}`;
-    const override = process.env[envKey];
+/**
+ * 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 cheap default for that
+ * agent.
+ */
+export function resolveAgentModel(agent, explicit) {
+    if (explicit && explicit.trim())
+        return explicit.trim();
+    const override = process.env[`EDS_AGENT_MODEL_${agent.toUpperCase()}`];
     if (override && override.trim())
         return override.trim();
-    return AGENT_BINARIES[agent];
+    return DEFAULT_MODELS[agent];
 }
-function buildArgs(agent, prompt, model, promptViaStdin = false) {
-    const m = model ?? DEFAULT_MODELS[agent];
+export function buildArgs(agent, prompt, model, promptViaStdin = false) {
+    const modelArg = ['--model', resolveAgentModel(agent, model)];
     // When the prompt is delivered on stdin, omit it from argv — a large prompt
     // as a command-line argument overflows ARG_MAX (spawn E2BIG). All four CLIs
     // read the prompt from stdin when it isn't passed positionally.
     const promptArg = promptViaStdin ? [] : [prompt];
     switch (agent) {
         case 'claude':
-            return ['--print', '--model', m, ...promptArg];
+            return ['--print', ...modelArg, ...promptArg];
         case 'codex':
             // --dangerously-bypass-approvals-and-sandbox required for non-interactive use
-            return ['exec', '--model', m, '--dangerously-bypass-approvals-and-sandbox', ...promptArg];
+            return ['exec', ...modelArg, '--dangerously-bypass-approvals-and-sandbox', ...promptArg];
         case 'opencode':
-            return ['run', '--model', m, ...promptArg];
+            return ['run', ...modelArg, ...promptArg];
         case 'cursor':
             // cursor-agent uses --print for non-interactive stdout output
-            return ['--print', '--model', m, ...promptArg];
+            return ['--print', ...modelArg, ...promptArg];
     }
 }
 export async function runAgent(options) {
@@ -319,13 +337,12 @@ export async function runAgent(options) {
     });
 }
 export async function checkAgentAuth(agent) {
-    if (agent !== 'claude')
-        return 'ok';
     const binary = resolveBinary(agent);
-    // Verify the binary exists first. When `binary` is an absolute path (e.g.
-    // set via EDS_AGENT_BINARY_CLAUDE=/opt/custom/claude), `which` on some
-    // shells doesn't resolve it — check the filesystem directly for absolute
-    // paths, and fall back to `which` for bare names on $PATH.
+    // Verify the selected agent's binary exists first — for EVERY agent, not
+    // just claude. When `binary` is an absolute path (e.g. set via
+    // EDS_AGENT_BINARY_<AGENT>=/opt/custom/bin), `which` on some shells doesn't
+    // resolve it — check the filesystem directly for absolute paths, and fall
+    // back to `which` for bare names on $PATH.
     const binaryExists = await new Promise((resolve) => {
         if (binary.startsWith('/')) {
             import('node:fs/promises').then((fs) => fs.access(binary).then(() => resolve(true), () => resolve(false)));
@@ -336,6 +353,11 @@ export async function checkAgentAuth(agent) {
     });
     if (!binaryExists)
         return 'not-found';
+    // Only Claude exposes `auth status --json`. Non-Claude agents are considered
+    // authenticated once their binary is present — never gate them on claude
+    // (AIS-392 B3: Codex-via-Bedrock users were blocked by a claude check).
+    if (agent !== 'claude')
+        return 'ok';
     // Use `claude auth status` — fast, no API call, works regardless of which
     // auth provider (direct, Bedrock, Vertex) or whether AWS_PROFILE is set.
     return new Promise((resolve) => {
@@ -373,6 +395,17 @@ export async function checkAgentAuth(agent) {
         });
     });
 }
+/**
+ * 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" (AIS-392 B1). `exitCode === 0` with no output is treated as the
+ * "produced no tool calls" case.
+ */
+export function describeAgentFailure(result, maxDetail = 800) {
+    const base = result.exitCode !== 0 ? `agent exited with code ${result.exitCode}` : 'agent produced no tool calls';
+    const detail = (result.stderr.trim() || result.stdout.trim()).slice(-maxDetail).trim();
+    return detail ? `${base} — ${detail}` : base;
+}
 export function extractSentinelOutput(stdout) {
     const START = '<<<EDS_OUTPUT_START>>>';
     const END = '<<<EDS_OUTPUT_END>>>';

package/dist/src/generate/command.js

@@ -4,7 +4,7 @@ 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 { parseToolCallLines, parseTokenToolCallLines, resolveBinary, runAgent, } from './agent-runner.js';
+import { describeAgentFailure, parseToolCallLines, parseTokenToolCallLines, resolveBinary, runAgent, } from './agent-runner.js';
 import { OutputFormatter, c } from '../output/format.js';
 import { formatGenerateProgressLine } from './progress.js';
 import { buildPrompt, resolveSkillPath } from './prompt-builder.js';
@@ -217,12 +217,12 @@ async function runOneComponent(agent, model, db, sessionId, component, tokensInl
             };
         }
         if (result.exitCode !== 0) {
-            lastError = `agent exited with code ${result.exitCode}`;
+            lastError = describeAgentFailure(result);
             continue;
         }
         const { calls, warnings } = parseToolCallLines(result.stdout);
         if (calls.length === 0) {
-            lastError = 'agent produced no tool calls';
+            lastError = describeAgentFailure(result);
             continue;
         }
         const applied = applyToolCalls(db, sessionId, component.component_id, component.name, calls, warnings);
@@ -452,7 +452,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
         // Machine-parseable summary on stdout for the wizard / orchestrator.
         process.stdout.write(`renamed-slots: ${totalRenamedSlots}\n`);
         if (generated.length === 0 && cachedResults.length === 0) {
-            die('Error: all components failed to generate — check agent output above');
+            die(`Error: all ${componentResults.length} component(s) failed to generate — see the per-component errors above.`);
         }
     }
     else if (skill === 'tokens') {
@@ -570,7 +570,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
 function addAgentFlags(cmd) {
     return cmd
         .option('--agent <name>', 'Agent to use: claude, codex, opencode, cursor (defaults to value saved by experiences setup)')
-        .option('--model <name>', 'Model to use (defaults to a small/fast model per agent)')
+        .option('--model <name>', 'Model to use (defaults to a cheap per-agent model; override with --model or EDS_AGENT_MODEL_<AGENT>)')
         .option('--verbose', 'Show full agent output including reasoning text')
         .option('--dry-run', 'Print the prompt without invoking the agent')
         .option('--no-cache', 'Bypass ALL fine-grained caches (extract, select, generate) and force AI re-run. ' +

package/dist/src/import/command.js

@@ -20,7 +20,7 @@ export function registerImportCommand(program) {
         .option('--project <path>', 'Path to the project root to analyze', '.')
         .option('--out <path>', 'Output directory for pipeline artifacts')
         .option('--agent <name>', 'Agent to use for generate components (overrides credentials.json; falls back to "claude")')
-        .option('--model <name>', 'Model to use for generate components (defaults to a small/fast model per agent)')
+        .option('--model <name>', 'Model to use for generate components (defaults to a cheap per-agent model; override with --model or EDS_AGENT_MODEL_<AGENT>)')
         .option('--tokens <path>', 'Path to a DTCG tokens.json file to push alongside generated components')
         .option('--raw-tokens <path>', 'Path to a raw token source file (SCSS, CSS variables, JS/TS, Style Dictionary, etc.) to classify and import alongside components. Bypasses the interactive token prompt.')
         .option('--select-all', 'Select all extracted components for generation (default)')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.15.1-dev-build-074e179.0",
+  "version": "2.15.1-dev-build-b11e821.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -34,8 +34,8 @@
     "react": "^18.3.1",
     "react-devtools-core": "^4.19.1",
     "react-dom": "^18.3.1",
-    "@contentful/experience-design-system-extraction": "2.15.1-dev-build-074e179.0",
-    "@contentful/experience-design-system-types": "2.15.1-dev-build-074e179.0"
+    "@contentful/experience-design-system-extraction": "2.15.1-dev-build-b11e821.0",
+    "@contentful/experience-design-system-types": "2.15.1-dev-build-b11e821.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.3",