refactor: rename sessionId to sessionResource in task execution and output monitoring

Author: meganrogge

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts

@@ -240,7 +240,7 @@ export async function collectTerminalResults(
 			isActive: isActive ? () => isActive(terminalTask) : undefined,
 			instance,
 			dependencyTasks,
-			sessionId: invocationContext.sessionId
+			sessionResource: invocationContext.sessionResource
 		};
 
 		// For tasks with problem matchers, wait until the task becomes busy before creating the output monitor

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts

@@ -11,6 +11,7 @@ import { Emitter, Event } from '../../../../../../../base/common/event.js';
 import { MarkdownString } from '../../../../../../../base/common/htmlContent.js';
 import { Disposable, MutableDisposable, type IDisposable } from '../../../../../../../base/common/lifecycle.js';
 import { isObject, isString } from '../../../../../../../base/common/types.js';
+import { URI } from '../../../../../../../base/common/uri.js';
 import { localize } from '../../../../../../../nls.js';
 import { ExtensionIdentifier } from '../../../../../../../platform/extensions/common/extensions.js';
 import { IChatWidgetService } from '../../../../../chat/browser/chat.js';
@@ -27,7 +28,6 @@ import { getTextResponseFromStream } from './utils.js';
 import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
 import { TerminalChatAgentToolsSettingId } from '../../../common/terminalChatAgentToolsConfiguration.js';
 import { ITerminalService } from '../../../../../terminal/browser/terminal.js';
-import { LocalChatSessionUri } from '../../../../../chat/common/model/chatUri.js';
 import { ITerminalLogService } from '../../../../../../../platform/terminal/common/terminal.js';
 
 export interface IOutputMonitor extends Disposable {
@@ -568,7 +568,7 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 		const focusTerminalSelection = Symbol('focusTerminalSelection');
 		const { promise: userPrompt, part } = this._createElicitationPart<boolean | typeof focusTerminalSelection>(
 			token,
-			execution.sessionId,
+			execution.sessionResource,
 			new MarkdownString(localize('poll.terminal.inputRequest', "The terminal is awaiting input.")),
 			new MarkdownString(localize('poll.terminal.requireInput', "{0}\nPlease provide the required input to the terminal.\n\n", confirmationPrompt.prompt)),
 			'',
@@ -634,7 +634,7 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 		let instanceDisposedDisposable: IDisposable = Disposable.None;
 		const { promise: userPrompt, part } = this._createElicitationPart<string | boolean | typeof focusTerminalSelection | undefined>(
 			token,
-			execution.sessionId,
+			execution.sessionResource,
 			new MarkdownString(localize('poll.terminal.confirmRequired', "The terminal is awaiting input.")),
 			new MarkdownString(localize('poll.terminal.confirmRunDetail', "{0}\n Do you want to send `{1}`{2} followed by `Enter` to the terminal?", confirmationPrompt.prompt, suggestedOptionValue, isString(suggestedOption) ? '' : suggestedOption.description ? ' (' + suggestedOption.description + ')' : '')),
 			'',
@@ -719,7 +719,7 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 	// attach additional listeners (e.g., onDidRequestHide) or compose with other promises.
 	private _createElicitationPart<T>(
 		token: CancellationToken,
-		sessionId: string | undefined,
+		sessionResource: URI | undefined,
 		title: MarkdownString,
 		detail: MarkdownString,
 		subtitle: string,
@@ -729,7 +729,7 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 		onReject?: () => MaybePromise<T | undefined>,
 		moreActions?: IAction[] | undefined
 	): { promise: Promise<T | undefined>; part: ChatElicitationRequestPart } {
-		const chatModel = sessionId && this._chatService.getSession(LocalChatSessionUri.forSession(sessionId));
+		const chatModel = sessionResource && this._chatService.getSession(sessionResource);
 		if (!(chatModel instanceof ChatModel)) {
 			throw new Error('No model');
 		}

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types.ts

@@ -7,6 +7,7 @@ import type { Task } from '../../../../../tasks/common/taskService.js';
 import type { ITerminalInstance } from '../../../../../terminal/browser/terminal.js';
 import type { ILinkLocation } from '../../taskHelpers.js';
 import type { IMarker as XtermMarker } from '@xterm/xterm';
+import type { URI } from '../../../../../../../base/common/uri.js';
 
 export interface IConfirmationPrompt {
 	prompt: string;
@@ -21,7 +22,7 @@ export interface IExecution {
 	task?: Task | Pick<Task, 'configurationProperties'>;
 	dependencyTasks?: Task[];
 	instance: Pick<ITerminalInstance, 'sendText' | 'instanceId' | 'onDidInputData' | 'onDisposed' | 'onData' | 'focus' | 'registerMarker'>;
-	sessionId: string | undefined;
+	sessionResource: URI | undefined;
 }
 
 export interface IPollingResult {