Fix Z.ai e2e state reset and Responses API tool fallback

Author: roomote

apps/vscode-e2e/src/suite/providers/zai.test.ts

@@ -19,6 +19,16 @@ import { setDefaultSuiteTimeout } from "../test-utils"
 type ZAiFixture = { match: string; result: string }
 type ZAiRequestCapture = { maxTokens?: number }
 
+function getBaseZAiConfiguration() {
+	return {
+		apiProvider: "zai" as const,
+		zaiApiKey: ZAI_API_KEY ?? "mock-key",
+		zaiApiLine: "international_api" as const,
+		modelMaxTokens: undefined,
+		modelMaxThinkingTokens: undefined,
+	}
+}
+
 function installZAiFetchInterceptor(
 	fixtures: ZAiFixture[],
 	capture?: ZAiRequestCapture,
@@ -151,6 +161,10 @@ suite("Z.ai GLM provider", function () {
 	let restoreFetch: (() => void) | undefined
 	const requestCapture: ZAiRequestCapture = {}
 
+	setup(() => {
+		requestCapture.maxTokens = undefined
+	})
+
 	suiteSetup(async () => {
 		restoreFetch = installZAiFetchInterceptor(
 			[
@@ -161,12 +175,14 @@ suite("Z.ai GLM provider", function () {
 			!!ZAI_API_KEY,
 		)
 
-		await globalThis.api.setConfiguration({
-			apiProvider: "zai" as const,
-			zaiApiKey: ZAI_API_KEY ?? "mock-key",
-			zaiApiLine: "international_api" as const,
-			apiModelId: "glm-5.1",
-		})
+		await globalThis.api.upsertProfile(
+			"default",
+			{
+				...getBaseZAiConfiguration(),
+				apiModelId: "glm-5.1",
+			},
+			true,
+		)
 	})
 
 	suiteTeardown(async () => {
@@ -175,12 +191,16 @@ suite("Z.ai GLM provider", function () {
 
 		const aimockUrl = process.env.AIMOCK_URL
 		const isRecord = process.env.AIMOCK_RECORD === "true"
-		await globalThis.api.setConfiguration({
-			apiProvider: "openrouter" as const,
-			openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
-			openRouterModelId: "openai/gpt-4.1",
-			...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
-		})
+		await globalThis.api.upsertProfile(
+			"default",
+			{
+				apiProvider: "openrouter" as const,
+				openRouterApiKey: aimockUrl && !isRecord ? "mock-key" : process.env.OPENROUTER_API_KEY!,
+				openRouterModelId: "openai/gpt-4.1",
+				...(aimockUrl && { openRouterBaseUrl: `${aimockUrl}/v1` }),
+			},
+			true,
+		)
 	})
 
 	test("Should complete a task end-to-end using glm-5.1 via Z.ai provider", async () => {
@@ -216,12 +236,14 @@ suite("Z.ai GLM provider", function () {
 	})
 
 	test("Should complete a task end-to-end using glm-5-turbo via Z.ai provider", async () => {
-		await globalThis.api.setConfiguration({
-			apiProvider: "zai" as const,
-			zaiApiKey: ZAI_API_KEY ?? "mock-key",
-			zaiApiLine: "international_api" as const,
-			apiModelId: "glm-5-turbo",
-		})
+		await globalThis.api.upsertProfile(
+			"default",
+			{
+				...getBaseZAiConfiguration(),
+				apiModelId: "glm-5-turbo",
+			},
+			true,
+		)
 
 		const api = globalThis.api
 		const messages: ClineMessage[] = []

src/api/transform/__tests__/responses-api-stream.spec.ts

@@ -235,6 +235,37 @@ describe("processResponsesApiStream", () => {
 				},
 			])
 		})
+
+		it("should fall back to output_item.done when delta omits the tool name", async () => {
+			const stream = mockStream([
+				{
+					type: "response.function_call_arguments.delta",
+					call_id: "call_123",
+					delta: '{"path":',
+					index: 0,
+				},
+				{
+					type: "response.output_item.done",
+					item: {
+						type: "function_call",
+						call_id: "call_123",
+						name: "read_file",
+						arguments: '{"path":"/tmp/test.txt"}',
+					},
+				},
+			])
+
+			const chunks = await collectChunks(processResponsesApiStream(stream, noopUsage))
+
+			expect(chunks).toEqual([
+				{
+					type: "tool_call",
+					id: "call_123",
+					name: "read_file",
+					arguments: '{"path":"/tmp/test.txt"}',
+				},
+			])
+		})
 	})
 
 	describe("completion and usage", () => {

src/api/transform/responses-api-stream.ts

@@ -83,7 +83,7 @@ export async function* processResponsesApiStream(
 		) {
 			const callId = event.call_id || event.tool_call_id || event.id || event.item_id
 			const name = event.name || event.function_name
-			if (typeof callId === "string" && callId.length > 0) {
+			if (typeof callId === "string" && callId.length > 0 && typeof name === "string" && name.length > 0) {
 				streamedCallIds.add(callId)
 				yield {
 					type: "tool_call_partial",