@ljoukov/llm 7.0.6 → 7.0.8

package/dist/index.cjs

@@ -7068,6 +7068,41 @@ async function executeToolCall(params) {
     );
   }
 }
+function findTerminalToolCall(tools, toolCalls) {
+  for (let index = toolCalls.length - 1; index >= 0; index -= 1) {
+    const toolCall = toolCalls[index];
+    if (!toolCall) {
+      continue;
+    }
+    const toolDef = tools[toolCall.toolName];
+    if (toolDef?.terminal === true && !toolCall.error) {
+      return toolCall;
+    }
+  }
+  return null;
+}
+function terminalToolCallText(toolCall) {
+  const output = toolCall.output;
+  if (typeof output === "string") {
+    return output;
+  }
+  if (output && typeof output === "object") {
+    const record = output;
+    const summary = record.summary;
+    if (typeof summary === "string" && summary.trim().length > 0) {
+      return summary;
+    }
+    const status = record.status;
+    const title = record.presentationTitle;
+    if (typeof status === "string" && typeof title === "string" && title.trim().length > 0) {
+      return `${status}: ${title}`;
+    }
+    if (typeof status === "string" && status.trim().length > 0) {
+      return status;
+    }
+  }
+  return "";
+}
 function buildToolLogId(turn, toolIndex) {
   return `turn${turn.toString()}/tool${toolIndex.toString()}`;
 }
@@ -8979,6 +9014,7 @@ async function runToolLoop(request) {
             costUsd: stepCostUsd,
             timing
           });
+          const terminalToolCall = findTerminalToolCall(request.tools, stepToolCalls);
           const steeringInput = steeringInternal?.drainPendingContents() ?? [];
           const steeringItems = steeringInput.length > 0 ? toOpenAiInput(steeringInput, {
             defaultMediaResolution: request.mediaResolution,
@@ -8999,9 +9035,14 @@ async function runToolLoop(request) {
               responseChars: responseText.length,
               thoughtChars: reasoningSummary.length,
               toolCalls: stepToolCalls.length,
-              finalStep: false
+              finalStep: terminalToolCall !== null
             }
           });
+          if (terminalToolCall) {
+            finalText = terminalToolCallText(terminalToolCall) || responseText;
+            finalThoughts = reasoningSummary;
+            return { text: finalText, thoughts: finalThoughts, steps, totalCostUsd };
+          }
           previousResponseId = finalResponse.id;
           input = steeringItems.length > 0 ? toolOutputs.concat(steeringItems) : toolOutputs;
         } catch (error) {
@@ -9317,6 +9358,7 @@ async function runToolLoop(request) {
             costUsd: stepCostUsd,
             timing
           });
+          const terminalToolCall = findTerminalToolCall(request.tools, toolCalls);
           const steeringInput = steeringInternal?.drainPendingContents() ?? [];
           const steeringItems = steeringInput.length > 0 ? toChatGptInput(steeringInput, {
             defaultMediaResolution: request.mediaResolution,
@@ -9336,9 +9378,14 @@ async function runToolLoop(request) {
               responseChars: responseText.length,
               thoughtChars: reasoningSummaryText.length,
               toolCalls: toolCalls.length,
-              finalStep: false
+              finalStep: terminalToolCall !== null
             }
           });
+          if (terminalToolCall) {
+            finalText = terminalToolCallText(terminalToolCall) || responseText;
+            finalThoughts = reasoningSummaryText;
+            return { text: finalText, thoughts: finalThoughts, steps, totalCostUsd };
+          }
           input = steeringItems.length > 0 ? input.concat(toolOutputs, steeringItems) : input.concat(toolOutputs);
         } catch (error) {
           stepCallLogger?.fail(error, {
@@ -9602,6 +9649,7 @@ async function runToolLoop(request) {
             costUsd: stepCostUsd,
             timing
           });
+          const terminalToolCall = findTerminalToolCall(request.tools, stepToolCalls);
           stepCallLogger?.complete({
             responseText,
             toolCallText: stepToolCallText,
@@ -9617,9 +9665,14 @@ async function runToolLoop(request) {
               responseChars: responseText.length,
               thoughtChars: 0,
               toolCalls: stepToolCalls.length,
-              finalStep: false
+              finalStep: terminalToolCall !== null
             }
           });
+          if (terminalToolCall) {
+            finalText = terminalToolCallText(terminalToolCall) || responseText;
+            finalThoughts = "";
+            return { text: finalText, thoughts: finalThoughts, steps, totalCostUsd };
+          }
           messages.push({
             role: "assistant",
             ...responseText.length > 0 ? { content: responseText } : {},
@@ -9963,6 +10016,7 @@ async function runToolLoop(request) {
           costUsd: stepCostUsd,
           timing
         });
+        const terminalToolCall = findTerminalToolCall(request.tools, toolCalls);
         stepCallLogger?.complete({
           responseText,
           attachments: responseOutputAttachments,
@@ -9978,9 +10032,14 @@ async function runToolLoop(request) {
             responseChars: responseText.length,
             thoughtChars: thoughtsText.length,
             toolCalls: toolCalls.length,
-            finalStep: false
+            finalStep: terminalToolCall !== null
           }
         });
+        if (terminalToolCall) {
+          finalText = terminalToolCallText(terminalToolCall) || responseText;
+          finalThoughts = thoughtsText;
+          return { text: finalText, thoughts: finalThoughts, steps, totalCostUsd };
+        }
         geminiContents.push({ role: "user", parts: responseParts });
         const steeringInput = steeringInternal?.drainPendingContents() ?? [];
         if (steeringInput.length > 0) {
@@ -10453,9 +10512,11 @@ var subagentInputItemSchema = import_zod4.z.object({
 }).passthrough();
 var spawnAgentInputSchema = import_zod4.z.object({
   prompt: import_zod4.z.string().nullish().describe("Alias for message. Initial plain-text task for the new agent."),
-  message: import_zod4.z.string().nullish().describe("Initial plain-text task for the new agent. Use either message or items."),
+  message: import_zod4.z.string().nullish().describe(
+    "Initial plain-text task for the new agent. Combined with items when both are provided."
+  ),
   items: import_zod4.z.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: import_zod4.z.string().nullish().describe(SPAWN_AGENT_TYPE_DESCRIPTION),
   fork_context: import_zod4.z.boolean().nullish().describe(
@@ -10614,7 +10675,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."
@@ -10667,7 +10727,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."
@@ -10821,18 +10880,19 @@ 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) {
     throw new Error(params.emptyItemsError);
@@ -10841,7 +10901,8 @@ function resolveCollabInputText(params) {
   if (!itemText) {
     throw new Error(params.emptyItemsError);
   }
-  return itemText;
+  blocks.push(itemText);
+  return blocks.join("\n\n");
 }
 function resolveInputItemsText(items) {
   if (!items || items.length === 0) {