@lazyingart/agintiflow 0.20.12 → 0.20.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazyingart/agintiflow",
-  "version": "0.20.12",
+  "version": "0.20.13",
   "type": "module",
   "description": "AgInTiFlow is a web-first coding agent and CLI with DeepSeek routing, sandboxed tools, model providers, canvas artifacts, and optional wrappers.",
   "license": "Apache-2.0",

package/scripts/smoke-model-roles.js

@@ -9,7 +9,7 @@ import {
   modelsForProviderGroup,
   selectModelRoute,
 } from "../src/model-routing.js";
-import { parseTextToolCalls, usesTextToolProtocol } from "../src/model-client.js";
+import { normalizeTextToolCallResponse, parseTextToolCalls, usesTextToolProtocol } from "../src/model-client.js";
 import { modelRoleChoices } from "../src/interactive-cli.js";
 
 const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
@@ -161,6 +161,33 @@ const multipleRequestedToolCalls = parseTextToolCalls(
 );
 assert(multipleRequestedToolCalls.length === 2, "Requested tools parser did not detect multiple function-call texts");
 assert(multipleRequestedToolCalls[1].function.name === "inspect_project", "Requested tools parser returned wrong second requested tool");
+const malformedRequestedToolResponse = normalizeTextToolCallResponse({
+  choices: [
+    {
+      message: {
+        role: "assistant",
+        content: 'Requested tools: write_file({"path":"story.md","content":"unfinished',
+      },
+    },
+  ],
+});
+const malformedMessage = malformedRequestedToolResponse.choices[0].message;
+assert(malformedMessage.tool_calls?.[0]?.function?.name === "wait", "malformed requested tool text should trigger a safe retry tool");
+assert(!malformedMessage.content.includes("write_file("), "malformed requested tool text should not be surfaced as assistant content");
+const cleanedMalformedSuffix = normalizeTextToolCallResponse({
+  choices: [
+    {
+      message: {
+        role: "assistant",
+        content: 'Here is a normal answer. Requested tools: write_file({"path":"story.md","content":"unfinished',
+      },
+    },
+  ],
+});
+assert(
+  cleanedMalformedSuffix.choices[0].message.content === "Here is a normal answer.",
+  "malformed tool suffix should be stripped from otherwise usable assistant content"
+);
 assert(usesTextToolProtocol({ provider: "venice", model: "gemma-4-uncensored" }), "Venice Gemma should use text tool protocol");
 assert(usesTextToolProtocol({ provider: "venice", model: "e2ee-venice-uncensored-24b-p" }), "Venice 1.1 should use text tool protocol");
 assert(usesTextToolProtocol({ provider: "venice", model: "venice-uncensored" }), "Venice legacy 1.1 should use text tool protocol");
@@ -192,6 +219,7 @@ console.log(
         "shared-model-selectors",
         "venice-text-tool-parser",
         "requested-tools-parser",
+        "malformed-text-tool-retry",
         "cli-models-command",
         "venice-shortcut",
       ],

package/src/model-client.js

@@ -107,6 +107,7 @@ function textToolProtocolPrompt(tools = []) {
     'A strict id form is also accepted: [TOOL_CALLS]tool_name[ARGS]call_short_id[ARGS]{"arg":"value"}',
     'A JSON block form is accepted too: TOOL_CALLS: ```json [{"name":"tool_name","arguments":{"arg":"value"}}] ```',
     "Return only one or more TOOL_CALLS blocks when calling tools; do not wrap them in markdown.",
+    "Keep tool-call JSON valid and complete. For long write_file content, prefer a concise complete file or smaller follow-up edits over emitting huge/truncated JSON.",
     "If no tool is needed, answer normally.",
     "Available text tools:",
     ...toolLines,
@@ -140,7 +141,7 @@ function messagesWithTextToolProtocol(config, messages, tools) {
 
 export function parseTextToolCalls(content = "") {
   const text = String(content || "");
-  if (!text.includes("[TOOL_CALLS]") && !/TOOL_CALLS\s*:/i.test(text) && !/Requested tools?\s*:/i.test(text)) return [];
+  if (!hasTextToolCallMarker(text)) return [];
 
   const calls = [];
   for (const call of parseRequestedToolCalls(text)) calls.push(call);
@@ -196,6 +197,11 @@ export function parseTextToolCalls(content = "") {
   return calls;
 }
 
+function hasTextToolCallMarker(content = "") {
+  const text = String(content || "");
+  return text.includes("[TOOL_CALLS]") || /TOOL_CALLS\s*:/i.test(text) || /Requested tools?\s*:/i.test(text);
+}
+
 function findMatchingParen(text = "", openIndex = 0) {
   let depth = 0;
   let quote = "";
@@ -269,14 +275,30 @@ function textBeforeToolCallMarker(content = "") {
     .trim();
 }
 
-function normalizeTextToolCallResponse(response) {
+export function normalizeTextToolCallResponse(response) {
   const message = response?.choices?.[0]?.message;
   if (!message || Array.isArray(message.tool_calls) && message.tool_calls.length > 0) return response;
 
   const calls = parseTextToolCalls(message.content || "");
   if (calls.length === 0) {
     const cleanedContent = textBeforeToolCallMarker(message.content || "");
-    if (!cleanedContent || cleanedContent === message.content) return response;
+    if (!hasTextToolCallMarker(message.content || "")) return response;
+    if (cleanedContent) {
+      return {
+        ...response,
+        choices: response.choices.map((choice, index) =>
+          index === 0
+            ? {
+                ...choice,
+                message: {
+                  ...message,
+                  content: cleanedContent,
+                },
+              }
+            : choice
+        ),
+      };
+    }
     return {
       ...response,
       choices: response.choices.map((choice, index) =>
@@ -285,7 +307,18 @@ function normalizeTextToolCallResponse(response) {
               ...choice,
               message: {
                 ...message,
-                content: cleanedContent,
+                content:
+                  "The previous text tool request was malformed or truncated and was not executed. Retry with one valid tool call using the configured tool interface. For long files, write a complete concise file or split the work into smaller valid edits; do not show raw tool-call JSON to the user.",
+                tool_calls: [
+                  {
+                    id: "text-tool-retry-1",
+                    type: "function",
+                    function: {
+                      name: "wait",
+                      arguments: JSON.stringify({ ms: 1 }),
+                    },
+                  },
+                ],
               },
             }
           : choice