@ljoukov/llm 7.0.5 → 7.0.7

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()}`;
 }
@@ -8196,7 +8231,7 @@ function buildJsonSchemaConfig(request) {
     name: schemaName,
     target: isOpenAiVariant ? "openAi" : "jsonSchema7"
   });
-  const responseJsonSchema = isOpenAiVariant ? resolveOpenAiSchemaRoot(baseJsonSchema) : isGeminiVariant ? addGeminiPropertyOrdering(baseJsonSchema) : resolveOpenAiSchemaRoot(baseJsonSchema);
+  const responseJsonSchema = isOpenAiVariant ? resolveOpenAiSchemaRoot(baseJsonSchema) : isGeminiVariant ? addGeminiPropertyOrdering(resolveOpenAiSchemaRoot(baseJsonSchema)) : resolveOpenAiSchemaRoot(baseJsonSchema);
   if (isOpenAiVariant && !isJsonSchemaObject(responseJsonSchema)) {
     throw new Error("OpenAI structured outputs require a JSON object schema at the root.");
   }
@@ -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) {