refactor(search-strategy): rename StrategyOutput to StrategyFinalPrompt

The StrategyOutput class and its instances have been renamed to StrategyFinalPrompt to better reflect their purpose. This change affects the HydeKeywordsStrategy, HydeCodeStrategy, and HydeStrategy classes, as well as the Catalyser class. The output property of the renamed class has also been renamed to prompt.

src/agent/catalyser/Catalyser.ts

@@ -3,7 +3,7 @@ import { channel } from "../../channel";
 import { HydeKeywordsStrategy } from "../../code-search/search-strategy/HydeKeywordsStrategy";
 import { SystemActionType } from "../../action/setting/SystemActionType";
 import { HydeCodeStrategy } from "../../code-search/search-strategy/HydeCodeStrategy";
-import { StrategyOutput } from "../../code-search/search-strategy/_base/StrategyOutput";
+import { StrategyFinalPrompt } from "../../code-search/search-strategy/_base/StrategyFinalPrompt";
 import { NamedChunk } from "../../code-search/embedding/_base/NamedChunk";
 import { TeamTermService } from "../../domain/TeamTermService";
 import { QueryExpansion } from "../../domain/QueryExpansion";
@@ -31,30 +31,33 @@ export class Catalyser {
 		let expandedQuery = QueryExpansion.instance().expand(query);
 		channel.append("Expanded query: " + expandedQuery + "\n");
 
-		let evaluateOutput: StrategyOutput | undefined = undefined;
+		let finalPrompt: StrategyFinalPrompt | undefined = undefined;
 		switch (type) {
 			case SystemActionType.SemanticSearchKeyword:
 				let keywordsStrategy = new HydeKeywordsStrategy(expandedQuery, this.extension);
-				evaluateOutput = await keywordsStrategy.execute();
+				finalPrompt = await keywordsStrategy.execute();
 				break;
 			case SystemActionType.SemanticSearchCode:
 				let strategy = new HydeCodeStrategy(expandedQuery, this.extension);
-				evaluateOutput = await strategy.execute();
+				finalPrompt = await strategy.execute();
 				break;
 			default:
 				channel.append("Unknown action type: " + type + "\n");
 				break;
 		}
 
-		if (!evaluateOutput) {
+		if (!finalPrompt) {
 			channel.append("No output from the strategy\n");
 			return;
 		}
 
-		if (evaluateOutput.chunks.length > 0) {
-			channel.append("\n");
-			channel.appendLine("Found " + evaluateOutput.chunks.length + " code snippets\n");
-			for (let chunk of evaluateOutput.chunks) {
+		this.extension.sidebar.webviewProtocol?.request("newSessionWithPrompt", {
+			prompt: finalPrompt.prompt,
+		});
+
+		if (finalPrompt.chunks.length > 0) {
+			channel.appendLine("Found " + finalPrompt.chunks.length + " code snippets\n");
+			for (let chunk of finalPrompt.chunks) {
 				// a file path will be like: `build.gradle.kts (0-5)`, we need to parse range from name
 				let rangeResult = chunk.name.match(/\((\d+)-(\d+)\)/);
 

src/code-search/search-strategy/HydeCodeStrategy.ts

@@ -10,7 +10,7 @@ import { DefaultRetrieval } from "../retrieval/DefaultRetrieval";
 import { ContextItem, RetrieveOption } from "../retrieval/Retrieval";
 import { KeywordEvaluateContext, KeywordsProposeContext } from "./HydeKeywordsStrategy";
 import { StreamingMarkdownCodeBlock } from "../../markdown/StreamingMarkdownCodeBlock";
-import { StrategyOutput } from "./_base/StrategyOutput";
+import { StrategyFinalPrompt } from "./_base/StrategyFinalPrompt";
 
 /**
  * Generate hypothetical document base on user input, and then used to retrieve similar code by symbols.
@@ -105,7 +105,7 @@ export class HydeCodeStrategy implements HydeStrategy<string> {
 		return docs;
 	}
 
-	async execute(): Promise<StrategyOutput> {
+	async execute(): Promise<StrategyFinalPrompt> {
 		channel.appendLine("=".repeat(80));
 		channel.appendLine(`= Hyde Keywords Strategy: ${this.constructor.name} =`);
 		channel.appendLine("=".repeat(80));
@@ -127,12 +127,12 @@ export class HydeCodeStrategy implements HydeStrategy<string> {
 
 		if (chunks.length === 0) {
 			channel.appendLine("No code snippets found.");
-			return new StrategyOutput("", []);
+			return new StrategyFinalPrompt("", []);
 		}
 
 		channel.appendLine("\n");
 		channel.appendLine(" --- Summary --- ");
 		let evaluateIns = await PromptManager.getInstance().renderHydeTemplate(this.step, this.documentType, evaluateContext);
-		return new StrategyOutput(await executeIns(evaluateIns), chunks);
+		return new StrategyFinalPrompt(evaluateIns, chunks);
 	}
 }

src/code-search/search-strategy/HydeKeywordsStrategy.ts

@@ -10,7 +10,7 @@ import { DefaultRetrieval } from "../retrieval/DefaultRetrieval";
 import { AutoDevExtension } from "../../AutoDevExtension";
 import { channel } from "../../channel";
 import { ContextItem, RetrieveOption } from "../retrieval/Retrieval";
-import { StrategyOutput } from "./_base/StrategyOutput";
+import { StrategyFinalPrompt } from "./_base/StrategyFinalPrompt";
 
 /**
  * The `HydeKeywordsStrategy` class is a part of the Hyde Strategy pattern and is used to generate keywords from a query.
@@ -88,7 +88,7 @@ export class HydeKeywordsStrategy implements HydeStrategy<HydeKeywords> {
 		return docs;
 	}
 
-	async execute() : Promise<StrategyOutput> {
+	async execute() : Promise<StrategyFinalPrompt> {
 		channel.appendLine("=".repeat(80));
 		channel.appendLine(`= Hyde Keywords Strategy: ${this.constructor.name} =`);
 		channel.appendLine("=".repeat(80));
@@ -111,13 +111,13 @@ export class HydeKeywordsStrategy implements HydeStrategy<HydeKeywords> {
 
 		if (chunkItems.length === 0) {
 			channel.appendLine("No code snippets found.");
-			return new StrategyOutput("", []);
+			return new StrategyFinalPrompt("", []);
 		}
 
 		channel.appendLine("\n");
 		channel.appendLine(" --- Summary --- ");
 		let evaluateIns = await PromptManager.getInstance().renderHydeTemplate(this.step, this.documentType, evaluateContext);
-		return new StrategyOutput(await executeIns(evaluateIns), chunkItems);
+		return new StrategyFinalPrompt(evaluateIns, chunkItems);
 	}
 
 	private createQueryTerm(keywords: HydeKeywords) {

src/code-search/search-strategy/_base/HydeStrategy.ts

@@ -1,6 +1,6 @@
 import { ChunkItem, Embedding } from "../../embedding/_base/Embedding";
 import { HydeDocument, HydeDocumentType } from "./HydeDocument";
-import { StrategyOutput } from "./StrategyOutput";
+import { StrategyFinalPrompt } from "./StrategyFinalPrompt";
 import { CustomActionPrompt } from "../../../prompt-manage/custom-action/CustomActionPrompt";
 import { AutoDevStatus, AutoDevStatusManager } from "../../../editor/editor-api/AutoDevStatusManager";
 import { LlmProvider } from "../../../llm-provider/LlmProvider";
@@ -65,7 +65,7 @@ export interface HydeStrategy<T> {
 	/**
 	 * Executes the method and returns a Promise that resolves with a StrategyOutput object.
 	 */
-	execute(): Promise<StrategyOutput>;
+	execute(): Promise<StrategyFinalPrompt>;
 }
 
 export async function executeIns(instruction: string) {
@@ -76,10 +76,10 @@ export async function executeIns(instruction: string) {
 		AutoDevStatusManager.instance.setStatus(AutoDevStatus.InProgress);
 		let response = await LlmProvider.codeCompletion()._streamChat(chatMessages);
 		for await (let chatMessage of response) {
-			channel.append(chatMessage.content);
 			result += chatMessage.content;
 		}
 
+		channel.append(result);
 		AutoDevStatusManager.instance.setStatus(AutoDevStatus.Done);
 		return result;
 	} catch (e) {

src/code-search/search-strategy/_base/StrategyFinalPrompt.ts

@@ -0,0 +1,6 @@
+import { ChunkItem } from "../../embedding/_base/Embedding";
+
+export class StrategyFinalPrompt {
+	constructor(public readonly prompt: string, public readonly chunks: ChunkItem[]) {
+	}
+}