Refactor probe & chat flows

extensions/codestory/package.json

@@ -24,6 +24,7 @@
     "defaultChatParticipant",
     "inlineCompletionsAdditions",
     "interactive",
+    "mappedEditsProvider",
     "modelSelection",
     "terminalSelection"
   ],
@@ -58,37 +59,33 @@
         "command": "codestory.feedback",
         "title": "Provide feedback on Discord",
         "icon": "assets/discord.svg"
+      },
+      {
+        "command": "codestory.startRecordingContext",
+        "title": "Start Recording context"
+      },
+      {
+        "command": "codestory.stopRecordingContext",
+        "title": "Stop Recording Context"
       }
     ],
-    "viewsContainers": {
-      "activitybar": [
-        {
-          "id": "changeTracker",
-          "title": "Change Tracker",
-          "icon": "assets/versions.svg"
-        }
-      ]
-    },
-    "aideChatParticipants": [
+    "aideAgents": [
       {
         "id": "aide",
-        "name": "Chat",
+        "name": "Aide",
+        "fullName": "Aide",
         "description": "What can I help you with today?",
+        "supportsModelPicker": true,
         "isDefault": true,
+        "metadata": {
+          "icon": "assets/aide-agent.png",
+          "requester": "assets/aide-user.png"
+        },
         "locations": [
           "panel"
         ]
       }
     ],
-    "menus": {
-      "view/title": [
-        {
-          "command": "codestory.feedback",
-          "when": "view == cs-chat",
-          "group": "navigation"
-        }
-      ]
-    },
     "configuration": {
       "type": "object",
       "title": "Aide Extension settings",
@@ -167,6 +164,11 @@
           "type": "boolean",
           "default": true,
           "description": "Should we allow clip board content to be sent over"
+        },
+        "aide.deepReasoning": {
+          "type": "boolean",
+          "default": false,
+          "description": "Should use deep reasoning before making edits"
         }
       }
     }

extensions/codestory/src/chatState/convertStreamToMessage.ts

@@ -17,7 +17,7 @@ import { AdjustedLineContent, LineContent, LineIndentManager } from '../completi
 
 export const reportFromStreamToSearchProgress = async (
 	stream: AsyncIterator<ConversationMessage>,
-	response: vscode.AideChatResponseStream,
+	response: vscode.ChatResponseStream,
 	cancellationToken: vscode.CancellationToken,
 	workingDirectory: string,
 ): Promise<string> => {
@@ -79,7 +79,11 @@ export const reportFromStreamToSearchProgress = async (
 			// the reporef location to the message and that would solve a lot of
 			// problems.
 			if (!enteredAnswerGenerationLoop) {
-				response.markdown('\n');
+				if (conversationMessage.answer.delta !== null) {
+					response.markdown(conversationMessage.answer.delta);
+				} else {
+					response.markdown('\n');
+				}
 				// progress.report(new CSChatProgressContent('\n## Answer\n\n' + conversationMessage.answer.delta));
 				enteredAnswerGenerationLoop = true;
 			} else {
@@ -193,7 +197,7 @@ export const reportCodeSpansToChat = (codeSpans: CodeSpan[], workingDirectory: s
 	return '## Relevant code snippets\n\n' + codeSpansString + suffixString;
 };
 
-export const reportCodeReferencesToChat = (response: vscode.AideChatResponseStream, codeSpans: CodeSpan[], workingDirectory: string) => {
+export const reportCodeReferencesToChat = (response: vscode.ChatResponseStream, codeSpans: CodeSpan[], workingDirectory: string) => {
 	const sortedCodeSpans = codeSpans.sort((a, b) => {
 		if (a.score !== null && b.score !== null) {
 			return b.score - a.score;
@@ -225,7 +229,7 @@ export const reportCodeReferencesToChat = (response: vscode.AideChatResponseStre
 
 
 export const reportProcUpdateToChat = (
-	progress: vscode.AideChatResponseStream,
+	progress: vscode.ChatResponseStream,
 	proc: AgentStep,
 	workingDirectory: string,
 ) => {
@@ -252,7 +256,7 @@ const pattern = /(?:^|\s)(\w+\s+at\s+[\w/.-]+)?(.*)/s;
 export const reportAgentEventsToChat = async (
 	editMode: boolean,
 	stream: AsyncIterableIterator<SideCarAgentEvent>,
-	response: vscode.AgentResponseStream,
+	response: vscode.AideAgentResponseStream,
 	threadId: string,
 	token: vscode.CancellationToken,
 	sidecarClient: SideCarClient,
@@ -294,33 +298,31 @@ export const reportAgentEventsToChat = async (
 						thinking: item.thinking,
 					};
 				});
-				response.initialSearchSymbols(initialSearchSymbolInformation);
+				// response.initialSearchSymbols(initialSearchSymbolInformation);
 			} else if (event.event.FrameworkEvent.RepoMapGenerationStart) {
-				response.repoMapGeneration(false);
+				// response.repoMapGeneration(false);
 			} else if (event.event.FrameworkEvent.RepoMapGenerationFinished) {
-				response.repoMapGeneration(true);
+				// response.repoMapGeneration(true);
 			} else if (event.event.FrameworkEvent.LongContextSearchStart) {
-				response.longContextSearch(false);
+				// response.longContextSearch(false);
 			} else if (event.event.FrameworkEvent.LongContextSearchFinished) {
-				response.longContextSearch(true);
+				// response.longContextSearch(true);
 			} else if (event.event.FrameworkEvent.OpenFile) {
 				const filePath = event.event.FrameworkEvent.OpenFile.fs_file_path;
 				if (filePath) {
-					response.openFile({
-						uri: vscode.Uri.file(filePath),
-					});
+					response.reference(vscode.Uri.file(filePath));
 				}
 			} else if (event.event.FrameworkEvent.CodeIterationFinished) {
-				response.codeIterationFinished({ edits: iterationEdits });
+				// response.codeIterationFinished({ edits: iterationEdits });
 			} else if (event.event.FrameworkEvent.ReferenceFound) {
-				response.referenceFound({ references: event.event.FrameworkEvent.ReferenceFound });
+				// response.referenceFound({ references: event.event.FrameworkEvent.ReferenceFound });
 			} else if (event.event.FrameworkEvent.RelevantReference) {
 				const ref = event.event.FrameworkEvent.RelevantReference;
-				response.relevantReference({
-					uri: vscode.Uri.file(ref.fs_file_path),
-					symbolName: ref.symbol_name,
-					reason: ref.reason,
-				});
+				// response.relevantReference({
+				// 	uri: vscode.Uri.file(ref.fs_file_path),
+				// 	symbolName: ref.symbol_name,
+				// 	reason: ref.reason,
+				// });
 			} else if (event.event.FrameworkEvent.GroupedReferences) {
 				const groupedRefs = event.event.FrameworkEvent.GroupedReferences;
 				const followups: { [key: string]: { symbolName: string; uri: vscode.Uri }[] } = {};
@@ -332,7 +334,7 @@ export const reportAgentEventsToChat = async (
 						};
 					});
 				}
-				response.followups(followups);
+				// response.followups(followups);
 			} else if (event.event.FrameworkEvent.SearchIteration) {
 				// console.log(event.event.FrameworkEvent.SearchIteration);
 			} else if (event.event.FrameworkEvent.AgenticTopLevelThinking) {
@@ -349,13 +351,13 @@ export const reportAgentEventsToChat = async (
 			const symbolEventKey = symbolEventKeys[0] as keyof typeof symbolEvent;
 			// If this is a symbol event then we have to make sure that we are getting the probe request over here
 			if (!editMode && symbolEventKey === 'Probe' && symbolEvent.Probe !== undefined) {
-				response.breakdown({
-					reference: {
-						uri: vscode.Uri.file(symbolEvent.Probe.symbol_identifier.fs_file_path ?? 'symbol_not_found'),
-						name: symbolEvent.Probe.symbol_identifier.symbol_name,
-					},
-					query: new vscode.MarkdownString(symbolEvent.Probe.probe_request)
-				});
+				// response.breakdown({
+				// 	reference: {
+				// 		uri: vscode.Uri.file(symbolEvent.Probe.symbol_identifier.fs_file_path ?? 'symbol_not_found'),
+				// 		name: symbolEvent.Probe.symbol_identifier.symbol_name,
+				// 	},
+				// 	query: new vscode.MarkdownString(symbolEvent.Probe.probe_request)
+				// });
 			}
 		} else if (event.event.SymbolEventSubStep) {
 			const { symbol_identifier, event: symbolEventSubStep } = event.event.SymbolEventSubStep;
@@ -369,7 +371,7 @@ export const reportAgentEventsToChat = async (
 				const startPosition = new vscode.Position(goToDefinition.range.startPosition.line, goToDefinition.range.startPosition.character);
 				const endPosition = new vscode.Position(goToDefinition.range.endPosition.line, goToDefinition.range.endPosition.character);
 				const range = new vscode.Range(startPosition, endPosition);
-				response.location({ uri, range, name: symbol_identifier.symbol_name, thinking: goToDefinition.thinking });
+				// response.location({ uri, range, name: symbol_identifier.symbol_name, thinking: goToDefinition.thinking });
 				continue;
 			} else if (symbolEventSubStep.Edit) {
 				if (!symbol_identifier.fs_file_path) {
@@ -381,21 +383,21 @@ export const reportAgentEventsToChat = async (
 				if (editEvent.CodeCorrectionTool) { }
 
 				if (editEvent.ThinkingForEdit) {
-					response.breakdown({
-						reference: {
-							uri: vscode.Uri.file(symbol_identifier.fs_file_path),
-							name: symbol_identifier.symbol_name
-						},
-						response: new vscode.MarkdownString(editEvent.ThinkingForEdit.thinking),
-					});
+					// response.breakdown({
+					// 	reference: {
+					// 		uri: vscode.Uri.file(symbol_identifier.fs_file_path),
+					// 		name: symbol_identifier.symbol_name
+					// 	},
+					// 	response: new vscode.MarkdownString(editEvent.ThinkingForEdit.thinking),
+					// });
 				}
 				if (editEvent.RangeSelectionForEdit) {
-					response.breakdown({
-						reference: {
-							uri: vscode.Uri.file(symbol_identifier.fs_file_path),
-							name: symbol_identifier.symbol_name,
-						}
-					});
+					// response.breakdown({
+					// 	reference: {
+					// 		uri: vscode.Uri.file(symbol_identifier.fs_file_path),
+					// 		name: symbol_identifier.symbol_name,
+					// 	}
+					// });
 				} else if (editEvent.EditCodeStreaming) {
 					// we have to do some state management over here
 					// we send 3 distinct type of events over here
@@ -469,13 +471,13 @@ export const reportAgentEventsToChat = async (
 				const subStepType = probeRequestKeys[0];
 				if (!editMode && subStepType === 'ProbeAnswer' && probeSubStep.ProbeAnswer !== undefined) {
 					const probeAnswer = probeSubStep.ProbeAnswer;
-					response.breakdown({
-						reference: {
-							uri: vscode.Uri.file(symbol_identifier.fs_file_path),
-							name: symbol_identifier.symbol_name
-						},
-						response: new vscode.MarkdownString(probeAnswer)
-					});
+					// response.breakdown({
+					// 	reference: {
+					// 		uri: vscode.Uri.file(symbol_identifier.fs_file_path),
+					// 		name: symbol_identifier.symbol_name
+					// 	},
+					// 	response: new vscode.MarkdownString(probeAnswer)
+					// });
 				}
 			}
 		} else if (event.event.RequestEvent) {
@@ -600,7 +602,7 @@ export class StreamProcessor {
 	documentLineIndex: number;
 	sentEdits: boolean;
 	documentLineLimit: number;
-	constructor(progress: vscode.AgentResponseStream,
+	constructor(progress: vscode.ChatResponseStream,
 		lines: string[],
 		indentStyle: IndentStyleSpaces | undefined,
 		uri: vscode.Uri,
@@ -712,7 +714,7 @@ export class StreamProcessor {
 
 class DocumentManager {
 	indentStyle: IndentStyleSpaces;
-	progress: vscode.AgentResponseStream;
+	progress: vscode.ChatResponseStream;
 	lines: LineContent[];
 	firstSentLineIndex: number;
 	firstRangeLine: number;
@@ -722,7 +724,7 @@ class DocumentManager {
 	applyDirectly: boolean;
 
 	constructor(
-		progress: vscode.AgentResponseStream,
+		progress: vscode.ChatResponseStream,
 		lines: string[],
 		// Fix the way we provide context over here?
 		range: SidecarRequestRange,
@@ -795,10 +797,10 @@ class DocumentManager {
 				await vscode.workspace.applyEdit(edits);
 			}
 			else if (this.limiter === null) {
-				await this.progress.codeEdit({ edits, iterationId: 'mock' });
+				// await this.progress.codeEdit({ edits, iterationId: 'mock' });
 			} else {
 				await this.limiter.queue(async () => {
-					await this.progress.codeEdit({ edits, iterationId: 'mock' });
+					// await this.progress.codeEdit({ edits, iterationId: 'mock' });
 				});
 			}
 			return index + 1;
@@ -810,10 +812,10 @@ class DocumentManager {
 				await vscode.workspace.applyEdit(edits);
 			}
 			else if (this.limiter === null) {
-				await this.progress.codeEdit({ edits, iterationId: 'mock' });
+				// await this.progress.codeEdit({ edits, iterationId: 'mock' });
 			} else {
 				await this.limiter.queue(async () => {
-					await this.progress.codeEdit({ edits, iterationId: 'mock' });
+					// await this.progress.codeEdit({ edits, iterationId: 'mock' });
 				});
 			}
 			return index + 1;
@@ -845,10 +847,10 @@ class DocumentManager {
 				await vscode.workspace.applyEdit(edits);
 			}
 			else if (this.limiter === null) {
-				await this.progress.codeEdit({ edits, iterationId: 'mock' });
+				// await this.progress.codeEdit({ edits, iterationId: 'mock' });
 			} else {
 				await this.limiter.queue(async () => {
-					await this.progress.codeEdit({ edits, iterationId: 'mock' });
+					// await this.progress.codeEdit({ edits, iterationId: 'mock' });
 				});
 			}
 			return startIndex + 1;
@@ -872,10 +874,10 @@ class DocumentManager {
 			await vscode.workspace.applyEdit(edits);
 		}
 		else if (this.limiter === null) {
-			await this.progress.codeEdit({ edits, iterationId: 'mock' });
+			// await this.progress.codeEdit({ edits, iterationId: 'mock' });
 		} else {
 			await this.limiter.queue(async () => {
-				await this.progress.codeEdit({ edits, iterationId: 'mock' });
+				// await this.progress.codeEdit({ edits, iterationId: 'mock' });
 			});
 		}
 		return this.lines.length;
@@ -898,10 +900,10 @@ class DocumentManager {
 			await vscode.workspace.applyEdit(edits);
 		}
 		else if (this.limiter === null) {
-			await this.progress.codeEdit({ edits, iterationId: 'mock' });
+			// await this.progress.codeEdit({ edits, iterationId: 'mock' });
 		} else {
 			await this.limiter.queue(async () => {
-				await this.progress.codeEdit({ edits, iterationId: 'mock' });
+				// await this.progress.codeEdit({ edits, iterationId: 'mock' });
 			});
 		}
 		return index + 2;