@ljoukov/llm 7.0.7 → 7.0.9

package/dist/index.js

@@ -10399,9 +10399,11 @@ var subagentInputItemSchema = z4.object({
 }).passthrough();
 var spawnAgentInputSchema = z4.object({
   prompt: z4.string().nullish().describe("Alias for message. Initial plain-text task for the new agent."),
-  message: z4.string().nullish().describe("Initial plain-text task for the new agent. Use either message or items."),
+  message: z4.string().nullish().describe(
+    "Initial plain-text task for the new agent. Combined with items when both are provided."
+  ),
   items: z4.array(subagentInputItemSchema).nullish().describe(
-    "Structured input items. Use this to pass explicit mentions (for example app:// connector paths)."
+    "Structured input items. Use this to pass explicit mentions (for example app:// connector paths). Combined with message/input when both are provided."
   ),
   agent_type: z4.string().nullish().describe(SPAWN_AGENT_TYPE_DESCRIPTION),
   fork_context: z4.boolean().nullish().describe(
@@ -10560,7 +10562,6 @@ function createSubagentToolController(options) {
         const initialPrompt = resolveCollabInputText({
           textCandidates: [{ value: input.prompt }, { value: input.message }],
           items: input.items,
-          bothError: "Provide either prompt/message or items, but not both.",
           missingError: "Provide one of: prompt/message or items.",
           emptyTextError: "Empty message can't be sent to an agent.",
           emptyItemsError: "Items can't be empty."
@@ -10613,7 +10614,6 @@ function createSubagentToolController(options) {
         const nextInput = resolveCollabInputText({
           textCandidates: [{ value: input.input }, { value: input.message }],
           items: input.items,
-          bothError: "Provide either input/message or items, but not both.",
           missingError: "Provide one of: input/message or items.",
           emptyTextError: "Empty message can't be sent to an agent.",
           emptyItemsError: "Items can't be empty."
@@ -10767,27 +10767,35 @@ function resolveCollabInputText(params) {
   );
   const hasText = Boolean(textCandidate);
   const hasItems = params.items !== void 0 && params.items !== null;
-  if (hasText && hasItems) {
-    throw new Error(params.bothError);
-  }
   if (!hasText && !hasItems) {
     throw new Error(params.missingError);
   }
+  const blocks = [];
   if (hasText) {
     const value = textCandidate?.value?.trim();
     if (!value) {
       throw new Error(params.emptyTextError);
     }
-    return value;
+    blocks.push(value);
+  }
+  if (!hasItems) {
+    return blocks.join("\n\n");
   }
   if (!params.items || params.items.length === 0) {
+    if (blocks.length > 0) {
+      return blocks.join("\n\n");
+    }
     throw new Error(params.emptyItemsError);
   }
   const itemText = resolveInputItemsText(params.items);
   if (!itemText) {
+    if (blocks.length > 0) {
+      return blocks.join("\n\n");
+    }
     throw new Error(params.emptyItemsError);
   }
-  return itemText;
+  blocks.push(itemText);
+  return blocks.join("\n\n");
 }
 function resolveInputItemsText(items) {
   if (!items || items.length === 0) {