@theia/ai-ide 1.65.0-next.6 → 1.65.0

package/src/browser/coder-agent.ts

@@ -15,9 +15,7 @@
 // *****************************************************************************
 import { AbstractStreamParsingChatAgent, ChatRequestModel, ChatService, ChatSession, MutableChatModel, MutableChatRequestModel } from '@theia/ai-chat/lib/common';
 import { inject, 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_SYSTEM_PROMPT_ID, getCoderAgentModePromptTemplate, getCoderPromptTemplateEdit, getCoderPromptTemplateSimpleEdit } from '../common/coder-replace-prompt-template';
-import { SuggestFileContent } from './file-changeset-functions';
 import { LanguageModelRequirement, PromptVariantSet } from '@theia/ai-core';
 import { nls } from '@theia/core';
 import { MarkdownStringImpl } from '@theia/core/lib/common/markdown-rendering';
@@ -43,7 +41,6 @@ export class CoderAgent extends AbstractStreamParsingChatAgent {
         defaultVariant: getCoderPromptTemplateEdit(),
         variants: [getCoderPromptTemplateSimpleEdit(), getCoderAgentModePromptTemplate()]
     }];
-    override functions = [GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID, GET_WORKSPACE_FILE_LIST_FUNCTION_ID, FILE_CONTENT_FUNCTION_ID, SuggestFileContent.ID];
     protected override systemPromptId: string | undefined = CODER_SYSTEM_PROMPT_ID;
     override async invoke(request: MutableChatRequestModel): Promise<void> {
         await super.invoke(request);

package/src/browser/file-changeset-functions.ts

@@ -241,7 +241,8 @@ export class ReplaceContentInFileFunctionHelper {
                         properties: replacementProperties,
                         required: ['oldContent', 'newContent']
                     },
-                    description: 'An array of replacement objects, each containing oldContent and newContent strings.'
+                    description: `An array of replacement objects, each containing oldContent and newContent strings.
+                    Ensure these strings are valid JSON string values, escaping quotes only as required.`
                 },
                 reset: {
                     type: 'boolean',

package/src/browser/frontend-module.ts

@@ -22,11 +22,17 @@ import { Agent, AIVariableContribution, bindToolProvider } from '@theia/ai-core/
 import { ArchitectAgent } from './architect-agent';
 import { CoderAgent } from './coder-agent';
 import { SummarizeSessionCommandContribution } from './summarize-session-command-contribution';
-import { FileContentFunction, FileDiagnosticProvider, GetWorkspaceDirectoryStructure, GetWorkspaceFileList, WorkspaceFunctionScope } from './workspace-functions';
+import {
+    FileContentFunction,
+    FileDiagnosticProvider,
+    FindFilesByPattern,
+    GetWorkspaceDirectoryStructure,
+    GetWorkspaceFileList,
+    WorkspaceFunctionScope
+} from './workspace-functions';
 import { WorkspaceSearchProvider } from './workspace-search-provider';
 import {
     FrontendApplicationContribution,
-    PreferenceContribution,
     WidgetFactory,
     bindViewContribution,
     RemoteConnectionProvider,
@@ -38,7 +44,7 @@ import {
     LaunchRunnerProvider,
     LaunchStopProvider,
 } from './workspace-launch-provider';
-import { WorkspacePreferencesSchema } from './workspace-preferences';
+import { WorkspacePreferencesSchema } from '../common/workspace-preferences';
 import {
     ClearFileChanges,
     GetProposedFileState,
@@ -65,7 +71,6 @@ import { AIVariableConfigurationWidget } from './ai-configuration/variable-confi
 import { ContextFilesVariableContribution } from '../common/context-files-variable';
 import { AIToolsConfigurationWidget } from './ai-configuration/tools-configuration-widget';
 import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { AiConfigurationPreferences } from './ai-configuration/ai-configuration-preferences';
 import { TemplatePreferenceContribution } from './template-preference-contribution';
 import { AIMCPConfigurationWidget } from './ai-configuration/mcp-configuration-widget';
 import { ChatWelcomeMessageProvider } from '@theia/ai-chat-ui/lib/browser/chat-tree-view';
@@ -74,14 +79,15 @@ import { AITokenUsageConfigurationWidget } from './ai-configuration/token-usage-
 import { TaskContextSummaryVariableContribution } from './task-background-summary-variable';
 import { TaskContextFileStorageService } from './task-context-file-storage-service';
 import { TaskContextStorageService } from '@theia/ai-chat/lib/browser/task-context-service';
-import { CommandContribution } from '@theia/core';
+import { CommandContribution, PreferenceContribution } from '@theia/core';
 import { AIPromptFragmentsConfigurationWidget } from './ai-configuration/prompt-fragments-configuration-widget';
 import { BrowserAutomation, browserAutomationPath } from '../common/browser-automation-protocol';
 import { CloseBrowserProvider, IsBrowserRunningProvider, LaunchBrowserProvider, QueryDomProvider } from './app-tester-chat-functions';
 import { ModelAliasesConfigurationWidget } from './ai-configuration/model-aliases-configuration-widget';
-import { aiIdePreferenceSchema } from './ai-ide-preferences';
+import { aiIdePreferenceSchema } from '../common/ai-ide-preferences';
 import { AIActivationService } from '@theia/ai-core/lib/browser';
 import { AIIdeActivationServiceImpl } from './ai-ide-activation-service';
+import { AiConfigurationPreferences } from '../common/ai-configuration-preferences';
 
 export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
     bind(PreferenceContribution).toConstantValue({ schema: aiIdePreferenceSchema });
@@ -128,6 +134,7 @@ export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
     bindToolProvider(FileContentFunction, bind);
     bindToolProvider(GetWorkspaceDirectoryStructure, bind);
     bindToolProvider(FileDiagnosticProvider, bind);
+    bindToolProvider(FindFilesByPattern, bind);
     bind(WorkspaceFunctionScope).toSelf().inSingletonScope();
     bindToolProvider(WorkspaceSearchProvider, bind);
 

package/src/browser/task-context-file-storage-service.ts

@@ -17,13 +17,13 @@
 import { Summary, SummaryMetadata, TaskContextStorageService } from '@theia/ai-chat/lib/browser/task-context-service';
 import { InMemoryTaskContextStorage } from '@theia/ai-chat/lib/browser/task-context-storage-service';
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { DisposableCollection, EOL, Emitter, ILogger, Path, URI, unreachable } from '@theia/core';
-import { PreferenceService, OpenerService, open } from '@theia/core/lib/browser';
+import { DisposableCollection, EOL, Emitter, ILogger, Path, PreferenceService, URI, unreachable } from '@theia/core';
+import { OpenerService, open } from '@theia/core/lib/browser';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import * as yaml from 'js-yaml';
 import { FileChange, FileChangeType } from '@theia/filesystem/lib/common/files';
-import { TASK_CONTEXT_STORAGE_DIRECTORY_PREF } from './workspace-preferences';
+import { TASK_CONTEXT_STORAGE_DIRECTORY_PREF } from '../common/workspace-preferences';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 
 @injectable()
@@ -67,16 +67,16 @@ export class TaskContextFileStorageService implements TaskContextStorageService
         this.watchStorage();
         this.preferenceService.onPreferenceChanged(e => {
             if (e.preferenceName === TASK_CONTEXT_STORAGE_DIRECTORY_PREF) {
-                this.watchStorage();
+                this.watchStorage().catch(error => this.logger.error(error));
             }
         });
     }
 
     protected toDisposeOnStorageChange?: DisposableCollection;
-    protected watchStorage(): void {
+    protected async watchStorage(): Promise<void> {
+        const newStorage = await this.getStorageLocation();
         this.toDisposeOnStorageChange?.dispose();
         this.toDisposeOnStorageChange = undefined;
-        const newStorage = this.getStorageLocation();
         if (!newStorage) { return; }
         this.toDisposeOnStorageChange = new DisposableCollection(
             this.fileService.watch(newStorage, { recursive: true, excludes: [] }),

package/src/browser/template-preference-contribution.ts

@@ -14,16 +14,16 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { FrontendApplicationContribution, PreferenceService } from '@theia/core/lib/browser';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { DefaultPromptFragmentCustomizationService, PromptFragmentCustomizationProperties } from '@theia/ai-core/lib/browser/frontend-prompt-customization-service';
 import {
     PROMPT_TEMPLATE_WORKSPACE_DIRECTORIES_PREF,
     PROMPT_TEMPLATE_ADDITIONAL_EXTENSIONS_PREF,
     PROMPT_TEMPLATE_WORKSPACE_FILES_PREF
-} from './workspace-preferences';
+} from '../common/workspace-preferences';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
-import { Path } from '@theia/core';
+import { Path, PreferenceService } from '@theia/core';
 
 @injectable()
 export class TemplatePreferenceContribution implements FrontendApplicationContribution {

package/src/browser/workspace-functions.spec.ts

@@ -20,7 +20,7 @@ import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/front
 FrontendApplicationConfigProvider.set({});
 
 import { expect } from 'chai';
-import { CancellationTokenSource } from '@theia/core';
+import { CancellationTokenSource, PreferenceService } from '@theia/core';
 import {
     GetWorkspaceDirectoryStructure,
     FileContentFunction,
@@ -33,7 +33,7 @@ import { Container } from '@theia/core/shared/inversify';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { URI } from '@theia/core/lib/common/uri';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
-import { PreferenceService, OpenerService } from '@theia/core/lib/browser';
+import { OpenerService } from '@theia/core/lib/browser';
 import { ProblemManager } from '@theia/markers/lib/browser';
 import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
 import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';

package/src/browser/workspace-functions.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 import { ToolProvider, ToolRequest } from '@theia/ai-core';
-import { CancellationToken, Disposable, URI } from '@theia/core';
+import { CancellationToken, Disposable, PreferenceService, URI } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileStat } from '@theia/filesystem/lib/common/files';
@@ -22,12 +22,12 @@ import { WorkspaceService } from '@theia/workspace/lib/browser';
 import {
     FILE_CONTENT_FUNCTION_ID, GET_FILE_DIAGNOSTICS_ID,
     GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID,
-    GET_WORKSPACE_FILE_LIST_FUNCTION_ID
+    GET_WORKSPACE_FILE_LIST_FUNCTION_ID, FIND_FILES_BY_PATTERN_FUNCTION_ID
 } from '../common/workspace-functions';
 import ignore from 'ignore';
 import { Minimatch } from 'minimatch';
-import { PreferenceService, OpenerService, open } from '@theia/core/lib/browser';
-import { CONSIDER_GITIGNORE_PREF, USER_EXCLUDE_PATTERN_PREF } from './workspace-preferences';
+import { OpenerService, open } from '@theia/core/lib/browser';
+import { CONSIDER_GITIGNORE_PREF, USER_EXCLUDE_PATTERN_PREF } from '../common/workspace-preferences';
 import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
 import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
 import { ProblemManager } from '@theia/markers/lib/browser';
@@ -141,8 +141,8 @@ export class GetWorkspaceDirectoryStructure implements ToolProvider {
         return {
             id: GetWorkspaceDirectoryStructure.ID,
             name: GetWorkspaceDirectoryStructure.ID,
-            description: `Retrieve the complete directory structure of the workspace, listing only directories (no file contents). This structure excludes specific directories,
-            such as node_modules and hidden files, ensuring paths are within workspace boundaries.`,
+            description: 'Retrieve the complete directory structure of the workspace, listing only directories (no file contents). ' +
+                'This structure excludes specific directories, such as node_modules and hidden files, ensuring paths are within workspace boundaries.',
             parameters: {
                 type: 'object',
                 properties: {}
@@ -209,15 +209,17 @@ export class FileContentFunction implements ToolProvider {
         return {
             id: FileContentFunction.ID,
             name: FileContentFunction.ID,
-            description: `Return the content of a specified file within the workspace. The file path must be provided relative to the workspace root. Only files within
-                workspace boundaries are accessible; attempting to access files outside the workspace will return an error.`,
+            description: 'Return the content of a specified file within the workspace. ' +
+                'The file path must be provided relative to the workspace root. Only files within ' +
+                'workspace boundaries are accessible; attempting to access files outside the workspace will return an error.',
             parameters: {
                 type: 'object',
                 properties: {
                     file: {
                         type: 'string',
-                        description: `The relative path to the target file within the workspace. This path is resolved from the workspace root, and only files within the workspace
-                            boundaries are accessible. Attempting to access paths outside the workspace will result in an error.`,
+                        description: 'The relative path to the target file within the workspace. ' +
+                            'This path is resolved from the workspace root, and only files within the workspace ' +
+                            'boundaries are accessible. Attempting to access paths outside the workspace will result in an error.',
                     }
                 },
                 required: ['file']
@@ -289,14 +291,16 @@ export class GetWorkspaceFileList implements ToolProvider {
                 properties: {
                     path: {
                         type: 'string',
-                        description: `Optional relative path to a directory within the workspace. If no path is specified, the function lists contents directly in the workspace
-                         root. Paths are resolved within workspace boundaries only; paths outside the workspace or unvalidated paths will result in an error.`
+                        description: 'Optional relative path to a directory within the workspace. ' +
+                            'If no path is specified, the function lists contents directly in the workspace root. ' +
+                            'Paths are resolved within workspace boundaries only; paths outside the workspace or unvalidated paths will result in an error.'
                     }
                 },
                 required: ['path']
             },
-            description: `List files and directories within a specified workspace directory. Paths are relative to the workspace root, and only workspace-contained paths are
-             allowed. If no path is provided, the root contents are listed. Paths outside the workspace will result in an error.`,
+            description: 'List files and directories within a specified workspace directory. ' +
+                'Paths are relative to the workspace root, and only workspace-contained paths are allowed. ' +
+                'If no path is provided, the root contents are listed. Paths outside the workspace will result in an error.',
             handler: (arg_string: string, ctx: MutableChatRequestModel) => {
                 const args = JSON.parse(arg_string);
                 const cancellationToken = ctx.response.cancellationToken;
@@ -363,7 +367,8 @@ export class GetWorkspaceFileList implements ToolProvider {
                     if (await this.workspaceScope.shouldExclude(child)) {
                         continue;
                     }
-                    result.push(child.resource.path.base);
+                    const itemName = child.resource.path.base;
+                    result.push(child.isDirectory ? `${itemName}/` : itemName);
                 }
             }
         }
@@ -393,15 +398,17 @@ export class FileDiagnosticProvider implements ToolProvider {
             id: FileDiagnosticProvider.ID,
             name: FileDiagnosticProvider.ID,
             description:
-                'A function to retrieve diagnostics associated with a specific file in the workspace. It will return a list of problems that includes the surrounding text \
-            a message describing the problem, and optionally a code and a codeDescription field describing that code.',
+                'A function to retrieve diagnostics associated with a specific file in the workspace. ' +
+                'It will return a list of problems that includes the surrounding text a message describing the problem, ' +
+                'and optionally a code and a codeDescription field describing that code.',
             parameters: {
                 type: 'object',
                 properties: {
                     file: {
                         type: 'string',
-                        description: `The relative path to the target file within the workspace. This path is resolved from the workspace root, and only files within the workspace
-                        boundaries are accessible. Attempting to access paths outside the workspace will result in an error.`
+                        description: 'The relative path to the target file within the workspace. ' +
+                            'This path is resolved from the workspace root, and only files within the workspace ' +
+                            'boundaries are accessible. Attempting to access paths outside the workspace will result in an error.'
                     }
                 },
                 required: ['file']
@@ -516,3 +523,178 @@ export class FileDiagnosticProvider implements ToolProvider {
         return { end: { character: Number.MAX_SAFE_INTEGER, line: endLine }, start: { character: 0, line: startLine } };
     }
 }
+
+@injectable()
+export class FindFilesByPattern implements ToolProvider {
+    static ID = FIND_FILES_BY_PATTERN_FUNCTION_ID;
+
+    @inject(WorkspaceFunctionScope)
+    protected readonly workspaceScope: WorkspaceFunctionScope;
+
+    @inject(PreferenceService)
+    protected readonly preferences: PreferenceService;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    getTool(): ToolRequest {
+        return {
+            id: FindFilesByPattern.ID,
+            name: FindFilesByPattern.ID,
+            description: 'Find files in the workspace that match a given glob pattern. ' +
+                'This function allows efficient discovery of files using patterns like \'**/*.ts\' for all TypeScript files or ' +
+                '\'src/**/*.js\' for JavaScript files in the src directory. The function respects gitignore patterns and user exclusions, ' +
+                'returns relative paths from the workspace root, and limits results to 200 files maximum.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    pattern: {
+                        type: 'string',
+                        description: 'Glob pattern to match files against. ' +
+                            'Examples: \'**/*.ts\' (all TypeScript files), \'src/**/*.js\' (JS files in src), ' +
+                            '\'**/*.{js,ts}\' (JS or TS files), \'**/test/**\' (files in test directories). ' +
+                            'Patterns are matched against paths relative to the workspace root.'
+                    },
+                    exclude: {
+                        type: 'array',
+                        items: { type: 'string' },
+                        description: 'Optional array of glob patterns to exclude from results. ' +
+                            'Examples: [\'**/*.spec.ts\', \'**/*.test.js\', \'node_modules/**\']. ' +
+                            'If not specified, common exclusions like node_modules, .git, and dist are applied automatically.'
+                    }
+                },
+                required: ['pattern']
+            },
+            handler: (arg_string: string, ctx: MutableChatRequestModel) => {
+                const args = JSON.parse(arg_string);
+                const cancellationToken = ctx.response.cancellationToken;
+                return this.findFiles(args.pattern, args.exclude, cancellationToken);
+            },
+        };
+    }
+
+    private async findFiles(pattern: string, excludePatterns?: string[], cancellationToken?: CancellationToken): Promise<string> {
+        if (cancellationToken?.isCancellationRequested) {
+            return JSON.stringify({ error: 'Operation cancelled by user' });
+        }
+
+        let workspaceRoot;
+        try {
+            workspaceRoot = await this.workspaceScope.getWorkspaceRoot();
+        } catch (error) {
+            return JSON.stringify({ error: error.message });
+        }
+
+        try {
+            // Build ignore patterns from gitignore and user preferences
+            const ignorePatterns = await this.buildIgnorePatterns(workspaceRoot);
+
+            const allExcludes = [...ignorePatterns];
+            if (excludePatterns && excludePatterns.length > 0) {
+                allExcludes.push(...excludePatterns);
+            }
+
+            if (cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+
+            const patternMatcher = new Minimatch(pattern, { dot: false });
+            const excludeMatchers = allExcludes.map(excludePattern => new Minimatch(excludePattern, { dot: true }));
+            const files: string[] = [];
+            const maxResults = 200;
+
+            await this.traverseDirectory(workspaceRoot, workspaceRoot, patternMatcher, excludeMatchers, files, maxResults, cancellationToken);
+
+            if (cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+
+            const result: { files: string[]; totalFound?: number; truncated?: boolean } = {
+                files: files.slice(0, maxResults)
+            };
+
+            if (files.length > maxResults) {
+                result.totalFound = files.length;
+                result.truncated = true;
+            }
+
+            return JSON.stringify(result);
+
+        } catch (error) {
+            return JSON.stringify({ error: `Failed to find files: ${error.message}` });
+        }
+    }
+
+    private async buildIgnorePatterns(workspaceRoot: URI): Promise<string[]> {
+        const patterns: string[] = [];
+
+        // Get user exclude patterns from preferences
+        const userExcludePatterns = this.preferences.get<string[]>(USER_EXCLUDE_PATTERN_PREF, []);
+        patterns.push(...userExcludePatterns);
+
+        // Add gitignore patterns if enabled
+        const shouldConsiderGitIgnore = this.preferences.get(CONSIDER_GITIGNORE_PREF, false);
+        if (shouldConsiderGitIgnore) {
+            try {
+                const gitignoreUri = workspaceRoot.resolve('.gitignore');
+                const gitignoreContent = await this.fileService.read(gitignoreUri);
+                const gitignoreLines = gitignoreContent.value
+                    .split('\n')
+                    .map(line => line.trim())
+                    .filter(line => line && !line.startsWith('#'));
+                patterns.push(...gitignoreLines);
+            } catch {
+                // Gitignore file doesn't exist or can't be read, continue without it
+            }
+        }
+
+        return patterns;
+    }
+
+    private async traverseDirectory(
+        currentUri: URI,
+        workspaceRoot: URI,
+        patternMatcher: Minimatch,
+        excludeMatchers: Minimatch[],
+        results: string[],
+        maxResults: number,
+        cancellationToken?: CancellationToken
+    ): Promise<void> {
+        if (cancellationToken?.isCancellationRequested || results.length >= maxResults) {
+            return;
+        }
+
+        try {
+            const stat = await this.fileService.resolve(currentUri);
+            if (!stat || !stat.isDirectory || !stat.children) {
+                return;
+            }
+
+            for (const child of stat.children) {
+                if (cancellationToken?.isCancellationRequested || results.length >= maxResults) {
+                    break;
+                }
+
+                const relativePath = workspaceRoot.relative(child.resource)?.toString();
+                if (!relativePath) {
+                    continue;
+                }
+
+                const shouldExclude = excludeMatchers.some(matcher => matcher.match(relativePath)) ||
+                    (await this.workspaceScope.shouldExclude(child));
+
+                if (shouldExclude) {
+                    continue;
+                }
+
+                if (child.isDirectory) {
+                    await this.traverseDirectory(child.resource, workspaceRoot, patternMatcher, excludeMatchers, results, maxResults, cancellationToken);
+                } else if (patternMatcher.match(relativePath)) {
+                    results.push(relativePath);
+                }
+            }
+        } catch {
+            // If we can't access a directory, skip it
+        }
+    }
+}

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

@@ -15,13 +15,12 @@
 // *****************************************************************************
 
 import { expect } from 'chai';
-import { CancellationTokenSource } from '@theia/core';
+import { CancellationTokenSource, PreferenceService } from '@theia/core';
 import { WorkspaceSearchProvider } from './workspace-search-provider';
 import { MutableChatRequestModel, MutableChatResponseModel } from '@theia/ai-chat';
 import { Container } from '@theia/core/shared/inversify';
 import { SearchInWorkspaceService, SearchInWorkspaceCallbacks } from '@theia/search-in-workspace/lib/browser/search-in-workspace-service';
 import { WorkspaceFunctionScope } from './workspace-functions';
-import { PreferenceService } from '@theia/core/lib/browser';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { URI } from '@theia/core/lib/common/uri';
 import { SearchInWorkspaceOptions } from '@theia/search-in-workspace/lib/common/search-in-workspace-interface';

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

@@ -17,14 +17,14 @@
 import { MutableChatRequestModel } from '@theia/ai-chat';
 import { ToolProvider, ToolRequest } from '@theia/ai-core';
 import { CancellationToken } from '@theia/core';
-import { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
+import { PreferenceService } from '@theia/core/lib/common/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 { SEARCH_IN_WORKSPACE_MAX_RESULTS_PREF } from '../common/workspace-preferences';
 import { optimizeSearchResults } from '../common/workspace-search-provider-util';
 
 @injectable()

package/src/{browser/ai-configuration → common}/ai-configuration-preferences.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { nls } from '@theia/core';
-import { PreferenceSchema } from '@theia/core/lib/browser/preferences/preference-contribution';
+import { PreferenceSchema } from '@theia/core/lib/common';
 
 /**
  * These preferences are not intended to reflect real settings.
@@ -23,7 +23,6 @@ import { PreferenceSchema } from '@theia/core/lib/browser/preferences/preference
  * in case the user looks in the preferences editor UI to find the configuration.
  */
 export const AiConfigurationPreferences: PreferenceSchema = {
-    type: 'object',
     properties: {
         'ai-features.agentSettings.details': {
             type: 'null',

package/src/{browser → common}/ai-ide-preferences.ts

@@ -14,15 +14,13 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { AI_CORE_PREFERENCES_TITLE, ENABLE_AI_CONTEXT_KEY } from '@theia/ai-core/lib/browser';
-import { nls } from '@theia/core';
-import { PreferenceSchema } from '@theia/core/lib/browser';
+import { AI_CORE_PREFERENCES_TITLE } from '@theia/ai-core/lib/common';
+import { nls, PreferenceSchema } from '@theia/core';
 
 // We reuse the context key for the preference name
-export const PREFERENCE_NAME_ENABLE_AI = ENABLE_AI_CONTEXT_KEY;
+export const PREFERENCE_NAME_ENABLE_AI = 'ai-features.AiEnable.enableAI';
 
 export const aiIdePreferenceSchema: PreferenceSchema = {
-    type: 'object',
     properties: {
         [PREFERENCE_NAME_ENABLE_AI]: {
             title: AI_CORE_PREFERENCES_TITLE,

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

@@ -10,8 +10,8 @@
 // *****************************************************************************
 import { PromptVariantSet } from '@theia/ai-core/lib/common';
 import {
-    GET_WORKSPACE_FILE_LIST_FUNCTION_ID, FILE_CONTENT_FUNCTION_ID, GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID, SEARCH_IN_WORKSPACE_FUNCTION_ID,
-    GET_FILE_DIAGNOSTICS_ID
+    GET_WORKSPACE_FILE_LIST_FUNCTION_ID, FILE_CONTENT_FUNCTION_ID, SEARCH_IN_WORKSPACE_FUNCTION_ID,
+    GET_FILE_DIAGNOSTICS_ID, FIND_FILES_BY_PATTERN_FUNCTION_ID
 } from './workspace-functions';
 import { CONTEXT_FILES_VARIABLE_ID, TASK_CONTEXT_SUMMARY_VARIABLE_ID } from './context-variables';
 import { UPDATE_CONTEXT_FILES_FUNCTION_ID } from './context-functions';
@@ -36,11 +36,14 @@ implement the change plan. If you refer to files, always mention the workspace-r
 
 ## Context Retrieval
 Use the following functions to interact with the workspace files if you require context:
-- **~{${GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID}}**
 - **~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}}**
 - **~{${FILE_CONTENT_FUNCTION_ID}}**
+- **~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}}** (find files by glob patterns like '**/*.ts')
 - **~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}**
 
+If you cannot find good search terms, navigate the directory structure.
+**Confirm Paths**: Always verify paths by listing directories or files as you navigate. Avoid assumptions based on user input alone.
+**Navigate Step-by-Step**: Move into subdirectories only as needed, confirming each directory level.
 Remember file locations that are relevant for completing your tasks using **~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}}**
 Only add files that are really relevant to look at later. Only add files that are really relevant to look at later.
 
@@ -70,9 +73,9 @@ aware that there is another agent called 'Coder' that can suggest file changes.
 implement the change plan. If you refer to files, always mention the workspace-relative path.\
     
 Use the following functions to interact with the workspace files as needed:
-- **~{${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.
+- **~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}}**: Find files by glob patterns like '**/*.ts'.
     
 ### Workspace Navigation Guidelines
 

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

@@ -14,9 +14,9 @@ import { CHANGE_SET_SUMMARY_VARIABLE_ID } from '@theia/ai-chat';
 import {
     GET_WORKSPACE_FILE_LIST_FUNCTION_ID,
     FILE_CONTENT_FUNCTION_ID,
-    GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID,
     GET_FILE_DIAGNOSTICS_ID,
     SEARCH_IN_WORKSPACE_FUNCTION_ID,
+    FIND_FILES_BY_PATTERN_FUNCTION_ID,
     LIST_TASKS_FUNCTION_ID,
     RUN_TASK_FUNCTION_ID
 } from './workspace-functions';
@@ -73,9 +73,9 @@ After each tool call:
 Never guess or hallucinate file content or structure. Use tools for all workspace interactions:
 
 ### Workspace Exploration
-- ~{${GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID}} — view overall structure
 - ~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}} — list contents of a specific directory
 - ~{${FILE_CONTENT_FUNCTION_ID}} — retrieve the content of a file
+- ~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}} — find files matching glob patterns (e.g., '**/*.ts' for all TypeScript files)
 - ~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}} — locate references or patterns (only search if you are missing information, always prefer examples that are explicitly provided, never \
 search for files you already know the path for)
 - ~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}} — bookmark important files for context
@@ -168,12 +168,14 @@ which will be reviewed and accepted by the user.
 
 ## Context Retrieval
 Use the following functions to interact with the workspace files if you require context:
-- **~{${GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID}}**
 - **~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}}**
 - **~{${FILE_CONTENT_FUNCTION_ID}}**
-- **~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}** (only search if you are missing information, always prefer examples that are explicitly provided, never search for files  \
-you already know the path for)
+- **~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}}** (find files by glob patterns like '**/*.ts')
+- **~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}**
 
+If you cannot find good search terms, navigate the directory structure.
+**Confirm Paths**: Always verify paths by listing directories or files as you navigate. Avoid assumptions based on user input alone.
+**Navigate Step-by-Step**: Move into subdirectories only as needed, confirming each directory level.
 Remember file locations that are relevant for completing your tasks using **~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}}**
 Only add files that are really relevant to look at later.
 
@@ -237,12 +239,14 @@ which will be reviewed and accepted by the user.
 
 ## Context Retrieval
 Use the following functions to interact with the workspace files if you require context:
-- **~{${GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID}}**
 - **~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}}**
 - **~{${FILE_CONTENT_FUNCTION_ID}}**
-- **~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}** (only search if you are missing information, always prefer examples that are explicitly provided, never search for files  \
-you already know the path for)
+- **~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}}** (find files by glob patterns like '**/*.ts')
+- **~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}**
 
+If you cannot find good search terms, navigate the directory structure.
+**Confirm Paths**: Always verify paths by listing directories or files as you navigate. Avoid assumptions based on user input alone.
+**Navigate Step-by-Step**: Move into subdirectories only as needed, confirming each directory level.
 Remember file locations that are relevant for completing your tasks using **~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}}**
 Only add files that are really relevant to look at later.
 

package/src/common/orchestrator-chat-agent.ts

@@ -36,7 +36,6 @@ export class OrchestratorChatAgent extends AbstractStreamParsingChatAgent {
     }];
     protected defaultLanguageModelPurpose: string = 'agent-selection';
 
-    override variables = ['chatAgents'];
     override prompts = [orchestratorTemplate];
     override description = nls.localize('theia/ai/chat/orchestrator/description',
         'This agent analyzes the user request against the description of all available chat agents and selects the best fitting agent to answer the request \