@iqai/adk 0.2.4 → 0.2.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iqai/adk
 
+## 0.2.5
+
+### Patch Changes
+
+- e1dc750: - Implements output schema to work with tools and agent transfers
+
 ## 0.2.4
 
 ### Patch Changes

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7; var _class8; var _class9; var _class10; var _class11; var _class12; var _class13; var _class14; var _class15; var _class16; var _class17; var _class18; var _class19; var _class20; var _class21; var _class22; var _class23; var _class24; var _class25; var _class26; var _class27; var _class28; var _class29; var _class30; var _class31; var _class32; var _class33; var _class34; var _class35;var __defProp = Object.defineProperty;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } async function _asyncOptionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = await fn(value); } else if (op === 'call' || op === 'optionalCall') { value = await fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7; var _class8; var _class9; var _class10; var _class11; var _class12; var _class13; var _class14; var _class15; var _class16; var _class17; var _class18; var _class19; var _class20; var _class21; var _class22; var _class23; var _class24; var _class25; var _class26; var _class27; var _class28; var _class29; var _class30; var _class31; var _class32; var _class33; var _class34; var _class35;var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -7111,6 +7111,7 @@ var AuthLlmRequestProcessor = class extends BaseLlmRequestProcessor {
 var requestProcessor = new AuthLlmRequestProcessor();
 
 // src/flows/llm-flows/basic.ts
+init_logger();
 var BasicLlmRequestProcessor = class extends BaseLlmRequestProcessor {
   async *runAsync(invocationContext, llmRequest) {
     const agent = invocationContext.agent;
@@ -7126,7 +7127,21 @@ var BasicLlmRequestProcessor = class extends BaseLlmRequestProcessor {
       llmRequest.config = {};
     }
     if (agent.outputSchema) {
-      llmRequest.setOutputSchema(agent.outputSchema);
+      const hasTools = await _asyncOptionalChain([(await _optionalChain([agent, 'access', _211 => _211.canonicalTools, 'optionalCall', _212 => _212(invocationContext)])), 'optionalAccess', async _213 => _213.length]) > 0;
+      const hasTransfers = !!("subAgents" in agent && agent.subAgents && agent.subAgents.length > 0 && !(agent.disallowTransferToParent && agent.disallowTransferToPeers));
+      if (!hasTools && !hasTransfers) {
+        llmRequest.setOutputSchema(agent.outputSchema);
+      } else {
+        (() => {
+          try {
+            const logger = new Logger({ name: "BasicLlmRequestProcessor" });
+            logger.debug(
+              `Skipping request-level output schema for agent ${agent.name} because tools/transfers are present. Schema will be validated during response processing.`
+            );
+          } catch (e) {
+          }
+        })();
+      }
     }
     const runConfig = invocationContext.runConfig;
     if (!llmRequest.liveConnectConfig) {
@@ -7204,7 +7219,7 @@ var BuiltInCodeExecutor = class extends BaseCodeExecutor {
    * Pre-process the LLM request for Gemini 2.0+ models to use the code execution tool
    */
   processLlmRequest(llmRequest) {
-    if (!_optionalChain([llmRequest, 'access', _211 => _211.model, 'optionalAccess', _212 => _212.startsWith, 'call', _213 => _213("gemini-2")])) {
+    if (!_optionalChain([llmRequest, 'access', _214 => _214.model, 'optionalAccess', _215 => _215.startsWith, 'call', _216 => _216("gemini-2")])) {
       throw new Error(
         `Gemini code execution tool is not supported for model ${llmRequest.model}`
       );
@@ -7249,7 +7264,7 @@ var CodeExecutionUtils = class _CodeExecutionUtils {
    * Extracts the first code block from the content and truncates everything after it
    */
   static extractCodeAndTruncateContent(content, codeBlockDelimiters) {
-    if (!_optionalChain([content, 'optionalAccess', _214 => _214.parts, 'optionalAccess', _215 => _215.length])) {
+    if (!_optionalChain([content, 'optionalAccess', _217 => _217.parts, 'optionalAccess', _218 => _218.length])) {
       return null;
     }
     for (let idx = 0; idx < content.parts.length; idx++) {
@@ -7335,7 +7350,7 @@ ${fileNames}`);
    * Converts the code execution parts to text parts in a Content
    */
   static convertCodeExecutionParts(content, codeBlockDelimiter, executionResultDelimiters) {
-    if (!_optionalChain([content, 'access', _216 => _216.parts, 'optionalAccess', _217 => _217.length])) {
+    if (!_optionalChain([content, 'access', _219 => _219.parts, 'optionalAccess', _220 => _220.length])) {
       return;
     }
     const lastPart = content.parts[content.parts.length - 1];
@@ -7728,7 +7743,7 @@ async function* runPostProcessor(invocationContext, llmResponse) {
 function extractAndReplaceInlineFiles(codeExecutorContext, llmRequest) {
   const allInputFiles = codeExecutorContext.getInputFiles();
   const savedFileNames = new Set(allInputFiles.map((f) => f.name));
-  for (let i = 0; i < (_optionalChain([llmRequest, 'access', _218 => _218.contents, 'optionalAccess', _219 => _219.length]) || 0); i++) {
+  for (let i = 0; i < (_optionalChain([llmRequest, 'access', _221 => _221.contents, 'optionalAccess', _222 => _222.length]) || 0); i++) {
     const content = llmRequest.contents[i];
     if (content.role !== "user" || !content.parts) {
       continue;
@@ -7760,7 +7775,7 @@ Available file: \`${fileName}\`
 }
 function getOrSetExecutionId(invocationContext, codeExecutorContext) {
   const agent = invocationContext.agent;
-  if (!hasCodeExecutor(agent) || !_optionalChain([agent, 'access', _220 => _220.codeExecutor, 'optionalAccess', _221 => _221.stateful])) {
+  if (!hasCodeExecutor(agent) || !_optionalChain([agent, 'access', _223 => _223.codeExecutor, 'optionalAccess', _224 => _224.stateful])) {
     return void 0;
   }
   let executionId = codeExecutorContext.getExecutionId();
@@ -7991,7 +8006,7 @@ function rearrangeEventsForLatestFunctionResponse(events) {
       continue;
     }
     const functionResponses2 = event.getFunctionResponses();
-    if (_optionalChain([functionResponses2, 'optionalAccess', _222 => _222.some, 'call', _223 => _223((fr) => fr.id && functionResponsesIds.has(fr.id))])) {
+    if (_optionalChain([functionResponses2, 'optionalAccess', _225 => _225.some, 'call', _226 => _226((fr) => fr.id && functionResponsesIds.has(fr.id))])) {
       functionResponseEvents.push(event);
     }
   }
@@ -8090,7 +8105,7 @@ function mergeFunctionResponseEvents(functionResponseEvents) {
   const partIndicesInMergedEvent = {};
   for (let idx = 0; idx < partsInMergedEvent.length; idx++) {
     const part = partsInMergedEvent[idx];
-    if (_optionalChain([part, 'access', _224 => _224.functionResponse, 'optionalAccess', _225 => _225.id])) {
+    if (_optionalChain([part, 'access', _227 => _227.functionResponse, 'optionalAccess', _228 => _228.id])) {
       partIndicesInMergedEvent[part.functionResponse.id] = idx;
     }
   }
@@ -8099,7 +8114,7 @@ function mergeFunctionResponseEvents(functionResponseEvents) {
       throw new Error("There should be at least one function_response part.");
     }
     for (const part of event.content.parts) {
-      if (_optionalChain([part, 'access', _226 => _226.functionResponse, 'optionalAccess', _227 => _227.id])) {
+      if (_optionalChain([part, 'access', _229 => _229.functionResponse, 'optionalAccess', _230 => _230.id])) {
         const functionCallId = part.functionResponse.id;
         if (functionCallId in partIndicesInMergedEvent) {
           partsInMergedEvent[partIndicesInMergedEvent[functionCallId]] = part;
@@ -8278,10 +8293,11 @@ var InstructionsLlmRequestProcessor = class extends BaseLlmRequestProcessor {
         });
         const { $schema, ...json } = raw || {};
         llmRequest.appendInstructions([
-          "You must respond with application/json that validates against this JSON Schema:",
-          "```json",
-          JSON.stringify(json, null, 2),
-          "```"
+          "You must respond with application/json that validates against this JSON Schema (do NOT wrap the output in markdown or code fences):",
+          JSON.stringify(json, null, 2)
+        ]);
+        llmRequest.appendInstructions([
+          'IMPORTANT: After any tool calls, function calls, or agent transfers have completed, produce ONE final assistant message whose entire content is ONLY the JSON object that conforms to the schema provided above. Do NOT include any explanatory text, markdown, or additional messages. Do NOT wrap the JSON in code fences (for example, do NOT use ```json or ```). If you cannot produce valid JSON that matches the schema, return a JSON object with an "error" field describing the problem.'
         ]);
       } catch (e5) {
       }
@@ -8368,7 +8384,7 @@ var PlanReActPlanner = class extends BasePlanner {
     let firstFcPartIndex = -1;
     for (let i = 0; i < responseParts.length; i++) {
       if (responseParts[i].functionCall) {
-        if (!_optionalChain([responseParts, 'access', _228 => _228[i], 'access', _229 => _229.functionCall, 'optionalAccess', _230 => _230.name])) {
+        if (!_optionalChain([responseParts, 'access', _231 => _231[i], 'access', _232 => _232.functionCall, 'optionalAccess', _233 => _233.name])) {
           continue;
         }
         preservedParts.push(responseParts[i]);
@@ -8407,7 +8423,7 @@ var PlanReActPlanner = class extends BasePlanner {
    * Handles non-function-call parts of the response
    */
   _handleNonFunctionCallParts(responsePart, preservedParts) {
-    if (_optionalChain([responsePart, 'access', _231 => _231.text, 'optionalAccess', _232 => _232.includes, 'call', _233 => _233(FINAL_ANSWER_TAG)])) {
+    if (_optionalChain([responsePart, 'access', _234 => _234.text, 'optionalAccess', _235 => _235.includes, 'call', _236 => _236(FINAL_ANSWER_TAG)])) {
       const [reasoningText, finalAnswerText] = this._splitByLastPattern(
         responsePart.text,
         FINAL_ANSWER_TAG
@@ -8578,6 +8594,7 @@ var requestProcessor7 = new NlPlanningRequestProcessor();
 var responseProcessor2 = new NlPlanningResponseProcessor();
 
 // src/flows/llm-flows/output-schema.ts
+var _jsonrepair = require('jsonrepair');
 init_logger();
 var OutputSchemaResponseProcessor = (_class26 = class extends BaseLlmResponseProcessor {constructor(...args2) { super(...args2); _class26.prototype.__init46.call(this); }
   __init46() {this.logger = new Logger({ name: "OutputSchemaResponseProcessor" })}
@@ -8599,7 +8616,8 @@ var OutputSchemaResponseProcessor = (_class26 = class extends BaseLlmResponsePro
       return;
     }
     try {
-      const parsed = JSON.parse(textContent);
+      const candidate = this.stripCodeFences(textContent);
+      const parsed = this.tryParseJson(candidate, agent.name);
       const validated = agent.outputSchema.parse(parsed);
       textContent = JSON.stringify(validated, null, 2);
       llmResponse.content.parts = llmResponse.content.parts.map((part) => {
@@ -8647,6 +8665,38 @@ var OutputSchemaResponseProcessor = (_class26 = class extends BaseLlmResponsePro
       yield errorEvent;
     }
   }
+  // Strip common code fences and surrounding explanatory text from LLM output.
+  stripCodeFences(raw) {
+    const fencePattern = /```(?:json)?\s*([\s\S]*?)```/i;
+    const fenceMatch = raw.match(fencePattern);
+    if (_optionalChain([fenceMatch, 'optionalAccess', _237 => _237[1]])) {
+      return fenceMatch[1].trim();
+    }
+    const lines = raw.split(/\r?\n/).map((l) => l.trim());
+    const startIdx = lines.findIndex(
+      (l) => l.startsWith("{") || l.startsWith("[")
+    );
+    if (startIdx >= 0) {
+      return lines.slice(startIdx).join("\n").trim();
+    }
+    return raw.trim();
+  }
+  // Try parsing JSON; if parse fails, attempt to repair using jsonrepair and parse again.
+  tryParseJson(candidate, agentName) {
+    try {
+      return JSON.parse(candidate);
+    } catch (err) {
+      this.logger.debug("Initial JSON.parse failed, attempting jsonrepair", {
+        agent: agentName
+      });
+      try {
+        const repaired = _jsonrepair.jsonrepair.call(void 0, candidate);
+        return JSON.parse(repaired);
+      } catch (repairErr) {
+        throw err;
+      }
+    }
+  }
 }, _class26);
 var responseProcessor3 = new OutputSchemaResponseProcessor();
 
@@ -8656,7 +8706,7 @@ var SharedMemoryRequestProcessor = class extends BaseLlmRequestProcessor {
     const memoryService = invocationContext.memoryService;
     if (!memoryService) return;
     const lastUserEvent = invocationContext.session.events.findLast(
-      (e) => e.author === "user" && _optionalChain([e, 'access', _234 => _234.content, 'optionalAccess', _235 => _235.parts, 'optionalAccess', _236 => _236.length])
+      (e) => e.author === "user" && _optionalChain([e, 'access', _238 => _238.content, 'optionalAccess', _239 => _239.parts, 'optionalAccess', _240 => _240.length])
     );
     if (!lastUserEvent) return;
     const query = (_nullishCoalesce(lastUserEvent.content.parts, () => ( []))).map((p) => p.text || "").join(" ");
@@ -8667,7 +8717,7 @@ var SharedMemoryRequestProcessor = class extends BaseLlmRequestProcessor {
     });
     const sessionTexts = new Set(
       (llmRequest.contents || []).flatMap(
-        (c) => _optionalChain([c, 'access', _237 => _237.parts, 'optionalAccess', _238 => _238.map, 'call', _239 => _239((p) => p.text)]) || []
+        (c) => _optionalChain([c, 'access', _241 => _241.parts, 'optionalAccess', _242 => _242.map, 'call', _243 => _243((p) => p.text)]) || []
       )
     );
     for (const memory of results.memories) {
@@ -9069,19 +9119,17 @@ var LlmAgent = (_class27 = class _LlmAgent extends BaseAgent {
     }
     if (!this.disallowTransferToParent || !this.disallowTransferToPeers) {
       this.logger.warn(
-        `Invalid config for agent ${this.name}: output_schema cannot co-exist with agent transfer configurations. Setting disallow_transfer_to_parent=true, disallow_transfer_to_peers=true`
+        `Agent ${this.name}: outputSchema is set while transfer flags allow transfers. The output schema will be applied in response post-processing to preserve tool-calling and transfer behavior.`
       );
-      this.disallowTransferToParent = true;
-      this.disallowTransferToPeers = true;
     }
     if (this.subAgents && this.subAgents.length > 0) {
-      throw new Error(
-        `Invalid config for agent ${this.name}: if output_schema is set, sub_agents must be empty to disable agent transfer.`
+      this.logger.warn(
+        `Agent ${this.name}: outputSchema is set and subAgents are present. Agent transfers to sub-agents will remain enabled; the schema will be validated after transfers/tools complete.`
       );
     }
     if (this.tools && this.tools.length > 0) {
-      throw new Error(
-        `Invalid config for agent ${this.name}: if output_schema is set, tools must be empty`
+      this.logger.warn(
+        `Agent ${this.name}: outputSchema is set and tools are configured. Tools will be callable; the output schema will be applied during response post-processing.`
       );
     }
   }
@@ -9090,7 +9138,7 @@ var LlmAgent = (_class27 = class _LlmAgent extends BaseAgent {
    * This matches the Python implementation's _llm_flow property
    */
   get llmFlow() {
-    if (this.disallowTransferToParent && this.disallowTransferToPeers && !_optionalChain([this, 'access', _240 => _240.subAgents, 'optionalAccess', _241 => _241.length])) {
+    if (this.disallowTransferToParent && this.disallowTransferToPeers && !_optionalChain([this, 'access', _244 => _244.subAgents, 'optionalAccess', _245 => _245.length])) {
       return new SingleFlow();
     }
     return new AutoFlow();
@@ -9106,7 +9154,7 @@ var LlmAgent = (_class27 = class _LlmAgent extends BaseAgent {
       );
       return;
     }
-    if (this.outputKey && event.isFinalResponse() && _optionalChain([event, 'access', _242 => _242.content, 'optionalAccess', _243 => _243.parts])) {
+    if (this.outputKey && event.isFinalResponse() && _optionalChain([event, 'access', _246 => _246.content, 'optionalAccess', _247 => _247.parts])) {
       let result = event.content.parts.map((part) => part.text || "").join("");
       if (this.outputSchema) {
         if (!result.trim()) {
@@ -9334,7 +9382,7 @@ var LoopAgent = class extends BaseAgent {
       for (const subAgent of this.subAgents) {
         for await (const event of subAgent.runAsync(ctx)) {
           yield event;
-          if (_optionalChain([event, 'access', _244 => _244.actions, 'optionalAccess', _245 => _245.escalate])) {
+          if (_optionalChain([event, 'access', _248 => _248.actions, 'optionalAccess', _249 => _249.escalate])) {
             return;
           }
         }
@@ -9646,17 +9694,17 @@ var RunConfig = class {
    */
   
   constructor(config) {
-    this.speechConfig = _optionalChain([config, 'optionalAccess', _246 => _246.speechConfig]);
-    this.responseModalities = _optionalChain([config, 'optionalAccess', _247 => _247.responseModalities]);
-    this.saveInputBlobsAsArtifacts = _optionalChain([config, 'optionalAccess', _248 => _248.saveInputBlobsAsArtifacts]) || false;
-    this.supportCFC = _optionalChain([config, 'optionalAccess', _249 => _249.supportCFC]) || false;
-    this.streamingMode = _optionalChain([config, 'optionalAccess', _250 => _250.streamingMode]) || "NONE" /* NONE */;
-    this.outputAudioTranscription = _optionalChain([config, 'optionalAccess', _251 => _251.outputAudioTranscription]);
-    this.inputAudioTranscription = _optionalChain([config, 'optionalAccess', _252 => _252.inputAudioTranscription]);
-    this.realtimeInputConfig = _optionalChain([config, 'optionalAccess', _253 => _253.realtimeInputConfig]);
-    this.enableAffectiveDialog = _optionalChain([config, 'optionalAccess', _254 => _254.enableAffectiveDialog]);
-    this.proactivity = _optionalChain([config, 'optionalAccess', _255 => _255.proactivity]);
-    this.maxLlmCalls = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _256 => _256.maxLlmCalls]), () => ( 500));
+    this.speechConfig = _optionalChain([config, 'optionalAccess', _250 => _250.speechConfig]);
+    this.responseModalities = _optionalChain([config, 'optionalAccess', _251 => _251.responseModalities]);
+    this.saveInputBlobsAsArtifacts = _optionalChain([config, 'optionalAccess', _252 => _252.saveInputBlobsAsArtifacts]) || false;
+    this.supportCFC = _optionalChain([config, 'optionalAccess', _253 => _253.supportCFC]) || false;
+    this.streamingMode = _optionalChain([config, 'optionalAccess', _254 => _254.streamingMode]) || "NONE" /* NONE */;
+    this.outputAudioTranscription = _optionalChain([config, 'optionalAccess', _255 => _255.outputAudioTranscription]);
+    this.inputAudioTranscription = _optionalChain([config, 'optionalAccess', _256 => _256.inputAudioTranscription]);
+    this.realtimeInputConfig = _optionalChain([config, 'optionalAccess', _257 => _257.realtimeInputConfig]);
+    this.enableAffectiveDialog = _optionalChain([config, 'optionalAccess', _258 => _258.enableAffectiveDialog]);
+    this.proactivity = _optionalChain([config, 'optionalAccess', _259 => _259.proactivity]);
+    this.maxLlmCalls = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _260 => _260.maxLlmCalls]), () => ( 500));
     this.validateMaxLlmCalls();
   }
   /**
@@ -9800,7 +9848,7 @@ var InMemoryMemoryService = (_class30 = class {
     }
     const userSessions = this._sessionEvents.get(userKey);
     const filteredEvents = session.events.filter(
-      (event) => _optionalChain([event, 'access', _257 => _257.content, 'optionalAccess', _258 => _258.parts])
+      (event) => _optionalChain([event, 'access', _261 => _261.content, 'optionalAccess', _262 => _262.parts])
     );
     userSessions.set(session.id, filteredEvents);
   }
@@ -9939,7 +9987,7 @@ var InMemorySessionService = (_class31 = class extends BaseSessionService {const
     return this.createSessionImpl(appName, userId, state, sessionId);
   }
   createSessionImpl(appName, userId, state, sessionId) {
-    const finalSessionId = _optionalChain([sessionId, 'optionalAccess', _259 => _259.trim, 'call', _260 => _260()]) || _crypto.randomUUID.call(void 0, );
+    const finalSessionId = _optionalChain([sessionId, 'optionalAccess', _263 => _263.trim, 'call', _264 => _264()]) || _crypto.randomUUID.call(void 0, );
     const session = {
       appName,
       userId,
@@ -10096,7 +10144,7 @@ var InMemorySessionService = (_class31 = class extends BaseSessionService {const
       warning(`sessionId ${sessionId} not in sessions[appName][userId]`);
       return event;
     }
-    if (_optionalChain([event, 'access', _261 => _261.actions, 'optionalAccess', _262 => _262.stateDelta])) {
+    if (_optionalChain([event, 'access', _265 => _265.actions, 'optionalAccess', _266 => _266.stateDelta])) {
       for (const key in event.actions.stateDelta) {
         const value = event.actions.stateDelta[key];
         if (key.startsWith(State.APP_PREFIX)) {
@@ -10130,14 +10178,14 @@ function _findFunctionCallEventIfLastEventIsFunctionResponse(session) {
     return null;
   }
   const lastEvent = events[events.length - 1];
-  if (_optionalChain([lastEvent, 'access', _263 => _263.content, 'optionalAccess', _264 => _264.parts, 'optionalAccess', _265 => _265.some, 'call', _266 => _266((part) => part.functionResponse)])) {
-    const functionCallId = _optionalChain([lastEvent, 'access', _267 => _267.content, 'access', _268 => _268.parts, 'access', _269 => _269.find, 'call', _270 => _270(
+  if (_optionalChain([lastEvent, 'access', _267 => _267.content, 'optionalAccess', _268 => _268.parts, 'optionalAccess', _269 => _269.some, 'call', _270 => _270((part) => part.functionResponse)])) {
+    const functionCallId = _optionalChain([lastEvent, 'access', _271 => _271.content, 'access', _272 => _272.parts, 'access', _273 => _273.find, 'call', _274 => _274(
       (part) => part.functionResponse
-    ), 'optionalAccess', _271 => _271.functionResponse, 'optionalAccess', _272 => _272.id]);
+    ), 'optionalAccess', _275 => _275.functionResponse, 'optionalAccess', _276 => _276.id]);
     if (!functionCallId) return null;
     for (let i = events.length - 2; i >= 0; i--) {
       const event = events[i];
-      const functionCalls = _optionalChain([event, 'access', _273 => _273.getFunctionCalls, 'optionalCall', _274 => _274()]) || [];
+      const functionCalls = _optionalChain([event, 'access', _277 => _277.getFunctionCalls, 'optionalCall', _278 => _278()]) || [];
       for (const functionCall of functionCalls) {
         if (functionCall.id === functionCallId) {
           return event;
@@ -10340,15 +10388,15 @@ var Runner = (_class32 = class {
    */
   _findAgentToRun(session, rootAgent) {
     const event = _findFunctionCallEventIfLastEventIsFunctionResponse(session);
-    if (_optionalChain([event, 'optionalAccess', _275 => _275.author])) {
+    if (_optionalChain([event, 'optionalAccess', _279 => _279.author])) {
       return rootAgent.findAgent(event.author);
     }
-    const nonUserEvents = _optionalChain([session, 'access', _276 => _276.events, 'optionalAccess', _277 => _277.filter, 'call', _278 => _278((e) => e.author !== "user"), 'access', _279 => _279.reverse, 'call', _280 => _280()]) || [];
+    const nonUserEvents = _optionalChain([session, 'access', _280 => _280.events, 'optionalAccess', _281 => _281.filter, 'call', _282 => _282((e) => e.author !== "user"), 'access', _283 => _283.reverse, 'call', _284 => _284()]) || [];
     for (const event2 of nonUserEvents) {
       if (event2.author === rootAgent.name) {
         return rootAgent;
       }
-      const agent = _optionalChain([rootAgent, 'access', _281 => _281.findSubAgent, 'optionalCall', _282 => _282(event2.author)]);
+      const agent = _optionalChain([rootAgent, 'access', _285 => _285.findSubAgent, 'optionalCall', _286 => _286(event2.author)]);
       if (!agent) {
         this.logger.debug(
           `Event from an unknown agent: ${event2.author}, event id: ${event2.id}`
@@ -10842,7 +10890,7 @@ var AgentBuilder = (_class33 = class _AgentBuilder {
       async ask(message) {
         const newMessage = typeof message === "string" ? { parts: [{ text: message }] } : typeof message === "object" && "contents" in message ? { parts: message.contents[message.contents.length - 1].parts } : message;
         let response = "";
-        if (!_optionalChain([sessionOptions, 'optionalAccess', _283 => _283.userId])) {
+        if (!_optionalChain([sessionOptions, 'optionalAccess', _287 => _287.userId])) {
           throw new Error("Session configuration is required");
         }
         for await (const event of baseRunner.runAsync({
@@ -10850,7 +10898,7 @@ var AgentBuilder = (_class33 = class _AgentBuilder {
           sessionId: session.id,
           newMessage
         })) {
-          if (_optionalChain([event, 'access', _284 => _284.content, 'optionalAccess', _285 => _285.parts]) && Array.isArray(event.content.parts)) {
+          if (_optionalChain([event, 'access', _288 => _288.content, 'optionalAccess', _289 => _289.parts]) && Array.isArray(event.content.parts)) {
             const content = event.content.parts.map(
               (part) => (part && typeof part === "object" && "text" in part ? part.text : "") || ""
             ).join("");
@@ -10958,7 +11006,7 @@ var VertexAiSessionService = class extends BaseSessionService {
         path: `operations/${operationId}`,
         request_dict: {}
       });
-      if (_optionalChain([lroResponse, 'optionalAccess', _286 => _286.done])) {
+      if (_optionalChain([lroResponse, 'optionalAccess', _290 => _290.done])) {
         break;
       }
       await new Promise((resolve) => setTimeout(resolve, 1e3));
@@ -11329,12 +11377,12 @@ var DatabaseSessionService = (_class34 = class extends BaseSessionService {
   }
   async createSession(appName, userId, state, sessionId) {
     await this.ensureInitialized();
-    const id = _optionalChain([sessionId, 'optionalAccess', _287 => _287.trim, 'call', _288 => _288()]) || this.generateSessionId();
+    const id = _optionalChain([sessionId, 'optionalAccess', _291 => _291.trim, 'call', _292 => _292()]) || this.generateSessionId();
     return await this.db.transaction().execute(async (trx) => {
       const appState = await trx.selectFrom("app_states").selectAll().where("app_name", "=", appName).executeTakeFirst();
       const userState = await trx.selectFrom("user_states").selectAll().where("app_name", "=", appName).where("user_id", "=", userId).executeTakeFirst();
-      let currentAppState = this.parseJsonSafely(_optionalChain([appState, 'optionalAccess', _289 => _289.state]), {});
-      let currentUserState = this.parseJsonSafely(_optionalChain([userState, 'optionalAccess', _290 => _290.state]), {});
+      let currentAppState = this.parseJsonSafely(_optionalChain([appState, 'optionalAccess', _293 => _293.state]), {});
+      let currentUserState = this.parseJsonSafely(_optionalChain([userState, 'optionalAccess', _294 => _294.state]), {});
       if (!appState) {
         await trx.insertInto("app_states").values({
           app_name: appName,
@@ -11393,21 +11441,21 @@ var DatabaseSessionService = (_class34 = class extends BaseSessionService {
         return void 0;
       }
       let eventQuery = trx.selectFrom("events").selectAll().where("session_id", "=", sessionId).orderBy("timestamp", "desc");
-      if (_optionalChain([config, 'optionalAccess', _291 => _291.afterTimestamp])) {
+      if (_optionalChain([config, 'optionalAccess', _295 => _295.afterTimestamp])) {
         eventQuery = eventQuery.where(
           "timestamp",
           ">=",
           new Date(config.afterTimestamp * 1e3)
         );
       }
-      if (_optionalChain([config, 'optionalAccess', _292 => _292.numRecentEvents])) {
+      if (_optionalChain([config, 'optionalAccess', _296 => _296.numRecentEvents])) {
         eventQuery = eventQuery.limit(config.numRecentEvents);
       }
       const storageEvents = await eventQuery.execute();
       const appState = await trx.selectFrom("app_states").selectAll().where("app_name", "=", appName).executeTakeFirst();
       const userState = await trx.selectFrom("user_states").selectAll().where("app_name", "=", appName).where("user_id", "=", userId).executeTakeFirst();
-      const currentAppState = this.parseJsonSafely(_optionalChain([appState, 'optionalAccess', _293 => _293.state]), {});
-      const currentUserState = this.parseJsonSafely(_optionalChain([userState, 'optionalAccess', _294 => _294.state]), {});
+      const currentAppState = this.parseJsonSafely(_optionalChain([appState, 'optionalAccess', _297 => _297.state]), {});
+      const currentUserState = this.parseJsonSafely(_optionalChain([userState, 'optionalAccess', _298 => _298.state]), {});
       const sessionState = this.parseJsonSafely(storageSession.state, {});
       const mergedState = this.mergeState(
         currentAppState,
@@ -11465,13 +11513,13 @@ var DatabaseSessionService = (_class34 = class extends BaseSessionService {
       }
       const appState = await trx.selectFrom("app_states").selectAll().where("app_name", "=", session.appName).executeTakeFirst();
       const userState = await trx.selectFrom("user_states").selectAll().where("app_name", "=", session.appName).where("user_id", "=", session.userId).executeTakeFirst();
-      let currentAppState = this.parseJsonSafely(_optionalChain([appState, 'optionalAccess', _295 => _295.state]), {});
-      let currentUserState = this.parseJsonSafely(_optionalChain([userState, 'optionalAccess', _296 => _296.state]), {});
+      let currentAppState = this.parseJsonSafely(_optionalChain([appState, 'optionalAccess', _299 => _299.state]), {});
+      let currentUserState = this.parseJsonSafely(_optionalChain([userState, 'optionalAccess', _300 => _300.state]), {});
       let sessionState = this.parseJsonSafely(storageSession.state, {});
       let appStateDelta = {};
       let userStateDelta = {};
       let sessionStateDelta = {};
-      if (_optionalChain([event, 'access', _297 => _297.actions, 'optionalAccess', _298 => _298.stateDelta])) {
+      if (_optionalChain([event, 'access', _301 => _301.actions, 'optionalAccess', _302 => _302.stateDelta])) {
         const deltas = this.extractStateDelta(event.actions.stateDelta);
         appStateDelta = deltas.appStateDelta;
         userStateDelta = deltas.userStateDelta;
@@ -11617,7 +11665,7 @@ var DatabaseSessionService = (_class34 = class extends BaseSessionService {
    * Overrides the base class method to work with plain object state.
    */
   updateSessionState(session, event) {
-    if (!_optionalChain([event, 'access', _299 => _299.actions, 'optionalAccess', _300 => _300.stateDelta])) {
+    if (!_optionalChain([event, 'access', _303 => _303.actions, 'optionalAccess', _304 => _304.stateDelta])) {
       return;
     }
     for (const [key, value] of Object.entries(event.actions.stateDelta)) {
@@ -11787,7 +11835,7 @@ var GcsArtifactService = class {
       };
       return part;
     } catch (error) {
-      if (_optionalChain([error, 'optionalAccess', _301 => _301.code]) === 404) {
+      if (_optionalChain([error, 'optionalAccess', _305 => _305.code]) === 404) {
         return null;
       }
       throw error;
@@ -12038,13 +12086,13 @@ var VertexAiEvalFacade = class _VertexAiEvalFacade {
     };
   }
   _getText(content) {
-    if (_optionalChain([content, 'optionalAccess', _302 => _302.parts])) {
+    if (_optionalChain([content, 'optionalAccess', _306 => _306.parts])) {
       return content.parts.map((p) => p.text || "").filter((text) => text.length > 0).join("\n");
     }
     return "";
   }
   _getScore(evalResult) {
-    if (_optionalChain([evalResult, 'optionalAccess', _303 => _303.summaryMetrics, 'optionalAccess', _304 => _304[0], 'optionalAccess', _305 => _305.meanScore]) !== void 0 && typeof evalResult.summaryMetrics[0].meanScore === "number" && !Number.isNaN(evalResult.summaryMetrics[0].meanScore)) {
+    if (_optionalChain([evalResult, 'optionalAccess', _307 => _307.summaryMetrics, 'optionalAccess', _308 => _308[0], 'optionalAccess', _309 => _309.meanScore]) !== void 0 && typeof evalResult.summaryMetrics[0].meanScore === "number" && !Number.isNaN(evalResult.summaryMetrics[0].meanScore)) {
       return evalResult.summaryMetrics[0].meanScore;
     }
     return void 0;
@@ -12194,7 +12242,7 @@ var ResponseEvaluator = class extends Evaluator {
     return fmeasure;
   }
   extractText(content) {
-    if (_optionalChain([content, 'optionalAccess', _306 => _306.parts])) {
+    if (_optionalChain([content, 'optionalAccess', _310 => _310.parts])) {
       return content.parts.map((p) => p.text || "").filter((text) => text.length > 0).join(" ");
     }
     return "";
@@ -12227,7 +12275,7 @@ var TrajectoryEvaluator = class extends Evaluator {
     for (let i = 0; i < actualInvocations.length; i++) {
       const actual = actualInvocations[i];
       const expected = expectedInvocations[i];
-      if (!_optionalChain([actual, 'access', _307 => _307.intermediateData, 'optionalAccess', _308 => _308.toolUses]) || !_optionalChain([expected, 'access', _309 => _309.intermediateData, 'optionalAccess', _310 => _310.toolUses])) {
+      if (!_optionalChain([actual, 'access', _311 => _311.intermediateData, 'optionalAccess', _312 => _312.toolUses]) || !_optionalChain([expected, 'access', _313 => _313.intermediateData, 'optionalAccess', _314 => _314.toolUses])) {
         perInvocationResults.push({
           actualInvocation: actual,
           expectedInvocation: expected,
@@ -12315,7 +12363,7 @@ var SafetyEvaluatorV1 = class extends Evaluator {
 
 // src/evaluation/llm-as-judge-utils.ts
 function getTextFromContent(content) {
-  if (_optionalChain([content, 'optionalAccess', _311 => _311.parts])) {
+  if (_optionalChain([content, 'optionalAccess', _315 => _315.parts])) {
     return content.parts.map((part) => part.text).filter(Boolean).join("\n");
   }
   return "";
@@ -12327,9 +12375,9 @@ function getEvalStatus(score, threshold) {
 // src/evaluation/llm-as-judge.ts
 var LlmAsJudge = class {
   async sampleJudge(prompt, numSamples, critiqueParser, judgeModelOptions) {
-    const modelName = _optionalChain([judgeModelOptions, 'optionalAccess', _312 => _312.judgeModel]) || "gemini-2.5-flash";
+    const modelName = _optionalChain([judgeModelOptions, 'optionalAccess', _316 => _316.judgeModel]) || "gemini-2.5-flash";
     const model = LLMRegistry.getModelOrCreate(modelName);
-    const config = _optionalChain([judgeModelOptions, 'optionalAccess', _313 => _313.judgeModelConfig]) || {};
+    const config = _optionalChain([judgeModelOptions, 'optionalAccess', _317 => _317.judgeModelConfig]) || {};
     const samples = [];
     for (let i = 0; i < numSamples; i++) {
       try {
@@ -12395,7 +12443,7 @@ function parseCritique(response) {
   const labelMatchIsResponseValid = response.match(
     /"is_the_agent_response_valid":\s*\[*[\n\s]*"*([^"^\]^\s]*)"*[\n\s]*\]*\s*[,\n\}]/
   );
-  if (_optionalChain([labelMatchIsResponseValid, 'optionalAccess', _314 => _314[1]])) {
+  if (_optionalChain([labelMatchIsResponseValid, 'optionalAccess', _318 => _318[1]])) {
     const label = labelMatchIsResponseValid[1].toLowerCase();
     return label === "valid" ? "valid" /* VALID */ : "invalid" /* INVALID */;
   }
@@ -12440,7 +12488,7 @@ var FinalResponseMatchV2Evaluator = class extends Evaluator {
         "{prompt}",
         prompt
       ).replace("{response}", response).replace("{golden_response}", goldenResponse);
-      const numSamples = _nullishCoalesce(_optionalChain([this, 'access', _315 => _315.metric, 'access', _316 => _316.judgeModelOptions, 'optionalAccess', _317 => _317.numSamples]), () => ( DEFAULT_NUM_SAMPLES));
+      const numSamples = _nullishCoalesce(_optionalChain([this, 'access', _319 => _319.metric, 'access', _320 => _320.judgeModelOptions, 'optionalAccess', _321 => _321.numSamples]), () => ( DEFAULT_NUM_SAMPLES));
       const labels = await this.llmAsJudge.sampleJudge(
         formattedPrompt,
         numSamples,
@@ -12480,7 +12528,7 @@ var MetricEvaluatorRegistry = (_class35 = class {constructor() { _class35.protot
     const metricName = metricInfo.metricName;
     if (this.registry.has(metricName)) {
       console.info(
-        `Updating Evaluator class for ${metricName} from ${_optionalChain([this, 'access', _318 => _318.registry, 'access', _319 => _319.get, 'call', _320 => _320(metricName), 'optionalAccess', _321 => _321.evaluator, 'access', _322 => _322.name])} to ${evaluator.name}`
+        `Updating Evaluator class for ${metricName} from ${_optionalChain([this, 'access', _322 => _322.registry, 'access', _323 => _323.get, 'call', _324 => _324(metricName), 'optionalAccess', _325 => _325.evaluator, 'access', _326 => _326.name])} to ${evaluator.name}`
       );
     }
     this.registry.set(metricName, {
@@ -12594,10 +12642,10 @@ var LocalEvalService = class extends BaseEvalService {
       for (const evalMetric of evaluateConfig.evalMetrics) {
         const evaluator = DEFAULT_METRIC_EVALUATOR_REGISTRY.getEvaluator(evalMetric);
         const actual = results.filter(
-          (r) => !_optionalChain([r, 'access', _323 => _323.invocationId, 'optionalAccess', _324 => _324.includes, 'call', _325 => _325("expected")])
+          (r) => !_optionalChain([r, 'access', _327 => _327.invocationId, 'optionalAccess', _328 => _328.includes, 'call', _329 => _329("expected")])
         );
         const expected = results.filter(
-          (r) => _optionalChain([r, 'access', _326 => _326.invocationId, 'optionalAccess', _327 => _327.includes, 'call', _328 => _328("expected")])
+          (r) => _optionalChain([r, 'access', _330 => _330.invocationId, 'optionalAccess', _331 => _331.includes, 'call', _332 => _332("expected")])
         );
         const result = await evaluator.evaluateInvocations(actual, expected);
         evalResult.evalCaseResults.push({
@@ -12989,13 +13037,13 @@ ${failures.join(
     console.log("\n\n");
   }
   static _convertContentToText(content) {
-    if (_optionalChain([content, 'optionalAccess', _329 => _329.parts])) {
+    if (_optionalChain([content, 'optionalAccess', _333 => _333.parts])) {
       return content.parts.map((p) => p.text || "").filter((text) => text.length > 0).join("\n");
     }
     return "";
   }
   static _convertToolCallsToText(intermediateData) {
-    if (_optionalChain([intermediateData, 'optionalAccess', _330 => _330.toolUses])) {
+    if (_optionalChain([intermediateData, 'optionalAccess', _334 => _334.toolUses])) {
       return intermediateData.toolUses.map((t) => JSON.stringify(t)).join("\n");
     }
     return "";
@@ -13050,7 +13098,7 @@ ${failures.join(
     for (const [metricName, evalMetricResultsWithInvocations] of Object.entries(
       evalMetricResults
     )) {
-      const threshold = _optionalChain([evalMetricResultsWithInvocations, 'access', _331 => _331[0], 'optionalAccess', _332 => _332.evalMetricResult, 'access', _333 => _333.threshold]) || 0;
+      const threshold = _optionalChain([evalMetricResultsWithInvocations, 'access', _335 => _335[0], 'optionalAccess', _336 => _336.evalMetricResult, 'access', _337 => _337.threshold]) || 0;
       const scores = evalMetricResultsWithInvocations.map((m) => m.evalMetricResult.score).filter((s) => s !== void 0);
       let overallScore;
       let overallEvalStatus;
@@ -13139,7 +13187,7 @@ var RougeEvaluator = class extends Evaluator {
   }
 };
 function getTextFromContent2(content) {
-  if (_optionalChain([content, 'optionalAccess', _334 => _334.parts])) {
+  if (_optionalChain([content, 'optionalAccess', _338 => _338.parts])) {
     return content.parts.map((part) => part.text).filter(Boolean).join("\n");
   }
   return "";

package/dist/index.mjs

@@ -7111,6 +7111,7 @@ var AuthLlmRequestProcessor = class extends BaseLlmRequestProcessor {
 var requestProcessor = new AuthLlmRequestProcessor();
 
 // src/flows/llm-flows/basic.ts
+init_logger();
 var BasicLlmRequestProcessor = class extends BaseLlmRequestProcessor {
   async *runAsync(invocationContext, llmRequest) {
     const agent = invocationContext.agent;
@@ -7126,7 +7127,21 @@ var BasicLlmRequestProcessor = class extends BaseLlmRequestProcessor {
       llmRequest.config = {};
     }
     if (agent.outputSchema) {
-      llmRequest.setOutputSchema(agent.outputSchema);
+      const hasTools = (await agent.canonicalTools?.(invocationContext))?.length > 0;
+      const hasTransfers = !!("subAgents" in agent && agent.subAgents && agent.subAgents.length > 0 && !(agent.disallowTransferToParent && agent.disallowTransferToPeers));
+      if (!hasTools && !hasTransfers) {
+        llmRequest.setOutputSchema(agent.outputSchema);
+      } else {
+        (() => {
+          try {
+            const logger = new Logger({ name: "BasicLlmRequestProcessor" });
+            logger.debug(
+              `Skipping request-level output schema for agent ${agent.name} because tools/transfers are present. Schema will be validated during response processing.`
+            );
+          } catch (e) {
+          }
+        })();
+      }
     }
     const runConfig = invocationContext.runConfig;
     if (!llmRequest.liveConnectConfig) {
@@ -8278,10 +8293,11 @@ var InstructionsLlmRequestProcessor = class extends BaseLlmRequestProcessor {
         });
         const { $schema, ...json } = raw || {};
         llmRequest.appendInstructions([
-          "You must respond with application/json that validates against this JSON Schema:",
-          "```json",
-          JSON.stringify(json, null, 2),
-          "```"
+          "You must respond with application/json that validates against this JSON Schema (do NOT wrap the output in markdown or code fences):",
+          JSON.stringify(json, null, 2)
+        ]);
+        llmRequest.appendInstructions([
+          'IMPORTANT: After any tool calls, function calls, or agent transfers have completed, produce ONE final assistant message whose entire content is ONLY the JSON object that conforms to the schema provided above. Do NOT include any explanatory text, markdown, or additional messages. Do NOT wrap the JSON in code fences (for example, do NOT use ```json or ```). If you cannot produce valid JSON that matches the schema, return a JSON object with an "error" field describing the problem.'
         ]);
       } catch {
       }
@@ -8578,6 +8594,7 @@ var requestProcessor7 = new NlPlanningRequestProcessor();
 var responseProcessor2 = new NlPlanningResponseProcessor();
 
 // src/flows/llm-flows/output-schema.ts
+import { jsonrepair } from "jsonrepair";
 init_logger();
 var OutputSchemaResponseProcessor = class extends BaseLlmResponseProcessor {
   logger = new Logger({ name: "OutputSchemaResponseProcessor" });
@@ -8599,7 +8616,8 @@ var OutputSchemaResponseProcessor = class extends BaseLlmResponseProcessor {
       return;
     }
     try {
-      const parsed = JSON.parse(textContent);
+      const candidate = this.stripCodeFences(textContent);
+      const parsed = this.tryParseJson(candidate, agent.name);
       const validated = agent.outputSchema.parse(parsed);
       textContent = JSON.stringify(validated, null, 2);
       llmResponse.content.parts = llmResponse.content.parts.map((part) => {
@@ -8647,6 +8665,38 @@ var OutputSchemaResponseProcessor = class extends BaseLlmResponseProcessor {
       yield errorEvent;
     }
   }
+  // Strip common code fences and surrounding explanatory text from LLM output.
+  stripCodeFences(raw) {
+    const fencePattern = /```(?:json)?\s*([\s\S]*?)```/i;
+    const fenceMatch = raw.match(fencePattern);
+    if (fenceMatch?.[1]) {
+      return fenceMatch[1].trim();
+    }
+    const lines = raw.split(/\r?\n/).map((l) => l.trim());
+    const startIdx = lines.findIndex(
+      (l) => l.startsWith("{") || l.startsWith("[")
+    );
+    if (startIdx >= 0) {
+      return lines.slice(startIdx).join("\n").trim();
+    }
+    return raw.trim();
+  }
+  // Try parsing JSON; if parse fails, attempt to repair using jsonrepair and parse again.
+  tryParseJson(candidate, agentName) {
+    try {
+      return JSON.parse(candidate);
+    } catch (err) {
+      this.logger.debug("Initial JSON.parse failed, attempting jsonrepair", {
+        agent: agentName
+      });
+      try {
+        const repaired = jsonrepair(candidate);
+        return JSON.parse(repaired);
+      } catch (repairErr) {
+        throw err;
+      }
+    }
+  }
 };
 var responseProcessor3 = new OutputSchemaResponseProcessor();
 
@@ -9069,19 +9119,17 @@ var LlmAgent = class _LlmAgent extends BaseAgent {
     }
     if (!this.disallowTransferToParent || !this.disallowTransferToPeers) {
       this.logger.warn(
-        `Invalid config for agent ${this.name}: output_schema cannot co-exist with agent transfer configurations. Setting disallow_transfer_to_parent=true, disallow_transfer_to_peers=true`
+        `Agent ${this.name}: outputSchema is set while transfer flags allow transfers. The output schema will be applied in response post-processing to preserve tool-calling and transfer behavior.`
       );
-      this.disallowTransferToParent = true;
-      this.disallowTransferToPeers = true;
     }
     if (this.subAgents && this.subAgents.length > 0) {
-      throw new Error(
-        `Invalid config for agent ${this.name}: if output_schema is set, sub_agents must be empty to disable agent transfer.`
+      this.logger.warn(
+        `Agent ${this.name}: outputSchema is set and subAgents are present. Agent transfers to sub-agents will remain enabled; the schema will be validated after transfers/tools complete.`
       );
     }
     if (this.tools && this.tools.length > 0) {
-      throw new Error(
-        `Invalid config for agent ${this.name}: if output_schema is set, tools must be empty`
+      this.logger.warn(
+        `Agent ${this.name}: outputSchema is set and tools are configured. Tools will be callable; the output schema will be applied during response post-processing.`
       );
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iqai/adk",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Agent Development Kit for TypeScript with multi-provider LLM support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -55,6 +55,7 @@
     "ts-node": "^10.9.2",
     "uuid": "^11.1.0",
     "zod": "^3.25.67",
+    "jsonrepair": "^3.13.0",
     "zod-to-json-schema": "^3.24.6"
   },
   "peerDependencies": {