@ai-sdk/harness-claude-code 1.0.75 → 1.0.76

package/src/bridge/index.ts

@@ -348,6 +348,15 @@ async function runTurn(start: StartMessage, turn: BridgeTurn): Promise<void> {
       systemPrompt: createClaudeCodeSystemPrompt(start.instructions),
       thinking: start.thinking,
       ...(start.effort !== undefined ? { effort: start.effort } : {}),
+      ...(start.responseFormat?.type === 'json' &&
+      start.responseFormat.schema != null
+        ? {
+            outputFormat: {
+              type: 'json_schema' as const,
+              schema: start.responseFormat.schema,
+            },
+          }
+        : {}),
       includePartialMessages: true,
       // The `PostCompact` hook carries the compaction summary, which the
       // `compact_boundary` system message does not. Latch it for the unified
@@ -425,6 +434,20 @@ async function runTurn(start: StartMessage, turn: BridgeTurn): Promise<void> {
           if (typeof msg.total_cost_usd === 'number') {
             totalCostUsd = (totalCostUsd ?? 0) + msg.total_cost_usd;
           }
+          if (
+            start.responseFormat?.type === 'json' &&
+            msg.structured_output !== undefined
+          ) {
+            const id = randomUUID();
+            emit({ type: 'text-start', id });
+            emit({
+              type: 'text-delta',
+              id,
+              delta: JSON.stringify(msg.structured_output),
+            });
+            emit({ type: 'text-end', id });
+            streamEventState.stepOpen = true;
+          }
           if (streamEventState.stepOpen) {
             emitFinishStep({
               state: streamEventState,

package/src/bridge/json-schema-to-zod.ts

@@ -43,7 +43,7 @@ function toZodType(schema: JsonSchemaObject | undefined): z.ZodTypeAny {
   let zType =
     zodForConst(schema) ??
     zodForEnum(schema) ??
-    zodForNullableUnion(schema) ??
+    zodForUnion(schema) ??
     zodForType(schema);
 
   if (isNullable(schema)) zType = zType.nullable();
@@ -90,16 +90,16 @@ function zodForEnum(schema: JsonSchemaObject): z.ZodTypeAny | undefined {
   return zodForLiterals(schema.enum);
 }
 
-function zodForNullableUnion(
-  schema: JsonSchemaObject,
-): z.ZodTypeAny | undefined {
+function zodForUnion(schema: JsonSchemaObject): z.ZodTypeAny | undefined {
   const unionSchemas = schema.anyOf ?? schema.oneOf;
   if (!unionSchemas || unionSchemas.length < 2) return undefined;
 
-  const nonNullSchemas = unionSchemas.filter(item => !isNullOnlySchema(item));
-  if (nonNullSchemas.length !== 1) return undefined;
-
-  return toZodType(nonNullSchemas[0]).nullable();
+  const options = unionSchemas.map(item => toZodType(item)) as unknown as [
+    z.ZodTypeAny,
+    z.ZodTypeAny,
+    ...z.ZodTypeAny[],
+  ];
+  return z.union(options);
 }
 
 function zodForLiterals(values: JsonLiteral[]): z.ZodTypeAny {
@@ -127,19 +127,6 @@ function isNullable(schema: JsonSchemaObject): boolean {
   );
 }
 
-function isNullOnlySchema(schema: JsonSchemaObject): boolean {
-  return (
-    schema.type === 'null' ||
-    (Array.isArray(schema.type) &&
-      schema.type.length === 1 &&
-      schema.type[0] === 'null') ||
-    schema.const === null ||
-    (Array.isArray(schema.enum) &&
-      schema.enum.length === 1 &&
-      schema.enum[0] === null)
-  );
-}
-
 function isJsonSchemaObject(input: unknown): input is JsonSchemaObject {
   return input != null && typeof input === 'object' && !Array.isArray(input);
 }

package/src/claude-code-harness.ts

@@ -1540,6 +1540,16 @@ function createSession({
     isResume,
     modelId: model,
     doPromptTurn: async promptOpts => {
+      if (
+        promptOpts.responseFormat?.type === 'json' &&
+        promptOpts.responseFormat.schema == null
+      ) {
+        throw new HarnessCapabilityUnsupportedError({
+          message:
+            "Harness 'claude-code' requires a JSON schema for structured output.",
+          harnessId: 'claude-code',
+        });
+      }
       const control = wireTurn({
         emit: promptOpts.emit,
         abortSignal: promptOpts.abortSignal,
@@ -1553,6 +1563,9 @@ function createSession({
           description: t.description,
           inputSchema: t.inputSchema,
         })),
+        ...(promptOpts.responseFormat == null
+          ? {}
+          : { responseFormat: promptOpts.responseFormat }),
         ...(promptOpts.instructions
           ? { instructions: promptOpts.instructions }
           : {}),
@@ -1576,6 +1589,16 @@ function createSession({
       return control;
     },
     doContinueTurn: async continueOpts => {
+      if (
+        continueOpts.responseFormat?.type === 'json' &&
+        continueOpts.responseFormat.schema == null
+      ) {
+        throw new HarnessCapabilityUnsupportedError({
+          message:
+            "Harness 'claude-code' requires a JSON schema for structured output.",
+          harnessId: 'claude-code',
+        });
+      }
       const control = wireTurn({
         emit: continueOpts.emit,
         abortSignal: continueOpts.abortSignal,
@@ -1611,6 +1634,9 @@ function createSession({
             description: t.description,
             inputSchema: t.inputSchema,
           })),
+          ...(continueOpts.responseFormat == null
+            ? {}
+            : { responseFormat: continueOpts.responseFormat }),
           ...(continueOpts.instructions
             ? { instructions: continueOpts.instructions }
             : {}),