Merge branch 'main' into mermaid-diagrams-2

Author: uinstinct

core/context/providers/_context-providers.vitest.ts

@@ -50,6 +50,7 @@ async function getContextProviderExtras(
     llm: config.modelsByRole.chat[0],
     reranker: config.selectedModelByRole.rerank,
     selectedCode: [],
+    isInAgentMode: true,
   };
 }
 

core/context/retrieval/pipelines/BaseRetrievalPipeline.ts

@@ -225,9 +225,11 @@ Determine which tools should be used to answer this query. You should feel free
               .join("");
       const parsed = JSON.parse(responseContent);
       toolCalls = parsed.tools || [];
-      console.log("retrieveWithTools", toolCalls);
     } catch (e) {
-      console.log("Failed to parse tool selection response", e);
+      console.log(
+        `Failed to parse tool selection response: ${toolSelectionResponse.content}\n\n`,
+        e,
+      );
       return [];
     }
 

core/context/retrieval/pipelines/RerankerRetrievalPipeline.ts

@@ -122,10 +122,7 @@ export default class RerankerRetrievalPipeline extends BaseRetrievalPipeline {
       results = results.slice(-this.options.nFinal);
       return results;
     } catch (e) {
-      void this.options.ide.showToast(
-        "warning",
-        `Failed to rerank retrieval results\n${e}`,
-      );
+      console.warn(`Failed to rerank retrieval results\n${e}`);
       return chunks.slice(-this.options.nFinal);
     }
   }

core/context/retrieval/retrieval.ts

@@ -79,14 +79,19 @@ export async function retrieveContextItemsFromEmbeddings(
 
   if (results.length === 0) {
     if (extras.config.disableIndexing) {
-      void extras.ide.showToast("warning", "No results found.");
-      return [];
-    } else {
       void extras.ide.showToast(
         "warning",
-        "No results found. If you think this is an error, re-index your codebase.",
+        "No results found (Indexing disabled).",
       );
-      // TODO - add "re-index" option to warning message which clears and reindexes codebase
+      return [];
+    }
+    if (extras.isInAgentMode) {
+      return [
+        {
+          ...INSTRUCTIONS_BASE_ITEM,
+          content: "No results were found. Try using other tools.",
+        },
+      ];
     }
     return [];
   }

core/core.ts

@@ -1071,6 +1071,7 @@ export class Core {
       query: string;
       fullInput: string;
       selectedCode: RangeInFile[];
+      isInAgentMode: boolean;
     }>,
   ) => {
     const { config } = await this.configHandler.loadConfig();
@@ -1115,6 +1116,7 @@ export class Core {
         reranker: config.selectedModelByRole.rerank,
         fetch: (url, init) =>
           fetchwithRequestOptions(url, init, config.requestOptions),
+        isInAgentMode: msg.data.isInAgentMode,
       });
 
       void Telemetry.capture(