Refactor probe & chat flows

extensions/codestory/src/completions/providers/probeProvider.ts

@@ -12,7 +12,7 @@ import { AnswerSplitOnNewLineAccumulatorStreaming, reportAgentEventsToChat, Stre
 import postHogClient from '../../posthog/client';
 import { applyEdits, applyEditsDirectly, Limiter } from '../../server/applyEdits';
 import { handleRequest } from '../../server/requestHandler';
-import { EditedCodeStreamingRequest, SidecarApplyEditsRequest } from '../../server/types';
+import { EditedCodeStreamingRequest, SidecarApplyEditsRequest, SidecarContextEvent } from '../../server/types';
 import { SideCarClient } from '../../sidecar/client';
 import { getUniqueId } from '../../utilities/uniqueId';
 import { RecentEditsRetriever } from '../../server/editedFiles';
@@ -96,6 +96,19 @@ export class AideProbeProvider implements vscode.Disposable {
 		);
 	}
 
+	/**
+	 *
+	 * @returns Retuns the optional editor url (which is weird, maybe we should just crash
+	 * if we don't get the editor url as its a necessary component now?)
+	 */
+	editorUrl(): string | undefined {
+		return this._editorUrl;
+	}
+
+	async sendContextRecording(events: SidecarContextEvent[]) {
+		await this._sideCarClient.sendContextRecording(events, this._editorUrl);
+	}
+
 	async sessionFollowup(sessionAction: vscode.AideProbeSessionAction) {
 		if (sessionAction.action.type === 'newIteration') {
 			// @theskcd - This is where we can accept the iteration

extensions/codestory/src/csEvents/csEventHandler.ts

@@ -23,7 +23,7 @@ export class CSEventHandler implements vscode.CSEventHandler, vscode.Disposable
 	// The current recording session which the user is going through over here
 	private _currentSession: SidecarContextEvent[];
 
-	constructor(private readonly _context: vscode.ExtensionContext) {
+	constructor(private readonly _context: vscode.ExtensionContext, _editorUrl: string | undefined) {
 		this._disposable = vscode.csevents.registerCSEventHandler(this);
 		this._currentSession = [];
 

extensions/codestory/src/extension.ts

@@ -42,35 +42,13 @@ export async function activate(context: ExtensionContext) {
 		},
 	});
 
-	// Gets access to all the events the editor is throwing our way
-	const csEventHandler = new CSEventHandler(context);
-	context.subscriptions.push(csEventHandler);
-
 	const registerPreCopyCommand = commands.registerCommand(
 		'webview.preCopySettings',
 		async () => {
 			await copySettings(env.appRoot, logger);
 		}
 	);
 	context.subscriptions.push(registerPreCopyCommand);
-	const startRecording = commands.registerCommand(
-		'codestory.startRecordingContext',
-		async () => {
-			await csEventHandler.startRecording();
-			console.log('start recording context');
-		}
-	);
-	context.subscriptions.push(startRecording);
-	const stopRecording = commands.registerCommand(
-		'codestory.stopRecordingContext',
-		async () => {
-			const response = await csEventHandler.stopRecording();
-			await sidecarClient.sendContextRecording(response);
-			console.log(JSON.stringify(response));
-			console.log('stop recording context');
-		}
-	);
-	context.subscriptions.push(stopRecording);
 	let rootPath = workspace.rootPath;
 	if (!rootPath) {
 		rootPath = '';
@@ -209,6 +187,7 @@ export async function activate(context: ExtensionContext) {
 	context.subscriptions.push(recentEditsRetriever);
 
 	const probeProvider = new AideProbeProvider(sidecarClient, rootPath, recentEditsRetriever);
+	const editorUrl = probeProvider.editorUrl();
 	context.subscriptions.push(probeProvider);
 
 	// Register feedback commands
@@ -219,31 +198,6 @@ export async function activate(context: ExtensionContext) {
 		})
 	);
 
-	// records when we change to a new text document
-	workspace.onDidChangeTextDocument(async (event) => {
-		console.log('onDidChangeTextDocument');
-		const fileName = event.document.fileName;
-		await csEventHandler.onDidChangeTextDocument(fileName);
-	});
-
-	window.onDidChangeActiveTextEditor(async (editor) => {
-		if (editor) {
-			const activeDocument = editor.document;
-			if (activeDocument) {
-				const activeDocumentUri = activeDocument.uri;
-				if (shouldTrackFile(activeDocumentUri)) {
-					// track that changed document over here
-					await csEventHandler.onDidChangeTextDocument(activeDocumentUri.fsPath);
-					await sidecarClient.documentOpen(
-						activeDocumentUri.fsPath,
-						activeDocument.getText(),
-						activeDocument.languageId
-					);
-				}
-			}
-		}
-	});
-
 	// When the selection changes in the editor we should trigger an event
 	window.onDidChangeTextEditorSelection(async (event) => {
 		const textEditor = event.textEditor;
@@ -292,6 +246,54 @@ export async function activate(context: ExtensionContext) {
 		}
 	});
 
+	// Gets access to all the events the editor is throwing our way
+	const csEventHandler = new CSEventHandler(context, editorUrl);
+	context.subscriptions.push(csEventHandler);
+
+	const startRecording = commands.registerCommand(
+		'codestory.startRecordingContext',
+		async () => {
+			await csEventHandler.startRecording();
+			console.log('start recording context');
+		}
+	);
+	context.subscriptions.push(startRecording);
+	const stopRecording = commands.registerCommand(
+		'codestory.stopRecordingContext',
+		async () => {
+			const response = await csEventHandler.stopRecording();
+			await probeProvider.sendContextRecording(response);
+			console.log(JSON.stringify(response));
+			console.log('stop recording context');
+		}
+	);
+	context.subscriptions.push(stopRecording);
+
+	// records when we change to a new text document
+	workspace.onDidChangeTextDocument(async (event) => {
+		console.log('onDidChangeTextDocument');
+		const fileName = event.document.fileName;
+		await csEventHandler.onDidChangeTextDocument(fileName);
+	});
+
+	window.onDidChangeActiveTextEditor(async (editor) => {
+		if (editor) {
+			const activeDocument = editor.document;
+			if (activeDocument) {
+				const activeDocumentUri = activeDocument.uri;
+				if (shouldTrackFile(activeDocumentUri)) {
+					// track that changed document over here
+					await csEventHandler.onDidChangeTextDocument(activeDocumentUri.fsPath);
+					await sidecarClient.documentOpen(
+						activeDocumentUri.fsPath,
+						activeDocument.getText(),
+						activeDocument.languageId
+					);
+				}
+			}
+		}
+	});
+
 	// shouldn't all listeners have this?
 	context.subscriptions.push(diagnosticsListener);
 }

extensions/codestory/src/sidecar/client.ts

@@ -984,12 +984,18 @@ export class SideCarClient {
 
 	async sendContextRecording(
 		contextEvents: readonly SidecarContextEvent[],
+		editorUrl: string | undefined,
 	) {
+		if (editorUrl === undefined) {
+			console.log('editorUrl not found');
+			return;
+		}
 		const baseUrl = new URL(this._url);
 		baseUrl.pathname = '/api/agentic/context_recording';
 		const url = baseUrl.toString();
 		const body = {
 			context_events: contextEvents,
+			editor_url: editorUrl,
 		};
 		await fetch(url, {
 			method: 'POST',