@lazyingart/agintiflow 0.20.69 → 0.20.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazyingart/agintiflow",
-  "version": "0.20.69",
+  "version": "0.20.70",
   "type": "module",
   "description": "Low-cost, project-aware Web and CLI agents with DeepSeek/Venice/OpenAI routing, visible tool calls, durable sessions, scouts, AAPS, SCS, and guarded local execution.",
   "license": "Apache-2.0",

package/scripts/smoke-coding-tools.js

@@ -3,7 +3,7 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { repairModelMessageHistory, runAgent } from "../src/agent-runner.js";
+import { repairModelMessageHistory, runAgent, shouldShortCircuitToolBatch, skippedAfterBlockedToolResult } from "../src/agent-runner.js";
 import { resolveRuntimeConfig } from "../src/config.js";
 import { readCodebaseMap } from "../src/codebase-map.js";
 import { evaluateCommandPolicy } from "../src/command-policy.js";
@@ -119,6 +119,25 @@ try {
     interruptedDeepSeekState.messages.at(-1)?.content === "Continue with this new request: /review",
     "interrupted repair dropped the new user request"
   );
+  const blockedBatchResult = {
+    ok: false,
+    blocked: true,
+    toolName: "run_command",
+    category: "nested-aginti",
+    permissionAdvice: { category: "nested-aginti", suggestedCommand: "aginti doctor --json" },
+  };
+  assert(shouldShortCircuitToolBatch(blockedBatchResult), "permissionAdvice block did not trigger batch short-circuit");
+  const skippedBatchResult = skippedAfterBlockedToolResult(
+    {
+      id: "call-b",
+      type: "function",
+      function: { name: "run_command", arguments: "{\"command\":\"npx aginti capabilities --json\"}" },
+    },
+    blockedBatchResult
+  );
+  assert(skippedBatchResult.skipped, "skipped tool result did not mark skipped=true");
+  assert(skippedBatchResult.blocked, "skipped tool result did not remain blocked");
+  assert(skippedBatchResult.priorBlockedCategory === "nested-aginti", "skipped tool result did not preserve prior block category");
   const completeToolState = {
     messages: [
       { role: "system", content: "system" },
@@ -513,6 +532,7 @@ try {
         workspace,
         checks: [
           "deepseek_history_repair",
+          "blocked_tool_batch_short_circuit",
           "deepseek_pro_patch_route",
           "large_profile_pro_route",
           "auto_system_pro_route",

package/src/agent-runner.js

@@ -659,6 +659,35 @@ function sanitizeToolArgs(toolName, args) {
   return safeArgs;
 }
 
+function safeParseToolArgs(toolCall) {
+  try {
+    return JSON.parse(toolCall?.function?.arguments || "{}");
+  } catch {
+    return {};
+  }
+}
+
+export function shouldShortCircuitToolBatch(toolResult) {
+  return Boolean(toolResult?.blocked && toolResult?.permissionAdvice);
+}
+
+export function skippedAfterBlockedToolResult(toolCall, blockedResult) {
+  const toolName = toolCall?.function?.name || "unknown";
+  const args = sanitizeToolArgs(toolName, safeParseToolArgs(toolCall));
+  return {
+    ok: false,
+    blocked: true,
+    skipped: true,
+    toolName,
+    args,
+    category: "blocked-batch",
+    reason:
+      "Skipped because an earlier tool call in the same assistant message returned permissionAdvice. The runtime stops the batch so the agent cannot retry variants before the user/model sees the blocker.",
+    priorBlockedTool: blockedResult?.toolName || "",
+    priorBlockedCategory: blockedResult?.category || "",
+  };
+}
+
 function goalClearlyAllowsOverwrite(goal = "") {
   const text = String(goal || "").toLowerCase();
   return (
@@ -1723,7 +1752,8 @@ export async function runAgent(config) {
       }
 
       let continueForQueuedInput = false;
-      for (const toolCall of toolCalls) {
+      for (let toolIndex = 0; toolIndex < toolCalls.length; toolIndex += 1) {
+        const toolCall = toolCalls[toolIndex];
         throwIfAborted(config);
         const toolResult = await executeTool(browserState, toolCall, snapshot, config, store, observers, state);
         state.messages.push({
@@ -1797,6 +1827,24 @@ export async function runAgent(config) {
           });
         }
 
+        if (shouldShortCircuitToolBatch(toolResult)) {
+          for (const skippedToolCall of toolCalls.slice(toolIndex + 1)) {
+            const skippedResult = skippedAfterBlockedToolResult(skippedToolCall, toolResult);
+            state.messages.push({
+              role: "tool",
+              tool_call_id: skippedToolCall.id,
+              content: JSON.stringify(skippedResult),
+            });
+            await store.appendEvent("tool.skipped", sanitizeToolResult(skippedResult));
+            observers.event("tool.skipped", {
+              toolName: skippedResult.toolName,
+              reason: skippedResult.reason,
+              priorBlockedTool: skippedResult.priorBlockedTool,
+            });
+          }
+          break;
+        }
+
         if (config.provider === "mock" && toolResult.ok === false && !toolResult.blocked) {
           throw new Error(
             `Mock tool failed: ${toolResult.error || toolResult.reason || `${toolResult.toolName || "tool"} returned ok=false`}`