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

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @ai-sdk/harness-claude-code
 
+## 1.0.76
+
+### Patch Changes
+
+- 62a9c2a: feat(harness): add support for structured output to `HarnessAgent` via `output` property
+- a5ddbb0: fix(harness-claude-code): preserve general `anyOf` and `oneOf` constraints when registering custom tools with the MCP bridge
+- Updated dependencies [62a9c2a]
+- Updated dependencies [d25cae2]
+  - @ai-sdk/harness@1.0.73
+
 ## 1.0.75
 
 ### Patch Changes

package/dist/bridge/index.mjs

@@ -53,7 +53,6 @@ async function runBridge(options) {
   let currentBoundPort = 0;
   let currentTurnState = "init";
   let activeSocket;
-  let activeSocketReadyForLiveEvents = false;
   let isFirstTurn = true;
   let turnAbort;
   let currentUserMessages;
@@ -137,14 +136,6 @@ async function runBridge(options) {
     } catch {
     }
   };
-  const sendControl = (msg) => {
-    if (activeSocket?.readyState === WS_OPEN) {
-      try {
-        activeSocket.send(JSON.stringify(msg));
-      } catch {
-      }
-    }
-  };
   const emit = (event) => {
     const seq = ++seqCounter;
     const line = JSON.stringify({ ...event, seq });
@@ -152,7 +143,7 @@ async function runBridge(options) {
     diskBuffer += `${line}
 `;
     scheduleEventFlush();
-    if (activeSocketReadyForLiveEvents && activeSocket?.readyState === WS_OPEN) {
+    if (activeSocket?.readyState === WS_OPEN) {
       try {
         activeSocket.send(line);
       } catch {
@@ -255,8 +246,7 @@ async function runBridge(options) {
   const handleInbound = async (msg, ws) => {
     switch (msg.type) {
       case "start": {
-        if (activeSocket !== ws) return;
-        activeSocketReadyForLiveEvents = true;
+        activeSocket = ws;
         const firstTurn = isFirstTurn;
         isFirstTurn = false;
         eventLog = [];
@@ -336,9 +326,8 @@ async function runBridge(options) {
         turnAbort?.abort();
         return;
       case "resume":
-        if (activeSocket !== ws) return;
+        activeSocket = ws;
         replay(ws, msg.lastSeenEventId);
-        activeSocketReadyForLiveEvents = true;
         return;
       case "destroy":
         currentTurnState = "done";
@@ -350,7 +339,7 @@ async function runBridge(options) {
         currentTurnState = "done";
         void writeBridgeMeta("done");
         const data = await onStop?.() ?? {};
-        sendControl({ type: "bridge-stop", data });
+        sendControl(ws, { type: "bridge-stop", data });
         drainThenExit(ws, 1e3, "stop");
         return;
       }
@@ -403,9 +392,7 @@ async function runBridge(options) {
       ws.close(1008, "unauthorized");
       return;
     }
-    activeSocket = ws;
-    activeSocketReadyForLiveEvents = false;
-    sendControl({
+    sendControl(ws, {
       type: "bridge-hello",
       state: currentTurnState,
       lastSeq: seqCounter
@@ -416,7 +403,7 @@ async function runBridge(options) {
         const text = typeof raw === "string" ? raw : Buffer.from(raw).toString("utf8");
         parsed = JSON.parse(text);
       } catch (err) {
-        sendControl({
+        sendControl(ws, {
           type: "error",
           error: `protocol parse error: ${err.message}`
         });
@@ -427,7 +414,6 @@ async function runBridge(options) {
     ws.on("close", () => {
       if (activeSocket === ws) {
         activeSocket = void 0;
-        activeSocketReadyForLiveEvents = false;
       }
     });
     ws.on("error", () => {
@@ -454,6 +440,14 @@ async function runBridge(options) {
     })
   };
 }
+function sendControl(socket, message) {
+  if (socket?.readyState === WS_OPEN) {
+    try {
+      socket.send(JSON.stringify(message));
+    } catch {
+    }
+  }
+}
 function serialiseError(err) {
   if (err instanceof Error) {
     return { name: err.name, message: err.message, stack: err.stack };
@@ -522,6 +516,7 @@ function createClaudeStreamEventState() {
     stepOpen: false,
     mcpToolUseIds: /* @__PURE__ */ new Set(),
     externalMcpToolUseIds: /* @__PURE__ */ new Set(),
+    structuredOutputToolUseIds: /* @__PURE__ */ new Set(),
     observedTerminalError: void 0
   };
 }
@@ -591,6 +586,10 @@ function createEmitStreamEvent({
       for (const block of msg.message.content) {
         if (block.type === "tool_use" && typeof block.id === "string" && typeof block.name === "string") {
           toolUseIds.push(block.id);
+          if (block.name === "StructuredOutput") {
+            state.structuredOutputToolUseIds.add(block.id);
+            continue;
+          }
           const mcpPrefix = "mcp__harness-tools__";
           if (block.name.startsWith(mcpPrefix)) {
             state.pendingStepToolUseIds.add(block.id);
@@ -626,6 +625,9 @@ function createEmitStreamEvent({
     if (type === "user" && msg.message?.content) {
       for (const block of msg.message.content) {
         if (block.type === "tool_result" && typeof block.tool_use_id === "string") {
+          if (state.structuredOutputToolUseIds.delete(block.tool_use_id)) {
+            continue;
+          }
           if (state.mcpToolUseIds.has(block.tool_use_id)) {
             state.mcpToolUseIds.delete(block.tool_use_id);
             state.pendingStepToolUseIds.delete(block.tool_use_id);
@@ -804,7 +806,7 @@ function toZodShape(schema) {
 }
 function toZodType(schema) {
   if (!schema) return z.any();
-  let zType = zodForConst(schema) ?? zodForEnum(schema) ?? zodForNullableUnion(schema) ?? zodForType(schema);
+  let zType = zodForConst(schema) ?? zodForEnum(schema) ?? zodForUnion(schema) ?? zodForType(schema);
   if (isNullable(schema)) zType = zType.nullable();
   if (schema.description) zType = zType.describe(schema.description);
   return zType;
@@ -844,12 +846,11 @@ function zodForEnum(schema) {
   if (!schema.enum.every(isJsonLiteral)) return z.any();
   return zodForLiterals(schema.enum);
 }
-function zodForNullableUnion(schema) {
+function zodForUnion(schema) {
   const unionSchemas = schema.anyOf ?? schema.oneOf;
   if (!unionSchemas || unionSchemas.length < 2) return void 0;
-  const nonNullSchemas = unionSchemas.filter((item) => !isNullOnlySchema(item));
-  if (nonNullSchemas.length !== 1) return void 0;
-  return toZodType(nonNullSchemas[0]).nullable();
+  const options = unionSchemas.map((item) => toZodType(item));
+  return z.union(options);
 }
 function zodForLiterals(values) {
   if (values.length === 0) return z.any();
@@ -863,9 +864,6 @@ function getNonNullTypes(schema) {
 function isNullable(schema) {
   return schema.nullable === true || Array.isArray(schema.type) && schema.type.includes("null");
 }
-function isNullOnlySchema(schema) {
-  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) {
   return input != null && typeof input === "object" && !Array.isArray(input);
 }
@@ -1136,6 +1134,12 @@ async function runTurn(start, turn) {
       systemPrompt: createClaudeCodeSystemPrompt(start.instructions),
       thinking: start.thinking,
       ...start.effort !== void 0 ? { effort: start.effort } : {},
+      ...start.responseFormat?.type === "json" && start.responseFormat.schema != null ? {
+        outputFormat: {
+          type: "json_schema",
+          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
@@ -1207,6 +1211,17 @@ async function runTurn(start, turn) {
           if (typeof msg.total_cost_usd === "number") {
             totalCostUsd = (totalCostUsd ?? 0) + msg.total_cost_usd;
           }
+          if (start.responseFormat?.type === "json" && msg.structured_output !== void 0) {
+            const id = randomUUID2();
+            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,