Merge pull request #7266 from continuedev/dallin/args-streaming-fix

fix HOTFIX remove cumulative args case

Author: sestinj

gui/src/util/toolCallState.test.ts

@@ -480,76 +480,6 @@ describe("addToolCallDeltaToState", () => {
     expect(currentState.parsedArgs).toEqual({ location: "Paris, France" });
   });
 
-  it("should handle arguments streamed in full progressive chunks", () => {
-    // Test case where model streams args progressively but includes full prefix each time
-    // e.g. '{"query":"te' -> '{"query":"tes' -> '{"query":"test"}'
-    const currentState: ToolCallState = {
-      status: "generating",
-      toolCall: {
-        id: "call123",
-        type: "function",
-        function: {
-          name: "searchFiles",
-          arguments: '{"query":"te',
-        },
-      },
-      toolCallId: "call123",
-      parsedArgs: { query: "te" },
-    };
-
-    const delta: ToolCallDelta = {
-      function: {
-        arguments: '{"query":"tes',
-      },
-    };
-
-    const result = addToolCallDeltaToState(delta, currentState);
-    expect(result.toolCall.function.arguments).toBe('{"query":"tes');
-    expect(result.parsedArgs).toEqual({ query: "tes" });
-
-    // Continue the streaming
-    const nextDelta: ToolCallDelta = {
-      function: {
-        arguments: '{"query":"test"}',
-      },
-    };
-
-    const finalResult = addToolCallDeltaToState(nextDelta, result);
-    expect(finalResult.toolCall.function.arguments).toBe('{"query":"test"}');
-    expect(finalResult.parsedArgs).toEqual({ query: "test" });
-  });
-
-  it("should handle when args delta is a superset of current args", () => {
-    // Test case where model sends a subset of the current arguments
-    // This can happen in certain LLM implementations
-    const currentState: ToolCallState = {
-      status: "generating",
-      toolCall: {
-        id: "call123",
-        type: "function",
-        function: {
-          name: "searchFiles",
-          arguments: '{"query":"test"',
-        },
-      },
-      toolCallId: "call123",
-      parsedArgs: { query: "test" },
-    };
-
-    const delta: ToolCallDelta = {
-      function: {
-        arguments: '{"query":"test","limit":10}',
-      },
-    };
-
-    // The subset should be ignored, keeping the current state
-    const result = addToolCallDeltaToState(delta, currentState);
-    expect(result.toolCall.function.arguments).toBe(
-      '{"query":"test","limit":10}',
-    );
-    expect(result.parsedArgs).toEqual({ query: "test", limit: 10 });
-  });
-
   it("should handle when args are complete JSON and new deltas arrive", () => {
     // When args are already a valid JSON object, new deltas should not modify it
     const currentState: ToolCallState = {

gui/src/util/toolCallState.ts

@@ -44,13 +44,11 @@ export function addToolCallDeltaToState(
     // If args is JSON parseable, it is complete, don't add to it
     JSON.parse(currentArgs);
   } catch (e) {
-    if (argsDelta.startsWith(currentArgs)) {
-      // Case where model progresssively streams args but full args each time e.g. "{"file": "file1"}" -> "{"file": "file1", "line": 1}"
-      mergedArgs = argsDelta;
-    } else if (!currentArgs.startsWith(argsDelta)) {
-      // Case where model streams in args in parts e.g. "{"file": "file1"" -> ", "line": 1}"
-      mergedArgs = currentArgs + argsDelta;
-    }
+    // Model streams in args in parts e.g. "{"file": "file1"" -> ", "line": 1}"
+    mergedArgs = currentArgs + argsDelta;
+
+    // Note, removed case where model progresssively streams args but full args each time e.g. "{"file": "file1"}" -> "{"file": "file1", "line": 1}"
+    // Because no apis do this and difficult to detect reliably
   }
 
   const [_, parsedArgs] = incrementalParseJson(mergedArgs || "{}");