@kenkaiiii/gg-agent 5.49.10 → 5.49.11

package/dist/index.cjs

@@ -23,6 +23,8 @@ __export(index_exports, {
   Agent: () => Agent,
   AgentStream: () => AgentStream,
   agentLoop: () => agentLoop,
+  cancelledBeforeStartText: () => cancelledBeforeStartText,
+  indeterminateOutcomeText: () => indeterminateOutcomeText,
   isAbortError: () => isAbortError,
   isBillingError: () => isBillingError,
   isContextOverflow: () => isContextOverflow,
@@ -1346,6 +1348,7 @@ async function* executeToolCallsMixed(toolCalls, initialToolResults, options) {
   const eventStream = new import_gg_ai.EventStream();
   const state = { finalized: false };
   const resultsById = /* @__PURE__ */ new Map();
+  const dispatchedIds = /* @__PURE__ */ new Set();
   const abortHandler = () => eventStream.abort(new Error("aborted"));
   options.signal?.addEventListener("abort", abortHandler, { once: true });
   const phases = [];
@@ -1370,6 +1373,7 @@ async function* executeToolCallsMixed(toolCalls, initialToolResults, options) {
       for (const phase of phases) {
         if (options.signal?.aborted) break;
         if (phase.sequential) {
+          dispatchedIds.add(phase.sequential.id);
           const record = await executeSingleToolCall(
             phase.sequential,
             options,
@@ -1377,6 +1381,7 @@ async function* executeToolCallsMixed(toolCalls, initialToolResults, options) {
           );
           resultsById.set(record.toolCallId, record);
         } else if (phase.parallel.length === 1) {
+          dispatchedIds.add(phase.parallel[0].id);
           const record = await executeSingleToolCall(
             phase.parallel[0],
             options,
@@ -1386,6 +1391,7 @@ async function* executeToolCallsMixed(toolCalls, initialToolResults, options) {
         } else {
           await Promise.all(
             phase.parallel.map(async (toolCall) => {
+              dispatchedIds.add(toolCall.id);
               const record = await executeSingleToolCall(
                 toolCall,
                 options,
@@ -1416,7 +1422,7 @@ async function* executeToolCallsMixed(toolCalls, initialToolResults, options) {
     options.signal?.removeEventListener("abort", abortHandler);
     state.finalized = true;
   }
-  const toolResults = buildToolResults(initialToolResults, toolCalls, resultsById);
+  const toolResults = buildToolResults(initialToolResults, toolCalls, resultsById, dispatchedIds);
   capToolResults(toolResults, options.maxToolResultChars);
   capTurnToolResults(toolResults, options.maxTurnToolResultChars);
   return { toolResults, aborted };
@@ -1425,10 +1431,12 @@ async function* executeToolCallsParallel(toolCalls, initialToolResults, options)
   const eventStream = new import_gg_ai.EventStream();
   const state = { finalized: false };
   const resultsById = /* @__PURE__ */ new Map();
+  const dispatchedIds = /* @__PURE__ */ new Set();
   const abortHandler = () => eventStream.abort(new Error("aborted"));
   options.signal?.addEventListener("abort", abortHandler, { once: true });
   Promise.all(
     toolCalls.map(async (toolCall) => {
+      dispatchedIds.add(toolCall.id);
       const record = await executeSingleToolCall(
         toolCall,
         options,
@@ -1456,12 +1464,18 @@ async function* executeToolCallsParallel(toolCalls, initialToolResults, options)
     options.signal?.removeEventListener("abort", abortHandler);
     state.finalized = true;
   }
-  const toolResults = buildToolResults(initialToolResults, toolCalls, resultsById);
+  const toolResults = buildToolResults(initialToolResults, toolCalls, resultsById, dispatchedIds);
   capToolResults(toolResults, options.maxToolResultChars);
   capTurnToolResults(toolResults, options.maxTurnToolResultChars);
   return { toolResults, aborted };
 }
-function buildToolResults(initialToolResults, toolCalls, resultsById) {
+function cancelledBeforeStartText(name) {
+  return `\`${name}\` was cancelled before it started, so it had no effect. Safe to retry.`;
+}
+function indeterminateOutcomeText(name) {
+  return `\`${name}\` started running and was cut off before it reported back, so its outcome is UNKNOWN \u2014 it may have completed. Check the real state (re-read the file, re-run a status command) before retrying it, and do not tell the user it did not happen.`;
+}
+function buildToolResults(initialToolResults, toolCalls, resultsById, dispatchedIds) {
   const toolResults = [...initialToolResults];
   for (const toolCall of toolCalls) {
     const result = resultsById.get(toolCall.id);
@@ -1473,10 +1487,11 @@ function buildToolResults(initialToolResults, toolCalls, resultsById) {
         isError: result.isError || void 0
       });
     } else {
+      const dispatched = dispatchedIds?.has(toolCall.id) ?? true;
       toolResults.push({
         type: "tool_result",
         toolCallId: toolCall.id,
-        content: "Tool execution was aborted.",
+        content: dispatched ? indeterminateOutcomeText(toolCall.name) : cancelledBeforeStartText(toolCall.name),
         isError: true
       });
     }
@@ -1624,32 +1639,22 @@ function repairToolPairingAdjacent(messages) {
     const msg = messages[i];
     if (msg.role !== "assistant") continue;
     if (typeof msg.content === "string" || !Array.isArray(msg.content)) continue;
-    const toolCallIds = msg.content.filter((p) => p.type === "tool_call").map((p) => p.id);
-    if (toolCallIds.length === 0) continue;
+    const orphanCalls = msg.content.filter((p) => p.type === "tool_call").map((p) => p);
+    if (orphanCalls.length === 0) continue;
+    const repaired = (call) => ({
+      type: "tool_result",
+      toolCallId: call.id,
+      content: indeterminateOutcomeText(call.name),
+      isError: true
+    });
     const next = messages[i + 1];
     if (next?.role === "tool" && Array.isArray(next.content)) {
       const existingIds = new Set(next.content.map((r) => r.toolCallId));
-      const missing = toolCallIds.filter((id) => !existingIds.has(id));
-      if (missing.length > 0) {
-        for (const id of missing) {
-          next.content.push({
-            type: "tool_result",
-            toolCallId: id,
-            content: "Tool execution was interrupted.",
-            isError: true
-          });
-        }
+      for (const call of orphanCalls) {
+        if (!existingIds.has(call.id)) next.content.push(repaired(call));
       }
     } else {
-      messages.splice(i + 1, 0, {
-        role: "tool",
-        content: toolCallIds.map((id) => ({
-          type: "tool_result",
-          toolCallId: id,
-          content: "Tool execution was interrupted.",
-          isError: true
-        }))
-      });
+      messages.splice(i + 1, 0, { role: "tool", content: orphanCalls.map(repaired) });
     }
   }
   const toolCallIdSet = /* @__PURE__ */ new Set();
@@ -1809,6 +1814,8 @@ var Agent = class {
   Agent,
   AgentStream,
   agentLoop,
+  cancelledBeforeStartText,
+  indeterminateOutcomeText,
   isAbortError,
   isBillingError,
   isContextOverflow,