diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index 402b55888f4..b6b4f5746bb 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -210,7 +210,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostUriOpeners = rpcProtocol.set(ExtHostContext.ExtHostUriOpeners, new ExtHostUriOpeners(rpcProtocol));
 	const extHostProfileContentHandlers = rpcProtocol.set(ExtHostContext.ExtHostProfileContentHandlers, new ExtHostProfileContentHandlers(rpcProtocol));
 	rpcProtocol.set(ExtHostContext.ExtHostInteractive, new ExtHostInteractive(rpcProtocol, extHostNotebook, extHostDocumentsAndEditors, extHostCommands, extHostLogService));
-	const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments, extHostNotebook));
+	const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments));
 	const extHostChatVariables = rpcProtocol.set(ExtHostContext.ExtHostChatVariables, new ExtHostChatVariables(rpcProtocol));
 	const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, new ExtHostLanguageModelTools(rpcProtocol));
 	const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, new ExtHostRelatedInformation(rpcProtocol));
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index a34438f1da1..8b2209b5363 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -21,7 +21,6 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatProgressDto, IExtensionChatAgentMetadata, IMainContext, MainContext, MainThreadChatAgentsShape2 } from 'vs/workbench/api/common/extHost.protocol';
 import { CommandsConverter, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
 import { ExtHostDocuments } from 'vs/workbench/api/common/extHostDocuments';
-import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
 import * as typeConvert from 'vs/workbench/api/common/extHostTypeConverters';
 import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
 import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult } from 'vs/workbench/contrib/chat/common/chatAgents';
@@ -266,8 +265,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		mainContext: IMainContext,
 		private readonly _logService: ILogService,
 		private readonly _commands: ExtHostCommands,
-		private readonly _documents: ExtHostDocuments,
-		private readonly _notebooks: ExtHostNotebookController
+		private readonly _documents: ExtHostDocuments
 	) {
 		super();
 		this._proxy = mainContext.getProxy(MainContext.MainThreadChatAgents2);
@@ -323,8 +321,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 
 			} else if (request.locationData?.type === ChatAgentLocation.Notebook) {
 				// notebook data
-				const notebook = this._notebooks.getNotebookDocument(request.locationData.sessionInputUri);
-				location2 = new extHostTypes.ChatRequestNotebookData(notebook.apiNotebook);
+				const cell = this._documents.getDocument(request.locationData.sessionInputUri);
+				location2 = new extHostTypes.ChatRequestNotebookData(cell);
 
 			} else if (request.locationData?.type === ChatAgentLocation.Terminal) {
 				// TBD
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index 4189c61331f..92b968e001e 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -4449,7 +4449,7 @@ export enum ChatLocation {
 	Editor = 4,
 }
 
-export class ChatRequestEditorData {
+export class ChatRequestEditorData implements vscode.ChatRequestEditorData {
 	constructor(
 		readonly document: vscode.TextDocument,
 		readonly selection: vscode.Selection,
@@ -4457,9 +4457,9 @@ export class ChatRequestEditorData {
 	) { }
 }
 
-export class ChatRequestNotebookData {
+export class ChatRequestNotebookData implements vscode.ChatRequestNotebookData {
 	constructor(
-		readonly notebook: vscode.NotebookDocument
+		readonly cell: vscode.TextDocument
 	) { }
 }
 
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index d3c0ca44e26..ce699b1fec9 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
@@ -40,9 +40,9 @@ declare module 'vscode' {
 
 	export class ChatRequestNotebookData {
 		//TODO@API should be the editor
-		notebook: NotebookDocument;
+		readonly cell: TextDocument;
 
-		constructor(notebook: NotebookDocument);
+		constructor(cell: TextDocument);
 	}
 
 	export interface ChatRequest {