@theia/ai-ide 1.63.0-next.24 → 1.63.0-next.52

package/src/browser/workspace-search-provider.ts

@@ -16,12 +16,16 @@
 
 import { MutableChatRequestModel } from '@theia/ai-chat';
 import { ToolProvider, ToolRequest } from '@theia/ai-core';
-import { CancellationToken, URI } from '@theia/core';
+import { CancellationToken } from '@theia/core';
+import { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
 import { inject, injectable } from '@theia/core/shared/inversify';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
 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';
 import { WorkspaceFunctionScope } from './workspace-functions';
+import { SEARCH_IN_WORKSPACE_MAX_RESULTS_PREF } from './workspace-preferences';
+import { optimizeSearchResults } from '../common/workspace-search-provider-util';
 
 @injectable()
 export class WorkspaceSearchProvider implements ToolProvider {
@@ -32,7 +36,11 @@ export class WorkspaceSearchProvider implements ToolProvider {
     @inject(WorkspaceFunctionScope)
     protected readonly workspaceScope: WorkspaceFunctionScope;
 
-    private readonly MAX_RESULTS = 50;
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
 
     getTool(): ToolRequest {
         return {
@@ -42,7 +50,7 @@ export class WorkspaceSearchProvider implements ToolProvider {
             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. \
             Multi-word patterns must match exactly (including spaces, case-insensitively). \
-            For best results, use specific search terms and consider filtering by file extensions to avoid overwhelming results. \
+            For best results, use specific search terms and consider filtering by file extensions or limiting to specific subdirectories to avoid overwhelming results. \
             For complex searches, prefer multiple simpler queries over one complex query or regular expression.',
             parameters: {
                 type: 'object',
@@ -61,6 +69,11 @@ export class WorkspaceSearchProvider implements ToolProvider {
                             type: 'string'
                         },
                         description: 'Optional array of file extensions to search in (e.g., ["ts", "js", "py"]). If not specified, searches all files.'
+                    },
+                    subDirectoryPath: {
+                        type: 'string',
+                        description: 'Optional subdirectory path to limit search scope. Use relative paths from workspace root ' +
+                            '(e.g., "packages/ai-ide/src", "packages/core/src/browser"). If not specified, searches entire workspace.'
                     }
                 },
                 required: ['query', 'useRegExp']
@@ -69,14 +82,36 @@ export class WorkspaceSearchProvider implements ToolProvider {
         };
     }
 
+    private async determineSearchRoots(subDirectoryPath?: string): Promise<string[]> {
+        const workspaceRoot = await this.workspaceScope.getWorkspaceRoot();
+
+        if (!subDirectoryPath) {
+            return [workspaceRoot.toString()];
+        }
+
+        const subDirUri = workspaceRoot.resolve(subDirectoryPath);
+        this.workspaceScope.ensureWithinWorkspace(subDirUri, workspaceRoot);
+
+        try {
+            const stat = await this.fileService.resolve(subDirUri);
+            if (!stat || !stat.isDirectory) {
+                throw new Error(`Subdirectory '${subDirectoryPath}' does not exist or is not a directory`);
+            }
+        } catch (error) {
+            throw new Error(`Invalid subdirectory path '${subDirectoryPath}': ${error.message}`);
+        }
+
+        return [subDirUri.toString()];
+    }
+
     private async handleSearch(argString: string, cancellationToken?: CancellationToken): Promise<string> {
         try {
-            const args: { query: string, useRegExp: boolean, fileExtensions?: string[] } = JSON.parse(argString);
+            const args: { query: string, useRegExp: boolean, fileExtensions?: string[], subDirectoryPath?: string } = JSON.parse(argString);
             const results: SearchInWorkspaceResult[] = [];
             let expectedSearchId: number | undefined;
             let searchCompleted = false;
 
-            const searchPromise = new Promise<SearchInWorkspaceResult[]>((resolve, reject) => {
+            const searchPromise = new Promise<SearchInWorkspaceResult[]>(async (resolve, reject) => {
                 const callbacks: SearchInWorkspaceCallbacks = {
                     onResult: (id, result) => {
                         if (expectedSearchId !== undefined && id !== expectedSearchId) {
@@ -100,25 +135,28 @@ export class WorkspaceSearchProvider implements ToolProvider {
 
                         searchCompleted = true;
                         if (error) {
-                            reject(new Error(`Search failed: ${error}`));
+                            reject(new Error('Search failed: ' + error));
                         } else {
                             resolve(results);
                         }
                     }
                 };
 
+                // Use one more than our actual maximum. this way we can determine if we have more results than our maximum and warn the user
+                const maxResultsForTheiaAPI = this.preferenceService.get<number>(SEARCH_IN_WORKSPACE_MAX_RESULTS_PREF, 30) + 1;
                 const options: SearchInWorkspaceOptions = {
                     useRegExp: args.useRegExp,
                     matchCase: false,
                     matchWholeWord: false,
-                    maxResults: this.MAX_RESULTS,
+                    maxResults: maxResultsForTheiaAPI,
                 };
 
                 if (args.fileExtensions && args.fileExtensions.length > 0) {
                     options.include = args.fileExtensions.map(ext => `**/*.${ext}`);
                 }
 
-                this.searchService.search(args.query, callbacks, options)
+                await this.determineSearchRoots(args.subDirectoryPath)
+                    .then(rootUris => this.searchService.searchWithCallback(args.query, rootUris, callbacks, options))
                     .then(id => {
                         expectedSearchId = id;
                         cancellationToken?.onCancellationRequested(() => {
@@ -143,16 +181,23 @@ export class WorkspaceSearchProvider implements ToolProvider {
             });
 
             const finalResults = await Promise.race([searchPromise, timeoutPromise]);
+            const maxResults = this.preferenceService.get<number>(SEARCH_IN_WORKSPACE_MAX_RESULTS_PREF, 30);
 
             const workspaceRoot = await this.workspaceScope.getWorkspaceRoot();
-            const formattedResults = finalResults.map(r => {
-                const fileUri = new URI(r.fileUri);
-                const relativePath = workspaceRoot.relative(fileUri);
-                return {
-                    file: relativePath ? relativePath.toString() : r.fileUri,
-                    matches: r.matches.map(m => ({ line: m.line, text: m.lineText }))
-                };
-            });
+            const formattedResults = optimizeSearchResults(finalResults, workspaceRoot);
+
+            let numberOfMatchesInFinalResults = 0;
+            for (const result of finalResults) {
+                numberOfMatchesInFinalResults += result.matches.length;
+            }
+            if (numberOfMatchesInFinalResults > maxResults) {
+                return JSON.stringify({
+                    info: 'Search limit exceeded: Found ' + maxResults + '+ results. ' +
+                        'Please refine your search with more specific terms or use file extension filters. ' +
+                        'You can increase the limit in preferences under \'ai-features.workspaceFunctions.searchMaxResults\'.',
+                    incompleteResults: formattedResults
+                });
+            }
 
             return JSON.stringify(formattedResults);
 
@@ -161,3 +206,4 @@ export class WorkspaceSearchProvider implements ToolProvider {
         }
     }
 }
+

package/src/common/architect-prompt-template.ts

@@ -17,13 +17,14 @@ import { CONTEXT_FILES_VARIABLE_ID, TASK_CONTEXT_SUMMARY_VARIABLE_ID } from './c
 import { UPDATE_CONTEXT_FILES_FUNCTION_ID } from './context-functions';
 
 export const ARCHITECT_TASK_SUMMARY_PROMPT_TEMPLATE_ID = 'architect-task-summary';
+export const ARCHITECT_TASK_SUMMARY_UPDATE_PROMPT_TEMPLATE_ID = 'architect-update-task-summary';
 
 export const architectVariants = <PromptVariantSet>{
     id: 'architect-system',
     defaultVariant: {
         id: 'architect-system-default',
         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:
+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 --}}
 # Instructions
 
@@ -55,12 +56,13 @@ Always look at the relevant files to understand your task using the function ~{$
         {
             id: 'architect-system-next',
             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:
+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 --}}
 # Instructions
 
-You are an AI assistant integrated into Theia IDE, designed to assist software developers. You can't change any files, but you can navigate and read the users workspace using \
-the provided functions. Therefore describe and explain the details or procedures necessary to achieve the desired outcome. If file changes are necessary to help the user, be \
+You are an AI assistant integrated into Theia IDE, designed to assist software developers. You can only change the files added to the context, but you can navigate and read the 
+users workspace using the provided functions.\
+Therefore describe and explain the details or procedures necessary to achieve the desired outcome. If file changes are necessary to help the user, be \
 aware that there is another agent called 'Coder' that can suggest file changes. In this case you can create a description on what to do and tell the user to ask '@Coder' to \
 implement the change plan. If you refer to files, always mention the workspace-relative path.\
 
@@ -105,7 +107,165 @@ Skip irrelevant information, e.g. for discussions, only sum up the final result.
 4. If any part of the task is ambiguous, note the ambiguity so that it can be clarified later.
 
 Focus on providing actionable steps and implementation guidance. The coding agent needs practical help with this specific coding task.
+
+Use the following format, but only include the sections that were discussed in the conversation:
+
+# Task Context: [Title Here]
+
+---
+
+## 1. 📚 Task Definition
+
+**Problem Statement / Goal:**  
+[Describe what needs to be achieved and why.]
+
+**Scope:**  
+- **In Scope:**  
+  [Features, components, or behaviors to be included.]
+- **Out of Scope:**  
+  [What explicitly won't be part of this task.]
+
+---
+
+## 2. 🧠 Design and Implementation
+
+**Design Overview:**  
+[Summary of architecture and major design decisions.]
+
+**Implementation Plan:**  
+1. [First major step]
+2. [Second major step]
+3. [Third major step]
+
+**Technology Choices:**  
+- [Frameworks, libraries, services, tools]
+
+---
+
+## 3. 🧪 Testing
+
+### 3.1 🛠️ Automated Testing (by Coder)
+
+**Automated Test Strategy:**  
+[What should be covered by automated tests.]
+
+**Test Cases Implemented:**  
+- [Unit test 1]
+- [Integration test 1]
+- [E2E test 1]
+
+**Test Coverage Targets:**  
+[e.g., Minimum 80% code coverage, all workflows tested.]
+
+---
+
+### 3.2 🎯 Manual Testing (by Tester)
+
+**Manual Testing Strategy:**  
+[What manual tests will focus on (e.g., usability, edge cases, exploratory testing).]
+
+**Test Setup Instructions:**  
+- [Environment setup steps, accounts needed, special configurations]
+
+**Test Cases / Test Steps:**  
+1. [Action 1]
+2. [Action 2]
+3. [Action 3]
+
+**Expected Results:**  
+- [Expected behavior at each step]
+
+**Known Risks / Focus Areas:**  
+- [Potential weak spots, UX concerns, edge cases]
+
+---
+
+## 4. 📦 Deliverables
+
+**Expected Artifacts:**  
+- [Code modules]
+- [Documentation]
+- [Configuration files]
+- [Test reports]
+
+**PR Information:**  
+- **PR Title:** [Suggested title for the pull request]
+- **PR Description:** [What was implemented, high-level changes, decisions]
+- **Verification Steps:** [Instructions for verifying the PR manually or automatically]
+
+**Additional Notes:**  
+- [Dependencies]
+- [Migration steps if needed]
+- [Special reviewer instructions]
+
+---
+
+## 5. 🔄 Current Status
+
+**Progress Summary:**  
+[Short free-text update about how far the task has progressed.]
+
+**Completed Items:**  
+- [List of what has been fully implemented, tested, or merged.]
+
+**Open Items:**  
+- [List of remaining tasks, missing parts.]
+
+**Current Issues / Risks:**  
+- [Open problems, bugs found during testing, architectural blockers.]
+
+**Next Steps:**  
+- [Immediate action items, who should act next.]
 `
-        }
+        },
+        {
+            id: ARCHITECT_TASK_SUMMARY_UPDATE_PROMPT_TEMPLATE_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 update task context files. You can interact provided task context file and propose changes.
+
+# Task Document Update Instructions
+
+You are an AI agent tasked with updating a technical document based on the current discussion. Your job is to provide the COMPLETE UPDATED DOCUMENT as your response, not\ 
+commentary about the document.
+
+## Analysis Requirements
+
+1. **Review the Current Discussion**: 
+   - Analyze the entire conversation
+   - Identify new information, decisions, and changes
+
+2. **Examine the Existing Document**: 
+   - Understand its structure and purpose
+   - Identify sections that need updates
+
+3. **Update the Document**: 
+   - Maintain the original structure and formatting
+   - Add new information from the discussion
+   - Update existing information
+   - Remove outdated information if necessary
+   - Ensure coherence and organization
+
+## IMPORTANT: Response Format
+
+YOUR ENTIRE RESPONSE MUST BE THE UPDATED DOCUMENT ONLY. Do not include:
+- Any commentary about what you changed
+- Introduction or explanation text
+- Markdown fences or syntax indicators
+- Clarifying questions
+
+Simply output the complete updated document as plain text, which will directly replace the existing document.
+
+## Guidelines
+
+- Be thorough in capturing all relevant information
+- Maintain the original document's style and tone
+- Use clear, concise language
+- Preserve all formatting from the original document
+- Ensure technical accuracy in all updates
+
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
+` }
     ]
 };

package/src/common/coder-replace-prompt-template.ts

@@ -85,9 +85,9 @@ search for files you already know the path for)
 - Use:
   - ~{${WRITE_FILE_REPLACEMENTS_ID}} — to immediately apply targeted code changes (no user review)
   - ~{${WRITE_FILE_CONTENT_ID}} — to immediately overwrite a file with new content (no user review)
-  - ~{${CLEAR_FILE_CHANGES_ID}} — clear all pending changes for a file
+  
 - For incremental changes, use multiple ~{${WRITE_FILE_REPLACEMENTS_ID}} calls
-- Use the reset parameter with ~{${WRITE_FILE_REPLACEMENTS_ID}} to clear previous changes
+- If ~{${WRITE_FILE_REPLACEMENTS_ID}} continuously fails use ~{${WRITE_FILE_CONTENT_ID}}.
 
 ### Validation
 - ~{${GET_FILE_DIAGNOSTICS_ID}} — detect syntax, lint, or type errors

package/src/common/summarize-session-commands.ts

@@ -20,3 +20,8 @@ export const AI_SUMMARIZE_SESSION_AS_TASK_FOR_CODER = Command.toLocalizedCommand
     id: 'ai-chat:summarize-session-as-task-for-coder',
     label: 'Summarize Session as Task for Coder'
 });
+
+export const AI_UPDATE_TASK_CONTEXT_COMMAND = Command.toLocalizedCommand({
+    id: 'ai.updateTaskContext',
+    label: 'Update Current Task Context'
+});

package/src/common/workspace-search-provider-util.ts

@@ -0,0 +1,50 @@
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { LinePreview, SearchInWorkspaceResult } from '@theia/search-in-workspace/lib/common/search-in-workspace-interface';
+import { URI } from '@theia/core';
+
+/**
+ * Optimizes search results for token efficiency while preserving all information.
+ * - Groups matches by file to reduce repetition
+ * - Trims leading/trailing whitespace from line text
+ * - Uses relative file paths
+ * - Preserves all line numbers and content
+ */
+export function optimizeSearchResults(results: SearchInWorkspaceResult[], workspaceRoot: URI): Array<{ file: string; matches: Array<{ line: number; text: string }> }> {
+    return results.map(result => {
+        const fileUri = new URI(result.fileUri);
+        const relativePath = workspaceRoot.relative(fileUri);
+
+        return {
+            file: relativePath ? relativePath.toString() : result.fileUri,
+            matches: result.matches.map(match => {
+                let lineText: string;
+                if (typeof match.lineText === 'string') {
+                    lineText = match.lineText;
+                } else {
+                    const linePreview = match.lineText as LinePreview;
+                    lineText = linePreview.text || '';
+                }
+
+                return {
+                    line: match.line,
+                    text: lineText.trim()
+                };
+            })
+        };
+    });
+}