@@ -16,8 +16,14 @@
 			}
 		},
 		{
+			// The post-tool request ends with a role:user message (fresh environment details
+			// appended after the tool result), so aimock's toolCallId matcher — which only
+			// inspects the LAST message — can never match it. Scope by the DTE-only model plus
+			// the presence of a tool-result message (turnIndex 1 tie-breaks the two requests).
 			"match": {
-				"toolCallId": "call_dte_e2e_001"
+				"model": "openai/gpt-5",
+				"hasToolResult": true,
+				"turnIndex": 1
 			},
 			"response": {
 				"toolCalls": [
 
@@ -152,8 +152,6 @@ async function withOpenRouterCaptureProxy<T>(
 			const requestUrl = req.url ?? "/"
 
 			if (!isChatCompletionsUrl("http://127.0.0.1" + requestUrl)) {
-				// DTE-DEBUG (temporary): log non-chat requests (e.g. model catalog) the proxy sees.
-				console.error("DTE-DEBUG non-chat", req.method, requestUrl)
 				res.writeHead(404)
 				res.end("Not found")
 				return
@@ -172,18 +170,6 @@ async function withOpenRouterCaptureProxy<T>(
 				lastUserMessage,
 			})
 
-			// DTE-DEBUG (temporary): log every chat request the proxy sees.
-			console.error(
-				"DTE-DEBUG chat",
-				JSON.stringify({
-					url: requestUrl,
-					model: body.model,
-					reasoning: body.reasoning,
-					roles: (body.messages ?? []).map((message) => message.role),
-					lastUserMessage: lastUserMessage.slice(0, 200),
-				}),
-			)
-
 			const forwardHeaders: Record<string, string> = {}
 			for (const [key, value] of Object.entries(req.headers)) {
 				if (!HOP_BY_HOP.has(key.toLowerCase()) && value !== undefined) {
@@ -285,51 +271,8 @@ suite("set_thinking_effort mid-task workflow (DTE addendum)", function () {
 				text: APPLY_MARKER + ": answer the math question",
 			})
 
-			try {
-				await waitUntilCompleted({ api, taskId })
-			} finally {
-				api.off(RooCodeEventName.Message, onMessage)
-
-				// DTE-DEBUG (temporary): dump aimock's request journal and the proxy's
-				// captured requests so a failure reveals the exact request shapes that
-				// the aimock matcher saw.
-				try {
-					const journalResponse = await fetch(aimockUrl + "/v1/_requests?limit=20")
-					const journal = (await journalResponse.json()) as Array<{
-						method?: string
-						path?: string
-						body?: { model?: string; messages?: Array<{ role?: string; content?: unknown }> }
-						response?: { status?: number }
-					}>
-					for (const entry of journal.slice(-10)) {
-						const entries = entry.body?.messages ?? []
-						const lastUser = [...entries].reverse().find((message) => message.role === "user")
-						const text =
-							typeof lastUser?.content === "string"
-								? lastUser.content
-								: JSON.stringify(lastUser?.content ?? "")
-						console.error(
-							"DTE-DEBUG aimock-journal",
-							entry.method,
-							entry.path,
-							"model=" + String(entry.body?.model ?? "?"),
-							"status=" + String(entry.response?.status ?? "?"),
-							"lastUserMessage=" + text.slice(0, 200),
-						)
-					}
-					console.error(
-						"DTE-DEBUG captured",
-						JSON.stringify(
-							requests.map((request) => ({
-								model: request.model,
-								lastUserMessage: request.lastUserMessage.slice(0, 200),
-							})),
-						),
-					)
-				} catch (error) {
-					console.error("DTE-DEBUG journal fetch failed", error)
-				}
-			}
+			await waitUntilCompleted({ api, taskId })
+			api.off(RooCodeEventName.Message, onMessage)
 
 			// (a) Real boundary: the task completes with the math answer after the
 			// mid-task tool round trip.