fix(cdk): accept -c JSON-string bedrockModels override (#628) resolveBedrockModelIds rejected any non-array context value, but CDK delivers a -c key=value context value as a raw string — so the -c bedrockModels='[...]' form the function's own JSDoc advertises threw at synth, while the cdk.context.json array form worked. JSON-parse a string context value before the array check so both forms behave identically. A non-JSON string (a true typo) is left as-is and still fails the array check with the same clear, key-named error, so loud-fail on malformed input is preserved. Same fix shape as resolveAgentCoreAzOverride (#358 review follow-up). Tests: added -c JSON-string array (success) and JSON-string-non-array (throws) cases.

Author: bgagent

cdk/src/constructs/bedrock-models.ts

@@ -58,10 +58,22 @@ export const BEDROCK_MODELS_CONTEXT_KEY = 'bedrockModels';
  * granting nothing or an invalid ARN.
  */
 export function resolveBedrockModelIds(node: Node): readonly string[] {
-  const override = node.tryGetContext(BEDROCK_MODELS_CONTEXT_KEY);
-  if (override === undefined || override === null) {
+  const raw = node.tryGetContext(BEDROCK_MODELS_CONTEXT_KEY);
+  if (raw === undefined || raw === null) {
     return DEFAULT_BEDROCK_MODEL_IDS;
   }
+  // `cdk.context.json` delivers a real array, but the `-c key=value` form
+  // documented above delivers a raw string. Parse the string form so both
+  // behave identically. A non-JSON string — a true typo — is left as-is and
+  // fails the array check below with the same clear, key-named error.
+  let override: unknown = raw;
+  if (typeof raw === 'string') {
+    try {
+      override = JSON.parse(raw);
+    } catch {
+      override = raw;
+    }
+  }
   if (!Array.isArray(override) || override.length === 0) {
     throw new Error(
       `Context '${BEDROCK_MODELS_CONTEXT_KEY}' must be a non-empty array of foundation-model IDs `

cdk/test/constructs/bedrock-models.test.ts

@@ -41,6 +41,21 @@ describe('resolveBedrockModelIds', () => {
     expect(ids).toEqual(override);
   });
 
+  it('parses a JSON-string override (the `-c key=value` CLI form)', () => {
+    // CDK delivers `-c bedrockModels=[...]` as a raw string, not a parsed array;
+    // the documented `-c` form must work identically to the file/array form.
+    const ids = resolveBedrockModelIds(
+      nodeWithContext({ [BEDROCK_MODELS_CONTEXT_KEY]: '["anthropic.claude-opus-4-8","anthropic.claude-sonnet-4-6"]' }),
+    );
+    expect(ids).toEqual(['anthropic.claude-opus-4-8', 'anthropic.claude-sonnet-4-6']);
+  });
+
+  it('throws on a JSON string that does not parse to an array', () => {
+    expect(() =>
+      resolveBedrockModelIds(nodeWithContext({ [BEDROCK_MODELS_CONTEXT_KEY]: '"anthropic.claude-sonnet-4-6"' })),
+    ).toThrow(/must be a non-empty array/);
+  });
+
   it('throws on a non-array override (typo guard)', () => {
     expect(() =>
       resolveBedrockModelIds(nodeWithContext({ [BEDROCK_MODELS_CONTEXT_KEY]: 'anthropic.claude-opus-4-8' })),