fix: align merged branches with current type contracts

packages/coding-agent/src/cursor.ts

@@ -946,7 +946,7 @@ export class CursorExecHandlers implements ICursorExecHandlers {
 	 */
 	async mcpApprovalPreflight(call: CursorMcpCall) {
 		const toolName = call.toolName || call.name;
-		const tool = this.options.tools.get(toolName) ?? this.options.getTool?.(toolName);
+		const tool = this.options.getExecutableTool?.(toolName) ?? this.options.tools.get(toolName);
 		if (!tool) return false;
 		const context = this.options.getToolContext?.();
 		const settings = context?.settings;

packages/coding-agent/test/advisor/advisor.test.ts

@@ -3493,7 +3493,7 @@ describe("advisor", () => {
 							stopDetails: { type: "refusal", category: "reasoning_extraction" },
 							errorMessage: state.error,
 							timestamp: 2,
-						} as AgentMessage);
+						} as unknown as AgentMessage);
 						return;
 					}
 					state.error = undefined;
@@ -3502,7 +3502,7 @@ describe("advisor", () => {
 						content: [],
 						stopReason: "stop",
 						timestamp: 3,
-					} as AgentMessage);
+					} as unknown as AgentMessage);
 				},
 				abort: () => {},
 				reset: () => {},
@@ -3557,7 +3557,7 @@ describe("advisor", () => {
 						stopDetails: { type: "refusal", category: "reasoning_extraction" },
 						errorMessage: state.error,
 						timestamp: promptInputs.length + 1,
-					} as AgentMessage);
+					} as unknown as AgentMessage);
 				},
 				abort: () => {},
 				reset: () => {},
@@ -3614,7 +3614,7 @@ describe("advisor", () => {
 							stopDetails: { type: "refusal" },
 							errorMessage: state.error,
 							timestamp: 2,
-						} as AgentMessage);
+						} as unknown as AgentMessage);
 						return;
 					}
 					state.error = undefined;
@@ -3623,7 +3623,7 @@ describe("advisor", () => {
 						content: [],
 						stopReason: "stop",
 						timestamp: 3,
-					} as AgentMessage);
+					} as unknown as AgentMessage);
 				},
 				abort: () => {},
 				reset: () => {},

packages/coding-agent/test/turn-recovery-replay-unsafe.test.ts

@@ -46,6 +46,7 @@ function createHost(
 	return {
 		agent: undefined as never,
 		sessionManager: undefined as never,
+		persistedAssistantEntryId: () => undefined,
 		settings,
 		modelRegistry,
 		configWarnings: [],