Add next template for coder

Co-authored-by: Jonas Helming <[email protected]>

Author: 2 people

packages/ai-ide/src/browser/coder-agent.ts

@@ -16,7 +16,7 @@
 import { AbstractStreamParsingChatAgent } from '@theia/ai-chat/lib/common';
 import { injectable } from '@theia/core/shared/inversify';
 import { FILE_CONTENT_FUNCTION_ID, GET_WORKSPACE_FILE_LIST_FUNCTION_ID, GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID } from '../common/workspace-functions';
-import { CODER_REPLACE_PROMPT_TEMPLATE_ID, getCoderReplacePromptTemplate } from '../common/coder-replace-prompt-template';
+import { CODER_REPLACE_PROMPT_TEMPLATE_ID, getCoderReplacePromptTemplate, getCoderReplacePromptTemplateNext } from '../common/coder-replace-prompt-template';
 import { WriteChangeToFileProvider } from './file-changeset-functions';
 import { LanguageModelRequirement } from '@theia/ai-core';
 import { nls } from '@theia/core';
@@ -35,7 +35,7 @@ export class CoderAgent extends AbstractStreamParsingChatAgent {
         'An AI assistant integrated into Theia IDE, designed to assist software developers. This agent can access the users workspace, it can get a list of all available files \
         and folders and retrieve their content. Futhermore, it can suggest modifications of files to the user. It can therefore assist the user with coding tasks or other \
         tasks involving file changes.');
-    override promptTemplates = [getCoderReplacePromptTemplate(true), getCoderReplacePromptTemplate(false)];
+    override promptTemplates = [getCoderReplacePromptTemplate(true), getCoderReplacePromptTemplate(false), getCoderReplacePromptTemplateNext()];
     override functions = [GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID, GET_WORKSPACE_FILE_LIST_FUNCTION_ID, FILE_CONTENT_FUNCTION_ID, WriteChangeToFileProvider.ID];
     protected override systemPromptId: string | undefined = CODER_REPLACE_PROMPT_TEMPLATE_ID;
 

packages/ai-ide/src/browser/workspace-search-provider.ts

@@ -20,8 +20,8 @@ import { CancellationToken } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { SearchInWorkspaceService, SearchInWorkspaceCallbacks } from '@theia/search-in-workspace/lib/browser/search-in-workspace-service';
 import { SearchInWorkspaceResult, SearchInWorkspaceOptions } from '@theia/search-in-workspace/lib/common/search-in-workspace-interface';
+import { SEARCH_IN_WORKSPACE_FUNCTION_ID } from '../common/workspace-functions';
 
-const SEARCH_IN_WORKSPACE_ID = 'searchInWorkspace';
 @injectable()
 export class WorkspaceSearchProvider implements ToolProvider {
 
@@ -32,8 +32,8 @@ export class WorkspaceSearchProvider implements ToolProvider {
 
     getTool(): ToolRequest {
         return {
-            id: SEARCH_IN_WORKSPACE_ID,
-            name: SEARCH_IN_WORKSPACE_ID,
+            id: SEARCH_IN_WORKSPACE_FUNCTION_ID,
+            name: SEARCH_IN_WORKSPACE_FUNCTION_ID,
             description: 'Searches the content of files within the workspace for lines matching the given search term (`query`). \
             The search uses case-insensitive string matching or regular expressions (controlled by the `useRegExp` parameter). \
             It returns a list of matching files, including the file path (URI), the line number, and the full text content of each matching line. \

packages/ai-ide/src/browser/workspace-task-provider.ts

@@ -20,9 +20,7 @@ import { TaskService } from '@theia/task/lib/browser/task-service';
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
 import { MutableChatRequestModel } from '@theia/ai-chat';
 import { CancellationToken } from '@theia/core';
-
-export const LIST_TASKS_ID = 'listTasks';
-export const RUN_TASK_ID = 'runTask';
+import { LIST_TASKS_FUNCTION_ID, RUN_TASK_FUNCTION_ID } from '../common/workspace-functions';
 
 @injectable()
 export class TaskListProvider implements ToolProvider {
@@ -32,8 +30,8 @@ export class TaskListProvider implements ToolProvider {
 
     getTool(): ToolRequest {
         return {
-            id: LIST_TASKS_ID,
-            name: LIST_TASKS_ID,
+            id: LIST_TASKS_FUNCTION_ID,
+            name: LIST_TASKS_FUNCTION_ID,
             description: 'Lists available tool tasks in the workspace, such as build, run, test. Tasks can be filtered by name.',
             parameters: {
                 type: 'object',
@@ -72,8 +70,8 @@ export class TaskRunnerProvider implements ToolProvider {
 
     getTool(): ToolRequest {
         return {
-            id: RUN_TASK_ID,
-            name: RUN_TASK_ID,
+            id: RUN_TASK_FUNCTION_ID,
+            name: RUN_TASK_FUNCTION_ID,
             description: 'Executes a specified task.',
             parameters: {
                 type: 'object',

packages/ai-ide/src/common/coder-replace-prompt-template.ts

@@ -15,14 +15,70 @@ import {
   GET_WORKSPACE_FILE_LIST_FUNCTION_ID,
   FILE_CONTENT_FUNCTION_ID,
   GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID,
-  GET_FILE_DIAGNOSTICS_ID
+  GET_FILE_DIAGNOSTICS_ID,
+  SEARCH_IN_WORKSPACE_FUNCTION_ID,
+  LIST_TASKS_FUNCTION_ID,
+  RUN_TASK_FUNCTION_ID
 } from './workspace-functions';
 import { CONTEXT_FILES_VARIABLE_ID } from './context-variables';
 import { UPDATE_CONTEXT_FILES_FUNCTION_ID } from './context-functions';
 
 export const CODER_REWRITE_PROMPT_TEMPLATE_ID = 'coder-rewrite';
 export const CODER_REPLACE_PROMPT_TEMPLATE_ID = 'coder-search-replace';
+export const CODER_REPLACE_PROMPT_TEMPLATE_NEXT_ID = 'coder-search-replace-next';
 
+export function getCoderReplacePromptTemplateNext(): PromptTemplate {
+  return {
+    id: CODER_REPLACE_PROMPT_TEMPLATE_NEXT_ID,
+    template: `{{!-- This prompt is licensed under the MIT License (https://opensource.org/license/mit).
+Made improvements or adaptations to this prompt template? We’d love for you to share it with the community! Contribute back here:
+https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution --}}
+You are an AI assistant integrated into Theia IDE, designed to assist software developers with code tasks. You can interact with the code base and suggest changes.
+
+## Context Retrieval
+Use the following functions to interact with the workspace files if you require context:
+- **~{${GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID}}**: Returns the complete directory structure.
+- **~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}}**: Lists files and directories in a specific directory.
+- **~{${FILE_CONTENT_FUNCTION_ID}}**: Retrieves the content of a specific file.
+- **~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}}**: Remember file locations that are relevant for completing your tasks. Only add files that are really relevant to look at later.
+
+## File Validation
+Use the following function to retrieve a list of problems in a file if the user requests fixes in a given file:
+- **~{${GET_FILE_DIAGNOSTICS_ID}}**: Retrieves a list of problems identified in a given file by tool integrations such as language servers and linters.
+
+## Propose Code Changes
+To propose code changes or any file changes to the user, never print code or new file content in your response.
+
+Instead, for each file you want to propose changes for:
+- **Always Retrieve Current Content**: Use ${FILE_CONTENT_FUNCTION_ID} to get the latest content of the target file.
+- **Change Content**: Use ~{changeSet_writeChangeToFile} or ~{changeSet_replaceContentInFile} to propose file changes to the user.\
+If ~{changeSet_replaceContentInFile} continously fails use ~{changeSet_writeChangeToFile}. Calling a function on a file will override previous \
+function calls on the same file, so you need exactly one successful call with all proposed changes per changed file. The changes will be presented as a applicable diff to \
+the user in any case.'
+  
+## File Search
+
+To search for content in workspace files, use the following function: ~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}
+
+## Tasks
+
+The user might want you to execute some task. You can find tasks using ~{${LIST_TASKS_FUNCTION_ID}} and execute them using ~{${RUN_TASK_FUNCTION_ID}}.
+
+## Additional Context
+
+The following files have been provided for additional context. Some of them may also be referred to by the user. \
+Always look at the relevant files to understand your task using the function ~{${FILE_CONTENT_FUNCTION_ID}}
+{{${CONTEXT_FILES_VARIABLE_ID}}}
+
+## Previously Proposed Changes
+You have previously proposed changes for the following files. Some suggestions may have been accepted by the user, while others may still be pending.
+{{${CHANGE_SET_SUMMARY_VARIABLE_ID}}}
+
+{{prompt:project-info}}
+`,
+    ...({ variantOf: CODER_REPLACE_PROMPT_TEMPLATE_ID }),
+  };
+}
 export function getCoderReplacePromptTemplate(withSearchAndReplace: boolean = false): PromptTemplate {
   return {
     id: withSearchAndReplace ? CODER_REPLACE_PROMPT_TEMPLATE_ID : CODER_REWRITE_PROMPT_TEMPLATE_ID,

packages/ai-ide/src/common/workspace-functions.ts

@@ -17,3 +17,6 @@ export const FILE_CONTENT_FUNCTION_ID = 'getFileContent';
 export const GET_WORKSPACE_FILE_LIST_FUNCTION_ID = 'getWorkspaceFileList';
 export const GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID = 'getWorkspaceDirectoryStructure';
 export const GET_FILE_DIAGNOSTICS_ID = 'getFileDiagnostics';
+export const SEARCH_IN_WORKSPACE_FUNCTION_ID = 'searchInWorkspace';
+export const LIST_TASKS_FUNCTION_ID = 'listTasks';
+export const RUN_TASK_FUNCTION_ID = 'runTask';