@theia/ai-ide 1.77.0-next.99 → 1.77.0

package/src/browser/github-chat-agent.ts

@@ -25,7 +25,7 @@ import { PreferenceScope, PreferenceService } from '@theia/core/lib/common';
 import { PreferencesCommands } from '@theia/preferences/lib/browser/util/preference-types';
 import { EditorManager } from '@theia/editor/lib/browser';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { githubTemplate, REQUIRED_GITHUB_MCP_SERVERS } from './github-prompt-template';
+import { githubTemplate, REQUIRED_GITHUB_MCP_SERVERS } from './github-prompt-template.js';
 
 export const GitHubChatAgentId = 'GitHub';
 
@@ -166,7 +166,7 @@ export class GitHubChatAgent extends AbstractStreamParsingChatAgent {
     }
 
     protected async offerConfiguration(): Promise<void> {
-        const currentServers = this.preferenceService.get<Record<string, MCPServerDescription>>(MCP_SERVERS_PREF, {});
+        const currentServers = this.preferenceService.get<Record<string, MCPServerDescription>>(MCP_SERVERS_PREF, {fallback: {}});
         const githubServer = REQUIRED_GITHUB_MCP_SERVERS[0];
 
         const { name, ...serverWithoutName } = githubServer;
@@ -234,7 +234,7 @@ export class GitHubChatAgent extends AbstractStreamParsingChatAgent {
     async ensureServerStarted(server: MCPServerDescription): Promise<void> {
         try {
             if (!(await this.mcpService.hasServer(server.name))) {
-                const currentServers = this.preferenceService.get<Record<string, MCPServerDescription>>(MCP_SERVERS_PREF, {});
+                const currentServers = this.preferenceService.get<Record<string, MCPServerDescription>>(MCP_SERVERS_PREF, {fallback: {}});
                 const { name, ...serverWithoutName } = server;
                 await this.preferenceService.set(MCP_SERVERS_PREF, { ...currentServers, [name]: serverWithoutName }, PreferenceScope.User);
                 await this.mcpService.addOrUpdateServer(server);

package/src/browser/github-repo-variable-contribution.ts

@@ -28,7 +28,7 @@ import {
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 
-import { GitHubRepoService } from '../common/github-repo-protocol';
+import { GitHubRepoService } from '../common/github-repo-protocol.js';
 
 export const GITHUB_REPO_NAME_VARIABLE: AIVariable = {
     id: 'github-repo-name-provider',

package/src/browser/ide-chat-welcome-message-provider.tsx

@@ -24,12 +24,12 @@ import { FrontendLanguageModelRegistry } from '@theia/ai-core/lib/common';
 import { PreferenceService } from '@theia/core/lib/common';
 import { BYPASS_MODEL_REQUIREMENT_PREF, DEFAULT_CHAT_AGENT_PREF } from '@theia/ai-chat/lib/common/ai-chat-preferences';
 import { WalkthroughService } from '@theia/getting-started/lib/browser/walkthrough-service';
-import { OPEN_AI_CONFIG_VIEW } from './ai-configuration/ai-configuration-view-contribution';
+import { OPEN_AI_CONFIG_VIEW } from './ai-configuration/ai-configuration-view-contribution.js';
 import { AIActivationService } from '@theia/ai-core/lib/browser';
 import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
 import { WorkspaceCommands } from '@theia/workspace/lib/browser/workspace-commands';
-import { AI_OPEN_GETTING_STARTED_WALKTHROUGH } from './ai-getting-started-commands';
-import { AI_GETTING_STARTED_WALKTHROUGH_ID } from './ai-getting-started-walkthrough';
+import { AI_OPEN_GETTING_STARTED_WALKTHROUGH } from './ai-getting-started-commands.js';
+import { AI_GETTING_STARTED_WALKTHROUGH_ID } from './ai-getting-started-walkthrough.js';
 
 const TheiaIdeAiLogo = ({ width = 120, height = 120, className = '' }) =>
     <svg

package/src/browser/implement-gh-ticket-command-contribution.ts

@@ -19,7 +19,7 @@ import { inject, injectable } from '@theia/core/shared/inversify';
 import { PromptService } from '@theia/ai-core/lib/common';
 import { nls } from '@theia/core';
 import { AGENT_DELEGATION_FUNCTION_ID } from '@theia/ai-core';
-import { GitHubChatAgentId } from './github-chat-agent';
+import { GitHubChatAgentId } from './github-chat-agent.js';
 
 @injectable()
 export class FixGitHubTicketCommandContribution implements FrontendApplicationContribution {

package/src/browser/memory-capability-contribution.spec.ts

@@ -22,10 +22,10 @@ import {
     FIND_FILES_BY_PATTERN_FUNCTION_ID,
     GET_WORKSPACE_FILE_LIST_FUNCTION_ID,
     SEARCH_IN_WORKSPACE_FUNCTION_ID
-} from '../common/workspace-functions';
-import { WRITE_FILE_CONTENT_ID, WRITE_FILE_REPLACEMENTS_ID } from '../common/file-changeset-function-ids';
-import { MEMORY_DIRECTORY_VARIABLE } from './memory-directory-variable-contribution';
-import { MemoryCapabilityContribution } from './memory-capability-contribution';
+} from '../common/workspace-functions.js';
+import { WRITE_FILE_CONTENT_ID, WRITE_FILE_REPLACEMENTS_ID } from '../common/file-changeset-function-ids.js';
+import { MEMORY_DIRECTORY_VARIABLE } from './memory-directory-variable-contribution.js';
+import { MemoryCapabilityContribution } from './memory-capability-contribution.js';
 
 const registerFragment = (): { id: string, template: string } => {
     const fragments: Array<{ id: string, template: string }> = [];

package/src/browser/memory-capability-contribution.ts

@@ -18,9 +18,11 @@ import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { PromptService } from '@theia/ai-core';
 import { nls } from '@theia/core';
-import { GET_WORKSPACE_FILE_LIST_FUNCTION_ID, FILE_CONTENT_FUNCTION_ID, SEARCH_IN_WORKSPACE_FUNCTION_ID, FIND_FILES_BY_PATTERN_FUNCTION_ID } from '../common/workspace-functions';
-import { WRITE_FILE_REPLACEMENTS_ID, WRITE_FILE_CONTENT_ID } from '../common/file-changeset-function-ids';
-import { MEMORY_DIRECTORY_VARIABLE } from './memory-directory-variable-contribution';
+import {
+    GET_WORKSPACE_FILE_LIST_FUNCTION_ID, FILE_CONTENT_FUNCTION_ID, SEARCH_IN_WORKSPACE_FUNCTION_ID, FIND_FILES_BY_PATTERN_FUNCTION_ID
+} from '../common/workspace-functions.js';
+import { WRITE_FILE_REPLACEMENTS_ID, WRITE_FILE_CONTENT_ID } from '../common/file-changeset-function-ids.js';
+import { MEMORY_DIRECTORY_VARIABLE } from './memory-directory-variable-contribution.js';
 
 @injectable()
 export class MemoryCapabilityContribution implements FrontendApplicationContribution {

package/src/browser/memory-directory-variable-contribution.spec.ts

@@ -19,7 +19,7 @@ import { URI } from '@theia/core';
 import { Container } from '@theia/core/shared/inversify';
 import { WorkspaceMetadataStorageService, WorkspaceMetadataStore } from '@theia/workspace/lib/browser/metadata-storage';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { MEMORY_DIRECTORY_VARIABLE, MEMORY_METADATA_STORE_KEY, MemoryDirectoryVariableContribution } from './memory-directory-variable-contribution';
+import { MEMORY_DIRECTORY_VARIABLE, MEMORY_METADATA_STORE_KEY, MemoryDirectoryVariableContribution } from './memory-directory-variable-contribution.js';
 
 describe('MemoryDirectoryVariableContribution', () => {
 

package/src/browser/memory-directory-variable-contribution.ts

@@ -21,7 +21,7 @@ import { MaybePromise, URI, nls } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { WorkspaceMetadataStorageService, WorkspaceMetadataStore } from '@theia/workspace/lib/browser/metadata-storage';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { AccessibleRootContribution } from './workspace-functions';
+import { AccessibleRootContribution } from './workspace-functions.js';
 
 /** Key under which the memory directory is requested from the workspace metadata storage. */
 export const MEMORY_METADATA_STORE_KEY = 'memory';

package/src/browser/multi-root-paths.spec.ts

@@ -35,8 +35,8 @@ import { ShellExecutionRequest, ShellExecutionServer } from '@theia/ai-terminal/
 import { ShellExecutionTool } from '@theia/ai-terminal/lib/browser/shell-execution-tool';
 import { ShellCommandPermissionService } from '@theia/ai-terminal/lib/browser/shell-command-permission-service';
 import { Minimatch } from 'minimatch';
-import { FindFilesByPattern, GetWorkspaceFileList, WorkspaceFunctionScope } from './workspace-functions';
-import { WorkspaceSearchProvider } from './workspace-search-provider';
+import { FindFilesByPattern, GetWorkspaceFileList, WorkspaceFunctionScope } from './workspace-functions.js';
+import { WorkspaceSearchProvider } from './workspace-search-provider.js';
 
 disableJSDOM();
 

package/src/browser/open-editors-hint-contribution.ts

@@ -17,7 +17,7 @@
 import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { PromptService } from '@theia/ai-core/lib/common';
-import { OPEN_EDITORS_HINT_FRAGMENT_ID } from '../common/open-editors-hint-fragment-id';
+import { OPEN_EDITORS_HINT_FRAGMENT_ID } from '../common/open-editors-hint-fragment-id.js';
 
 @injectable()
 export class OpenEditorsHintContribution implements FrontendApplicationContribution {

package/src/browser/remember-command-contribution.ts

@@ -19,8 +19,8 @@ import { inject, injectable } from '@theia/core/shared/inversify';
 import { PromptService } from '@theia/ai-core/lib/common';
 import { nls } from '@theia/core';
 import { AGENT_DELEGATION_FUNCTION_ID, AGENTS_MD_FILE_NAME } from '@theia/ai-core';
-import { ArchitectAgentId } from './architect-agent';
-import { CoderAgentId } from './coder-agent';
+import { ArchitectAgentId } from './architect-agent.js';
+import { CoderAgentId } from './coder-agent.js';
 
 /**
  * Contribution that registers the `/remember` slash command for AI chat agents.

package/src/browser/review/pr-review-agent.ts

@@ -18,7 +18,7 @@ import { AbstractStreamParsingChatAgent } from '@theia/ai-chat';
 import { LanguageModelRequirement } from '@theia/ai-core/lib/common';
 import { ILogger, nls } from '@theia/core';
 import { inject, injectable, named } from '@theia/core/shared/inversify';
-import { PR_REVIEW_SYSTEM_PROMPT_ID, prReviewSystemPrompt } from './pr-review-prompt-template';
+import { PR_REVIEW_SYSTEM_PROMPT_ID, prReviewSystemPrompt } from './pr-review-prompt-template.js';
 
 export const PRReviewAgentId = 'pr-reviewer';
 

package/src/browser/review/pr-review-capability-contribution.ts

@@ -23,17 +23,17 @@ import { SHELL_EXECUTION_FUNCTION_ID } from '@theia/ai-terminal/lib/common/shell
 import {
     LIST_TASKS_FUNCTION_ID,
     RUN_TASK_FUNCTION_ID
-} from '../../common/workspace-functions';
-import { USER_INTERACTION_FUNCTION_ID } from '../../common/user-interaction-tool';
-import { GitHubChatAgentId } from '../github-chat-agent';
-import { ExploreAgentId } from '../explore-agent';
+} from '../../common/workspace-functions.js';
+import { USER_INTERACTION_FUNCTION_ID } from '../../common/user-interaction-tool.js';
+import { GitHubChatAgentId } from '../github-chat-agent.js';
+import { ExploreAgentId } from '../explore-agent.js';
 import {
     PR_REVIEW_CODEBASE_EXPLORATION_CAPABILITY_ID,
     PR_REVIEW_GITHUB_INFORMATION_CAPABILITY_ID,
     PR_REVIEW_LOCAL_CHECKOUT_CAPABILITY_ID,
     PR_REVIEW_LOCAL_VALIDATION_CAPABILITY_ID,
     PR_REVIEW_PENDING_GITHUB_REVIEW_CAPABILITY_ID
-} from './pr-review-prompt-template';
+} from './pr-review-prompt-template.js';
 
 @injectable()
 export class PRReviewCapabilityContribution implements FrontendApplicationContribution {
@@ -137,7 +137,7 @@ Store these values for the review plan and cleanup:
     }
 
     protected buildLocalValidationTemplate(): string {
-        const name = nls.localize('theia/ai/ide/prReview/capability/localValidation/name', 'Build');
+        const name = nls.localizeByDefault('Build');
         const description = nls.localize('theia/ai/ide/prReview/capability/localValidation/description',
             'Runs local install, build, lint, test, or comparable validation tasks for the pull request.');
 

package/src/browser/review/pr-review-prompt-template.ts

@@ -16,20 +16,20 @@
 // *****************************************************************************
 
 import { AGENTS_MD_FILE_NAME, AGENTS_MD_PROMPT_FRAGMENT_ID, BasePromptFragment } from '@theia/ai-core/lib/common';
-import { CONTEXT_FILES_VARIABLE_ID, TASK_CONTEXT_SUMMARY_VARIABLE_ID } from '../../common/context-variables';
+import { CONTEXT_FILES_VARIABLE_ID, TASK_CONTEXT_SUMMARY_VARIABLE_ID } from '../../common/context-variables.js';
 import {
     FILE_CONTENT_FUNCTION_ID,
     GET_FILE_DIAGNOSTICS_ID,
     SEARCH_IN_WORKSPACE_FUNCTION_ID
-} from '../../common/workspace-functions';
+} from '../../common/workspace-functions.js';
 import {
     CREATE_TASK_CONTEXT_FUNCTION_ID,
     GET_TASK_CONTEXT_FUNCTION_ID,
     EDIT_TASK_CONTEXT_FUNCTION_ID,
     LIST_TASK_CONTEXTS_FUNCTION_ID,
     REWRITE_TASK_CONTEXT_FUNCTION_ID
-} from '../../common/task-context-function-ids';
-import { USER_INTERACTION_FUNCTION_ID } from '../../common/user-interaction-tool';
+} from '../../common/task-context-function-ids.js';
+import { USER_INTERACTION_FUNCTION_ID } from '../../common/user-interaction-tool.js';
 
 export const PR_REVIEW_SYSTEM_PROMPT_ID = 'pr-review-system';
 export const PR_REVIEW_GITHUB_INFORMATION_CAPABILITY_ID = 'pr-review-github-information';

package/src/browser/shell-execution-capability-contribution.ts

@@ -18,7 +18,7 @@ import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { PromptService } from '@theia/ai-core/lib/common';
 import { SHELL_EXECUTION_FUNCTION_ID } from '@theia/ai-terminal/lib/common/shell-execution-server';
-import { LIST_TASKS_FUNCTION_ID, RUN_TASK_FUNCTION_ID } from '../common/workspace-functions';
+import { LIST_TASKS_FUNCTION_ID, RUN_TASK_FUNCTION_ID } from '../common/workspace-functions.js';
 import { nls } from '@theia/core';
 
 @injectable()

package/src/browser/skill-file-functions.spec.ts

@@ -25,7 +25,7 @@ import { expect } from 'chai';
 import { Container } from '@theia/core/shared/inversify';
 import { SkillService } from '@theia/ai-core/lib/browser/skill-service';
 import { Skill } from '@theia/ai-core/lib/common/skill';
-import { ListSkills } from './skill-file-functions';
+import { ListSkills } from './skill-file-functions.js';
 
 disableJSDOM();
 

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

@@ -20,7 +20,7 @@ import { URI } from '@theia/core';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { SkillService } from '@theia/ai-core/lib/browser/skill-service';
 import { parseSkillFile } from '@theia/ai-core/lib/common/skill';
-import { GET_SKILL_FILE_CONTENT_FUNCTION_ID, LIST_SKILLS_FUNCTION_ID } from '../common/workspace-functions';
+import { GET_SKILL_FILE_CONTENT_FUNCTION_ID, LIST_SKILLS_FUNCTION_ID } from '../common/workspace-functions.js';
 
 @injectable()
 export class ListSkills implements ToolProvider {

package/src/browser/summarize-session-command-contribution.ts

@@ -18,8 +18,8 @@ import { ChatAgentLocation, ChatService } from '@theia/ai-chat/lib/common';
 import { CommandContribution, CommandRegistry, CommandService, ILogger } from '@theia/core';
 import { TaskContextStorageService, TaskContextService } from '@theia/ai-chat/lib/browser/task-context-service';
 import { injectable, inject, named } from '@theia/core/shared/inversify';
-import { AI_EXECUTE_PLAN_WITH_CODER } from '../common/summarize-session-commands';
-import { CoderAgent } from './coder-agent';
+import { AI_EXECUTE_PLAN_WITH_CODER } from '../common/summarize-session-commands.js';
+import { CoderAgent } from './coder-agent.js';
 import { TASK_CONTEXT_VARIABLE } from '@theia/ai-chat/lib/browser/task-context-variable';
 
 import { FILE_VARIABLE } from '@theia/ai-core/lib/browser/file-variable-contribution';

package/src/browser/task-background-summary-variable.ts

@@ -28,7 +28,7 @@ import {
 } from '@theia/ai-core';
 import { ChatSessionContext } from '@theia/ai-chat';
 import { TASK_CONTEXT_VARIABLE } from '@theia/ai-chat/lib/browser/task-context-variable';
-import { TASK_CONTEXT_SUMMARY_VARIABLE_ID } from '../common/context-variables';
+import { TASK_CONTEXT_SUMMARY_VARIABLE_ID } from '../common/context-variables.js';
 
 export const TASK_CONTEXT_SUMMARY_VARIABLE: AIVariable = {
     id: TASK_CONTEXT_SUMMARY_VARIABLE_ID,

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

@@ -27,7 +27,7 @@ import { AIVariableResourceResolver } from '@theia/ai-core';
 import { InMemoryTaskContextStorage } from '@theia/ai-chat/lib/browser/task-context-storage-service';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
-import { TaskContextFileStorageService } from './task-context-file-storage-service';
+import { TaskContextFileStorageService } from './task-context-file-storage-service.js';
 disableJSDOM();
 
 const workspaceRoot = new URI('file:///workspace');

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

@@ -23,7 +23,7 @@ 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 { FileChange, FileChangeType } from '@theia/filesystem/lib/common/files';
-import { TASK_CONTEXT_STORAGE_DIRECTORY_PREF } from '../common/workspace-preferences';
+import { TASK_CONTEXT_STORAGE_DIRECTORY_PREF } from '../common/workspace-preferences.js';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 
 @injectable()

package/src/browser/task-context-functions.ts

@@ -27,7 +27,7 @@ import {
     EDIT_TASK_CONTEXT_FUNCTION_ID,
     LIST_TASK_CONTEXTS_FUNCTION_ID,
     REWRITE_TASK_CONTEXT_FUNCTION_ID
-} from '../common/task-context-function-ids';
+} from '../common/task-context-function-ids.js';
 
 @injectable()
 export class CreateTaskContextFunction implements ToolProvider {

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

@@ -23,7 +23,7 @@ import {
     PROMPT_TEMPLATE_WORKSPACE_DIRECTORIES_PREF,
     PROMPT_TEMPLATE_ADDITIONAL_EXTENSIONS_PREF,
     PROMPT_TEMPLATE_WORKSPACE_FILES_PREF
-} from '../common/workspace-preferences';
+} from '../common/workspace-preferences.js';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { Path, PreferenceService } from '@theia/core';
 import { WorkspaceTrustService } from '@theia/workspace/lib/browser/workspace-trust-service';

package/src/browser/todo-tool-renderer.tsx

@@ -22,7 +22,7 @@ import { ReactNode } from '@theia/core/shared/react';
 import * as React from '@theia/core/shared/react';
 import { codicon, ContextMenuRenderer, KeybindingRegistry, OpenerService } from '@theia/core/lib/browser';
 import { nls } from '@theia/core';
-import { TODO_WRITE_FUNCTION_ID, TodoItem, isValidTodoItem } from '../common/todo-tool';
+import { TODO_WRITE_FUNCTION_ID, TodoItem, isValidTodoItem } from '../common/todo-tool.js';
 import { ToolConfirmationKeybindingHints, withToolCallConfirmation } from '@theia/ai-chat-ui/lib/browser/chat-response-renderer/tool-confirmation';
 import {
     APPROVE_LATEST_TOOL_CONFIRMATION_COMMAND,

package/src/browser/todo-tool.spec.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { expect } from 'chai';
-import { isValidTodoItem } from '../common/todo-tool';
+import { isValidTodoItem } from '../common/todo-tool.js';
 
 describe('isValidTodoItem', () => {
     it('should accept a minimal valid item', () => {

package/src/browser/todo-tool.ts

@@ -16,7 +16,7 @@
 
 import { injectable } from '@theia/core/shared/inversify';
 import { ToolProvider, ToolRequest } from '@theia/ai-core/lib/common';
-import { TODO_WRITE_FUNCTION_ID, isValidTodoItem } from '../common/todo-tool';
+import { TODO_WRITE_FUNCTION_ID, isValidTodoItem } from '../common/todo-tool.js';
 
 @injectable()
 export class TodoWriteTool implements ToolProvider {

package/src/browser/user-interaction-tool-renderer.tsx

@@ -35,7 +35,7 @@ import {
 import { ToolConfirmationManager } from '@theia/ai-chat/lib/browser/chat-tool-preference-bindings';
 import { PendingToolConfirmationTracker } from '@theia/ai-chat/lib/browser/pending-tool-confirmation-tracker';
 import { ToolInvocationRegistry } from '@theia/ai-core';
-import { UserInteractionTool } from './user-interaction-tool';
+import { UserInteractionTool } from './user-interaction-tool.js';
 import {
     USER_INTERACTION_FUNCTION_ID,
     UserInteractionArgs,
@@ -49,7 +49,7 @@ import {
     parseUserInteractionInput,
     parseUserInteractionResult,
     resolveContentRef,
-} from '../common/user-interaction-tool';
+} from '../common/user-interaction-tool.js';
 
 interface StepState {
     value?: string;
@@ -281,7 +281,7 @@ const UserInteractionComponent: React.FC<UserInteractionComponentProps> = ({
                     }
                     return (
                         <span className='user-interaction-tool status waiting' role='status' aria-live='polite'>
-                            {nls.localize('theia/ai/chat-ui/chat-view-tree-widget/waitingForInput', 'Waiting for input')}
+                            {nls.localizeByDefault('Waiting for input')}
                         </span>
                     );
                 })()}

package/src/browser/user-interaction-tool.spec.ts

@@ -21,9 +21,9 @@ FrontendApplicationConfigProvider.set({});
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { Container } from '@theia/core/shared/inversify';
-import { UserInteractionTool } from './user-interaction-tool';
-import { UserInteractionResult } from '../common/user-interaction-tool';
-import { WorkspaceFunctionScope } from './workspace-functions';
+import { UserInteractionTool } from './user-interaction-tool.js';
+import { UserInteractionResult } from '../common/user-interaction-tool.js';
+import { WorkspaceFunctionScope } from './workspace-functions.js';
 import { OpenerService } from '@theia/core/lib/browser';
 import { EditorManager } from '@theia/editor/lib/browser';
 import { ScmService } from '@theia/scm/lib/browser/scm-service';

package/src/browser/user-interaction-tool.ts

@@ -25,7 +25,7 @@ import URI from '@theia/core/lib/common/uri';
 import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { EditorManager } from '@theia/editor/lib/browser';
 import { ScmService } from '@theia/scm/lib/browser/scm-service';
-import { WorkspaceFunctionScope } from './workspace-functions';
+import { WorkspaceFunctionScope } from './workspace-functions.js';
 import {
     ContentRef,
     USER_INTERACTION_FUNCTION_ID,
@@ -38,7 +38,7 @@ import {
     normalizeUserInteractionLink,
     parseUserInteractionArgs,
     resolveContentRef
-} from '../common/user-interaction-tool';
+} from '../common/user-interaction-tool.js';
 import { ILogger } from '@theia/core';
 
 interface PendingInteraction {

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

@@ -29,7 +29,7 @@ import {
     FileDiagnosticProvider,
     WorkspaceFunctionScope,
     FindFilesByPattern
-} from './workspace-functions';
+} from './workspace-functions.js';
 import { bindRootContributionProvider } from '@theia/core/lib/common/contribution-provider';
 import { AiConfigurationService, ToolInvocationContext } from '@theia/ai-core';
 import { Container } from '@theia/core/shared/inversify';
@@ -145,7 +145,7 @@ describe('Workspace Functions Cancellation Tests', () => {
         } as unknown as FileService;
 
         const mockPreferenceService = {
-            get: <T>(_path: string, defaultValue: T) => defaultValue
+            get: <T>(_path: string, options?: { fallback?: T }) => options?.fallback
         };
 
         const mockMonacoWorkspace = {
@@ -287,7 +287,7 @@ describe('FileContentFunction.getArgumentsShortLabel', () => {
         } as unknown as FileService;
 
         const mockPreferenceService = {
-            get: <T>(_path: string, defaultValue: T) => defaultValue
+            get: <T>(_path: string, options?: { fallback?: T }) => options?.fallback
         };
 
         const mockMonacoWorkspace = {
@@ -348,7 +348,7 @@ describe('FileContentFunction handler', () => {
     let mockRead: () => Promise<unknown>;
     let mockReadStream: () => Promise<unknown>;
     let mockMonacoWorkspace: MonacoWorkspace;
-    let mockPreferenceService: { get: <T>(path: string, defaultValue: T) => T };
+    let mockPreferenceService: { get: <T>(path: string, optionsOrFallback?: { fallback?: T } | T) => T | undefined };
 
     const makeMockStream = (content: string) => {
         const handlers: Record<string, Function> = {};
@@ -406,7 +406,16 @@ describe('FileContentFunction handler', () => {
         } as unknown as FileService;
 
         mockPreferenceService = {
-            get: <T>(_path: string, defaultValue: T) => defaultValue
+            get: <T>(_path: string, optionsOrFallback?: { fallback?: T } | T) => {
+                if (optionsOrFallback === undefined) {
+                    return undefined;
+                }
+                // eslint-disable-next-line no-null/no-null
+                if (typeof optionsOrFallback === 'object' && optionsOrFallback !== null && !Array.isArray(optionsOrFallback) && 'fallback' in optionsOrFallback) {
+                    return (optionsOrFallback as { fallback?: T }).fallback;
+                }
+                return optionsOrFallback as T;
+            }
         };
 
         mockMonacoWorkspace = {
@@ -617,7 +626,7 @@ describe('FileContentFunction handler', () => {
 
     it('uses custom preference value for size limit', async () => {
         // Set a very small limit of 1 KB
-        mockPreferenceService.get = <T>(_path: string, _defaultValue: T) => 1 as unknown as T;
+        mockPreferenceService.get = <T>(_path: string, _optionsOrFallback?: { fallback?: T } | T) => 1 as unknown as T;
 
         const content = 'x'.repeat(2 * 1024); // 2 KB
         mockRead = async () => ({ value: content });
@@ -776,7 +785,7 @@ describe('FindFilesByPattern.getArgumentsShortLabel', () => {
         } as unknown as FileService;
 
         const mockPreferenceService = {
-            get: <T>(_path: string, defaultValue: T) => defaultValue
+            get: <T>(_path: string, options?: { fallback?: T }) => options?.fallback
         };
 
         container.bind(ILogger).to(MockLogger);

package/src/browser/workspace-functions.ts

@@ -27,7 +27,7 @@ import {
     FILE_CONTENT_FUNCTION_ID, GET_FILE_DIAGNOSTICS_ID,
     GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID,
     GET_WORKSPACE_FILE_LIST_FUNCTION_ID, FIND_FILES_BY_PATTERN_FUNCTION_ID
-} from '../common/workspace-functions';
+} from '../common/workspace-functions.js';
 import { extractJsonStringField } from '@theia/ai-chat-ui/lib/browser/chat-response-renderer/toolcall-utils';
 import ignore from 'ignore';
 import { Minimatch } from 'minimatch';
@@ -36,7 +36,7 @@ import {
     CONSIDER_GITIGNORE_PREF,
     FILE_CONTENT_MAX_SIZE_KB_PREF,
     USER_EXCLUDE_PATTERN_PREF
-} from '../common/workspace-preferences';
+} from '../common/workspace-preferences.js';
 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';
@@ -83,7 +83,7 @@ export class WorkspaceFunctionScope {
     @inject(ContributionProvider) @named(AccessibleRootContribution) @optional()
     protected readonly accessibleRootContributions: ContributionProvider<AccessibleRootContribution> | undefined;
 
-    private gitignoreMatchers = new Map<string, ReturnType<typeof ignore> | undefined>();
+    private gitignoreMatchers = new Map<string, ReturnType<typeof ignore.default> | undefined>();
     private gitignoreWatchersInitialized = new Set<string>();
 
     private _allRootUris: URI[] | undefined;
@@ -545,7 +545,7 @@ export class WorkspaceFunctionScope {
      * The cache is invalidated by {@link initializeGitignoreWatcher} when the `.gitignore` is
      * created, changed, or deleted, so individual exclusion checks need no filesystem RPC.
      */
-    protected async getGitignoreMatcher(workspaceRoot: URI): Promise<ReturnType<typeof ignore> | undefined> {
+    protected async getGitignoreMatcher(workspaceRoot: URI): Promise<ReturnType<typeof ignore.default> | undefined> {
         await this.initializeGitignoreWatcher(workspaceRoot);
 
         const rootKey = workspaceRoot.toString();
@@ -553,11 +553,12 @@ export class WorkspaceFunctionScope {
             return this.gitignoreMatchers.get(rootKey);
         }
 
-        let matcher: ReturnType<typeof ignore> | undefined;
+        let matcher: ReturnType<typeof ignore.default> | undefined;
         try {
             const gitignoreUri = workspaceRoot.resolve(this.GITIGNORE_FILE_NAME);
             const gitignoreContent = await this.fileService.read(gitignoreUri);
-            matcher = ignore().add(gitignoreContent.value);
+            // `ignore` is a CommonJS module that also provides itself as `default` export.
+            matcher = ignore.default().add(gitignoreContent.value);
         } catch {
             // No .gitignore (or it cannot be read): cache the absence so we don't retry on every check.
             matcher = undefined;

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

@@ -27,14 +27,14 @@ import {
     LaunchListProvider,
     LaunchRunnerProvider,
     LaunchStopProvider,
-} from './workspace-launch-provider';
+} from './workspace-launch-provider.js';
 import { DebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
 import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
 import { DebugSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
 import { DebugConfiguration } from '@theia/debug/lib/common/debug-common';
 import { DebugCompound } from '@theia/debug/lib/common/debug-compound';
 import { DebugSession } from '@theia/debug/lib/browser/debug-session';
-import { WorkspaceFunctionScope } from './workspace-functions';
+import { WorkspaceFunctionScope } from './workspace-functions.js';
 import { AiConfigurationService } from '@theia/ai-core';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { WorkspaceService } from '@theia/workspace/lib/browser';

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

@@ -26,8 +26,8 @@ import {
     LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID,
     RUN_LAUNCH_CONFIGURATION_FUNCTION_ID,
     STOP_LAUNCH_CONFIGURATION_FUNCTION_ID
-} from '../common/workspace-functions';
-import { WorkspaceFunctionScope } from './workspace-functions';
+} from '../common/workspace-functions.js';
+import { WorkspaceFunctionScope } from './workspace-functions.js';
 
 /**
  * Sentinel value returned (and accepted) as `workspaceRoot` for launch

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

@@ -17,11 +17,11 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { CancellationTokenSource, PreferenceService } from '@theia/core';
-import { WorkspaceSearchProvider } from './workspace-search-provider';
+import { WorkspaceSearchProvider } from './workspace-search-provider.js';
 import { ToolInvocationContext } from '@theia/ai-core';
 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 { WorkspaceFunctionScope } from './workspace-functions.js';
 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

@@ -21,10 +21,10 @@ 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 '../common/workspace-preferences';
-import { optimizeSearchResults } from '../common/workspace-search-provider-util';
+import { SEARCH_IN_WORKSPACE_FUNCTION_ID } from '../common/workspace-functions.js';
+import { WorkspaceFunctionScope } from './workspace-functions.js';
+import { SEARCH_IN_WORKSPACE_MAX_RESULTS_PREF } from '../common/workspace-preferences.js';
+import { optimizeSearchResults } from '../common/workspace-search-provider-util.js';
 
 @injectable()
 export class WorkspaceSearchProvider implements ToolProvider {

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

@@ -17,14 +17,14 @@
 import { expect } from 'chai';
 import { CancellationTokenSource, PreferenceService, ILogger } from '@theia/core';
 import URI from '@theia/core/lib/common/uri';
-import { GLOBAL_SCOPE_TOKEN, TaskListProvider, TaskRunnerProvider, WORKSPACE_SCOPE_TOKEN } from './workspace-task-provider';
+import { GLOBAL_SCOPE_TOKEN, TaskListProvider, TaskRunnerProvider, WORKSPACE_SCOPE_TOKEN } from './workspace-task-provider.js';
 import { AiConfigurationService, ToolInvocationContext } from '@theia/ai-core';
 import { Container } from '@theia/core/shared/inversify';
 import { TaskService } from '@theia/task/lib/browser/task-service';
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
 import { TaskConfiguration, TaskInfo, TaskScope } from '@theia/task/lib/common';
 import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
-import { WorkspaceFunctionScope } from './workspace-functions';
+import { WorkspaceFunctionScope } from './workspace-functions.js';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';