Clean up optional checks on hookProgress (#3741)

Author: roblourens

src/extension/chat/vscode-node/chatHookService.ts

@@ -303,7 +303,7 @@ export class ChatHookService implements IChatHookService {
 			// Exit code 2 (error) means deny the tool
 			onError: (errorMessage) => {
 				const messageWithTool = errorMessage ? `Tried to use ${toolName} - ${errorMessage}` : `Tried to use ${toolName}`;
-				outputStream?.hookProgress?.('PreToolUse', formatHookErrorMessage(messageWithTool));
+				outputStream?.hookProgress('PreToolUse', formatHookErrorMessage(messageWithTool));
 				mostRestrictiveDecision = 'deny';
 				winningReason = messageWithTool || winningReason;
 			},
@@ -402,10 +402,10 @@ export class ChatHookService implements IChatHookService {
 					hasBlock = true;
 					const messageWithTool = errorMessage ? `Tried to use ${toolName} - ${errorMessage}` : `Tried to use ${toolName}`;
 					blockReason = messageWithTool || undefined;
-					outputStream?.hookProgress?.('PostToolUse', formatHookErrorMessage(messageWithTool));
+					outputStream?.hookProgress('PostToolUse', formatHookErrorMessage(messageWithTool));
 				} else {
 					const messageWithTool = errorMessage ? `Tried to use ${toolName} - ${errorMessage}` : `Tried to use ${toolName}`;
-					outputStream?.hookProgress?.('PostToolUse', undefined, formatHookErrorMessage(messageWithTool));
+					outputStream?.hookProgress('PostToolUse', undefined, formatHookErrorMessage(messageWithTool));
 				}
 			},
 		});

src/extension/codeBlocks/node/codeBlockProcessor.ts

@@ -125,7 +125,7 @@ export class CodeBlockTrackingChatResponseStream implements ChatResponseStream {
 	workspaceEdit = this.forward(this._wrapped.workspaceEdit?.bind(this._wrapped) || (() => { }));
 	confirmation = this.forward(this._wrapped.confirmation.bind(this._wrapped));
 	warning = this.forward(this._wrapped.warning.bind(this._wrapped));
-	hookProgress = this.forward(this._wrapped.hookProgress?.bind(this._wrapped) ?? (() => { }));
+	hookProgress = this.forward(this._wrapped.hookProgress.bind(this._wrapped));
 	reference2 = this.forward(this._wrapped.reference2.bind(this._wrapped));
 	codeCitation = this.forward(this._wrapped.codeCitation.bind(this._wrapped));
 	anchor = this.forward(this._wrapped.anchor.bind(this._wrapped));

src/extension/intents/node/hookResultProcessor.ts

@@ -87,7 +87,7 @@ export function processHookResults(options: ProcessHookResultsOptions): void {
 				continue;
 			}
 			logService.info(`[ToolCallingLoop] ${hookType} hook requested abort: ${result.stopReason}`);
-			outputStream?.hookProgress?.(hookType, formatHookErrorMessage(result.stopReason));
+			outputStream?.hookProgress(hookType, formatHookErrorMessage(result.stopReason));
 			throw new HookAbortError(hookType, result.stopReason);
 		}
 
@@ -117,14 +117,14 @@ export function processHookResults(options: ProcessHookResultsOptions): void {
 				// Completely ignore error - no throw, no hookProgress (silently continue)
 				continue;
 			} else {
-				outputStream?.hookProgress?.(hookType, formatHookErrorMessage(errorMessage));
+				outputStream?.hookProgress(hookType, formatHookErrorMessage(errorMessage));
 				throw new HookAbortError(hookType, errorMessage);
 			}
 		}
 	}
 
 	// Show aggregated warnings via hookProgress
-	if (warnings.length > 0 && outputStream?.hookProgress) {
+	if (warnings.length > 0 && outputStream) {
 		if (warnings.length === 1) {
 			outputStream.hookProgress(hookType, undefined, warnings[0]);
 		} else {

src/extension/intents/node/toolCallingLoop.ts

@@ -312,10 +312,10 @@ export abstract class ToolCallingLoop<TOptions extends IToolCallingLoopOptions =
 	protected showStopHookBlockedMessage(outputStream: ChatResponseStream | undefined, reasons: readonly string[]): void {
 		if (outputStream) {
 			if (reasons.length === 1) {
-				outputStream.hookProgress?.('Stop', reasons[0]);
+				outputStream.hookProgress('Stop', reasons[0]);
 			} else {
 				const formattedReasons = reasons.map((r, i) => `${i + 1}. ${r}`).join('\n');
-				outputStream.hookProgress?.('Stop', formattedReasons);
+				outputStream.hookProgress('Stop', formattedReasons);
 			}
 		}
 		this._logService.trace(`[ToolCallingLoop] Stop hook blocked stopping: ${reasons.join('; ')}`);
@@ -465,10 +465,10 @@ export abstract class ToolCallingLoop<TOptions extends IToolCallingLoopOptions =
 	protected showSubagentStopHookBlockedMessage(outputStream: ChatResponseStream | undefined, reasons: readonly string[]): void {
 		if (outputStream) {
 			if (reasons.length === 1) {
-				outputStream.hookProgress?.('SubagentStop', reasons[0]);
+				outputStream.hookProgress('SubagentStop', reasons[0]);
 			} else {
 				const formattedReasons = reasons.map((r, i) => `${i + 1}. ${r}`).join('\n');
-				outputStream.hookProgress?.('SubagentStop', formattedReasons);
+				outputStream.hookProgress('SubagentStop', formattedReasons);
 			}
 		}
 		this._logService.trace(`[ToolCallingLoop] SubagentStop hook blocked stopping: ${reasons.join('; ')}`);

src/extension/linkify/common/responseStreamWithLinkification.ts

@@ -78,7 +78,7 @@ export class ResponseStreamWithLinkification implements FinalizableChatResponseS
 	}
 
 	hookProgress(hookType: ChatHookType, stopReason?: string, systemMessage?: string): ChatResponseStream {
-		this.enqueue(() => this._progress.hookProgress?.(hookType, stopReason, systemMessage), false);
+		this.enqueue(() => this._progress.hookProgress(hookType, stopReason, systemMessage), false);
 		return this;
 	}