diff --git a/src/resources/extensions/claude-code-cli/stream-adapter.ts b/src/resources/extensions/claude-code-cli/stream-adapter.ts
index cb9b901ed..fffcb1402 100644
--- a/src/resources/extensions/claude-code-cli/stream-adapter.ts
+++ b/src/resources/extensions/claude-code-cli/stream-adapter.ts
@@ -957,10 +957,10 @@ async function pumpSdkMessages(
 					// (e.g. stop_reason: "tool_use" followed directly by result,
 					// or a turn with text but no tool execution), the `builder`
 					// still holds toolCall blocks that were never pushed into
-					// `intermediateToolCalls`. Fold them in here so they aren't
+					// `intermediateToolBlocks`. Fold them in here so they aren't
 					// dropped from the final AssistantMessage.
 					if (builder) {
-						mergePendingToolCalls(intermediateToolCalls, builder.message.content);
+						mergePendingToolCalls(intermediateToolBlocks, builder.message.content);
 					}
 
 					// Add tool calls from intermediate turns first (renders above text)
diff --git a/src/resources/extensions/claude-code-cli/tests/stream-adapter.test.ts b/src/resources/extensions/claude-code-cli/tests/stream-adapter.test.ts
index 3f9d1efa5..d1f347939 100644
--- a/src/resources/extensions/claude-code-cli/tests/stream-adapter.test.ts
+++ b/src/resources/extensions/claude-code-cli/tests/stream-adapter.test.ts
@@ -417,7 +417,7 @@ describe("stream-adapter — session persistence (#2859)", () => {
 			delete process.env.GSD_WORKFLOW_MCP_ARGS;
 			delete process.env.GSD_WORKFLOW_MCP_ENV;
 			delete process.env.GSD_WORKFLOW_MCP_CWD;
-			const options = buildSdkOptions("claude-sonnet-4-20250514", "test", { onElicitation });
+			const options = buildSdkOptions("claude-sonnet-4-20250514", "test", undefined, { onElicitation });
 			assert.equal(options.onElicitation, onElicitation);
 		} finally {
 			process.env.GSD_WORKFLOW_MCP_COMMAND = prev.GSD_WORKFLOW_MCP_COMMAND;