@lazyingart/agintiflow 0.20.69 → 0.20.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazyingart/agintiflow",
-  "version": "0.20.69",
+  "version": "0.20.71",
   "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-cli-chat.js

@@ -24,6 +24,44 @@ const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), "agintiflow-cli-chat-")
 const agintiflowHome = path.join(tempRoot, ".agintiflow-home");
 const binPath = path.join(repoRoot, "bin/aginti-cli.js");
 
+function charCellWidth(char = "") {
+  const code = char.codePointAt(0);
+  if (!code) return 0;
+  if (code < 32 || (code >= 0x7f && code < 0xa0)) return 0;
+  if (
+    (code >= 0x0300 && code <= 0x036f) ||
+    (code >= 0x1ab0 && code <= 0x1aff) ||
+    (code >= 0x1dc0 && code <= 0x1dff) ||
+    (code >= 0x20d0 && code <= 0x20ff) ||
+    (code >= 0xfe20 && code <= 0xfe2f)
+  ) {
+    return 0;
+  }
+  if (
+    code >= 0x1100 &&
+    (code <= 0x115f ||
+      code === 0x2329 ||
+      code === 0x232a ||
+      (code >= 0x2e80 && code <= 0xa4cf && code !== 0x303f) ||
+      (code >= 0xac00 && code <= 0xd7a3) ||
+      (code >= 0xf900 && code <= 0xfaff) ||
+      (code >= 0xfe10 && code <= 0xfe19) ||
+      (code >= 0xfe30 && code <= 0xfe6f) ||
+      (code >= 0xff00 && code <= 0xff60) ||
+      (code >= 0xffe0 && code <= 0xffe6) ||
+      (code >= 0x1f300 && code <= 0x1f64f) ||
+      (code >= 0x1f900 && code <= 0x1f9ff) ||
+      (code >= 0x20000 && code <= 0x3fffd))
+  ) {
+    return 2;
+  }
+  return 1;
+}
+
+function cellWidth(value = "") {
+  return [...String(value || "").replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, "")].reduce((sum, char) => sum + charCellWidth(char), 0);
+}
+
 function runChat(inputText) {
   return runCli(["chat", "--provider", "mock", "--routing", "manual", "--profile", "code"], inputText);
 }
@@ -221,6 +259,14 @@ try {
   if (!jaLaunchHeader.includes("低コストでプロジェクトを理解するエージェント")) {
     throw new Error("launch header did not localize by language option");
   }
+  const zhLaunchHeader = buildLaunchHeaderLines({ width: 80, packageVersion: "0.0.0", animated: false, language: "zh-Hans" });
+  if (zhLaunchHeader.some((line) => cellWidth(line) > 80)) {
+    throw new Error("launch header did not account for CJK terminal cell width");
+  }
+  const jaNarrowHeader = buildLaunchHeaderLines({ width: 80, packageVersion: "0.0.0", animated: false, language: "ja" });
+  if (jaNarrowHeader.some((line) => cellWidth(line) > 80)) {
+    throw new Error("Japanese launch header overflowed narrow terminal width");
+  }
   const hugePromptLayout = buildPromptLayout(Array.from({ length: 30 }, (_unused, index) => `line ${index + 1}`).join("\n"), 120, 80, 20);
   if (hugePromptLayout.renderedRows.length > 12 || !hugePromptLayout.renderedRows.some((line) => line.includes("earlier input row"))) {
     throw new Error("terminal prompt layout did not bound redraw size for large prompts");

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`}`

package/src/interactive-cli.js

@@ -175,8 +175,62 @@ function promptViewportRows(height = terminalHeight()) {
   return Math.max(Math.min(Math.floor(Number(height) * 0.42), 10), 4);
 }
 
+function stripAnsi(value) {
+  return String(value || "").replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, "");
+}
+
+function charCellWidth(char = "") {
+  const code = char.codePointAt(0);
+  if (!code) return 0;
+  if (code < 32 || (code >= 0x7f && code < 0xa0)) return 0;
+  if (
+    (code >= 0x0300 && code <= 0x036f) ||
+    (code >= 0x1ab0 && code <= 0x1aff) ||
+    (code >= 0x1dc0 && code <= 0x1dff) ||
+    (code >= 0x20d0 && code <= 0x20ff) ||
+    (code >= 0xfe20 && code <= 0xfe2f)
+  ) {
+    return 0;
+  }
+  if (
+    code >= 0x1100 &&
+    (code <= 0x115f ||
+      code === 0x2329 ||
+      code === 0x232a ||
+      (code >= 0x2e80 && code <= 0xa4cf && code !== 0x303f) ||
+      (code >= 0xac00 && code <= 0xd7a3) ||
+      (code >= 0xf900 && code <= 0xfaff) ||
+      (code >= 0xfe10 && code <= 0xfe19) ||
+      (code >= 0xfe30 && code <= 0xfe6f) ||
+      (code >= 0xff00 && code <= 0xff60) ||
+      (code >= 0xffe0 && code <= 0xffe6) ||
+      (code >= 0x1f300 && code <= 0x1f64f) ||
+      (code >= 0x1f900 && code <= 0x1f9ff) ||
+      (code >= 0x20000 && code <= 0x3fffd))
+  ) {
+    return 2;
+  }
+  return 1;
+}
+
+function stringCellWidth(value = "") {
+  return [...String(value || "")].reduce((sum, char) => sum + charCellWidth(char), 0);
+}
+
+function sliceToVisualWidth(value = "", width = 0) {
+  let used = 0;
+  let result = "";
+  for (const char of String(value || "")) {
+    const next = used + charCellWidth(char);
+    if (next > width) break;
+    result += char;
+    used = next;
+  }
+  return result;
+}
+
 function visualLength(value) {
-  return stripAnsi(value).length;
+  return stringCellWidth(stripAnsi(value));
 }
 
 function padVisible(value, width) {
@@ -186,7 +240,7 @@ function padVisible(value, width) {
 
 function panelLine(content = "", bgCode = ansi.systemBg, width = editorWidth()) {
   const raw = String(content || "");
-  const safeContent = visualLength(raw) > width ? stripAnsi(raw).slice(0, width) : raw;
+  const safeContent = visualLength(raw) > width ? sliceToVisualWidth(stripAnsi(raw), width) : raw;
   if (!useColor) return padVisible(safeContent, width);
   const padded = padVisible(safeContent, width).replaceAll(ansi.reset, `${ansi.reset}${bgCode}`);
   return `${bgCode}${padded}${ansi.reset}`;
@@ -203,10 +257,6 @@ function commandCompleter(line = "") {
   return [hits.length > 0 ? hits : SLASH_COMMANDS, trimmed];
 }
 
-function stripAnsi(value) {
-  return String(value || "").replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, "");
-}
-
 function promptGutter() {
   const visible = stripAnsi(userPrompt()).replace(/^\n/, "").length;
   return " ".repeat(Math.max(visible - 2, 0)) + `${color("|", ansi.userBg)} `;
@@ -253,7 +303,7 @@ function clamp(value, min, max) {
 
 function compactLine(value = "", limit = 96) {
   const text = stripAnsi(String(value || "").replace(/\s+/g, " ").trim());
-  return text.length <= limit ? text : `${text.slice(0, Math.max(limit - 1, 1))}…`;
+  return visualLength(text) <= limit ? text : `${sliceToVisualWidth(text, Math.max(limit - 1, 1))}…`;
 }
 
 export function formatElapsedDuration(ms = 0) {