@contentful/experience-design-system-generation 2.32.1-dev-build-10912f6.0 → 2.32.1-dev-build-d5e6302.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-generation",
-  "version": "2.32.1-dev-build-10912f6.0",
+  "version": "2.32.1-dev-build-d5e6302.0",
   "description": "Agent-invocation and skill-prompt engine for the Contentful Experience Design System SDK",
   "license": "MIT",
   "type": "module",

package/dist/src/agent-invoker.d.ts

@@ -2,6 +2,7 @@ import type { AgentDebugEvent, AgentAuthStatus, AgentName, AgentRunResult } from
 export interface InvokeAgentOptions {
     agent: AgentName;
     model?: string;
+    bedrock?: boolean;
     prompt: string;
     timeoutMs: number;
     onOutput?: (chunk: string) => void;

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

@@ -102,20 +102,25 @@ export interface ParsedMapTokenPropToolCalls {
 }
 export declare function parseMapTokenPropToolCallLines(stdout: string): ParsedMapTokenPropToolCalls;
 export declare function resolveBinary(agent: AgentName): string;
+export declare function agentSupportsBedrock(agent: AgentName): boolean;
 /**
  * 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.
+ * that agent. `bedrock` only affects the fallback default, and only for
+ * agents whose model id changes shape under Bedrock (codex, opencode) — an
+ * explicit value or env override is never rewritten.
  */
-export declare function resolveAgentModel(agent: AgentName, explicit?: string): string | undefined;
+export declare function resolveAgentModel(agent: AgentName, explicit?: string, bedrock?: boolean): string | undefined;
 export type AgentDebugEvent = (name: string, payload?: Record<string, unknown>) => void;
-export declare function buildArgs(agent: AgentName, prompt: string, model?: string, promptViaStdin?: boolean): string[];
+export declare function buildArgs(agent: AgentName, prompt: string, model?: string, promptViaStdin?: boolean, bedrock?: boolean): string[];
 export declare function runAgent(options: {
     agent: AgentName;
     prompt: string;
     timeoutMs: number;
     model?: string;
+    /** Apply the selected agent's Bedrock-routing env vars when enabled. */
+    bedrock?: boolean;
     onOutput?: (chunk: string) => void;
     /**
      * Deliver the prompt on stdin instead of as an argv positional. Required for

package/dist/src/agent-runner.js

@@ -280,34 +280,85 @@ export function resolveBinary(agent) {
         return override.trim();
     return AGENT_BINARIES[agent];
 }
+/** Per-agent env vars that switch model calls to AWS Bedrock. */
+const BEDROCK_ENV_BY_AGENT = {
+    claude: { CLAUDE_CODE_USE_BEDROCK: '1' },
+};
+/**
+ * Agents with a working Bedrock routing mechanism, of any shape (env var,
+ * argv config override, or a provider-prefixed model string) — not just the
+ * env-var agents in BEDROCK_ENV_BY_AGENT. cursor is excluded: its own Bedrock
+ * support is currently broken for non-interactive/CI use.
+ */
+const BEDROCK_CAPABLE_AGENTS = new Set(['claude', 'codex', 'opencode']);
+export function agentSupportsBedrock(agent) {
+    return BEDROCK_CAPABLE_AGENTS.has(agent);
+}
+const DEFAULT_CODEX_BEDROCK_REGION = 'us-east-1';
+const DEFAULT_OPENCODE_MODEL = 'claude-haiku-4-5';
 /**
  * Default models per agent — lightweight/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).
+ * explicit model is configured. cursor uses `gpt-mini` (verified alias from
+ * GetUsableModels; haiku is not available in cursor's model catalog).
+ *
+ * codex is deliberately absent: with no entry here it gets no `--model` at
+ * all, so the installed Codex CLI picks whatever its account supports. On
+ * Bedrock it still needs an explicit id, since the model id there carries an
+ * `openai.` prefix required by the Bedrock provider and absent from the
+ * direct api.openai.com id — see DEFAULT_CODEX_BEDROCK_MODEL.
  */
 const DEFAULT_MODELS = {
     claude: 'haiku',
-    opencode: 'claude-haiku-4-5',
+    opencode: DEFAULT_OPENCODE_MODEL,
     cursor: 'gpt-mini', // cursor alias for gpt-5.4-mini-medium; haiku not in cursor's catalog
     copilot: 'Auto', // the only model guaranteed on every Copilot plan (Free/Pro/Business/Enterprise); Pro+ users override via EDS_AGENT_MODEL_COPILOT
 };
+const DEFAULT_CODEX_BEDROCK_MODEL = 'openai.gpt-5.6-luna';
 /**
  * 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.
+ * that agent. `bedrock` only affects the fallback default, and only for
+ * agents whose model id changes shape under Bedrock (codex, opencode) — an
+ * explicit value or env override is never rewritten.
  */
-export function resolveAgentModel(agent, explicit) {
+export function resolveAgentModel(agent, explicit, bedrock = false) {
     if (explicit && explicit.trim())
         return explicit.trim();
     const override = process.env[`EDS_AGENT_MODEL_${agent.toUpperCase()}`];
     if (override && override.trim())
         return override.trim();
+    if (bedrock && agent === 'codex')
+        return DEFAULT_CODEX_BEDROCK_MODEL;
+    if (bedrock && agent === 'opencode')
+        return withBedrockProviderPrefix(DEFAULT_OPENCODE_MODEL);
     return DEFAULT_MODELS[agent];
 }
-export function buildArgs(agent, prompt, model, promptViaStdin = false) {
-    const resolvedModel = resolveAgentModel(agent, model);
+/**
+ * opencode selects providers via a `provider/model` string rather than a
+ * flag or env var, so routing it through Bedrock means rewriting the model
+ * string itself. Left alone if it already carries a provider prefix (an
+ * explicit --model / EDS_AGENT_MODEL_OPENCODE value naming its own
+ * provider), since resolveAgentModel only applies this to the bare default.
+ */
+function withBedrockProviderPrefix(model) {
+    return model.includes('/') ? model : `amazon-bedrock/${model}`;
+}
+/**
+ * codex has no Bedrock env var; it requires `-c` config overrides
+ * (`model_provider` + the Bedrock provider's region) passed as argv, per the
+ * org's verified codex-bedrock-security-review setup. Region comes from the
+ * environment's own AWS region var, falling back to us-east-1 — the region
+ * gpt-5.6-luna's Bedrock endpoint requires — when neither is set.
+ */
+function codexBedrockConfigArgs() {
+    const region = process.env.AWS_REGION?.trim() || process.env.AWS_DEFAULT_REGION?.trim() || DEFAULT_CODEX_BEDROCK_REGION;
+    return ['-c', 'model_provider=amazon-bedrock', '-c', `model_providers.amazon-bedrock.region=${region}`];
+}
+export function buildArgs(agent, prompt, model, promptViaStdin = false, bedrock = false) {
+    // codex with no configured model resolves to undefined — omit --model
+    // entirely so the CLI picks its own account-compatible default.
+    const resolvedModel = resolveAgentModel(agent, model, bedrock);
     const modelArg = resolvedModel ? ['--model', resolvedModel] : [];
     // 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
@@ -316,9 +367,11 @@ export function buildArgs(agent, prompt, model, promptViaStdin = false) {
     switch (agent) {
         case 'claude':
             return ['--print', ...modelArg, ...promptArg];
-        case 'codex':
+        case 'codex': {
+            const bedrockArgs = bedrock ? codexBedrockConfigArgs() : [];
             // --dangerously-bypass-approvals-and-sandbox required for non-interactive use
-            return ['exec', ...modelArg, '--dangerously-bypass-approvals-and-sandbox', ...promptArg];
+            return ['exec', ...bedrockArgs, ...modelArg, '--dangerously-bypass-approvals-and-sandbox', ...promptArg];
+        }
         case 'opencode':
             return ['run', ...modelArg, ...promptArg];
         case 'cursor':
@@ -347,21 +400,29 @@ export function buildArgs(agent, prompt, model, promptViaStdin = false) {
 }
 export async function runAgent(options) {
     const { agent, prompt, timeoutMs, model, onOutput, promptViaStdin, onDebugEvent } = options;
+    // Fall back to the process-wide EDS_BEDROCK signal (set once by the CLI's
+    // top-level --bedrock resolution and inherited by every spawned subprocess)
+    // when a call site doesn't pass `bedrock` explicitly — closes the gap for
+    // call sites that forget to thread the flag through by hand.
+    const bedrock = options.bedrock ?? process.env.EDS_BEDROCK === '1';
     const binary = resolveBinary(agent);
     const useStdin = !!promptViaStdin;
-    const args = buildArgs(agent, prompt, model, useStdin);
+    const args = buildArgs(agent, prompt, model, useStdin, bedrock);
     const startedAt = Date.now();
     onDebugEvent?.('run.start', {
         agent,
         binary,
         model,
+        bedrock: !!bedrock,
         timeoutMs,
         promptLen: prompt.length,
         promptHead: prompt.slice(0, 500),
     });
     return new Promise((resolve) => {
+        const bedrockEnv = bedrock ? BEDROCK_ENV_BY_AGENT[agent] : undefined;
         const child = spawn(binary, args, {
             stdio: ['pipe', 'pipe', 'pipe'],
+            ...(bedrockEnv ? { env: { ...process.env, ...bedrockEnv } } : {}),
         });
         if (useStdin && child.stdin) {
             // Guard against EPIPE: the child may close stdin before we finish

package/dist/src/index.d.ts

@@ -1,6 +1,6 @@
 export { AGENT_NAMES, DEFAULT_AGENT_NAME, isAgentName } from './agent-names.js';
 export type { AgentName } from './agent-names.js';
-export { buildArgs, checkAgentAuth, describeAgentFailure, extractSentinelOutput, parseMapTokenPropToolCallLines, parseSelectToolCallLines, parseTokenToolCallLines, parseToolCallLines, resolveAgentModel, resolveBinary, runAgent, } from './agent-runner.js';
+export { agentSupportsBedrock, buildArgs, checkAgentAuth, describeAgentFailure, extractSentinelOutput, parseMapTokenPropToolCallLines, parseSelectToolCallLines, parseTokenToolCallLines, parseToolCallLines, resolveAgentModel, resolveBinary, runAgent, } from './agent-runner.js';
 export type { AgentAuthStatus, AgentDebugEvent, AgentRunResult, ClassifyComponentCall, ClassifyPropCall, ClassifySlotCall, ExcludePropCall, MapTokenPropCall, ParsedMapTokenPropToolCalls, ParsedSelectToolCalls, ParsedTokenToolCalls, ParsedToolCalls, RejectComponentCall, SelectComponentCall, SelectToolCall, SetGroupCall, SetTokenCall, ToolCall, TokenToolCall, } from './agent-runner.js';
 export { createLocalCliAgentInvoker } from './agent-invoker.js';
 export type { AgentInvoker, CreateLocalCliAgentInvokerOptions, InvokeAgentOptions } from './agent-invoker.js';

package/dist/src/index.js

@@ -1,7 +1,7 @@
 // Agent identity
 export { AGENT_NAMES, DEFAULT_AGENT_NAME, isAgentName } from './agent-names.js';
 // Agent invocation (low-level)
-export { buildArgs, checkAgentAuth, describeAgentFailure, extractSentinelOutput, parseMapTokenPropToolCallLines, parseSelectToolCallLines, parseTokenToolCallLines, parseToolCallLines, resolveAgentModel, resolveBinary, runAgent, } from './agent-runner.js';
+export { agentSupportsBedrock, buildArgs, checkAgentAuth, describeAgentFailure, extractSentinelOutput, parseMapTokenPropToolCallLines, parseSelectToolCallLines, parseTokenToolCallLines, parseToolCallLines, resolveAgentModel, resolveBinary, runAgent, } from './agent-runner.js';
 // Agent invocation (interface)
 export { createLocalCliAgentInvoker } from './agent-invoker.js';
 // Prompt building

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-generation",
-  "version": "2.32.1-dev-build-10912f6.0",
+  "version": "2.32.1-dev-build-d5e6302.0",
   "description": "Agent-invocation and skill-prompt engine for the Contentful Experience Design System SDK",
   "license": "MIT",
   "type": "module",
@@ -22,7 +22,7 @@
     "skills/"
   ],
   "dependencies": {
-    "@contentful/experience-design-system-types": "2.32.1-dev-build-10912f6.0"
+    "@contentful/experience-design-system-types": "2.32.1-dev-build-d5e6302.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",