@kenkaiiii/gg-agent 5.63.0 → 5.64.1

package/dist/index.js

@@ -7,6 +7,7 @@ import {
   stream,
   EventStream,
   GGAIError,
+  environmentSecrets,
   isHardBillingMessage,
   redactValue,
   sliceHead,
@@ -92,6 +93,11 @@ function clampOutputTokens(key, requested) {
 // src/agent-loop.ts
 var DEFAULT_MAX_TURNS = 300;
 var DEFAULT_TOOL_TIMEOUT_MS = 3e5;
+var _toolRedaction;
+function toolRedactionOptions() {
+  _toolRedaction ??= { secrets: environmentSecrets(process.env) };
+  return _toolRedaction;
+}
 var _diagFn = null;
 function setStreamDiagnostic(fn) {
   _diagFn = fn;
@@ -1182,7 +1188,8 @@ async function* agentLoop(messages, options) {
         maxTurnToolResultChars: options.maxTurnToolResultChars,
         toolMap,
         invalidToolArgumentCounts,
-        markFatalToolArgumentError
+        markFatalToolArgumentError,
+        seenToolCalls: /* @__PURE__ */ new Set()
       };
       const hasSequentialToolCall = toolCalls.some(
         (toolCall) => toolMap.get(toolCall.name)?.executionMode === "sequential"
@@ -1303,6 +1310,15 @@ async function* agentLoop(messages, options) {
     totalUsage: { ...totalUsage }
   };
 }
+function canonicalToolArgs(value) {
+  if (Array.isArray(value)) return value.map(canonicalToolArgs);
+  if (value !== null && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).sort(([a], [b]) => a.localeCompare(b)).map(([k, v]) => [k, canonicalToolArgs(v)])
+    );
+  }
+  return value;
+}
 function pushToolEvent(eventStream, state, event) {
   if (!state.finalized) eventStream.push(event);
 }
@@ -1319,6 +1335,21 @@ async function executeSingleToolCall(toolCall, options, pushEvent) {
   let isError = false;
   let invalidArgAttempt;
   const tool = options.toolMap.get(toolCall.name);
+  if (tool) {
+    const signature = JSON.stringify([toolCall.name, canonicalToolArgs(toolCall.args)]);
+    if (options.seenToolCalls.has(signature)) {
+      const content = "Tool call cancelled: an identical call already appeared in this response; this call was not executed.";
+      pushEvent({
+        type: "tool_call_end",
+        toolCallId: toolCall.id,
+        result: content,
+        isError: true,
+        durationMs: Date.now() - startTime
+      });
+      return { toolCallId: toolCall.id, content, isError: true };
+    }
+    options.seenToolCalls.add(signature);
+  }
   if (!tool) {
     resultContent = `Unknown tool: ${toolCall.name}`;
     isError = true;
@@ -1350,8 +1381,8 @@ async function executeSingleToolCall(toolCall, options, pushEvent) {
       };
       const raw = await tool.execute(parsed, ctx);
       const normalized = normalizeToolResult(raw);
-      resultContent = redactValue(normalized.content);
-      details = redactValue(normalized.details);
+      resultContent = redactValue(normalized.content, toolRedactionOptions());
+      details = redactValue(normalized.details, toolRedactionOptions());
       for (const key of options.invalidToolArgumentCounts.keys()) {
         if (key.startsWith(`${toolCall.name}:`)) options.invalidToolArgumentCounts.delete(key);
       }
@@ -1380,12 +1411,15 @@ async function executeSingleToolCall(toolCall, options, pushEvent) {
           );
         }
       } else {
-        resultContent = redactValue(err instanceof Error ? err.message : String(err));
+        resultContent = redactValue(
+          err instanceof Error ? err.message : String(err),
+          toolRedactionOptions()
+        );
       }
     }
   }
-  resultContent = redactValue(resultContent);
-  details = redactValue(details);
+  resultContent = redactValue(resultContent, toolRedactionOptions());
+  details = redactValue(details, toolRedactionOptions());
   const durationMs = Date.now() - startTime;
   pushEvent({
     type: "tool_call_end",
@@ -1427,6 +1461,11 @@ async function* executeToolCallsMixed(toolCalls, initialToolResults, options) {
       for (const phase of phases) {
         if (options.signal?.aborted) break;
         if (phase.sequential) {
+          const signature = JSON.stringify([
+            phase.sequential.name,
+            canonicalToolArgs(phase.sequential.args)
+          ]);
+          if (!options.seenToolCalls.has(signature)) options.seenToolCalls.clear();
           dispatchedIds.add(phase.sequential.id);
           const record = await executeSingleToolCall(
             phase.sequential,