@anvia/client 1.0.0-rc.2 → 1.0.0-rc.4

package/dist/index.js

@@ -51,21 +51,23 @@ function uiMessagesToMessages(messages) {
         if (part.type === "text") {
           content2.push(textContent(part.text, part.signature));
         } else if (part.type === "reasoning") {
-          content2.push({
+          let reasoning = {
             type: "reasoning",
-            text: part.text,
-            ...part.reasoningId === void 0 ? {} : { id: part.reasoningId },
-            ...part.content === void 0 ? {} : { details: part.content }
-          });
+            text: part.text
+          };
+          if (part.reasoningId !== void 0) reasoning = { ...reasoning, id: part.reasoningId };
+          if (part.content !== void 0) reasoning = { ...reasoning, details: part.content };
+          content2.push(reasoning);
         } else if (part.type === "tool") {
-          content2.push({
+          let toolCall = {
             type: "tool-call",
             toolCallId: part.toolCallId,
-            ...part.callId === void 0 ? {} : { callId: part.callId },
             toolName: part.toolName,
-            input: part.input ?? {},
-            ...part.signature === void 0 ? {} : { signature: part.signature }
-          });
+            input: part.input ?? {}
+          };
+          if (part.callId !== void 0) toolCall = { ...toolCall, callId: part.callId };
+          if (part.signature !== void 0) toolCall = { ...toolCall, signature: part.signature };
+          content2.push(toolCall);
           if (part.state === "output-available" || part.state === "error") {
             toolResults.push(toolResultFromPart(part));
           }
@@ -73,12 +75,15 @@ function uiMessagesToMessages(messages) {
           content2.push(attachmentToAssistantContent(part.attachment));
         }
       }
-      result.push({
+      let assistant = {
         role: "assistant",
         content: content2,
-        ...message.modelMessageId === void 0 ? {} : { id: message.modelMessageId },
         ...metadataField(message.metadata)
-      });
+      };
+      if (message.modelMessageId !== void 0) {
+        assistant = { ...assistant, id: message.modelMessageId };
+      }
+      result.push(assistant);
       if (toolResults.length > 0) {
         result.push({ role: "tool", content: toolResults });
       }
@@ -121,13 +126,13 @@ function messagesToUIMessages(messages) {
     if (message.role === "assistant") {
       const content = typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content;
       const parts = content.map(assistantContentToUIMessagePart);
-      const uiMessage = {
+      let uiMessage = {
         id: createId("msg"),
         role: "assistant",
         parts,
-        ...message.id === void 0 ? {} : { modelMessageId: message.id },
         ...metadataField(message.metadata)
       };
+      if (message.id !== void 0) uiMessage = { ...uiMessage, modelMessageId: message.id };
       const messageIndex = result.length;
       result.push(uiMessage);
       for (const [partIndex, part] of parts.entries()) {
@@ -140,6 +145,7 @@ function messagesToUIMessages(messages) {
     }
     const unmerged = [];
     for (const content of message.content) {
+      if (content.type !== "tool-result") continue;
       const location = (content.callId === void 0 ? void 0 : byCallId.get(content.callId)) ?? byToolCallId.get(content.toolCallId);
       const part = toolResultToUIMessagePart(content, toolNameAt(result, location));
       if (message.metadata === void 0 && location !== void 0) {
@@ -167,12 +173,13 @@ function messagesToUIMessages(messages) {
 }
 function contentToUIMessagePart(content) {
   if (content.type === "text") {
-    return {
+    const part = {
       id: createId("part"),
       type: "text",
-      text: content.text,
-      ...content.signature === void 0 ? {} : { signature: content.signature }
+      text: content.text
     };
+    if (content.signature !== void 0) part.signature = content.signature;
+    return part;
   }
   return {
     id: createId("part"),
@@ -183,25 +190,27 @@ function contentToUIMessagePart(content) {
 function assistantContentToUIMessagePart(content) {
   if (content.type === "text") return contentToUIMessagePart(content);
   if (content.type === "reasoning") {
-    return {
+    const part = {
       id: createId("part"),
       type: "reasoning",
-      text: content.text,
-      ...content.id === void 0 ? {} : { reasoningId: content.id },
-      ...content.details === void 0 ? {} : { content: content.details }
+      text: content.text
     };
+    if (content.id !== void 0) part.reasoningId = content.id;
+    if (content.details !== void 0) part.content = content.details;
+    return part;
   }
   if (content.type === "tool-call") {
-    return {
+    const part = {
       id: toolPartId(content.toolCallId),
       type: "tool",
       toolName: content.toolName,
       toolCallId: content.toolCallId,
       state: "input-available",
-      input: content.input,
-      ...content.callId === void 0 ? {} : { callId: content.callId },
-      ...content.signature === void 0 ? {} : { signature: content.signature }
+      input: content.input
     };
+    if (content.callId !== void 0) part.callId = content.callId;
+    if (content.signature !== void 0) part.signature = content.signature;
+    return part;
   }
   return {
     id: createId("part"),
@@ -213,13 +222,14 @@ function textContent(text, signature) {
   return signature === void 0 ? { type: "text", text } : { type: "text", text, signature };
 }
 function toolResultFromPart(part) {
-  return {
+  let result = {
     type: "tool-result",
     toolCallId: part.toolCallId,
-    ...part.callId === void 0 ? {} : { callId: part.callId },
     toolName: part.toolName,
     output: toolOutputFromPart(part)
   };
+  if (part.callId !== void 0) result = { ...result, callId: part.callId };
+  return result;
 }
 function toolOutputFromPart(part) {
   if (part.state === "error") {
@@ -244,23 +254,25 @@ function attachmentToImageContent(attachment) {
   const image = attachment.url !== void 0 ? { type: "url", url: attachment.url } : attachment.data !== void 0 ? { type: "data", data: attachment.data } : (() => {
     throw new TypeError("Image attachments require a URL or base64 data.");
   })();
-  return {
+  let content = {
     type: "image",
-    image,
-    ...attachment.mediaType === void 0 ? {} : { mediaType: attachment.mediaType },
-    ...attachment.detail === void 0 ? {} : { detail: attachment.detail }
+    image
   };
+  if (attachment.mediaType !== void 0) content = { ...content, mediaType: attachment.mediaType };
+  if (attachment.detail !== void 0) content = { ...content, detail: attachment.detail };
+  return content;
 }
 function attachmentToFileContent(attachment) {
   const data = attachment.url !== void 0 ? { type: "url", url: attachment.url } : attachment.data !== void 0 ? { type: "data", data: attachment.data } : attachment.text !== void 0 ? { type: "text", text: attachment.text } : (() => {
     throw new TypeError("File attachments require a URL, base64 data, or text.");
   })();
-  return {
+  let content = {
     type: "file",
     data,
-    mediaType: attachment.mediaType ?? "application/octet-stream",
-    ...attachment.name === void 0 ? {} : { filename: attachment.name }
+    mediaType: attachment.mediaType ?? "application/octet-stream"
   };
+  if (attachment.name !== void 0) content = { ...content, filename: attachment.name };
+  return content;
 }
 function contentToAttachment(content) {
   const attachment = {
@@ -287,9 +299,9 @@ function toolResultToUIMessagePart(content, fallbackToolName) {
     id: toolPartId(content.toolCallId),
     type: "tool",
     toolName: content.toolName || fallbackToolName || "tool",
-    toolCallId: content.toolCallId,
-    ...content.callId === void 0 ? {} : { callId: content.callId }
+    toolCallId: content.toolCallId
   };
+  if (content.callId !== void 0) Object.assign(common, { callId: content.callId });
   if (output.type === "error-text" || output.type === "error-json") {
     return {
       ...common,
@@ -306,12 +318,13 @@ function toolResultToUIMessagePart(content, fallbackToolName) {
       error: { message: output.reason ?? "Tool execution was denied." }
     };
   }
-  return {
+  const part = {
     ...common,
     state: "output-available",
-    output: toolResultOutput(output),
-    ...output.type === "content" ? { resultContent: output.value } : {}
+    output: toolResultOutput(output)
   };
+  if (output.type === "content") part.resultContent = output.value;
+  return part;
 }
 function toolResultOutput(output) {
   if (output.type === "text" || output.type === "error-text") return output.value;
@@ -359,10 +372,11 @@ function createId(prefix) {
 }
 
 // src/protocol.ts
+import { parseAgentInteractionRequest, parseAgentInteractionResponse } from "@anvia/core/agent";
 import { isJsonValue as isJsonValue2, parseMessages } from "@anvia/core/completion";
 
 // src/types.ts
-var CLIENT_STREAM_PROTOCOL = "anvia.client.v2";
+var CLIENT_STREAM_PROTOCOL = "anvia.client.v3";
 
 // src/protocol.ts
 var ClientProtocolError = class extends Error {
@@ -394,14 +408,19 @@ function parseUIMessage(value, options = {}) {
   if (message.generation !== void 0 && !isUIMessageGeneration(message.generation)) {
     invalid("UI message.generation", value);
   }
-  return {
+  let parsed = {
     id: message.id,
     role: message.role,
-    parts,
-    ...message.modelMessageId === void 0 ? {} : { modelMessageId: message.modelMessageId },
-    ...metadata === void 0 ? {} : { metadata },
-    ...message.generation === void 0 ? {} : { generation: message.generation }
+    parts
   };
+  if (message.modelMessageId !== void 0) {
+    parsed = { ...parsed, modelMessageId: message.modelMessageId };
+  }
+  if (metadata !== void 0) parsed = { ...parsed, metadata };
+  if (message.generation !== void 0) {
+    parsed = { ...parsed, generation: message.generation };
+  }
+  return parsed;
 }
 function parseUIMessages(value, options = {}) {
   if (!Array.isArray(value)) {
@@ -411,17 +430,52 @@ function parseUIMessages(value, options = {}) {
 }
 function parseClientStreamRequest(value) {
   const input = requireRecord(value, "Client stream request");
-  requireOnlyKeys(input, ["messages", "metadata", "resume"], "Client stream request");
-  let messages;
-  try {
-    messages = parseMessages(input.messages);
-  } catch {
-    throw new ClientProtocolError("Client stream request.messages must be Message[].", value);
-  }
+  requireOnlyKeys(
+    input,
+    ["type", "messages", "interactionId", "response", "metadata", "resume"],
+    "Client stream request"
+  );
+  requireOneOf(
+    input.type,
+    ["messages", "interaction_response"],
+    "Client stream request.type",
+    value
+  );
   if (input.metadata !== void 0 && !isJsonObject(input.metadata)) {
     throw new ClientProtocolError("Client stream request.metadata must be a JSON object.", value);
   }
-  const request = { messages };
+  let request;
+  if (input.type === "messages") {
+    if (input.interactionId !== void 0 || input.response !== void 0) {
+      throw new ClientProtocolError(
+        "Messages requests cannot include interaction response fields.",
+        value
+      );
+    }
+    let messages;
+    try {
+      messages = parseMessages(input.messages);
+    } catch {
+      throw new ClientProtocolError("Client stream request.messages must be Message[].", value);
+    }
+    request = { type: "messages", messages };
+  } else {
+    if (input.messages !== void 0 || typeof input.interactionId !== "string") {
+      throw new ClientProtocolError(
+        "Interaction response requests require interactionId and cannot include messages.",
+        value
+      );
+    }
+    try {
+      request = {
+        type: "interaction_response",
+        interactionId: input.interactionId,
+        response: parseAgentInteractionResponse(input.response)
+      };
+    } catch {
+      throw new ClientProtocolError("Client interaction response is invalid.", value);
+    }
+  }
   if (input.metadata !== void 0) request.metadata = input.metadata;
   if (input.resume !== void 0) {
     const resume = requireRecord(input.resume, "Client stream request.resume");
@@ -582,13 +636,13 @@ function parseClientStreamEvent(value, options = {}) {
       requireEventKeys(event, ["toolCall"]);
       if (!isProviderToolCall(event.toolCall)) invalid("provider_tool_call.toolCall", value);
       break;
-    case "tool_approval":
-      requireEventKeys(event, ["approval"]);
-      if (!isToolApproval(event.approval)) invalid("tool_approval.approval", value);
-      break;
-    case "tool_question":
-      requireEventKeys(event, ["question"]);
-      if (!isToolQuestion(event.question)) invalid("tool_question.question", value);
+    case "interaction":
+      requireEventKeys(event, ["interaction"]);
+      try {
+        parseAgentInteractionRequest(event.interaction);
+      } catch {
+        invalid("interaction.interaction", value);
+      }
       break;
     case "guardrail_decision":
       requireEventKeys(event, ["decision"]);
@@ -661,7 +715,7 @@ function parseClientStreamEvent(value, options = {}) {
       ]);
       requireOneOf(
         event.status,
-        ["completed", "blocked", "approval_required", "cancelled", "error"],
+        ["completed", "blocked", "suspended", "cancelled", "error"],
         "run_end.status",
         value
       );
@@ -708,8 +762,11 @@ function parseClientStreamFrame(value, options = {}) {
       ["type", "protocol", "streamId", "eventId", "resumable"],
       "stream_start frame"
     );
-    if (frame.protocol === "anvia.client.v1") {
-      throw new ClientProtocolError("Client stream protocol v1 is not supported.", value);
+    if (frame.protocol === "anvia.client.v1" || frame.protocol === "anvia.client.v2") {
+      throw new ClientProtocolError(
+        `Client stream protocol ${frame.protocol.slice(-2)} is not supported.`,
+        value
+      );
     }
     if (frame.protocol !== CLIENT_STREAM_PROTOCOL || typeof frame.streamId !== "string" || frame.eventId !== 0 || typeof frame.resumable !== "boolean") {
       throw new ClientProtocolError("Invalid client stream_start frame.", value);
@@ -792,7 +849,7 @@ function isUIMessageGeneration(value) {
   if (!hasOnlyKeys(value, ["runId", "status", "usage", "contextUsage", "trace", "memoryCompaction"])) {
     return false;
   }
-  return (value.runId === void 0 || typeof value.runId === "string") && (value.status === void 0 || ["completed", "blocked", "approval_required", "cancelled", "error"].includes(
+  return (value.runId === void 0 || typeof value.runId === "string") && (value.status === void 0 || ["completed", "blocked", "suspended", "cancelled", "error"].includes(
     value.status
   )) && (value.usage === void 0 || isUsage(value.usage)) && (value.contextUsage === void 0 || isContextUsage(value.contextUsage)) && (value.trace === void 0 || isTrace(value.trace)) && (value.memoryCompaction === void 0 || isRecord(value.memoryCompaction) && validateMemoryCompactionForGuard(value.memoryCompaction));
 }
@@ -924,50 +981,6 @@ function isCompletionSource(value) {
 function isProviderToolCall(value) {
   return isRecord(value) && hasOnlyKeys(value, ["id", "name", "status", "details"]) && typeof value.id === "string" && typeof value.name === "string" && (value.status === void 0 || typeof value.status === "string") && (value.details === void 0 || isRecord(value.details) && isJsonValue2(value.details));
 }
-function isToolApproval(value) {
-  if (!isRecord(value)) return false;
-  const optionalStrings = [
-    "runId",
-    "agentId",
-    "sessionId",
-    "callId",
-    "internalCallId",
-    "requestedAt",
-    "resolvedAt",
-    "reason"
-  ];
-  return hasOnlyKeys(value, ["id", "toolName", "input", "status", ...optionalStrings]) && typeof value.id === "string" && typeof value.toolName === "string" && optionalStrings.every((key) => value[key] === void 0 || typeof value[key] === "string") && (value.input === void 0 || isJsonValue2(value.input)) && typeof value.status === "string" && ["pending", "approved", "rejected", "timed_out", "cancelled"].includes(value.status);
-}
-function isToolQuestion(value) {
-  if (!isRecord(value)) return false;
-  const optionalStrings = [
-    "runId",
-    "agentId",
-    "sessionId",
-    "callId",
-    "internalCallId",
-    "requestedAt",
-    "answeredAt",
-    "cancelledAt"
-  ];
-  return hasOnlyKeys(value, [
-    "id",
-    "toolName",
-    "input",
-    "questions",
-    "status",
-    "answers",
-    ...optionalStrings
-  ]) && typeof value.id === "string" && typeof value.toolName === "string" && optionalStrings.every((key) => value[key] === void 0 || typeof value[key] === "string") && (value.input === void 0 || isJsonValue2(value.input)) && Array.isArray(value.questions) && value.questions.every(isToolQuestionPrompt) && typeof value.status === "string" && ["pending", "answered", "cancelled"].includes(value.status) && (value.answers === void 0 || Array.isArray(value.answers) && value.answers.every(isToolQuestionAnswer));
-}
-function isToolQuestionPrompt(value) {
-  return isRecord(value) && hasOnlyKeys(value, ["id", "question", "choices"]) && typeof value.id === "string" && typeof value.question === "string" && Array.isArray(value.choices) && value.choices.every(
-    (choice) => isRecord(choice) && hasOnlyKeys(choice, ["label", "value"]) && typeof choice.label === "string" && typeof choice.value === "string"
-  );
-}
-function isToolQuestionAnswer(value) {
-  return isRecord(value) && hasOnlyKeys(value, ["questionId", "answer", "choice", "custom"]) && typeof value.questionId === "string" && typeof value.answer === "string" && (value.choice === void 0 || typeof value.choice === "string") && (value.custom === void 0 || typeof value.custom === "boolean");
-}
 function isGuardrailDecision(value) {
   return isRecord(value) && hasOnlyKeys(value, [
     "policyId",
@@ -1087,11 +1100,12 @@ function completionToClientStream(options) {
   return propagateCancellation(events, (source) => ({
     async *[Symbol.asyncIterator]() {
       const state = createMessageState({ runId });
-      yield clientEvent(state, {
+      const runStart = {
         type: "run_start",
-        source: "completion",
-        ...options.metadata === void 0 ? {} : { metadata: options.metadata }
-      });
+        source: "completion"
+      };
+      if (options.metadata !== void 0) runStart.metadata = options.metadata;
+      yield clientEvent(state, runStart);
       if (options.model !== void 0) {
         yield clientEvent(state, { type: "generation_start", model: options.model });
       }
@@ -1125,21 +1139,27 @@ function completionToClientStream(options) {
             case "final": {
               const result = event.result;
               if (result.messageId !== void 0) state.modelMessageId = result.messageId;
-              yield* finishMessage(state, result.content, {
-                usage: result.usage,
-                ...result.contextUsage === void 0 ? {} : { contextUsage: result.contextUsage },
-                ...result.sources === void 0 ? {} : { sources: result.sources },
-                ...result.providerToolCalls === void 0 ? {} : { providerToolCalls: result.providerToolCalls }
-              });
+              const finalMetadata = {
+                usage: result.usage
+              };
+              if (result.contextUsage !== void 0) {
+                finalMetadata.contextUsage = result.contextUsage;
+              }
+              if (result.sources !== void 0) finalMetadata.sources = result.sources;
+              if (result.providerToolCalls !== void 0) {
+                finalMetadata.providerToolCalls = result.providerToolCalls;
+              }
+              yield* finishMessage(state, result.content, finalMetadata);
               const output = clientOutput(result.output, options.mapOutput);
-              yield clientEvent(state, {
+              const runEnd = {
                 type: "run_end",
                 status: "completed",
                 text: result.text,
-                ...output === void 0 ? {} : { output },
-                usage: result.usage,
-                ...result.contextUsage === void 0 ? {} : { contextUsage: result.contextUsage }
-              });
+                usage: result.usage
+              };
+              if (output !== void 0) runEnd.output = output;
+              if (result.contextUsage !== void 0) runEnd.contextUsage = result.contextUsage;
+              yield clientEvent(state, runEnd);
               terminal = true;
               break;
             }
@@ -1174,11 +1194,12 @@ function agentToClientStream(options) {
         messages: /* @__PURE__ */ new Map(),
         startedScopes: /* @__PURE__ */ new Set(["root"])
       };
-      yield rootEvent(runId, {
+      const runStart = {
         type: "run_start",
-        source: "agent",
-        ...options.metadata === void 0 ? {} : { metadata: options.metadata }
-      });
+        source: "agent"
+      };
+      if (options.metadata !== void 0) runStart.metadata = options.metadata;
+      yield rootEvent(runId, runStart);
       let terminal = false;
       try {
         for await (const event of source) {
@@ -1215,12 +1236,12 @@ async function* translateAgentEvent(runtime, event, scope) {
   if (event.type === "agent_tool_event") {
     const childScope = {
       agentId: event.agentId,
-      ...event.agentName === void 0 ? {} : { agentName: event.agentName },
       parentRunId: runtime.runId,
       parentToolName: event.toolName,
       parentToolCallId: event.toolCallId ?? event.internalCallId,
       parentInternalToolCallId: event.internalCallId
     };
+    if (event.agentName !== void 0) childScope.agentName = event.agentName;
     const key = scopeKey(childScope);
     if (!runtime.startedScopes.has(key)) {
       runtime.startedScopes.add(key);
@@ -1302,35 +1323,44 @@ async function* translateAgentEvent(runtime, event, scope) {
         event.internalCallId
       );
       tool.result = clientToolResult(event.output, event.result);
-      yield clientEvent(state, {
+      const resultEvent = {
         type: "tool_result",
         messageId: state.messageId,
         partId: tool.partId,
         toolCallId: tool.toolCallId,
-        ...tool.callId === void 0 ? {} : { callId: tool.callId },
         internalCallId: event.internalCallId,
         toolName: event.toolName,
         input: parseJsonOrString(event.args),
         result: tool.result
-      });
+      };
+      if (tool.callId !== void 0) resultEvent.callId = tool.callId;
+      yield clientEvent(state, resultEvent);
       return;
     }
     case "turn_end": {
       const state = getAgentMessage(runtime, event.turn, scope);
       yield* startMessage(state);
       if (event.response.messageId !== void 0) state.modelMessageId = event.response.messageId;
-      yield* finishMessage(state, event.response.choice, {
-        usage: event.response.usage,
-        ...event.response.contextUsage === void 0 ? {} : { contextUsage: event.response.contextUsage },
-        ...event.response.sources === void 0 ? {} : { sources: event.response.sources },
-        ...event.response.providerToolCalls === void 0 ? {} : { providerToolCalls: event.response.providerToolCalls }
-      });
-      yield scopedEvent(runtime.runId, event.turn, scope, {
+      const finalMetadata = {
+        usage: event.response.usage
+      };
+      if (event.response.contextUsage !== void 0) {
+        finalMetadata.contextUsage = event.response.contextUsage;
+      }
+      if (event.response.sources !== void 0) finalMetadata.sources = event.response.sources;
+      if (event.response.providerToolCalls !== void 0) {
+        finalMetadata.providerToolCalls = event.response.providerToolCalls;
+      }
+      yield* finishMessage(state, event.response.choice, finalMetadata);
+      const turnEnd = {
         type: "turn_end",
-        usage: event.response.usage,
-        ...event.response.contextUsage === void 0 ? {} : { contextUsage: event.response.contextUsage },
-        ...event.firstDeltaMs === void 0 ? {} : { firstDeltaMs: event.firstDeltaMs }
-      });
+        usage: event.response.usage
+      };
+      if (event.response.contextUsage !== void 0) {
+        turnEnd.contextUsage = event.response.contextUsage;
+      }
+      if (event.firstDeltaMs !== void 0) turnEnd.firstDeltaMs = event.firstDeltaMs;
+      yield scopedEvent(runtime.runId, event.turn, scope, turnEnd);
       return;
     }
     case "guardrail_decision":
@@ -1339,43 +1369,29 @@ async function* translateAgentEvent(runtime, event, scope) {
         decision: event.decision
       });
       return;
-    case "approval_required": {
-      const input = jsonValueOrUndefined(event.approval.input);
-      yield scopedEvent(runtime.runId, turn, scope, {
-        type: "tool_approval",
-        approval: {
-          id: event.approval.id,
-          runId: event.runId,
-          toolName: event.approval.toolName,
-          ...event.approval.toolCallId === void 0 ? {} : { callId: event.approval.toolCallId },
-          ...input === void 0 ? {} : { input },
-          status: "pending",
-          ...event.approval.reason === void 0 ? {} : { reason: event.approval.reason }
-        }
-      });
-      yield scopedEvent(runtime.runId, turn, scope, {
-        type: "run_end",
-        status: "approval_required",
-        usage: event.usage,
-        ...event.memoryCompaction === void 0 ? {} : { memoryCompaction: event.memoryCompaction },
-        ...runtime.options.metadata === void 0 ? {} : { metadata: runtime.options.metadata }
-      });
-      return;
-    }
     case "final": {
       const result = event.result;
+      if (result.status === "suspended" && scope === void 0) {
+        yield scopedEvent(runtime.runId, turn, scope, {
+          type: "interaction",
+          interaction: result.interaction
+        });
+      }
       const output = result.status === "completed" ? clientOutput(result.output, runtime.options.mapOutput) : void 0;
-      yield scopedEvent(runtime.runId, turn, scope, {
+      const runEnd = {
         type: "run_end",
         status: result.status,
         text: result.text,
-        ...output === void 0 ? {} : { output },
-        usage: result.usage,
-        ...result.contextUsage === void 0 ? {} : { contextUsage: result.contextUsage },
-        ...result.trace === void 0 ? {} : { trace: clientTrace(result.trace) },
-        ...result.memoryCompaction === void 0 ? {} : { memoryCompaction: result.memoryCompaction },
-        ...runtime.options.metadata === void 0 ? {} : { metadata: runtime.options.metadata }
-      });
+        usage: result.usage
+      };
+      if (output !== void 0) runEnd.output = output;
+      if (result.contextUsage !== void 0) runEnd.contextUsage = result.contextUsage;
+      if (result.trace !== void 0) runEnd.trace = clientTrace(result.trace);
+      if (result.memoryCompaction !== void 0) {
+        runEnd.memoryCompaction = result.memoryCompaction;
+      }
+      if (runtime.options.metadata !== void 0) runEnd.metadata = runtime.options.metadata;
+      yield scopedEvent(runtime.runId, turn, scope, runEnd);
       return;
     }
     case "error": {
@@ -1389,11 +1405,12 @@ async function* translateAgentEvent(runtime, event, scope) {
       return;
     }
     default: {
-      const mapped = runtime.options.mapCustomEvent?.(event, {
-        runId: runtime.runId,
-        ...turn === void 0 ? {} : { turn },
-        ...scope === void 0 ? {} : { scope }
-      });
+      const context = {
+        runId: runtime.runId
+      };
+      if (turn !== void 0) context.turn = turn;
+      if (scope !== void 0) context.scope = scope;
+      const mapped = runtime.options.mapCustomEvent?.(event, context);
       if (mapped === void 0) return;
       if (Array.isArray(mapped)) {
         yield* mapped;
@@ -1404,11 +1421,9 @@ async function* translateAgentEvent(runtime, event, scope) {
   }
 }
 function createMessageState(input) {
-  return {
+  const state = {
     runId: input.runId,
     messageId: createClientId("msg"),
-    ...input.turn === void 0 ? {} : { turn: input.turn },
-    ...input.scope === void 0 ? {} : { scope: input.scope },
     started: false,
     ended: false,
     textPartId: createClientId("text"),
@@ -1420,16 +1435,20 @@ function createMessageState(input) {
     sourceFingerprints: /* @__PURE__ */ new Set(),
     providerToolCallFingerprints: /* @__PURE__ */ new Set()
   };
+  if (input.turn !== void 0) state.turn = input.turn;
+  if (input.scope !== void 0) state.scope = input.scope;
+  return state;
 }
 function getAgentMessage(runtime, turn, scope) {
   const key = `${scopeKey(scope)}:${turn}`;
   const current = runtime.messages.get(key);
   if (current !== void 0) return current;
-  const created = createMessageState({
+  const input = {
     runId: runtime.runId,
-    turn,
-    ...scope === void 0 ? {} : { scope }
-  });
+    turn
+  };
+  if (scope !== void 0) input.scope = scope;
+  const created = createMessageState(input);
   runtime.messages.set(key, created);
   return created;
 }
@@ -1482,40 +1501,43 @@ async function* appendReasoning(state, event) {
   if (reasoning === void 0) {
     reasoning = {
       partId: createClientId("reasoning"),
-      ...event.id === void 0 ? {} : { reasoningId: event.id },
       text: "",
       ended: false
     };
+    if (event.id !== void 0) reasoning.reasoningId = event.id;
     state.reasoning.set(key, reasoning);
-    yield clientEvent(state, {
+    const reasoningStart = {
       type: "reasoning_start",
       messageId: state.messageId,
-      partId: reasoning.partId,
-      ...event.id === void 0 ? {} : { reasoningId: event.id }
-    });
+      partId: reasoning.partId
+    };
+    if (event.id !== void 0) reasoningStart.reasoningId = event.id;
+    yield clientEvent(state, reasoningStart);
   }
   reasoning.text += event.delta;
-  yield clientEvent(state, {
+  const reasoningDelta = {
     type: "reasoning_delta",
     messageId: state.messageId,
     partId: reasoning.partId,
-    delta: event.delta,
-    ...event.contentType === void 0 ? {} : { contentType: event.contentType },
-    ...event.signature === void 0 ? {} : { signature: event.signature }
-  });
+    delta: event.delta
+  };
+  if (event.contentType !== void 0) reasoningDelta.contentType = event.contentType;
+  if (event.signature !== void 0) reasoningDelta.signature = event.signature;
+  yield clientEvent(state, reasoningDelta);
 }
 async function* appendToolCall(state, event) {
   const tool = getToolState(state, event.id, event.name);
   if (!tool.started) {
     tool.started = true;
-    yield clientEvent(state, {
+    const toolCallStart = {
       type: "tool_call_start",
       messageId: state.messageId,
       partId: tool.partId,
-      toolCallId: event.id,
-      ...event.callId === void 0 ? {} : { callId: event.callId },
-      ...event.name === void 0 ? {} : { toolName: event.name }
-    });
+      toolCallId: event.id
+    };
+    if (event.callId !== void 0) toolCallStart.callId = event.callId;
+    if (event.name !== void 0) toolCallStart.toolName = event.name;
+    yield clientEvent(state, toolCallStart);
   }
   if (event.callId !== void 0) tool.callId = event.callId;
   if (event.name !== void 0) tool.toolName = event.name;
@@ -1524,31 +1546,33 @@ async function* appendToolCall(state, event) {
   const mode = event.argumentsMode ?? "append";
   const prior = typeof tool.input === "string" ? tool.input : "";
   tool.input = mode === "replace" ? event.argumentsDelta : `${prior}${event.argumentsDelta}`;
-  yield clientEvent(state, {
+  const toolCallDelta = {
     type: "tool_call_delta",
     messageId: state.messageId,
     partId: tool.partId,
     toolCallId: event.id,
-    ...event.callId === void 0 ? {} : { callId: event.callId },
-    ...event.name === void 0 ? {} : { toolName: event.name },
     delta: event.argumentsDelta,
-    mode,
-    ...event.signature === void 0 ? {} : { signature: event.signature }
-  });
+    mode
+  };
+  if (event.callId !== void 0) toolCallDelta.callId = event.callId;
+  if (event.name !== void 0) toolCallDelta.toolName = event.name;
+  if (event.signature !== void 0) toolCallDelta.signature = event.signature;
+  yield clientEvent(state, toolCallDelta);
 }
 async function* finishToolCall(state, toolCall) {
   const tool = getToolState(state, toolCall.toolCallId, toolCall.toolName);
   const wasEnded = tool.ended;
   if (!tool.started) {
     tool.started = true;
-    yield clientEvent(state, {
+    const toolCallStart = {
       type: "tool_call_start",
       messageId: state.messageId,
       partId: tool.partId,
       toolCallId: toolCall.toolCallId,
-      ...toolCall.callId === void 0 ? {} : { callId: toolCall.callId },
       toolName: toolCall.toolName
-    });
+    };
+    if (toolCall.callId !== void 0) toolCallStart.callId = toolCall.callId;
+    yield clientEvent(state, toolCallStart);
   }
   if (toolCall.callId === void 0) delete tool.callId;
   else tool.callId = toolCall.callId;
@@ -1558,16 +1582,17 @@ async function* finishToolCall(state, toolCall) {
   else tool.signature = toolCall.signature;
   if (wasEnded) return;
   tool.ended = true;
-  yield clientEvent(state, {
+  const toolCallEnd = {
     type: "tool_call_end",
     messageId: state.messageId,
     partId: tool.partId,
     toolCallId: toolCall.toolCallId,
-    ...toolCall.callId === void 0 ? {} : { callId: toolCall.callId },
     toolName: toolCall.toolName,
-    input: toolCall.input,
-    ...toolCall.signature === void 0 ? {} : { signature: toolCall.signature }
-  });
+    input: toolCall.input
+  };
+  if (toolCall.callId !== void 0) toolCallEnd.callId = toolCall.callId;
+  if (toolCall.signature !== void 0) toolCallEnd.signature = toolCall.signature;
+  yield clientEvent(state, toolCallEnd);
 }
 async function* finishMessage(state, content, metadata) {
   if (state.ended) return;
@@ -1586,13 +1611,16 @@ async function* finishMessage(state, content, metadata) {
     }
     state.text = text;
     state.textEnded = true;
-    yield clientEvent(state, {
+    const textEnd = {
       type: "text_end",
       messageId: state.messageId,
       partId: state.textPartId,
-      text,
-      ...textContent2.length === 1 && textContent2[0]?.signature !== void 0 ? { signature: textContent2[0].signature } : {}
-    });
+      text
+    };
+    if (textContent2.length === 1 && textContent2[0]?.signature !== void 0) {
+      textEnd.signature = textContent2[0].signature;
+    }
+    yield clientEvent(state, textEnd);
   }
   const finalReasoning = content.filter(
     (part) => part.type === "reasoning"
@@ -1606,23 +1634,25 @@ async function* finishMessage(state, content, metadata) {
     const current = existing ?? createReasoningState(reasoning.id);
     if (existing === void 0) {
       state.reasoning.set(reasoning.id ?? `final:${index}`, current);
-      yield clientEvent(state, {
+      const reasoningStart = {
         type: "reasoning_start",
         messageId: state.messageId,
-        partId: current.partId,
-        ...reasoning.id === void 0 ? {} : { reasoningId: reasoning.id }
-      });
+        partId: current.partId
+      };
+      if (reasoning.id !== void 0) reasoningStart.reasoningId = reasoning.id;
+      yield clientEvent(state, reasoningStart);
     }
     if (!current.ended) {
       current.ended = true;
       current.text = reasoning.text;
-      yield clientEvent(state, {
+      const reasoningEnd = {
         type: "reasoning_end",
         messageId: state.messageId,
         partId: current.partId,
-        text: reasoning.text,
-        ...reasoning.details === void 0 ? {} : { content: reasoning.details }
-      });
+        text: reasoning.text
+      };
+      if (reasoning.details !== void 0) reasoningEnd.content = reasoning.details;
+      yield clientEvent(state, reasoningEnd);
     }
   }
   for (const reasoning of state.reasoning.values()) {
@@ -1652,14 +1682,15 @@ async function* finishMessage(state, content, metadata) {
     yield* emitProviderToolCall(state, toolCall);
   }
   state.ended = true;
-  yield clientEvent(state, {
+  const messageEnd = {
     type: "message_end",
     messageId: state.messageId,
-    ...state.modelMessageId === void 0 ? {} : { modelMessageId: state.modelMessageId },
     parts: contentToUIMessageParts(content, state),
-    usage: metadata.usage,
-    ...metadata.contextUsage === void 0 ? {} : { contextUsage: metadata.contextUsage }
-  });
+    usage: metadata.usage
+  };
+  if (state.modelMessageId !== void 0) messageEnd.modelMessageId = state.modelMessageId;
+  if (metadata.contextUsage !== void 0) messageEnd.contextUsage = metadata.contextUsage;
+  yield clientEvent(state, messageEnd);
 }
 async function* finishErroredRun(state, error, usage, mapper) {
   const mapped = mapClientError(error, mapper);
@@ -1672,25 +1703,28 @@ async function* finishErroredRun(state, error, usage, mapper) {
       text: state.text
     });
   }
-  yield clientEvent(state, {
+  const errorEvent = {
     type: "error",
-    error: mapped,
-    ...usage === void 0 ? {} : { usage }
-  });
+    error: mapped
+  };
+  if (usage !== void 0) errorEvent.usage = usage;
+  yield clientEvent(state, errorEvent);
   if (!state.ended) {
     state.ended = true;
-    yield clientEvent(state, {
+    const messageEnd = {
       type: "message_end",
-      messageId: state.messageId,
-      ...state.modelMessageId === void 0 ? {} : { modelMessageId: state.modelMessageId },
-      ...usage === void 0 ? {} : { usage }
-    });
+      messageId: state.messageId
+    };
+    if (state.modelMessageId !== void 0) messageEnd.modelMessageId = state.modelMessageId;
+    if (usage !== void 0) messageEnd.usage = usage;
+    yield clientEvent(state, messageEnd);
   }
-  yield clientEvent(state, {
+  const runEnd = {
     type: "run_end",
-    status: "error",
-    ...usage === void 0 ? {} : { usage }
-  });
+    status: "error"
+  };
+  if (usage !== void 0) runEnd.usage = usage;
+  yield clientEvent(state, runEnd);
 }
 function contentToUIMessageParts(content, state) {
   let textIndex = 0;
@@ -1756,11 +1790,11 @@ function getToolState(state, id, name) {
     tool = {
       partId: createClientId("tool"),
       toolCallId: id,
-      ...name === void 0 ? {} : { toolName: name },
       input: "",
       started: false,
       ended: false
     };
+    if (name !== void 0) tool.toolName = name;
     state.tools.set(id, tool);
   } else if (name !== void 0) {
     tool.toolName = name;
@@ -1777,12 +1811,13 @@ function getToolResultState(state, toolName, toolCallId, callId, internalCallId)
   return tool;
 }
 function createReasoningState(id) {
-  return {
+  const state = {
     partId: createClientId("reasoning"),
-    ...id === void 0 ? {} : { reasoningId: id },
     text: "",
     ended: false
   };
+  if (id !== void 0) state.reasoningId = id;
+  return state;
 }
 function contentAttachment(content) {
   const attachment = {
@@ -1863,15 +1898,13 @@ function valueFingerprint(value) {
   }
   return `${typeof value}:${JSON.stringify(value)}`;
 }
-function jsonValueOrUndefined(value) {
-  return isJsonValue3(value) ? value : void 0;
-}
 function clientTrace(trace) {
-  return {
-    observer: trace.observer,
-    ...trace.traceId === void 0 ? {} : { traceId: trace.traceId },
-    ...trace.observationId === void 0 ? {} : { observationId: trace.observationId }
+  const result = {
+    observer: trace.observer
   };
+  if (trace.traceId !== void 0) result.traceId = trace.traceId;
+  if (trace.observationId !== void 0) result.observationId = trace.observationId;
+  return result;
 }
 function mapClientError(error, mapper) {
   const mapped = mapper?.(error) ?? maskedClientError();
@@ -1887,12 +1920,10 @@ function rootEvent(runId, event, scope) {
   return scopedEvent(runId, void 0, scope, event);
 }
 function scopedEvent(runId, turn, scope, event) {
-  return {
-    runId,
-    ...turn === void 0 ? {} : { turn },
-    ...scope === void 0 ? {} : { scope },
-    ...event
-  };
+  let scoped = { runId, ...event };
+  if (turn !== void 0) scoped = { ...scoped, turn };
+  if (scope !== void 0) scoped = { ...scoped, scope };
+  return scoped;
 }
 function scopeKey(scope) {
   if (scope === void 0) return "root";
@@ -1905,7 +1936,7 @@ function scopeKey(scope) {
   ].join(":");
 }
 function isRootTerminalAgentEvent(event) {
-  return event.type === "final" || event.type === "approval_required" || event.type === "error";
+  return event.type === "final" || event.type === "error";
 }
 function propagateCancellation(source, transform) {
   return {
@@ -1958,6 +1989,15 @@ function createDirectClientTransport(options) {
       if (resume !== void 0) {
         throw new ClientProtocolError("Direct client transports do not support resume cursors.");
       }
+      const handlerOptions = {
+        request: sendOptions.request
+      };
+      if (sendOptions.abortSignal !== void 0) {
+        handlerOptions.abortSignal = sendOptions.abortSignal;
+      }
+      if (sendOptions.headers !== void 0) handlerOptions.headers = sendOptions.headers;
+      const events = await options.handler(handlerOptions);
+      const iterator = events[Symbol.asyncIterator]();
       const streamId = createClientId("stream");
       let eventId = 0;
       yield {
@@ -1969,12 +2009,6 @@ function createDirectClientTransport(options) {
       };
       let status = "completed";
       try {
-        const events = await options.handler({
-          request: sendOptions.request,
-          ...sendOptions.abortSignal === void 0 ? {} : { abortSignal: sendOptions.abortSignal },
-          ...sendOptions.headers === void 0 ? {} : { headers: sendOptions.headers }
-        });
-        const iterator = events[Symbol.asyncIterator]();
         let closePromise;
         const close = () => {
           closePromise ??= Promise.resolve(iterator.return?.());
@@ -2046,10 +2080,10 @@ async function* validateFrameSequence(frames, resume) {
   }
 }
 function protocolOptions(options) {
-  return {
-    ...options.metadataSchema === void 0 ? {} : { metadataSchema: options.metadataSchema },
-    ...options.dataSchemas === void 0 ? {} : { dataSchemas: options.dataSchemas }
-  };
+  const result = {};
+  if (options.metadataSchema !== void 0) result.metadataSchema = options.metadataSchema;
+  if (options.dataSchemas !== void 0) result.dataSchemas = options.dataSchemas;
+  return result;
 }
 function resumeCursorFromRequest(value) {
   if (typeof value !== "object" || value === null || !("resume" in value)) return void 0;
@@ -2066,16 +2100,16 @@ function applyClientStreamEvent(messages, event) {
     return messages;
   }
   switch (event.type) {
-    case "message_start":
-      return messages.some((message) => message.id === event.messageId) ? messages : [
-        ...messages,
-        {
-          id: event.messageId,
-          role: event.role,
-          parts: [],
-          ...event.metadata === void 0 ? {} : { metadata: event.metadata }
-        }
-      ];
+    case "message_start": {
+      if (messages.some((message2) => message2.id === event.messageId)) return messages;
+      let message = {
+        id: event.messageId,
+        role: event.role,
+        parts: []
+      };
+      if (event.metadata !== void 0) message = { ...message, metadata: event.metadata };
+      return [...messages, message];
+    }
     case "text_start":
       return upsertPart(messages, event.messageId, {
         id: event.partId,
@@ -2098,21 +2132,25 @@ function applyClientStreamEvent(messages, event) {
         if (event.signature !== void 0) next.signature = event.signature;
         return next;
       });
-    case "reasoning_start":
-      return upsertPart(messages, event.messageId, {
+    case "reasoning_start": {
+      const reasoning = {
         id: event.partId,
         type: "reasoning",
-        text: "",
-        ...event.reasoningId === void 0 ? {} : { reasoningId: event.reasoningId }
-      });
+        text: ""
+      };
+      if (event.reasoningId !== void 0) reasoning.reasoningId = event.reasoningId;
+      return upsertPart(messages, event.messageId, reasoning);
+    }
     case "reasoning_delta":
       return updatePart(messages, event.messageId, event.partId, (part) => {
         const reasoning = {
           id: event.partId,
           type: "reasoning",
-          text: part?.type === "reasoning" ? `${part.text}${event.delta}` : event.delta,
-          ...part?.type === "reasoning" && part.reasoningId !== void 0 ? { reasoningId: part.reasoningId } : {}
+          text: part?.type === "reasoning" ? `${part.text}${event.delta}` : event.delta
         };
+        if (part?.type === "reasoning" && part.reasoningId !== void 0) {
+          reasoning.reasoningId = part.reasoningId;
+        }
         const content = appendReasoningContent(
           part?.type === "reasoning" ? part.content : void 0,
           event
@@ -2121,13 +2159,22 @@ function applyClientStreamEvent(messages, event) {
         return reasoning;
       });
     case "reasoning_end":
-      return updatePart(messages, event.messageId, event.partId, (part) => ({
-        id: event.partId,
-        type: "reasoning",
-        text: event.text ?? (part?.type === "reasoning" ? part.text : ""),
-        ...part?.type === "reasoning" && part.reasoningId !== void 0 ? { reasoningId: part.reasoningId } : {},
-        ...event.content !== void 0 ? { content: event.content } : part?.type === "reasoning" && part.content !== void 0 ? { content: part.content } : {}
-      }));
+      return updatePart(messages, event.messageId, event.partId, (part) => {
+        const reasoning = {
+          id: event.partId,
+          type: "reasoning",
+          text: event.text ?? (part?.type === "reasoning" ? part.text : "")
+        };
+        if (part?.type === "reasoning" && part.reasoningId !== void 0) {
+          reasoning.reasoningId = part.reasoningId;
+        }
+        if (event.content !== void 0) {
+          reasoning.content = event.content;
+        } else if (part?.type === "reasoning" && part.content !== void 0) {
+          reasoning.content = part.content;
+        }
+        return reasoning;
+      });
     case "tool_call_start": {
       const part = {
         id: event.partId,
@@ -2220,28 +2267,40 @@ function applyClientStreamEvent(messages, event) {
       return messages.map((message) => {
         if (message.id !== event.messageId) return message;
         const metadata = mergeMetadata(message.metadata, event.metadata);
-        const generation = mergeGeneration(message.generation, {
-          runId: event.runId,
-          ...event.usage === void 0 ? {} : { usage: event.usage },
-          ...event.contextUsage === void 0 ? {} : { contextUsage: event.contextUsage }
-        });
-        return {
+        const generationUpdate = {
+          runId: event.runId
+        };
+        if (event.usage !== void 0) generationUpdate.usage = event.usage;
+        if (event.contextUsage !== void 0) {
+          generationUpdate.contextUsage = event.contextUsage;
+        }
+        const generation = mergeGeneration(message.generation, generationUpdate);
+        let updated = {
           ...message,
-          ...event.parts === void 0 ? {} : { parts: reconcileFinalParts(message.parts, event.parts) },
-          ...event.modelMessageId === void 0 ? {} : { modelMessageId: event.modelMessageId },
-          ...metadata === void 0 ? {} : { metadata },
           generation
         };
+        if (event.parts !== void 0) {
+          updated = { ...updated, parts: reconcileFinalParts(message.parts, event.parts) };
+        }
+        if (event.modelMessageId !== void 0) {
+          updated = { ...updated, modelMessageId: event.modelMessageId };
+        }
+        if (metadata !== void 0) updated = { ...updated, metadata };
+        return updated;
       });
-    case "run_end":
-      return updateLastAssistantGeneration(messages, {
+    case "run_end": {
+      const generation = {
         runId: event.runId,
-        status: event.status,
-        ...event.usage === void 0 ? {} : { usage: event.usage },
-        ...event.contextUsage === void 0 ? {} : { contextUsage: event.contextUsage },
-        ...event.trace === void 0 ? {} : { trace: event.trace },
-        ...event.memoryCompaction === void 0 ? {} : { memoryCompaction: event.memoryCompaction }
-      });
+        status: event.status
+      };
+      if (event.usage !== void 0) generation.usage = event.usage;
+      if (event.contextUsage !== void 0) generation.contextUsage = event.contextUsage;
+      if (event.trace !== void 0) generation.trace = event.trace;
+      if (event.memoryCompaction !== void 0) {
+        generation.memoryCompaction = event.memoryCompaction;
+      }
+      return updateLastAssistantGeneration(messages, generation);
+    }
     case "error":
       return appendToLastAssistant(messages, {
         id: createClientId("error"),
@@ -2267,11 +2326,12 @@ function appendReasoningContent(current, event) {
     if (last?.type === "text" && last.signature === event.signature) {
       next[next.length - 1] = { ...last, text: `${last.text}${event.delta}` };
     } else {
-      next.push({
+      let detail = {
         type,
-        text: event.delta,
-        ...event.signature === void 0 ? {} : { signature: event.signature }
-      });
+        text: event.delta
+      };
+      if (event.signature !== void 0) detail = { ...detail, signature: event.signature };
+      next.push(detail);
     }
     return next;
   }