deploy: current vibn theia state

Made-with: Cursor

packages/ai-ide/.eslintrc.js

@@ -0,0 +1,10 @@
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+    extends: [
+        '../../configs/build.eslintrc.json'
+    ],
+    parserOptions: {
+        tsconfigRootDir: __dirname,
+        project: 'tsconfig.json'
+    }
+};

packages/ai-ide/README.md

@@ -0,0 +1,49 @@
+<div align='center'>
+
+<br />
+
+<img src='https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia.svg?sanitize=true' alt='theia-ext-logo' width='100px' />
+
+<h2>ECLIPSE THEIA - AI IDE AGENTS EXTENSION</h2>
+
+<hr />
+
+</div>
+
+## Description
+
+The `@theia/ai-ide` package consolidates various AI agents for use within IDEs like the Theia IDE.
+
+## Agents
+
+The package includes the following agents:
+
+- **Orchestrator Chat Agent**: Analyzes user requests and determines which specific chat agent is best suited to handle each request. It seamlessly delegates tasks to the appropriate agent, ensuring users receive the most relevant assistance. It used as the default agent if no other agent is specified.
+
+- **Universal Chat Agent**: Provides general programming support. It answers broad programming-related questions and serves as a fallback for generic inquiries, without specific access to the user context or workspace. This agent is used as the preferred fallback in case the default agent is not available.
+
+- **Coder Agent**: Assists software developers with code-related tasks in the Theia IDE. It utilizes AI to provide recommendations and improvements, leveraging a suite of functions to interact with the workspace.
+
+- **Command Chat Agent**: This agent helps users execute commands within the Theia IDE based on user requests. It identifies the correct command from Theia's command registry and facilitates its execution, providing users with a seamless command interaction experience.
+
+- **Architect Agent**: The agent is able to inspect the current files of the workspace, including their content, to answer questions.
+
+## Configuration View
+
+The package provides a configuration view that enables you to adjust settings related to the behavior of AI agents. This view is implemented in the files located at packages/ai-ide/src/browser/ai-configuration and offers customization of default parameters, feature toggles, and additional preferences for the AI IDE.
+
+## Additional Information
+
+- [API documentation for `@theia/ai-ide`](https://eclipse-theia.github.io/theia/docs/next/modules/_theia_ai-ide.html)
+- [Theia - GitHub](https://github.com/eclipse-theia/theia)
+- [Theia - Website](https://theia-ide.org/)
+
+## License
+
+- [Eclipse Public License 2.0](http://www.eclipse.org/legal/epl-2.0/)
+- [GNU General Public License, version 2 with the GNU Classpath Exception](https://projects.eclipse.org/license/secondary-gpl-2.0-cp)
+
+## Trademark
+
+"Theia" is a trademark of the Eclipse Foundation
+<https://www.eclipse.org/theia>

packages/ai-ide/package.json

@@ -0,0 +1,71 @@
+{
+  "name": "@theia/ai-ide",
+  "version": "1.68.0",
+  "description": "AI IDE Agents Extension",
+  "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/eclipse-theia/theia.git"
+  },
+  "bugs": {
+    "url": "https://github.com/eclipse-theia/theia/issues"
+  },
+  "homepage": "https://github.com/eclipse-theia/theia",
+  "keywords": [
+    "theia-extension"
+  ],
+  "dependencies": {
+    "@theia/ai-chat": "1.68.0",
+    "@theia/ai-chat-ui": "1.68.0",
+    "@theia/ai-core": "1.68.0",
+    "@theia/core": "1.68.0",
+    "@theia/debug": "1.68.0",
+    "@theia/editor": "1.68.0",
+    "@theia/filesystem": "1.68.0",
+    "@theia/markers": "1.68.0",
+    "@theia/monaco": "1.68.0",
+    "@theia/navigator": "1.68.0",
+    "@theia/preferences": "1.68.0",
+    "@theia/scm": "1.68.0",
+    "@theia/search-in-workspace": "1.68.0",
+    "@theia/task": "1.68.0",
+    "@theia/terminal": "1.68.0",
+    "@theia/workspace": "1.68.0",
+    "date-fns": "^4.1.0",
+    "ignore": "^6.0.0",
+    "js-yaml": "^4.1.0",
+    "minimatch": "^10.0.3",
+    "puppeteer-core": "^24.10.0",
+    "simple-git": "^3.25.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "devDependencies": {
+    "@theia/cli": "1.68.0",
+    "@theia/test": "1.68.0"
+  },
+  "theiaExtensions": [
+    {
+      "frontend": "lib/browser/frontend-module",
+      "secondaryWindow": "lib/browser/frontend-module",
+      "backend": "lib/node/backend-module"
+    }
+  ],
+  "files": [
+    "lib",
+    "src"
+  ],
+  "scripts": {
+    "build": "theiaext build",
+    "clean": "theiaext clean",
+    "compile": "theiaext compile",
+    "lint": "theiaext lint",
+    "test": "theiaext test",
+    "watch": "theiaext watch"
+  },
+  "nyc": {
+    "extends": "../../configs/nyc.json"
+  },
+  "gitHead": "21358137e41342742707f660b8e222f940a27652"
+}

packages/ai-ide/src/browser/address-pr-review-command-contribution.ts

@@ -0,0 +1,180 @@
+// *****************************************************************************
+// 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 { FrontendApplicationContribution } from '@theia/core/lib/browser';
+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-chat/lib/browser/agent-delegation-tool';
+import { GitHubChatAgentId } from './github-chat-agent';
+
+@injectable()
+export class AddressGhReviewCommandContribution implements FrontendApplicationContribution {
+
+    @inject(PromptService)
+    protected readonly promptService: PromptService;
+
+    onStart(): void {
+        this.registerAddressGhReviewCommand();
+    }
+
+    protected registerAddressGhReviewCommand(): void {
+        const commandTemplate = this.buildCommandTemplate();
+
+        this.promptService.addBuiltInPromptFragment({
+            id: 'address-gh-review',
+            template: commandTemplate,
+            isCommand: true,
+            commandName: 'address-gh-review',
+            commandDescription: nls.localize(
+                'theia/ai-ide/addressGhReviewCommand/description',
+                'Address review comments on a GitHub pull request'
+            ),
+            commandArgumentHint: nls.localize(
+                'theia/ai-ide/addressGhReviewCommand/argumentHint',
+                '<pr-number>'
+            ),
+            commandAgents: ['Coder']
+        });
+    }
+
+    protected buildCommandTemplate(): string {
+        return `You have been asked to address review comments on a GitHub pull request.
+
+## Pull Request Number
+$ARGUMENTS
+
+## Task Overview
+You need to retrieve all details about the specified pull request, especially the review comments, assess whether you can safely address all comments, and if so, 
+implement the requested changes.
+
+## Step 1: Retrieve Pull Request Information
+Use the ~{${AGENT_DELEGATION_FUNCTION_ID}} tool to delegate to the GitHub agent and retrieve comprehensive information about the pull request.
+
+**Agent ID:** '${GitHubChatAgentId}'
+**Prompt:** Ask the GitHub agent to retrieve ALL details about PR #$ARGUMENTS, specifically requesting:
+- The PR title and description
+- The current state of the PR (open, closed, merged)
+- ALL review comments - this is critical, every single review comment must be retrieved
+- General PR comments (conversation)
+- The list of files changed in the PR
+- Any referenced issues
+- Review status (approved, changes requested, etc.)
+
+Example delegation prompt:
+\`\`\`
+Please retrieve comprehensive information about pull request #$ARGUMENTS. I need:
+1. The PR title, description, and current state
+2. ALL review comments on this PR - every single inline review comment is critical
+3. ALL general conversation comments on the PR
+4. The list of files changed in this PR
+5. The current review status (approved, changes requested, pending)
+6. Any linked or referenced issues
+
+This is for addressing the review comments, so completeness is absolutely crucial. Make sure to get every review comment.
+\`\`\`
+
+## Step 2: Analyze and Categorize Review Comments
+After receiving the PR information, analyze each review comment and categorize them:
+
+### Categories of Review Comments:
+1. **Clear code changes**: Comments requesting specific, unambiguous code modifications (e.g., "rename this variable", "add null check here", "fix this typo")
+2. **Style/formatting fixes**: Comments about code style, formatting, or conventions
+3. **Bug fixes**: Comments pointing out bugs or issues that need to be fixed
+4. **Clarification questions**: Reviewers asking questions that need answers, not code changes
+5. **Design discussions**: Comments about architectural or design decisions that require human judgment
+6. **Ambiguous requests**: Comments that are unclear or could be interpreted multiple ways
+
+### Criteria for Safely Addressable Comments:
+- The requested change is clearly specified
+- The change is localized and well-scoped
+- No architectural or design decisions are required
+- The change doesn't conflict with other review comments
+- You have enough context to make the change correctly
+
+### Criteria for Comments Requiring Clarification:
+- The comment is ambiguous or vague
+- Multiple valid interpretations exist
+- The comment requires design decisions
+- Comments conflict with each other
+- The reviewer is asking a question rather than requesting a change
+
+## Step 3: Respond Based on Analysis
+
+### If ANY comments cannot be safely addressed:
+List all comments and their status, then ask for clarification on the problematic ones:
+
+Example response format:
+\`\`\`
+## PR Review Analysis
+
+### Comments I Can Address:
+1. [File: path/to/file.ts, Line X] - "[Comment summary]" - Will [action]
+2. [File: path/to/file.ts, Line Y] - "[Comment summary]" - Will [action]
+
+### Comments Requiring Clarification:
+1. [File: path/to/file.ts, Line Z] - "[Comment summary]"
+   - **Issue**: [Why this needs clarification]
+   - **Question**: [Specific question to resolve ambiguity]
+
+2. [File: path/to/other.ts, Line W] - "[Comment summary]"
+   - **Issue**: [Why this needs clarification]
+   - **Question**: [Specific question to resolve ambiguity]
+
+### Conflicting Comments:
+- [Describe any conflicts between review comments]
+
+Please provide clarification on the above items. Once clarified, I can proceed to address all review comments.
+
+Alternatively, if you'd like me to proceed with just the comments I can safely address, please confirm.
+\`\`\`
+
+### If ALL comments can be safely addressed:
+Proceed with implementing all the requested changes:
+
+1. **List all comments** and what you will do to address each one
+2. **Implement the changes** file by file, addressing each review comment
+3. **Explain each change** as you make it, referencing the original review comment
+4. **Summarize** all changes made at the end
+
+Example response format:
+\`\`\`
+## PR Review Analysis
+
+All review comments can be safely addressed. Proceeding with implementation.
+
+### Review Comments to Address:
+1. [File: path/to/file.ts, Line X] - "[Comment summary]" - Will [action]
+2. [File: path/to/file.ts, Line Y] - "[Comment summary]" - Will [action]
+...
+
+### Implementation
+[Proceed to make changes, explaining each one]
+
+### Summary
+[List all changes made and which review comments they address]
+\`\`\`
+
+## Important Guidelines
+- Always preserve the intent of the original code while addressing review comments
+- If a review comment conflicts with the existing code style, follow the project's conventions
+- Make minimal changes - only change what's necessary to address each comment
+- If you discover issues beyond the review comments, mention them but don't fix them unless asked
+- After implementation, provide a summary that maps each change to the review comment it addresses
+
+Remember: It's better to ask for clarification than to make assumptions that could introduce bugs or go against the reviewer's intent.`;
+    }
+}

packages/ai-ide/src/browser/ai-configuration/agent-configuration-widget.tsx

@@ -0,0 +1,555 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 {
+    Agent,
+    AgentService,
+    AISettingsService,
+    AIVariableService,
+    FrontendLanguageModelRegistry,
+    LanguageModel,
+    LanguageModelRegistry,
+    matchVariablesRegEx,
+    PROMPT_FUNCTION_REGEX,
+    PromptFragmentCustomizationService,
+    PromptService,
+} from '@theia/ai-core/lib/common';
+import { codicon, QuickInputService } from '@theia/core/lib/browser';
+import { URI } from '@theia/core/lib/common';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+import { AIConfigurationSelectionService } from './ai-configuration-service';
+import { LanguageModelRenderer } from './language-model-renderer';
+import { LanguageModelAliasRegistry, LanguageModelAlias } from '@theia/ai-core/lib/common/language-model-alias';
+import { AIVariableConfigurationWidget } from './variable-configuration-widget';
+import { nls } from '@theia/core';
+import { PromptVariantRenderer } from './template-settings-renderer';
+import { AIListDetailConfigurationWidget } from './base/ai-list-detail-configuration-widget';
+
+interface ParsedPrompt {
+    functions: string[];
+    globalVariables: string[];
+    agentSpecificVariables: string[];
+};
+
+@injectable()
+export class AIAgentConfigurationWidget extends AIListDetailConfigurationWidget<Agent> {
+
+    static readonly ID = 'ai-agent-configuration-container-widget';
+    static readonly LABEL = nls.localize('theia/ai/core/agentConfiguration/label', 'Agents');
+
+    @inject(AgentService)
+    protected readonly agentService: AgentService;
+
+    @inject(LanguageModelRegistry)
+    protected readonly languageModelRegistry: FrontendLanguageModelRegistry;
+
+    @inject(PromptFragmentCustomizationService)
+    protected readonly promptFragmentCustomizationService: PromptFragmentCustomizationService;
+
+    @inject(LanguageModelAliasRegistry)
+    protected readonly languageModelAliasRegistry: LanguageModelAliasRegistry;
+
+    @inject(AISettingsService)
+    protected readonly aiSettingsService: AISettingsService;
+
+    @inject(AIConfigurationSelectionService)
+    protected readonly aiConfigurationSelectionService: AIConfigurationSelectionService;
+
+    @inject(AIVariableService)
+    protected readonly variableService: AIVariableService;
+
+    @inject(PromptService)
+    protected promptService: PromptService;
+
+    @inject(QuickInputService)
+    protected readonly quickInputService: QuickInputService;
+
+    protected languageModels: LanguageModel[] | undefined;
+    protected languageModelAliases: LanguageModelAlias[] = [];
+    protected parsedPromptParts: ParsedPrompt | undefined;
+    protected isLoadingDetails = false;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = AIAgentConfigurationWidget.ID;
+        this.title.label = AIAgentConfigurationWidget.LABEL;
+        this.title.closable = false;
+
+        Promise.all([
+            this.loadItems(),
+            this.languageModelRegistry.getLanguageModels().then(models => {
+                this.languageModels = models ?? [];
+            })
+        ]).then(() => this.update());
+
+        this.languageModelAliasRegistry.ready.then(() => {
+            this.languageModelAliases = this.languageModelAliasRegistry.getAliases();
+            this.toDispose.push(this.languageModelAliasRegistry.onDidChange(() => {
+                this.languageModelAliases = this.languageModelAliasRegistry.getAliases();
+                this.update();
+            }));
+        });
+
+        this.toDispose.pushAll([
+            this.languageModelRegistry.onChange(({ models }) => {
+                this.languageModelAliases = this.languageModelAliasRegistry.getAliases();
+                this.languageModels = models;
+                this.update();
+            }),
+            this.promptService.onPromptsChange(() => this.updateParsedPromptParts()),
+            this.promptFragmentCustomizationService.onDidChangePromptFragmentCustomization(() => {
+                this.updateParsedPromptParts();
+            }),
+            this.aiSettingsService.onDidChange(() => {
+                this.updateParsedPromptParts();
+            }),
+            this.aiConfigurationSelectionService.onDidAgentChange(() => {
+                this.selectedItem = this.aiConfigurationSelectionService.getActiveAgent();
+                this.updateParsedPromptParts();
+            }),
+            this.agentService.onDidChangeAgents(async () => {
+                await this.loadItems();
+                this.update();
+            })
+        ]);
+
+        this.updateParsedPromptParts();
+    }
+
+    protected async loadItems(): Promise<void> {
+        this.items = this.agentService.getAllAgents();
+        const activeAgent = this.aiConfigurationSelectionService.getActiveAgent();
+        if (activeAgent) {
+            this.selectedItem = activeAgent;
+        } else if (this.items.length > 0 && !this.selectedItem) {
+            this.selectedItem = this.items[0];
+            this.aiConfigurationSelectionService.setActiveAgent(this.items[0]);
+        }
+    }
+
+    protected getItemId(agent: Agent): string {
+        return agent.id;
+    }
+
+    protected getItemLabel(agent: Agent): string {
+        return agent.name;
+    }
+
+    protected override getEmptySelectionMessage(): string {
+        return nls.localize('theia/ai/core/agentConfiguration/selectAgentMessage', 'Please select an Agent first!');
+    }
+
+    protected override handleItemSelect = (agent: Agent): void => {
+        this.selectedItem = agent;
+        this.aiConfigurationSelectionService.setActiveAgent(agent);
+        this.updateParsedPromptParts();
+    };
+
+    protected override renderItemPrefix(agent: Agent): React.ReactNode {
+        const enabled = this.agentService.isEnabled(agent.id);
+        return (
+            <span
+                className={
+                    `agent-status-indicator ${enabled ? `agent-enabled ${codicon('circle-filled')}` : `agent-disabled ${codicon('circle')}`}`
+                }
+                title={enabled ? 'Enabled' : 'Disabled'}
+            >
+            </span>
+        );
+    }
+
+    protected override renderItemSuffix(agent: Agent): React.ReactNode {
+        if (!agent.tags?.length) {
+            return undefined;
+        }
+        return <span>{agent.tags.map(tag => <span key={tag} className='agent-tag'>{tag}</span>)}</span>;
+    }
+
+    protected override renderList(): React.ReactNode {
+        return (
+            <div className="ai-configuration-list preferences-tree-widget theia-TreeContainer">
+                <ul>
+                    {this.items.map(agent => {
+                        const agentId = this.getItemId(agent);
+                        const isSelected = this.selectedItem && this.getItemId(this.selectedItem) === agentId;
+                        return (
+                            <li
+                                key={agentId}
+                                className={`theia-TreeNode theia-CompositeTreeNode${isSelected ? ' theia-mod-selected' : ''} ${this.getItemClassName(agent)}`}
+                                onClick={() => this.handleItemSelect(agent)}
+                            >
+                                {this.renderItemPrefix(agent)}
+                                <span className="ai-configuration-list-item-label">{this.getItemLabel(agent)}</span>
+                                {this.renderItemSuffix(agent)}
+                            </li>
+                        );
+                    })}
+                </ul>
+                <div className='configuration-agents-add'>
+                    <button
+                        className='theia-button main'
+                        onClick={() => this.addCustomAgent()}>
+                        {nls.localize('theia/ai/core/agentConfiguration/addCustomAgent', 'Add Custom Agent')}
+                    </button>
+                </div>
+            </div>
+        );
+    }
+
+    protected async updateParsedPromptParts(): Promise<void> {
+        this.isLoadingDetails = true;
+        const agent = this.aiConfigurationSelectionService.getActiveAgent();
+        if (agent) {
+            this.parsedPromptParts = await this.parsePromptFragmentsForVariableAndFunction(agent);
+        } else {
+            this.parsedPromptParts = undefined;
+        }
+        this.isLoadingDetails = false;
+        this.update();
+    }
+
+    protected renderItemDetail(agent: Agent): React.ReactNode {
+        if (this.isLoadingDetails) {
+            return <div>{nls.localizeByDefault('Loading...')}</div>;
+        }
+
+        const enabled = this.agentService.isEnabled(agent.id);
+
+        if (!this.parsedPromptParts) {
+            this.updateParsedPromptParts();
+            return <div>{nls.localizeByDefault('Loading...')}</div>;
+        }
+
+        const globalVariables = Array.from(new Set([...this.parsedPromptParts.globalVariables, ...agent.variables]));
+        const functions = Array.from(new Set([...this.parsedPromptParts.functions, ...agent.functions]));
+
+        const agentNameWithTags = <>
+            {agent.name}
+            {agent.tags?.length && <span>{agent.tags.map(tag => <span key={tag} className='agent-tag'>{tag}</span>)}</span>}
+        </>;
+
+        return <div key={agent.id}>
+            <div className='settings-section-title settings-section-category-title agent-title-with-toggle'>
+                <div className='agent-title-content'>
+                    <div>
+                        {agentNameWithTags}
+                        <pre className='ai-id-label'>Id: {agent.id}</pre>
+                    </div>
+                    <label className='agent-enable-toggle' title={nls.localize('theia/ai/core/agentConfiguration/enableAgent', 'Enable Agent')}>
+                        <div className='toggle-switch' onClick={this.toggleAgentEnabled}>
+                            <input type="checkbox" checked={enabled} onChange={this.toggleAgentEnabled} />
+                            <span className='toggle-slider'></span>
+                        </div>
+                    </label>
+                </div>
+            </div>
+
+            {agent.description && (
+                <div className="ai-agent-description">
+                    {agent.description}
+                </div>
+            )}
+            {agent.prompts.length > 0 && (
+                <>
+                    <div className="settings-section-subcategory-title ai-settings-section-subcategory-title">
+                        {nls.localize('theia/ai/core/agentConfiguration/promptTemplates', 'Prompt Templates')}
+                    </div>
+                    <table className="ai-templates-table">
+                        <thead>
+                            <tr>
+                                <th>{nls.localize('theia/ai/core/agentConfiguration/templateName', 'Template')}</th>
+                                <th>{nls.localize('theia/ai/core/agentConfiguration/variant', 'Variant')}</th>
+                                <th className="template-actions-header">{nls.localize('theia/ai/core/agentConfiguration/actions', 'Actions')}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {agent.prompts.map(prompt => (
+                                <PromptVariantRenderer
+                                    key={agent.id + '.' + prompt.id}
+                                    agentId={agent.id}
+                                    promptVariantSet={prompt}
+                                    promptService={this.promptService}
+                                />
+                            ))}
+                        </tbody>
+                    </table>
+                </>
+            )}
+
+            <div className='ai-lm-requirements'>
+                <LanguageModelRenderer
+                    agent={agent}
+                    languageModels={this.languageModels}
+                    aiSettingsService={this.aiSettingsService}
+                    languageModelRegistry={this.languageModelRegistry}
+                    languageModelAliases={this.languageModelAliases}
+                />
+            </div>
+
+            {globalVariables.length > 0 && (
+                <>
+                    <div className="settings-section-subcategory-title">
+                        {nls.localize('theia/ai/core/agentConfiguration/usedGlobalVariables', 'Used Global Variables')}
+                    </div>
+                    <AgentGlobalVariables
+                        variables={globalVariables}
+                        variableService={this.variableService}
+                    />
+                </>
+            )}
+
+            {this.parsedPromptParts.agentSpecificVariables.length > 0 && (
+                <>
+                    <div className="settings-section-subcategory-title">
+                        {nls.localize('theia/ai/core/agentConfiguration/usedAgentSpecificVariables', 'Used Agent-Specific Variables')}
+                    </div>
+                    <ul className='variable-references'>
+                        <AgentSpecificVariables
+                            promptVariables={this.parsedPromptParts.agentSpecificVariables}
+                            agent={agent}
+                        />
+                    </ul>
+                </>
+            )}
+
+            {functions.length > 0 && (
+                <>
+                    <div className="settings-section-subcategory-title">
+                        {nls.localize('theia/ai/core/agentConfiguration/usedFunctions', 'Used Functions')}
+                    </div>
+                    <ul className='function-references'>
+                        <AgentFunctions functions={functions} />
+                    </ul>
+                </>
+            )}
+        </div>;
+    }
+
+    protected async parsePromptFragmentsForVariableAndFunction(agent: Agent): Promise<ParsedPrompt> {
+        const result: ParsedPrompt = { functions: [], globalVariables: [], agentSpecificVariables: [] };
+        const agentSettings = await this.aiSettingsService.getAgentSettings(agent.id);
+        const selectedVariants = agentSettings?.selectedVariants ?? {};
+
+        for (const mainTemplate of agent.prompts) {
+            const promptId = selectedVariants[mainTemplate.id] ?? mainTemplate.defaultVariant.id ?? mainTemplate.id;
+            const promptToAnalyze: string | undefined = this.promptService.getRawPromptFragment(promptId)?.template;
+
+            if (!promptToAnalyze) {
+                continue;
+            }
+
+            this.extractVariablesAndFunctions(promptToAnalyze, result, agent);
+        }
+
+        return result;
+    }
+
+    protected extractVariablesAndFunctions(promptContent: string, result: ParsedPrompt, agent: Agent): void {
+        const variableMatches = matchVariablesRegEx(promptContent);
+        variableMatches.forEach(match => {
+            const variableId = match[1];
+            if (variableId.startsWith('!--')) {
+                return;
+            }
+
+            const baseVariableId = variableId.split(':')[0];
+
+            if (this.variableService.hasVariable(baseVariableId) &&
+                agent.agentSpecificVariables.find(v => v.name === baseVariableId) === undefined) {
+                result.globalVariables.push(variableId);
+            } else {
+                result.agentSpecificVariables.push(variableId);
+            }
+        });
+
+        const functionMatches = [...promptContent.matchAll(PROMPT_FUNCTION_REGEX)];
+        functionMatches.forEach(match => {
+            const functionId = match[1];
+            result.functions.push(functionId);
+        });
+    }
+
+    protected showVariableConfigurationTab(): void {
+        this.aiConfigurationSelectionService.selectConfigurationTab(AIVariableConfigurationWidget.ID);
+    }
+
+    protected async addCustomAgent(): Promise<void> {
+        const locations = await this.promptFragmentCustomizationService.getCustomAgentsLocations();
+
+        // If only one location is available, use the direct approach
+        if (locations.length === 1) {
+            this.promptFragmentCustomizationService.openCustomAgentYaml(locations[0].uri);
+            return;
+        }
+
+        // Multiple locations - show quick picker
+        const quickPick = this.quickInputService.createQuickPick();
+        quickPick.title = nls.localize('theia/ai/ide/agentConfiguration/customAgentLocationQuickPick/title', 'Select Location for Custom Agents File');
+        quickPick.placeholder = nls.localize('theia/ai/ide/agentConfiguration/customAgentLocationQuickPick/placeholder', 'Choose where to create or open a custom agents file');
+
+        quickPick.items = locations.map(location => ({
+            label: location.uri.path.toString(),
+            description: location.exists
+                ? nls.localize('theia/ai/ide/agentConfiguration/customAgentLocationQuickPick/openExistingFile', 'Open existing file')
+                : nls.localize('theia/ai/ide/agentConfiguration/customAgentLocationQuickPick/createNewFile', 'Create new file'),
+            location
+        }));
+
+        quickPick.onDidAccept(async () => {
+            const selectedItem = quickPick.selectedItems[0] as unknown as { location: { uri: URI, exists: boolean } };
+            if (selectedItem && selectedItem.location) {
+                quickPick.dispose();
+                this.promptFragmentCustomizationService.openCustomAgentYaml(selectedItem.location.uri);
+            }
+        });
+
+        quickPick.show();
+    }
+
+    private toggleAgentEnabled = async () => {
+        const agent = this.aiConfigurationSelectionService.getActiveAgent();
+        if (!agent) {
+            return false;
+        }
+        const enabled = this.agentService.isEnabled(agent.id);
+        if (enabled) {
+            await this.agentService.disableAgent(agent.id);
+        } else {
+            await this.agentService.enableAgent(agent.id);
+        }
+        this.update();
+    };
+}
+
+interface AgentGlobalVariablesProps {
+    variables: string[];
+    variableService: AIVariableService;
+}
+const AgentGlobalVariables = ({ variables: globalVariables, variableService }: AgentGlobalVariablesProps) => {
+    if (globalVariables.length === 0) {
+        return <div className="ai-empty-state-content">
+            {nls.localizeByDefault('None')}
+        </div>;
+    }
+
+    const allVariables = variableService.getVariables();
+    const variableData = globalVariables.map(varId => {
+        const variable = allVariables.find(v => v.id === varId);
+        return {
+            id: varId,
+            name: variable?.name || varId,
+            description: variable?.description || ''
+        };
+    });
+
+    return (
+        <table className="ai-templates-table">
+            <thead>
+                <tr>
+                    <th>{nls.localizeByDefault('Variable')}</th>
+                    <th>{nls.localizeByDefault('Description')}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {variableData.map(variable => (
+                    <tr key={variable.id}>
+                        <td className="ai-variable-name-cell">{variable.name}</td>
+                        <td className="ai-variable-description-cell">
+                            {variable.description || nls.localize('theia/ai/ide/agentConfiguration/noDescription', 'No description available')}
+                        </td>
+                    </tr>
+                ))}
+            </tbody>
+        </table>
+    );
+};
+
+interface AgentFunctionsProps {
+    functions: string[];
+}
+const AgentFunctions = ({ functions }: AgentFunctionsProps) => {
+    if (functions.length === 0) {
+        return <>{nls.localizeByDefault('None')}</>;
+    }
+    return <>
+        {functions.map(functionId => <li key={functionId} className='variable-reference'>
+            <span>{functionId}</span>
+        </li>)}
+    </>;
+};
+
+interface AgentSpecificVariablesProps {
+    promptVariables: string[];
+    agent: Agent;
+}
+const AgentSpecificVariables = ({ promptVariables, agent }: AgentSpecificVariablesProps) => {
+    const agentDefinedVariablesName = agent.agentSpecificVariables.map(v => v.name);
+    const variables = Array.from(new Set([...promptVariables, ...agentDefinedVariablesName]));
+    if (variables.length === 0) {
+        return <div className="ai-empty-state-content">
+            {nls.localizeByDefault('None')}
+        </div>;
+    }
+    return <div>
+        {variables.map(variableId =>
+            <AgentSpecificVariable
+                key={variableId}
+                variableId={variableId}
+                agent={agent}
+                promptVariables={promptVariables} />
+        )}
+    </div>;
+};
+interface AgentSpecificVariableProps {
+    variableId: string;
+    agent: Agent;
+    promptVariables: string[];
+}
+const AgentSpecificVariable = ({ variableId, agent, promptVariables }: AgentSpecificVariableProps) => {
+    const agentDefinedVariable = agent.agentSpecificVariables.find(v => v.name === variableId);
+    const undeclared = agentDefinedVariable === undefined;
+    const notUsed = !promptVariables.includes(variableId) && agentDefinedVariable?.usedInPrompt === true;
+    return <div key={variableId} className="ai-agent-specific-variable-item">
+        <div className="ai-configuration-value-row">
+            <span className="ai-configuration-value-row-label">{nls.localizeByDefault('Name')}:</span>
+            <span className="ai-configuration-value-row-value">{variableId}</span>
+        </div>
+        {undeclared ? (
+            <div className="ai-configuration-value-row">
+                <span className="ai-configuration-value-row-label">{nls.localizeByDefault('Status')}:</span>
+                <span className="ai-configuration-value-row-value ai-configuration-warning-text">
+                    {nls.localize('theia/ai/core/agentConfiguration/undeclared', 'Undeclared')}
+                </span>
+            </div>
+        ) : (
+            <>
+                <div className="ai-configuration-value-row">
+                    <span className="ai-configuration-value-row-label">{nls.localizeByDefault('Description')}:</span>
+                    <span className="ai-configuration-value-row-value">{agentDefinedVariable.description}</span>
+                </div>
+                {notUsed && (
+                    <div className="ai-configuration-value-row">
+                        <span className="ai-configuration-value-row-label">{nls.localizeByDefault('Status')}:</span>
+                        <span className="ai-configuration-value-row-value ai-configuration-warning-text">
+                            {nls.localize('theia/ai/core/agentConfiguration/notUsedInPrompt', 'Not used in prompt')}
+                        </span>
+                    </div>
+                )}
+            </>
+        )}
+    </div>;
+};

packages/ai-ide/src/browser/ai-configuration/ai-configuration-service.ts

@@ -0,0 +1,56 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { Agent } from '@theia/ai-core/lib/common';
+import { Emitter } from '@theia/core';
+import { injectable } from '@theia/core/shared/inversify';
+
+@injectable()
+export class AIConfigurationSelectionService {
+    protected activeAgent?: Agent;
+    protected selectedAliasId?: string;
+
+    protected readonly onDidSelectConfigurationEmitter = new Emitter<string>();
+    onDidSelectConfiguration = this.onDidSelectConfigurationEmitter.event;
+
+    protected readonly onDidAgentChangeEmitter = new Emitter<Agent | undefined>();
+    onDidAgentChange = this.onDidAgentChangeEmitter.event;
+
+    protected readonly onDidAliasChangeEmitter = new Emitter<string | undefined>();
+    onDidAliasChange = this.onDidAliasChangeEmitter.event;
+
+    public getActiveAgent(): Agent | undefined {
+        return this.activeAgent;
+    }
+
+    public setActiveAgent(agent?: Agent): void {
+        this.activeAgent = agent;
+        this.onDidAgentChangeEmitter.fire(agent);
+    }
+
+    public getSelectedAliasId(): string | undefined {
+        return this.selectedAliasId;
+    }
+
+    public setSelectedAliasId(aliasId?: string): void {
+        this.selectedAliasId = aliasId;
+        this.onDidAliasChangeEmitter.fire(aliasId);
+    }
+
+    public selectConfigurationTab(widgetId: string): void {
+        this.onDidSelectConfigurationEmitter.fire(widgetId);
+    }
+}

packages/ai-ide/src/browser/ai-configuration/ai-configuration-view-contribution.ts

@@ -0,0 +1,66 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { Command, CommandRegistry, nls } from '@theia/core';
+import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { AIViewContribution } from '@theia/ai-core/lib/browser';
+import { ChatViewWidget } from '@theia/ai-chat-ui/lib/browser/chat-view-widget';
+import { FrontendApplication } from '@theia/core/lib/browser';
+import { injectable } from '@theia/core/shared/inversify';
+import { AIConfigurationContainerWidget } from './ai-configuration-widget';
+
+export const AI_CONFIGURATION_TOGGLE_COMMAND_ID = 'aiConfiguration:toggle';
+export const OPEN_AI_CONFIG_VIEW = Command.toLocalizedCommand({
+    id: 'aiConfiguration:open',
+    label: 'Open AI Configuration view',
+});
+
+@injectable()
+export class AIAgentConfigurationViewContribution extends AIViewContribution<AIConfigurationContainerWidget> implements TabBarToolbarContribution {
+
+    constructor() {
+        super({
+            widgetId: AIConfigurationContainerWidget.ID,
+            widgetName: AIConfigurationContainerWidget.LABEL,
+            defaultWidgetOptions: {
+                area: 'main',
+                rank: 100
+            },
+            toggleCommandId: AI_CONFIGURATION_TOGGLE_COMMAND_ID
+        });
+    }
+
+    async initializeLayout(_app: FrontendApplication): Promise<void> {
+        await this.openView();
+    }
+
+    override registerCommands(commands: CommandRegistry): void {
+        super.registerCommands(commands);
+        commands.registerCommand(OPEN_AI_CONFIG_VIEW, {
+            execute: () => this.openView({ activate: true }),
+        });
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem({
+            id: 'chat-view.' + OPEN_AI_CONFIG_VIEW.id,
+            command: OPEN_AI_CONFIG_VIEW.id,
+            tooltip: nls.localize('theia/ai-ide/open-agent-settings-tooltip', 'Open Agent settings...'),
+            group: 'ai-settings',
+            priority: 2,
+            isVisible: widget => this.activationService.isActive && widget instanceof ChatViewWidget
+        });
+    }
+}

packages/ai-ide/src/browser/ai-configuration/ai-configuration-widget.tsx

@@ -0,0 +1,118 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { BaseWidget, BoxLayout, codicon, DockPanel, WidgetManager } from '@theia/core/lib/browser';
+import { TheiaDockPanel } from '@theia/core/lib/browser/shell/theia-dock-panel';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { AIAgentConfigurationWidget } from './agent-configuration-widget';
+import { AIVariableConfigurationWidget } from './variable-configuration-widget';
+import { AIToolsConfigurationWidget } from './tools-configuration-widget';
+import { AISkillsConfigurationWidget } from './skills-configuration-widget';
+import { AIConfigurationSelectionService } from './ai-configuration-service';
+import { nls } from '@theia/core';
+// import { AIMCPConfigurationWidget } from './mcp-configuration-widget'; // Requires @theia/ai-mcp
+import { AITokenUsageConfigurationWidget } from './token-usage-configuration-widget';
+import { AIPromptFragmentsConfigurationWidget } from './prompt-fragments-configuration-widget';
+import { ModelAliasesConfigurationWidget } from './model-aliases-configuration-widget';
+
+@injectable()
+export class AIConfigurationContainerWidget extends BaseWidget {
+
+    static readonly ID = 'ai-configuration';
+    static readonly LABEL = nls.localize('theia/ai/core/aiConfiguration/label', 'AI Configuration [Beta]');
+    protected dockpanel: DockPanel;
+
+    @inject(TheiaDockPanel.Factory)
+    protected readonly dockPanelFactory: TheiaDockPanel.Factory;
+    @inject(WidgetManager)
+    protected readonly widgetManager: WidgetManager;
+    @inject(AIConfigurationSelectionService)
+    protected readonly aiConfigurationSelectionService: AIConfigurationSelectionService;
+
+    protected agentsWidget: AIAgentConfigurationWidget;
+    protected variablesWidget: AIVariableConfigurationWidget;
+    // protected mcpWidget: AIMCPConfigurationWidget; // Requires @theia/ai-mcp
+    protected tokenUsageWidget: AITokenUsageConfigurationWidget;
+    protected promptFragmentsWidget: AIPromptFragmentsConfigurationWidget;
+    protected toolsWidget: AIToolsConfigurationWidget;
+    protected skillsWidget: AISkillsConfigurationWidget;
+    protected modelAliasesWidget: ModelAliasesConfigurationWidget;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = AIConfigurationContainerWidget.ID;
+        this.title.label = AIConfigurationContainerWidget.LABEL;
+        this.title.caption = AIConfigurationContainerWidget.LABEL;
+        this.title.closable = true;
+        this.addClass('theia-settings-container');
+        this.title.iconClass = codicon('hubot');
+        this.initUI();
+        this.initListeners();
+    }
+
+    protected async initUI(): Promise<void> {
+        const layout = (this.layout = new BoxLayout({ direction: 'top-to-bottom', spacing: 0 }));
+        this.dockpanel = this.dockPanelFactory({
+            mode: 'multiple-document',
+            spacing: 0
+        });
+        BoxLayout.setStretch(this.dockpanel, 1);
+        layout.addWidget(this.dockpanel);
+        this.dockpanel.addClass('ai-configuration-widget');
+
+        this.agentsWidget = await this.widgetManager.getOrCreateWidget(AIAgentConfigurationWidget.ID);
+        this.variablesWidget = await this.widgetManager.getOrCreateWidget(AIVariableConfigurationWidget.ID);
+        // this.mcpWidget = await this.widgetManager.getOrCreateWidget(AIMCPConfigurationWidget.ID); // Requires @theia/ai-mcp
+        this.tokenUsageWidget = await this.widgetManager.getOrCreateWidget(AITokenUsageConfigurationWidget.ID);
+        this.promptFragmentsWidget = await this.widgetManager.getOrCreateWidget(AIPromptFragmentsConfigurationWidget.ID);
+        this.toolsWidget = await this.widgetManager.getOrCreateWidget(AIToolsConfigurationWidget.ID);
+        this.skillsWidget = await this.widgetManager.getOrCreateWidget(AISkillsConfigurationWidget.ID);
+        this.modelAliasesWidget = await this.widgetManager.getOrCreateWidget(ModelAliasesConfigurationWidget.ID);
+
+        this.dockpanel.addWidget(this.agentsWidget);
+        this.dockpanel.addWidget(this.variablesWidget, { mode: 'tab-after', ref: this.agentsWidget });
+        // this.dockpanel.addWidget(this.mcpWidget, { mode: 'tab-after', ref: this.variablesWidget }); // Requires @theia/ai-mcp
+        this.dockpanel.addWidget(this.tokenUsageWidget, { mode: 'tab-after', ref: this.variablesWidget });
+        this.dockpanel.addWidget(this.promptFragmentsWidget, { mode: 'tab-after', ref: this.tokenUsageWidget });
+        this.dockpanel.addWidget(this.toolsWidget, { mode: 'tab-after', ref: this.promptFragmentsWidget });
+        this.dockpanel.addWidget(this.skillsWidget, { mode: 'tab-after', ref: this.toolsWidget });
+        this.dockpanel.addWidget(this.modelAliasesWidget, { mode: 'tab-after', ref: this.skillsWidget });
+
+        this.update();
+    }
+
+    protected initListeners(): void {
+        this.aiConfigurationSelectionService.onDidSelectConfiguration(widgetId => {
+            if (widgetId === AIAgentConfigurationWidget.ID) {
+                this.dockpanel.activateWidget(this.agentsWidget);
+            } else if (widgetId === AIVariableConfigurationWidget.ID) {
+                this.dockpanel.activateWidget(this.variablesWidget);
+            // } else if (widgetId === AIMCPConfigurationWidget.ID) { // Requires @theia/ai-mcp
+            //     this.dockpanel.activateWidget(this.mcpWidget);
+            } else if (widgetId === AITokenUsageConfigurationWidget.ID) {
+                this.dockpanel.activateWidget(this.tokenUsageWidget);
+            } else if (widgetId === AIPromptFragmentsConfigurationWidget.ID) {
+                this.dockpanel.activateWidget(this.promptFragmentsWidget);
+            } else if (widgetId === AIToolsConfigurationWidget.ID) {
+                this.dockpanel.activateWidget(this.toolsWidget);
+            } else if (widgetId === AISkillsConfigurationWidget.ID) {
+                this.dockpanel.activateWidget(this.skillsWidget);
+            } else if (widgetId === ModelAliasesConfigurationWidget.ID) {
+                this.dockpanel.activateWidget(this.modelAliasesWidget);
+            }
+        });
+    }
+}

packages/ai-ide/src/browser/ai-configuration/base/ai-card-grid-configuration-widget.tsx

@@ -0,0 +1,72 @@
+// *****************************************************************************
+// 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 * as React from '@theia/core/shared/react';
+import { injectable } from '@theia/core/shared/inversify';
+import { AIConfigurationBaseWidget } from './ai-configuration-base-widget';
+
+/**
+ * Base class for AI configuration widgets that display items in a responsive card grid.
+ * This pattern is used by the MCP configuration widget.
+ */
+@injectable()
+export abstract class AICardGridConfigurationWidget<T> extends AIConfigurationBaseWidget {
+    protected items: T[] = [];
+
+    /**
+     * Get unique identifier for an item.
+     */
+    protected abstract getItemId(item: T): string;
+
+    /**
+     * Render a single card for an item.
+     */
+    protected abstract renderCard(item: T): React.ReactNode;
+
+    /**
+     * Load items to display in the grid. Called during initialization.
+     */
+    protected abstract loadItems(): Promise<void>;
+
+    /**
+     * Optional: Render content before the card grid (e.g., header, controls).
+     */
+    protected renderHeader(): React.ReactNode {
+        return undefined;
+    }
+
+    /**
+     * Optional: Render content after the card grid.
+     */
+    protected renderFooter(): React.ReactNode {
+        return undefined;
+    }
+
+    protected renderContent(): React.ReactNode {
+        return (
+            <div className="ai-card-grid-configuration-main">
+                {this.renderHeader()}
+                <div className="ai-configuration-card-grid">
+                    {this.items.map(item => (
+                        <div key={this.getItemId(item)} className="ai-configuration-card">
+                            {this.renderCard(item)}
+                        </div>
+                    ))}
+                </div>
+                {this.renderFooter()}
+            </div>
+        );
+    }
+}

packages/ai-ide/src/browser/ai-configuration/base/ai-configuration-base-widget.tsx

@@ -0,0 +1,37 @@
+// *****************************************************************************
+// 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 * as React from '@theia/core/shared/react';
+import { injectable } from '@theia/core/shared/inversify';
+import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
+
+/**
+ * Base class for all AI configuration widgets providing common structure and lifecycle management.
+ */
+@injectable()
+export abstract class AIConfigurationBaseWidget extends ReactWidget {
+    /**
+     * Subclasses must implement this method to provide their specific content rendering.
+     */
+    protected abstract renderContent(): React.ReactNode;
+
+    protected render(): React.ReactNode {
+        return (
+            <div className='ai-configuration-widget-content'>
+                {this.renderContent()}
+            </div>
+        );
+    }
+}

packages/ai-ide/src/browser/ai-configuration/base/ai-hierarchical-configuration-widget.tsx

@@ -0,0 +1,51 @@
+// *****************************************************************************
+// 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 { injectable } from '@theia/core/shared/inversify';
+import { AIConfigurationBaseWidget } from './ai-configuration-base-widget';
+
+/**
+ * Base class for AI configuration widgets that display hierarchical or expandable content.
+ * This pattern is used by the prompt fragments and tools configuration widgets.
+ *
+ * This base class provides minimal structure - subclasses implement their own
+ * hierarchical rendering logic using the shared ExpandableSection component.
+ */
+@injectable()
+export abstract class AIHierarchicalConfigurationWidget extends AIConfigurationBaseWidget {
+    /**
+     * Track expansion state for sections.
+     */
+    protected expandedSections: Set<string> = new Set();
+
+    /**
+     * Toggle expansion state for a section.
+     */
+    protected toggleSection = (sectionId: string): void => {
+        if (this.expandedSections.has(sectionId)) {
+            this.expandedSections.delete(sectionId);
+        } else {
+            this.expandedSections.add(sectionId);
+        }
+        this.update();
+    };
+
+    /**
+     * Check if a section is expanded.
+     */
+    protected isSectionExpanded(sectionId: string): boolean {
+        return this.expandedSections.has(sectionId);
+    }
+}

packages/ai-ide/src/browser/ai-configuration/base/ai-list-detail-configuration-widget.tsx

@@ -0,0 +1,140 @@
+// *****************************************************************************
+// 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 * as React from '@theia/core/shared/react';
+import { injectable } from '@theia/core/shared/inversify';
+import { nls } from '@theia/core/lib/common/nls';
+import { AIConfigurationBaseWidget } from './ai-configuration-base-widget';
+
+/**
+ * Base class for AI configuration widgets that follow the list-detail pattern:
+ * - Left panel: Tree list of items
+ * - Right panel: Detail view of selected item
+ *
+ * This pattern is used by agents, variables, and model aliases widgets.
+ */
+@injectable()
+export abstract class AIListDetailConfigurationWidget<T> extends AIConfigurationBaseWidget {
+    protected selectedItem: T | undefined;
+    protected items: T[] = [];
+
+    /**
+     * Get unique identifier for an item. Used for selection tracking.
+     */
+    protected abstract getItemId(item: T): string;
+
+    /**
+     * Get display label for an item in the list.
+     */
+    protected abstract getItemLabel(item: T): string;
+
+    /**
+     * Render the detail panel for the selected item.
+     */
+    protected abstract renderItemDetail(item: T): React.ReactNode;
+
+    /**
+     * Load items to display in the list. Called during initialization.
+     */
+    protected abstract loadItems(): Promise<void>;
+
+    /**
+     * Get the message to display when no item is selected.
+     */
+    protected getEmptySelectionMessage(): string {
+        return nls.localize('theia/ai/configuration/selectItem', 'Please select an item.');
+    }
+
+    /**
+     * Optional: Additional CSS classes for list items.
+     */
+    protected getItemClassName(item: T): string {
+        return '';
+    }
+
+    /**
+     * Optional: Render additional content before the item label.
+     */
+    protected renderItemPrefix(item: T): React.ReactNode {
+        return undefined;
+    }
+
+    /**
+     * Optional: Render additional content after the item label.
+     */
+    protected renderItemSuffix(item: T): React.ReactNode {
+        return undefined;
+    }
+
+    protected handleItemSelect = (item: T): void => {
+        this.selectedItem = item;
+        this.update();
+    };
+
+    /**
+     * Public method to programmatically select an item.
+     * Useful for navigation from other widgets.
+     */
+    public selectItem(item: T): void {
+        this.handleItemSelect(item);
+    }
+
+    protected renderContent(): React.ReactNode {
+        return (
+            <div className="ai-list-detail-configuration-main">
+                {this.renderList()}
+                {this.renderDetail()}
+            </div>
+        );
+    }
+
+    protected renderList(): React.ReactNode {
+        return (
+            <div className="ai-configuration-list preferences-tree-widget theia-TreeContainer">
+                <ul>
+                    {this.items.map(item => {
+                        const itemId = this.getItemId(item);
+                        const isSelected = this.selectedItem && this.getItemId(this.selectedItem) === itemId;
+                        return (
+                            <li
+                                key={itemId}
+                                className={`theia-TreeNode theia-CompositeTreeNode${isSelected ? ' theia-mod-selected' : ''} ${this.getItemClassName(item)}`}
+                                onClick={() => this.handleItemSelect(item)}
+                            >
+                                {this.renderItemPrefix(item)}
+                                <span className="ai-configuration-list-item-label">{this.getItemLabel(item)}</span>
+                                {this.renderItemSuffix(item)}
+                            </li>
+                        );
+                    })}
+                </ul>
+            </div>
+        );
+    }
+
+    protected renderDetail(): React.ReactNode {
+        return (
+            <div className="ai-configuration-detail preferences-editor-widget">
+                {this.selectedItem ? (
+                    this.renderItemDetail(this.selectedItem)
+                ) : (
+                    <div className="ai-configuration-empty-state">
+                        <span className="ai-empty-state-message">{this.getEmptySelectionMessage()}</span>
+                    </div>
+                )}
+            </div>
+        );
+    }
+}

packages/ai-ide/src/browser/ai-configuration/base/ai-table-configuration-widget.tsx

@@ -0,0 +1,107 @@
+// *****************************************************************************
+// 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 * as React from '@theia/core/shared/react';
+import { injectable } from '@theia/core/shared/inversify';
+import { AIConfigurationBaseWidget } from './ai-configuration-base-widget';
+
+/**
+ * Column definition for table configuration widgets.
+ */
+export interface TableColumn<T> {
+    id: string;
+    label: string;
+    className?: string;
+    renderCell: (item: T) => React.ReactNode;
+}
+
+/**
+ * Base class for AI configuration widgets that display data in a table format.
+ * This pattern is used by the token usage configuration widget.
+ */
+@injectable()
+export abstract class AITableConfigurationWidget<T> extends AIConfigurationBaseWidget {
+    protected items: T[] = [];
+
+    /**
+     * Get unique identifier for a row item.
+     */
+    protected abstract getItemId(item: T): string;
+
+    /**
+     * Define the columns for the table.
+     */
+    protected abstract getColumns(): TableColumn<T>[];
+
+    /**
+     * Load items to display in the table. Called during initialization.
+     */
+    protected abstract loadItems(): Promise<void>;
+
+    /**
+     * Optional: Render content before the table (e.g., header, filters, controls).
+     */
+    protected renderHeader(): React.ReactNode {
+        return undefined;
+    }
+
+    /**
+     * Optional: Render content after the table (e.g., summary, footer).
+     */
+    protected renderFooter(): React.ReactNode {
+        return undefined;
+    }
+
+    /**
+     * Optional: Additional CSS class for a specific row.
+     */
+    protected getRowClassName(item: T): string {
+        return '';
+    }
+
+    protected renderContent(): React.ReactNode {
+        const columns = this.getColumns();
+        return (
+            <div className="ai-table-configuration-main">
+                {this.renderHeader()}
+                <div className="ai-configuration-table-container">
+                    <table className="ai-configuration-table">
+                        <thead>
+                            <tr>
+                                {columns.map(column => (
+                                    <th key={column.id} className={column.className}>
+                                        {column.label}
+                                    </th>
+                                ))}
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {this.items.map(item => (
+                                <tr key={this.getItemId(item)} className={this.getRowClassName(item)}>
+                                    {columns.map(column => (
+                                        <td key={column.id} className={column.className}>
+                                            {column.renderCell(item)}
+                                        </td>
+                                    ))}
+                                </tr>
+                            ))}
+                        </tbody>
+                    </table>
+                </div>
+                {this.renderFooter()}
+            </div>
+        );
+    }
+}

packages/ai-ide/src/browser/ai-configuration/components/configuration-section.tsx

@@ -0,0 +1,37 @@
+// *****************************************************************************
+// 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 * as React from '@theia/core/shared/react';
+
+export interface ConfigurationSectionProps {
+    title: string;
+    children: React.ReactNode;
+    className?: string;
+}
+
+/**
+ * A reusable section component with a title and content area.
+ * Follows the Theia settings section styling.
+ */
+export const ConfigurationSection: React.FC<ConfigurationSectionProps> = ({ title, children, className }) => (
+    <div className={`ai-configuration-section ${className || ''}`}>
+        <div className='settings-section-title settings-section-category-title'>
+            {title}
+        </div>
+        <div className='ai-configuration-section-content'>
+            {children}
+        </div>
+    </div>
+);

packages/ai-ide/src/browser/ai-configuration/components/empty-state.tsx

@@ -0,0 +1,30 @@
+// *****************************************************************************
+// 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 * as React from '@theia/core/shared/react';
+
+export interface EmptyStateProps {
+    message: string;
+    className?: string;
+}
+
+/**
+ * A component to display an empty state message (e.g., "Please select an item").
+ */
+export const EmptyState: React.FC<EmptyStateProps> = ({ message, className }) => (
+    <div className={`ai-configuration-empty-state ${className || ''}`}>
+        <span className='ai-empty-state-message'>{message}</span>
+    </div>
+);

packages/ai-ide/src/browser/ai-configuration/components/expandable-section.tsx

@@ -0,0 +1,51 @@
+// *****************************************************************************
+// 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 * as React from '@theia/core/shared/react';
+import { codicon } from '@theia/core/lib/browser';
+
+export interface ExpandableSectionProps {
+    title: React.ReactNode;
+    isExpanded: boolean;
+    onToggle: () => void;
+    children: React.ReactNode;
+    className?: string;
+}
+
+/**
+ * A collapsible section with a chevron icon and expandable content.
+ */
+export const ExpandableSection: React.FC<ExpandableSectionProps> = ({
+    title,
+    isExpanded,
+    onToggle,
+    children,
+    className
+}) => (
+    <div className={`ai-expandable-section ${className || ''}`}>
+        <div
+            className={`ai-expandable-section-header ${isExpanded ? 'expanded' : ''}`}
+            onClick={onToggle}
+        >
+            <span className='ai-expandable-section-icon'>
+                <i className={codicon(isExpanded ? 'chevron-down' : 'chevron-right')} />
+            </span>
+            <div className='ai-expandable-section-title'>{title}</div>
+        </div>
+        {isExpanded && (
+            <div className='ai-expandable-section-content'>{children}</div>
+        )}
+    </div>
+);

packages/ai-ide/src/browser/ai-configuration/language-model-renderer.tsx

@@ -0,0 +1,160 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 * as React from '@theia/core/shared/react';
+import { Agent, AISettingsService, FrontendLanguageModelRegistry, LanguageModel, LanguageModelRequirement } from '@theia/ai-core/lib/common';
+import { LanguageModelAlias } from '@theia/ai-core/lib/common/language-model-alias';
+import { Mutable } from '@theia/core';
+import { nls } from '@theia/core/lib/common/nls';
+
+export interface LanguageModelSettingsProps {
+    agent: Agent;
+    languageModels?: LanguageModel[];
+    aiSettingsService: AISettingsService;
+    languageModelRegistry: FrontendLanguageModelRegistry;
+    languageModelAliases: LanguageModelAlias[];
+}
+
+export const LanguageModelRenderer: React.FC<LanguageModelSettingsProps> = (
+    { agent, languageModels, aiSettingsService, languageModelRegistry, languageModelAliases: aliases }) => {
+
+    const findLanguageModelRequirement = async (purpose: string): Promise<LanguageModelRequirement | undefined> => {
+        const requirementSetting = await aiSettingsService.getAgentSettings(agent.id);
+        return requirementSetting?.languageModelRequirements?.find(e => e.purpose === purpose);
+    };
+
+    const [lmRequirementMap, setLmRequirementMap] = React.useState<Record<string, LanguageModelRequirement>>({});
+    const [resolvedAliasModels, setResolvedAliasModels] = React.useState<Record<string, LanguageModel | undefined>>({});
+
+    React.useEffect(() => {
+        const computeLmRequirementMap = async () => {
+            const map = await agent.languageModelRequirements.reduce(async (accPromise, curr) => {
+                const acc = await accPromise;
+                // take the agents requirements and override them with the user settings if present
+                const lmRequirement = await findLanguageModelRequirement(curr.purpose) ?? curr;
+                // if no llm is selected through the identifier, see what would be the default
+                if (!lmRequirement.identifier) {
+                    const llm = await languageModelRegistry.selectLanguageModel({ agent: agent.id, ...lmRequirement });
+                    (lmRequirement as Mutable<LanguageModelRequirement>).identifier = llm?.id;
+                }
+                acc[curr.purpose] = lmRequirement;
+                return acc;
+            }, Promise.resolve({} as Record<string, LanguageModelRequirement>));
+            setLmRequirementMap(map);
+        };
+        computeLmRequirementMap();
+    }, []);
+
+    // Effect to resolve alias to model whenever requirements.identifier or aliases change
+    React.useEffect(() => {
+        const resolveAliases = async () => {
+            const newResolved: Record<string, LanguageModel | undefined> = {};
+            await Promise.all(Object.values(lmRequirementMap).map(async requirements => {
+                const id = requirements.identifier;
+                if (id && aliases.some(a => a.id === id)) {
+                    newResolved[id] = await languageModelRegistry.getReadyLanguageModel(id);
+                }
+            }));
+            setResolvedAliasModels(newResolved);
+        };
+        resolveAliases();
+    }, [lmRequirementMap, aliases]);
+
+    const onSelectedModelChange = (purpose: string, event: React.ChangeEvent<HTMLSelectElement>): void => {
+        const newLmRequirementMap = { ...lmRequirementMap, [purpose]: { purpose, identifier: event.target.value } };
+        aiSettingsService.updateAgentSettings(agent.id, { languageModelRequirements: Object.values(newLmRequirementMap) });
+        setLmRequirementMap(newLmRequirementMap);
+    };
+
+    return <div className='language-model-container'>
+        {lmRequirementMap && Object.keys(lmRequirementMap).length > 0 ? (
+            <div className="settings-section-subcategory-title ai-settings-section-subcategory-title">
+                {nls.localize('theia/ai/core/agentConfiguration/llmRequirements', 'LLM Requirements')}
+            </div>
+        ) : undefined}
+        {Object.values(lmRequirementMap).map((requirement, index) => {
+            const isAlias = requirement.identifier && aliases.some(a => a.id === requirement.identifier);
+            const resolvedModel = isAlias ? resolvedAliasModels[requirement.identifier] : undefined;
+            return (
+                <div key={index} className="ai-llm-requirement-item">
+                    <div className="ai-configuration-value-row">
+                        <span className="ai-configuration-value-row-label">{nls.localize('theia/ai/core/languageModelRenderer/purpose', 'Purpose')}:</span>
+                        <span className="ai-configuration-value-row-value">{requirement.purpose}</span>
+                    </div>
+                    <div className="ai-configuration-value-row">
+                        <label
+                            className="ai-configuration-value-row-label"
+                            style={{ lineHeight: '1.4' }}
+                            htmlFor={`model-select-${agent.id}-${requirement.purpose}`}>
+                            {nls.localize('theia/ai/core/languageModelRenderer/languageModel', 'Language Model')}:
+                        </label>
+                        <select
+                            className="theia-select ai-configuration-value-row-value"
+                            id={`model-select-${agent.id}-${requirement.purpose}`}
+                            style={{ maxWidth: '400px' }}
+                            value={requirement.identifier}
+                            onChange={event => onSelectedModelChange(requirement.purpose, event)}
+                        >
+                            <option value=""></option>
+                            {/* Aliases first, then languange models */}
+                            {aliases?.sort((a, b) => a.id.localeCompare(b.id)).map(alias => (
+                                <option key={`alias/${alias.id}`} value={alias.id} className='ai-language-model-item-ready'>
+                                    {nls.localize('theia/ai/core/languageModelRenderer/alias', '[alias] {0}', alias.id)}
+                                </option>
+                            ))}
+                            {languageModels?.sort((a, b) => (a.name ?? a.id).localeCompare(b.name ?? b.id)).map(model => {
+                                const isNotReady = model.status.status !== 'ready';
+                                return (
+                                    <option
+                                        key={model.id}
+                                        value={model.id}
+                                        className={isNotReady ? 'ai-language-model-item-not-ready' : 'ai-language-model-item-ready'}
+                                        title={isNotReady && model.status.message ? model.status.message : undefined}
+                                    >
+                                        {model.name ?? model.id} {isNotReady ? '✗' : '✓'}
+                                    </option>
+                                );
+                            })}
+                        </select>
+                    </div>
+                    {/* If alias is selected, show what it currently evaluates to */}
+                    {isAlias && (
+                        <div className="ai-configuration-value-row">
+                            <span className="ai-configuration-value-row-label">{nls.localize('theia/ai/core/modelAliasesConfiguration/evaluatesTo', 'Evaluates to')}:</span>
+                            {resolvedModel ? (
+                                <span className="ai-configuration-value-row-value">
+                                    {resolvedModel.name ?? resolvedModel.id}
+                                    {resolvedModel.status.status === 'ready' ? (
+                                        <span className="ai-model-status-ready"
+                                            title={nls.localize('theia/ai/core/modelAliasesConfiguration/modelReadyTooltip', 'Ready')}>✓</span>
+                                    ) : (
+                                        <span className="ai-model-status-not-ready" title={resolvedModel.status.message
+                                            || nls.localize('theia/ai/core/modelAliasesConfiguration/modelNotReadyTooltip', 'Not ready')}>✗</span>
+                                    )}
+                                </span>
+                            ) : (
+                                <span className="ai-configuration-value-row-value ai-alias-evaluates-to-unresolved">
+                                    {nls.localize('theia/ai/core/modelAliasesConfiguration/noResolvedModel', 'No model ready for this alias.')}
+                                    <span className="ai-model-status-not-ready"
+                                        title={nls.localize('theia/ai/core/modelAliasesConfiguration/noModelReadyTooltip', 'No model ready')}>✗</span>
+                                </span>
+                            )}
+                        </div>
+                    )}
+                </div>
+            );
+        })}
+    </div>;
+};

packages/ai-ide/src/browser/ai-configuration/mcp-configuration-widget.tsx

@@ -0,0 +1,435 @@
+// *****************************************************************************
+// 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
+// *****************************************************************************
+// @ts-nocheck - Disabled: requires @theia/ai-mcp
+
+
+import { codicon, ReactWidget } from '@theia/core/lib/browser';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+import { HoverService } from '@theia/core/lib/browser/hover-service';
+import {
+    isLocalMCPServerDescription,
+    isRemoteMCPServerDescription,
+    MCPFrontendNotificationService,
+    MCPFrontendService,
+    MCPServerDescription,
+    MCPServerStatus
+} from '@theia/ai-mcp/lib/common/mcp-server-manager';
+import { MessageService, nls } from '@theia/core';
+import { PROMPT_VARIABLE } from '@theia/ai-core/lib/common/prompt-variable-contribution';
+
+@injectable()
+export class AIMCPConfigurationWidget extends ReactWidget {
+
+    static readonly ID = 'ai-mcp-configuration-container-widget';
+    static readonly LABEL = nls.localizeByDefault('MCP Servers');
+
+    protected servers: MCPServerDescription[] = [];
+    protected expandedTools: Record<string, boolean> = {};
+
+    @inject(MCPFrontendService)
+    protected readonly mcpFrontendService: MCPFrontendService;
+
+    @inject(MCPFrontendNotificationService)
+    protected readonly mcpFrontendNotificationService: MCPFrontendNotificationService;
+
+    @inject(HoverService)
+    protected readonly hoverService: HoverService;
+
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = AIMCPConfigurationWidget.ID;
+        this.title.label = AIMCPConfigurationWidget.LABEL;
+        this.title.closable = false;
+        this.toDispose.push(this.mcpFrontendNotificationService.onDidUpdateMCPServers(async () => {
+            this.loadServers();
+        }));
+        this.loadServers();
+    }
+
+    protected async loadServers(): Promise<void> {
+        const serverNames = await this.mcpFrontendService.getServerNames();
+        const descriptions = await Promise.all(serverNames.map(name => this.mcpFrontendService.getServerDescription(name)));
+        this.servers = descriptions.filter((desc): desc is MCPServerDescription => desc !== undefined);
+        this.update();
+    }
+
+    protected getStatusColor(status?: MCPServerStatus): { bg: string, fg: string } {
+        if (!status) {
+            return { bg: 'var(--theia-descriptionForeground)', fg: 'white' };
+        }
+        switch (status) {
+            case MCPServerStatus.Running:
+            case MCPServerStatus.Connected:
+                return { bg: 'var(--theia-successBackground)', fg: 'var(--theia-successForeground)' };
+            case MCPServerStatus.Starting:
+            case MCPServerStatus.Connecting:
+                return { bg: 'var(--theia-warningBackground)', fg: 'var(--theia-warningForeground)' };
+            case MCPServerStatus.Errored:
+                return { bg: 'var(--theia-errorBackground)', fg: 'var(--theia-errorForeground)' };
+            case MCPServerStatus.NotRunning:
+            case MCPServerStatus.NotConnected:
+            default:
+                return { bg: 'var(--theia-inputValidation-infoBackground)', fg: 'var(--theia-inputValidation-infoForeground)' };
+        }
+    }
+
+    protected showErrorHover(spanRef: React.RefObject<HTMLSpanElement>, error: string): void {
+        this.hoverService.requestHover({ content: error, target: spanRef.current!, position: 'left' });
+    }
+
+    protected hideErrorHover(): void {
+        this.hoverService.cancelHover();
+    }
+
+    protected async handleStartServer(serverName: string): Promise<void> {
+        await this.mcpFrontendService.startServer(serverName);
+    }
+
+    protected async handleStopServer(serverName: string): Promise<void> {
+        await this.mcpFrontendService.stopServer(serverName);
+    }
+
+    protected renderButton(text: React.ReactNode,
+        title: string,
+        onClick: React.MouseEventHandler<HTMLButtonElement>,
+        className?: string,
+        style?: React.CSSProperties): React.ReactNode {
+        return (
+            <button className={className} title={title} onClick={onClick} style={style}>
+                {text}
+            </button>
+        );
+    }
+
+    protected renderStatusBadge(server: MCPServerDescription): React.ReactNode {
+        const colors = this.getStatusColor(server.status);
+        let displayStatus = server.status;
+        if (!displayStatus) {
+            displayStatus = isRemoteMCPServerDescription(server) ? MCPServerStatus.NotConnected : MCPServerStatus.NotRunning;
+        }
+        const spanRef = React.createRef<HTMLSpanElement>();
+        const error = server.error;
+        return (
+            <div className="mcp-status-container">
+                <span className="mcp-status-badge" style={{
+                    backgroundColor: colors.bg,
+                    color: colors.fg
+                }}>
+                    {displayStatus}
+                </span>
+                {error && (
+                    <span
+                        onMouseEnter={() => this.showErrorHover(spanRef, error)}
+                        onMouseLeave={() => this.hideErrorHover()}
+                        ref={spanRef}
+                        className="mcp-error-indicator"
+                    >
+                        ?
+                    </span>
+                )}
+            </div>
+        );
+    }
+
+    protected renderServerHeader(server: MCPServerDescription): React.ReactNode {
+        const isStoppable = server.status === MCPServerStatus.Running
+            || server.status === MCPServerStatus.Connected;
+        const isStarting = server.status === MCPServerStatus.Starting
+            || server.status === MCPServerStatus.Connecting;
+        const isStartable = server.status === MCPServerStatus.NotRunning
+            || server.status === MCPServerStatus.NotConnected
+            || server.status === MCPServerStatus.Errored;
+
+        const isRemote = isRemoteMCPServerDescription(server);
+        const startIcon = isRemote ? 'plug' : 'play';
+        const startingIcon = 'loading';
+        const stopIcon = isRemote ? 'debug-disconnect' : 'debug-stop';
+        const startLabel = isRemote
+            ? nls.localize('theia/ai/mcpConfiguration/connectServer', 'Connect')
+            : nls.localizeByDefault('Start Server');
+        const startingLabel = isRemote
+            ? nls.localize('theia/ai/mcpConfiguration/connectingServer', 'Connecting...')
+            : nls.localizeByDefault('Starting...');
+        const stopLabel = isRemote
+            ? nls.localizeByDefault('Disconnect')
+            : nls.localizeByDefault('Stop Server');
+
+        return (
+            <div className="mcp-server-header">
+                <div className="mcp-server-name">{server.name}</div>
+                <div className="mcp-server-header-controls">
+                    {this.renderStatusBadge(server)}
+                    {isStartable && (
+                        <button
+                            className={`mcp-action-button ${codicon(startIcon)}`}
+                            onClick={() => this.handleStartServer(server.name)}
+                            title={startLabel}
+                        />
+                    )}
+                    {isStarting && (
+                        <button
+                            className={`mcp-action-button ${codicon(startingIcon)} theia-animation-spin`}
+                            disabled
+                            title={startingLabel}
+                        />
+                    )}
+                    {isStoppable && (
+                        <button
+                            className={`mcp-action-button ${codicon(stopIcon)}`}
+                            onClick={() => this.handleStopServer(server.name)}
+                            title={stopLabel}
+                        />
+                    )}
+                </div>
+            </div>
+        );
+    }
+
+    protected renderCommandSection(server: MCPServerDescription): React.ReactNode {
+        if (!isLocalMCPServerDescription(server)) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localizeByDefault('Command')}:</span>
+                <code className="mcp-property-value">{server.command}</code>
+            </div>
+        );
+    }
+
+    protected renderArgumentsSection(server: MCPServerDescription): React.ReactNode {
+        if (!isLocalMCPServerDescription(server) || !server.args || server.args.length === 0) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/arguments', 'Arguments')}:</span>
+                <code className="mcp-property-value">{server.args.join(' ')}</code>
+            </div>
+        );
+    }
+
+    protected renderEnvironmentSection(server: MCPServerDescription): React.ReactNode {
+        if (!isLocalMCPServerDescription(server) || !server.env || Object.keys(server.env).length === 0) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/environmentVariables', 'Environment Variables')}:</span>
+                <div className="mcp-property-value">
+                    {Object.entries(server.env).map(([key, value]) => (
+                        <div key={key} className="mcp-env-entry">
+                            <code>{key}={key.toLowerCase().includes('token') ? '******' : String(value)}</code>
+                        </div>
+                    ))}
+                </div>
+            </div>
+        );
+    }
+
+    protected renderServerUrlSection(server: MCPServerDescription): React.ReactNode {
+        if (!isRemoteMCPServerDescription(server)) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/serverUrl', 'Server URL')}:</span>
+                <code className="mcp-property-value">{server.serverUrl}</code>
+            </div>
+        );
+    }
+
+    protected renderServerAuthTokenHeaderSection(server: MCPServerDescription): React.ReactNode {
+        if (!isRemoteMCPServerDescription(server) || !server.serverAuthTokenHeader) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/serverAuthTokenHeader', 'Auth Header Name')}:</span>
+                <code className="mcp-property-value">{server.serverAuthTokenHeader}</code>
+            </div>
+        );
+    }
+
+    protected renderServerAuthTokenSection(server: MCPServerDescription): React.ReactNode {
+        if (!isRemoteMCPServerDescription(server) || !server.serverAuthToken) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/serverAuthToken', 'Auth Token')}:</span>
+                <code className="mcp-property-value">******</code>
+            </div>
+        );
+    }
+
+    protected renderServerHeadersSection(server: MCPServerDescription): React.ReactNode {
+        if (!isRemoteMCPServerDescription(server) || !server.headers) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/headers', 'Headers')}:</span>
+                <div className="mcp-property-value">
+                    {Object.entries(server.headers).map(([key, value]) => (
+                        <div key={key} className="mcp-env-entry">
+                            <code>{key}={(key.toLowerCase().includes('token') || key.toLowerCase().includes('authorization')) ? '******' : String(value)}</code>
+                        </div>
+                    ))}
+                </div>
+            </div>
+        );
+    }
+
+    protected renderAutostartSection(server: MCPServerDescription): React.ReactNode {
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/autostart', 'Autostart')}:</span>
+                <span className="mcp-autostart-badge" style={{
+                    color: server.autostart ? 'var(--theia-successForeground)' : 'var(--theia-errorForeground)',
+                }}>
+                    {server.autostart ? nls.localizeByDefault('Enabled') : nls.localizeByDefault('Disabled')}
+                </span>
+            </div>
+        );
+    }
+
+    protected renderToolsSection(server: MCPServerDescription): React.ReactNode {
+        if (!server.tools || server.tools.length === 0) {
+            return;
+        }
+        const isToolsExpanded = this.expandedTools[server.name] || false;
+        return (
+            <div className="mcp-tools-section">
+                <div className="mcp-tools-header" onClick={() => this.toggleTools(server.name)}>
+                    <div className="mcp-toggle-indicator">
+                        <span className="mcp-toggle-icon">
+                            {isToolsExpanded ? '▼' : '►'}
+                        </span>
+                    </div>
+                    <div className="mcp-tools-label-container">
+                        <span className="mcp-section-label">{nls.localize('theia/ai/mcpConfiguration/tools', 'Tools: ')}</span>
+                    </div>
+                    <div className="mcp-tools-actions">
+                        {this.renderButton(
+                            <i className="codicon codicon-versions"></i>,
+                            nls.localize('theia/ai/mcpConfiguration/copyAllList', 'Copy all (list of all tools)'),
+                            e => {
+                                e.stopPropagation();
+                                if (server.tools) {
+                                    const toolNames = server.tools.map(tool => `~{mcp_${server.name}_${tool.name}}`).join('\n');
+                                    navigator.clipboard.writeText(toolNames);
+                                    this.messageService.info(nls.localize('theia/ai/mcpConfiguration/copiedAllList', 'Copied all tools to clipboard (list of all tools)'));
+                                }
+                            },
+                            'mcp-copy-tool-button'
+                        )}
+                        {this.renderButton(
+                            <i className="codicon codicon-bracket"></i>,
+                            nls.localize('theia/ai/mcpConfiguration/copyForPromptTemplate', 'Copy all for prompt template (single prompt fragment with all tools)'),
+                            e => {
+                                e.stopPropagation();
+                                navigator.clipboard.writeText(`{{${PROMPT_VARIABLE.name}:${this.mcpFrontendService.getPromptTemplateId(server.name)}}}`);
+                                this.messageService.info(nls.localize('theia/ai/mcpConfiguration/copiedForPromptTemplate', 'Copied all tools to clipboard for prompt template \
+                                    (single prompt fragment with all tools)'));
+                            },
+                            'mcp-copy-tool-button'
+                        )}
+                        {this.renderButton(
+                            <i className="codicon codicon-copy"></i>,
+                            nls.localize('theia/ai/mcpConfiguration/copyAllSingle', 'Copy all for chat (single prompt fragment with all tools)'),
+                            e => {
+                                e.stopPropagation();
+                                navigator.clipboard.writeText(`#${PROMPT_VARIABLE.name}:${this.mcpFrontendService.getPromptTemplateId(server.name)}`);
+                                this.messageService.info(nls.localize('theia/ai/mcpConfiguration/copiedAllSingle', 'Copied all tools to clipboard (single prompt fragment with \
+                                    all tools)'));
+                            },
+                            'mcp-copy-tool-button'
+                        )}
+                    </div>
+                </div>
+                {isToolsExpanded && (
+                    <div className="mcp-tools-list">
+                        {server.tools.map(tool => (
+                            <div key={tool.name} className="mcp-tool-item">
+                                <div className="mcp-tool-content">
+                                    <strong>{tool.name}:</strong> {tool.description}
+                                </div>
+                                <div className="mcp-tool-actions">
+                                    {this.renderButton(
+                                        <i className="codicon codicon-copy"></i>,
+                                        nls.localize('theia/ai/mcpConfiguration/copyForPrompt', 'Copy tool (for chat or prompt template)'),
+                                        e => {
+                                            e.stopPropagation();
+                                            const copied = `~{mcp_${server.name}_${tool.name}}`;
+                                            navigator.clipboard.writeText(copied);
+                                            this.messageService.info(`Copied ${copied} to clipboard (for chat or prompt template)`);
+                                        },
+                                        'mcp-copy-tool-button'
+                                    )}
+                                </div>
+                            </div>
+                        ))}
+                    </div>
+                )}
+            </div>
+        );
+    }
+
+    protected toggleTools(serverName: string): void {
+        this.expandedTools[serverName] = !this.expandedTools[serverName];
+        this.update();
+    }
+
+    protected renderServerCard(server: MCPServerDescription): React.ReactNode {
+        return (
+            <div key={server.name} className="mcp-server-card">
+                {this.renderServerHeader(server)}
+                <div className="mcp-server-content">
+                    {this.renderCommandSection(server)}
+                    {this.renderArgumentsSection(server)}
+                    {this.renderEnvironmentSection(server)}
+                    {this.renderServerUrlSection(server)}
+                    {this.renderServerAuthTokenHeaderSection(server)}
+                    {this.renderServerAuthTokenSection(server)}
+                    {this.renderServerHeadersSection(server)}
+                    {this.renderAutostartSection(server)}
+                </div>
+                {this.renderToolsSection(server)}
+            </div>
+        );
+    }
+
+    protected render(): React.ReactNode {
+        if (this.servers.length === 0) {
+            return (
+                <div className="mcp-no-servers">
+                    {nls.localize('theia/ai/mcpConfiguration/noServers', 'No MCP servers configured')}
+                </div>
+            );
+        }
+
+        return (
+            <div className="mcp-configuration-container">
+                {this.servers.map(server => this.renderServerCard(server))}
+            </div>
+        );
+    }
+}

packages/ai-ide/src/browser/ai-configuration/mcp-configuration-widget.tsx.bak

@@ -0,0 +1,433 @@
+// *****************************************************************************
+// 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 { codicon, ReactWidget } from '@theia/core/lib/browser';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+import { HoverService } from '@theia/core/lib/browser/hover-service';
+import {
+    isLocalMCPServerDescription,
+    isRemoteMCPServerDescription,
+    MCPFrontendNotificationService,
+    MCPFrontendService,
+    MCPServerDescription,
+    MCPServerStatus
+} from '@theia/ai-mcp/lib/common/mcp-server-manager';
+import { MessageService, nls } from '@theia/core';
+import { PROMPT_VARIABLE } from '@theia/ai-core/lib/common/prompt-variable-contribution';
+
+@injectable()
+export class AIMCPConfigurationWidget extends ReactWidget {
+
+    static readonly ID = 'ai-mcp-configuration-container-widget';
+    static readonly LABEL = nls.localizeByDefault('MCP Servers');
+
+    protected servers: MCPServerDescription[] = [];
+    protected expandedTools: Record<string, boolean> = {};
+
+    @inject(MCPFrontendService)
+    protected readonly mcpFrontendService: MCPFrontendService;
+
+    @inject(MCPFrontendNotificationService)
+    protected readonly mcpFrontendNotificationService: MCPFrontendNotificationService;
+
+    @inject(HoverService)
+    protected readonly hoverService: HoverService;
+
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = AIMCPConfigurationWidget.ID;
+        this.title.label = AIMCPConfigurationWidget.LABEL;
+        this.title.closable = false;
+        this.toDispose.push(this.mcpFrontendNotificationService.onDidUpdateMCPServers(async () => {
+            this.loadServers();
+        }));
+        this.loadServers();
+    }
+
+    protected async loadServers(): Promise<void> {
+        const serverNames = await this.mcpFrontendService.getServerNames();
+        const descriptions = await Promise.all(serverNames.map(name => this.mcpFrontendService.getServerDescription(name)));
+        this.servers = descriptions.filter((desc): desc is MCPServerDescription => desc !== undefined);
+        this.update();
+    }
+
+    protected getStatusColor(status?: MCPServerStatus): { bg: string, fg: string } {
+        if (!status) {
+            return { bg: 'var(--theia-descriptionForeground)', fg: 'white' };
+        }
+        switch (status) {
+            case MCPServerStatus.Running:
+            case MCPServerStatus.Connected:
+                return { bg: 'var(--theia-successBackground)', fg: 'var(--theia-successForeground)' };
+            case MCPServerStatus.Starting:
+            case MCPServerStatus.Connecting:
+                return { bg: 'var(--theia-warningBackground)', fg: 'var(--theia-warningForeground)' };
+            case MCPServerStatus.Errored:
+                return { bg: 'var(--theia-errorBackground)', fg: 'var(--theia-errorForeground)' };
+            case MCPServerStatus.NotRunning:
+            case MCPServerStatus.NotConnected:
+            default:
+                return { bg: 'var(--theia-inputValidation-infoBackground)', fg: 'var(--theia-inputValidation-infoForeground)' };
+        }
+    }
+
+    protected showErrorHover(spanRef: React.RefObject<HTMLSpanElement>, error: string): void {
+        this.hoverService.requestHover({ content: error, target: spanRef.current!, position: 'left' });
+    }
+
+    protected hideErrorHover(): void {
+        this.hoverService.cancelHover();
+    }
+
+    protected async handleStartServer(serverName: string): Promise<void> {
+        await this.mcpFrontendService.startServer(serverName);
+    }
+
+    protected async handleStopServer(serverName: string): Promise<void> {
+        await this.mcpFrontendService.stopServer(serverName);
+    }
+
+    protected renderButton(text: React.ReactNode,
+        title: string,
+        onClick: React.MouseEventHandler<HTMLButtonElement>,
+        className?: string,
+        style?: React.CSSProperties): React.ReactNode {
+        return (
+            <button className={className} title={title} onClick={onClick} style={style}>
+                {text}
+            </button>
+        );
+    }
+
+    protected renderStatusBadge(server: MCPServerDescription): React.ReactNode {
+        const colors = this.getStatusColor(server.status);
+        let displayStatus = server.status;
+        if (!displayStatus) {
+            displayStatus = isRemoteMCPServerDescription(server) ? MCPServerStatus.NotConnected : MCPServerStatus.NotRunning;
+        }
+        const spanRef = React.createRef<HTMLSpanElement>();
+        const error = server.error;
+        return (
+            <div className="mcp-status-container">
+                <span className="mcp-status-badge" style={{
+                    backgroundColor: colors.bg,
+                    color: colors.fg
+                }}>
+                    {displayStatus}
+                </span>
+                {error && (
+                    <span
+                        onMouseEnter={() => this.showErrorHover(spanRef, error)}
+                        onMouseLeave={() => this.hideErrorHover()}
+                        ref={spanRef}
+                        className="mcp-error-indicator"
+                    >
+                        ?
+                    </span>
+                )}
+            </div>
+        );
+    }
+
+    protected renderServerHeader(server: MCPServerDescription): React.ReactNode {
+        const isStoppable = server.status === MCPServerStatus.Running
+            || server.status === MCPServerStatus.Connected;
+        const isStarting = server.status === MCPServerStatus.Starting
+            || server.status === MCPServerStatus.Connecting;
+        const isStartable = server.status === MCPServerStatus.NotRunning
+            || server.status === MCPServerStatus.NotConnected
+            || server.status === MCPServerStatus.Errored;
+
+        const isRemote = isRemoteMCPServerDescription(server);
+        const startIcon = isRemote ? 'plug' : 'play';
+        const startingIcon = 'loading';
+        const stopIcon = isRemote ? 'debug-disconnect' : 'debug-stop';
+        const startLabel = isRemote
+            ? nls.localize('theia/ai/mcpConfiguration/connectServer', 'Connect')
+            : nls.localizeByDefault('Start Server');
+        const startingLabel = isRemote
+            ? nls.localize('theia/ai/mcpConfiguration/connectingServer', 'Connecting...')
+            : nls.localizeByDefault('Starting...');
+        const stopLabel = isRemote
+            ? nls.localizeByDefault('Disconnect')
+            : nls.localizeByDefault('Stop Server');
+
+        return (
+            <div className="mcp-server-header">
+                <div className="mcp-server-name">{server.name}</div>
+                <div className="mcp-server-header-controls">
+                    {this.renderStatusBadge(server)}
+                    {isStartable && (
+                        <button
+                            className={`mcp-action-button ${codicon(startIcon)}`}
+                            onClick={() => this.handleStartServer(server.name)}
+                            title={startLabel}
+                        />
+                    )}
+                    {isStarting && (
+                        <button
+                            className={`mcp-action-button ${codicon(startingIcon)} theia-animation-spin`}
+                            disabled
+                            title={startingLabel}
+                        />
+                    )}
+                    {isStoppable && (
+                        <button
+                            className={`mcp-action-button ${codicon(stopIcon)}`}
+                            onClick={() => this.handleStopServer(server.name)}
+                            title={stopLabel}
+                        />
+                    )}
+                </div>
+            </div>
+        );
+    }
+
+    protected renderCommandSection(server: MCPServerDescription): React.ReactNode {
+        if (!isLocalMCPServerDescription(server)) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localizeByDefault('Command')}:</span>
+                <code className="mcp-property-value">{server.command}</code>
+            </div>
+        );
+    }
+
+    protected renderArgumentsSection(server: MCPServerDescription): React.ReactNode {
+        if (!isLocalMCPServerDescription(server) || !server.args || server.args.length === 0) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/arguments', 'Arguments')}:</span>
+                <code className="mcp-property-value">{server.args.join(' ')}</code>
+            </div>
+        );
+    }
+
+    protected renderEnvironmentSection(server: MCPServerDescription): React.ReactNode {
+        if (!isLocalMCPServerDescription(server) || !server.env || Object.keys(server.env).length === 0) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/environmentVariables', 'Environment Variables')}:</span>
+                <div className="mcp-property-value">
+                    {Object.entries(server.env).map(([key, value]) => (
+                        <div key={key} className="mcp-env-entry">
+                            <code>{key}={key.toLowerCase().includes('token') ? '******' : String(value)}</code>
+                        </div>
+                    ))}
+                </div>
+            </div>
+        );
+    }
+
+    protected renderServerUrlSection(server: MCPServerDescription): React.ReactNode {
+        if (!isRemoteMCPServerDescription(server)) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/serverUrl', 'Server URL')}:</span>
+                <code className="mcp-property-value">{server.serverUrl}</code>
+            </div>
+        );
+    }
+
+    protected renderServerAuthTokenHeaderSection(server: MCPServerDescription): React.ReactNode {
+        if (!isRemoteMCPServerDescription(server) || !server.serverAuthTokenHeader) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/serverAuthTokenHeader', 'Auth Header Name')}:</span>
+                <code className="mcp-property-value">{server.serverAuthTokenHeader}</code>
+            </div>
+        );
+    }
+
+    protected renderServerAuthTokenSection(server: MCPServerDescription): React.ReactNode {
+        if (!isRemoteMCPServerDescription(server) || !server.serverAuthToken) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/serverAuthToken', 'Auth Token')}:</span>
+                <code className="mcp-property-value">******</code>
+            </div>
+        );
+    }
+
+    protected renderServerHeadersSection(server: MCPServerDescription): React.ReactNode {
+        if (!isRemoteMCPServerDescription(server) || !server.headers) {
+            return;
+        }
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/headers', 'Headers')}:</span>
+                <div className="mcp-property-value">
+                    {Object.entries(server.headers).map(([key, value]) => (
+                        <div key={key} className="mcp-env-entry">
+                            <code>{key}={(key.toLowerCase().includes('token') || key.toLowerCase().includes('authorization')) ? '******' : String(value)}</code>
+                        </div>
+                    ))}
+                </div>
+            </div>
+        );
+    }
+
+    protected renderAutostartSection(server: MCPServerDescription): React.ReactNode {
+        return (
+            <div className="mcp-property-row">
+                <span className="mcp-property-label">{nls.localize('theia/ai/mcpConfiguration/autostart', 'Autostart')}:</span>
+                <span className="mcp-autostart-badge" style={{
+                    color: server.autostart ? 'var(--theia-successForeground)' : 'var(--theia-errorForeground)',
+                }}>
+                    {server.autostart ? nls.localizeByDefault('Enabled') : nls.localizeByDefault('Disabled')}
+                </span>
+            </div>
+        );
+    }
+
+    protected renderToolsSection(server: MCPServerDescription): React.ReactNode {
+        if (!server.tools || server.tools.length === 0) {
+            return;
+        }
+        const isToolsExpanded = this.expandedTools[server.name] || false;
+        return (
+            <div className="mcp-tools-section">
+                <div className="mcp-tools-header" onClick={() => this.toggleTools(server.name)}>
+                    <div className="mcp-toggle-indicator">
+                        <span className="mcp-toggle-icon">
+                            {isToolsExpanded ? '▼' : '►'}
+                        </span>
+                    </div>
+                    <div className="mcp-tools-label-container">
+                        <span className="mcp-section-label">{nls.localize('theia/ai/mcpConfiguration/tools', 'Tools: ')}</span>
+                    </div>
+                    <div className="mcp-tools-actions">
+                        {this.renderButton(
+                            <i className="codicon codicon-versions"></i>,
+                            nls.localize('theia/ai/mcpConfiguration/copyAllList', 'Copy all (list of all tools)'),
+                            e => {
+                                e.stopPropagation();
+                                if (server.tools) {
+                                    const toolNames = server.tools.map(tool => `~{mcp_${server.name}_${tool.name}}`).join('\n');
+                                    navigator.clipboard.writeText(toolNames);
+                                    this.messageService.info(nls.localize('theia/ai/mcpConfiguration/copiedAllList', 'Copied all tools to clipboard (list of all tools)'));
+                                }
+                            },
+                            'mcp-copy-tool-button'
+                        )}
+                        {this.renderButton(
+                            <i className="codicon codicon-bracket"></i>,
+                            nls.localize('theia/ai/mcpConfiguration/copyForPromptTemplate', 'Copy all for prompt template (single prompt fragment with all tools)'),
+                            e => {
+                                e.stopPropagation();
+                                navigator.clipboard.writeText(`{{${PROMPT_VARIABLE.name}:${this.mcpFrontendService.getPromptTemplateId(server.name)}}}`);
+                                this.messageService.info(nls.localize('theia/ai/mcpConfiguration/copiedForPromptTemplate', 'Copied all tools to clipboard for prompt template \
+                                    (single prompt fragment with all tools)'));
+                            },
+                            'mcp-copy-tool-button'
+                        )}
+                        {this.renderButton(
+                            <i className="codicon codicon-copy"></i>,
+                            nls.localize('theia/ai/mcpConfiguration/copyAllSingle', 'Copy all for chat (single prompt fragment with all tools)'),
+                            e => {
+                                e.stopPropagation();
+                                navigator.clipboard.writeText(`#${PROMPT_VARIABLE.name}:${this.mcpFrontendService.getPromptTemplateId(server.name)}`);
+                                this.messageService.info(nls.localize('theia/ai/mcpConfiguration/copiedAllSingle', 'Copied all tools to clipboard (single prompt fragment with \
+                                    all tools)'));
+                            },
+                            'mcp-copy-tool-button'
+                        )}
+                    </div>
+                </div>
+                {isToolsExpanded && (
+                    <div className="mcp-tools-list">
+                        {server.tools.map(tool => (
+                            <div key={tool.name} className="mcp-tool-item">
+                                <div className="mcp-tool-content">
+                                    <strong>{tool.name}:</strong> {tool.description}
+                                </div>
+                                <div className="mcp-tool-actions">
+                                    {this.renderButton(
+                                        <i className="codicon codicon-copy"></i>,
+                                        nls.localize('theia/ai/mcpConfiguration/copyForPrompt', 'Copy tool (for chat or prompt template)'),
+                                        e => {
+                                            e.stopPropagation();
+                                            const copied = `~{mcp_${server.name}_${tool.name}}`;
+                                            navigator.clipboard.writeText(copied);
+                                            this.messageService.info(`Copied ${copied} to clipboard (for chat or prompt template)`);
+                                        },
+                                        'mcp-copy-tool-button'
+                                    )}
+                                </div>
+                            </div>
+                        ))}
+                    </div>
+                )}
+            </div>
+        );
+    }
+
+    protected toggleTools(serverName: string): void {
+        this.expandedTools[serverName] = !this.expandedTools[serverName];
+        this.update();
+    }
+
+    protected renderServerCard(server: MCPServerDescription): React.ReactNode {
+        return (
+            <div key={server.name} className="mcp-server-card">
+                {this.renderServerHeader(server)}
+                <div className="mcp-server-content">
+                    {this.renderCommandSection(server)}
+                    {this.renderArgumentsSection(server)}
+                    {this.renderEnvironmentSection(server)}
+                    {this.renderServerUrlSection(server)}
+                    {this.renderServerAuthTokenHeaderSection(server)}
+                    {this.renderServerAuthTokenSection(server)}
+                    {this.renderServerHeadersSection(server)}
+                    {this.renderAutostartSection(server)}
+                </div>
+                {this.renderToolsSection(server)}
+            </div>
+        );
+    }
+
+    protected render(): React.ReactNode {
+        if (this.servers.length === 0) {
+            return (
+                <div className="mcp-no-servers">
+                    {nls.localize('theia/ai/mcpConfiguration/noServers', 'No MCP servers configured')}
+                </div>
+            );
+        }
+
+        return (
+            <div className="mcp-configuration-container">
+                {this.servers.map(server => this.renderServerCard(server))}
+            </div>
+        );
+    }
+}

packages/ai-ide/src/browser/ai-configuration/model-aliases-configuration-widget.tsx

@@ -0,0 +1,270 @@
+// *****************************************************************************
+// 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 * as React from '@theia/core/shared/react';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { LanguageModelAliasRegistry, LanguageModelAlias } from '@theia/ai-core/lib/common/language-model-alias';
+import { FrontendLanguageModelRegistry, LanguageModel, LanguageModelRegistry, LanguageModelRequirement } from '@theia/ai-core/lib/common/language-model';
+import { nls } from '@theia/core/lib/common/nls';
+import { AgentService, AISettingsService } from '@theia/ai-core';
+import { AIListDetailConfigurationWidget } from './base/ai-list-detail-configuration-widget';
+import { ConfigurationSection } from './components/configuration-section';
+
+@injectable()
+export class ModelAliasesConfigurationWidget extends AIListDetailConfigurationWidget<LanguageModelAlias> {
+    static readonly ID = 'ai-model-aliases-configuration-widget';
+    static readonly LABEL = nls.localize('theia/ai/core/modelAliasesConfiguration/label', 'Model Aliases');
+
+    @inject(LanguageModelAliasRegistry)
+    protected readonly languageModelAliasRegistry: LanguageModelAliasRegistry;
+    @inject(LanguageModelRegistry)
+    protected readonly languageModelRegistry: FrontendLanguageModelRegistry;
+    @inject(AISettingsService)
+    protected readonly aiSettingsService: AISettingsService;
+    @inject(AgentService)
+    protected readonly agentService: AgentService;
+
+    protected languageModels: LanguageModel[] = [];
+    protected matchingAgentIdsForAliasMap: Map<string, string[]> = new Map();
+    protected resolvedModelForAlias: Map<string, LanguageModel | undefined> = new Map();
+
+    @postConstruct()
+    protected init(): void {
+        this.id = ModelAliasesConfigurationWidget.ID;
+        this.title.label = ModelAliasesConfigurationWidget.LABEL;
+        this.title.closable = false;
+
+        Promise.all([
+            this.loadItems(),
+            this.loadLanguageModels()
+        ]).then(() => this.update());
+
+        this.languageModelAliasRegistry.ready.then(() =>
+            this.toDispose.push(this.languageModelAliasRegistry.onDidChange(async () => {
+                await this.loadItems();
+                this.update();
+            }))
+        );
+
+        this.toDispose.pushAll([
+            this.languageModelRegistry.onChange(async () => {
+                await this.loadItems();
+                await this.loadLanguageModels();
+                this.update();
+            }),
+            this.aiSettingsService.onDidChange(async () => {
+                await this.loadMatchingAgentIdsForAllAliases();
+                this.update();
+            })
+        ]);
+    }
+
+    protected override async loadItems(): Promise<void> {
+        await this.languageModelAliasRegistry.ready;
+        this.items = this.languageModelAliasRegistry.getAliases();
+
+        // Set initial selection
+        if (this.items.length > 0 && !this.selectedItem) {
+            this.selectedItem = this.items[0];
+        }
+
+        await this.loadMatchingAgentIdsForAllAliases();
+
+        // Resolve evaluated models for each alias
+        this.resolvedModelForAlias = new Map();
+        for (const alias of this.items) {
+            const model = await this.languageModelRegistry.getReadyLanguageModel(alias.id);
+            this.resolvedModelForAlias.set(alias.id, model);
+        }
+    }
+
+    protected async loadLanguageModels(): Promise<void> {
+        this.languageModels = await this.languageModelRegistry.getLanguageModels();
+    }
+
+    protected async loadMatchingAgentIdsForAllAliases(): Promise<void> {
+        const agents = this.agentService.getAllAgents();
+        const aliasMap: Map<string, string[]> = new Map();
+        for (const alias of this.items) {
+            const matchingAgentIds: string[] = [];
+            for (const agent of agents) {
+                const requirementSetting = await this.aiSettingsService.getAgentSettings(agent.id);
+                if (requirementSetting?.languageModelRequirements) {
+                    if (requirementSetting?.languageModelRequirements?.find(e => e.identifier === alias.id)) {
+                        matchingAgentIds.push(agent.id);
+                    }
+                } else {
+                    if (agent.languageModelRequirements.some((req: LanguageModelRequirement) => req.identifier === alias.id)) {
+                        matchingAgentIds.push(agent.id);
+                    }
+                }
+            }
+            aliasMap.set(alias.id, matchingAgentIds);
+        }
+        this.matchingAgentIdsForAliasMap = aliasMap;
+    }
+
+    protected override getItemId(item: LanguageModelAlias): string {
+        return item.id;
+    }
+
+    protected override getItemLabel(item: LanguageModelAlias): string {
+        return item.id;
+    }
+
+    protected override getEmptySelectionMessage(): string {
+        return nls.localize('theia/ai/core/modelAliasesConfiguration/selectAlias', 'Please select a Model Alias.');
+    }
+
+    protected handleAliasSelectedModelIdChange = (alias: LanguageModelAlias, event: React.ChangeEvent<HTMLSelectElement>): void => {
+        const newModelId = event.target.value || undefined;
+        const updatedAlias: LanguageModelAlias = {
+            ...alias,
+            selectedModelId: newModelId
+        };
+        this.languageModelAliasRegistry.ready.then(() => {
+            this.languageModelAliasRegistry.addAlias(updatedAlias);
+        });
+        this.handleItemSelect(updatedAlias);
+    };
+
+    protected override renderItemDetail(alias: LanguageModelAlias): React.ReactNode {
+        const availableModelIds = this.languageModels.map(m => m.id);
+        const selectedModelId = alias.selectedModelId ?? '';
+        const isInvalidModel = !!selectedModelId && !availableModelIds.includes(alias.selectedModelId ?? '');
+        const agentIds = this.matchingAgentIdsForAliasMap.get(alias.id) || [];
+        const agents = this.agentService.getAllAgents().filter(agent => agentIds.includes(agent.id));
+        const resolvedModel = this.resolvedModelForAlias.get(alias.id);
+
+        return (
+            <div>
+                <div className="settings-section-title settings-section-category-title">
+                    {alias.id}
+                </div>
+
+                {alias.description && (
+                    <div className="ai-alias-detail-description">{alias.description}</div>
+                )}
+
+                <ConfigurationSection
+                    title={nls.localize('theia/ai/core/modelAliasesConfiguration/selectedModelId', 'Selected Model')}
+                    className="ai-alias-selected-model-section"
+                >
+                    <select
+                        className={`theia-select template-variant-selector ${isInvalidModel ? 'error' : ''}`}
+                        value={isInvalidModel ? 'invalid' : selectedModelId}
+                        onChange={event => this.handleAliasSelectedModelIdChange(alias, event)}
+                    >
+                        {isInvalidModel && (
+                            <option value="invalid" disabled>
+                                {nls.localize('theia/ai/core/modelAliasesConfiguration/unavailableModel', 'Selected model is no longer available')}
+                            </option>
+                        )}
+                        <option value="" className='ai-language-model-item-ready'>
+                            {nls.localize('theia/ai/core/modelAliasesConfiguration/defaultList', '[Default list]')}
+                        </option>
+                        {[...this.languageModels]
+                            .sort((a, b) => (a.name ?? a.id).localeCompare(b.name ?? b.id))
+                            .map(model => {
+                                const isNotReady = model.status.status !== 'ready';
+                                return (
+                                    <option
+                                        key={model.id}
+                                        value={model.id}
+                                        className={isNotReady ? 'ai-language-model-item-not-ready' : 'ai-language-model-item-ready'}
+                                        title={isNotReady && model.status.message ? model.status.message : undefined}
+                                    >
+                                        {model.name ?? model.id} {isNotReady ? '✗' : '✓'}
+                                    </option>
+                                );
+                            }
+                            )}
+                    </select>
+                </ConfigurationSection>
+
+                {alias.selectedModelId === undefined && (
+                    <>
+                        <ConfigurationSection
+                            title={nls.localize('theia/ai/core/modelAliasesConfiguration/priorityList', 'Priority List')}
+                            className="ai-alias-defaults-section"
+                        >
+                            <ol>
+                                {alias.defaultModelIds.map(modelId => {
+                                    const model = this.languageModels.find(m => m.id === modelId);
+                                    const isReady = model?.status.status === 'ready';
+                                    return (
+                                        <li key={modelId}>
+                                            {isReady ? (
+                                                <span className={modelId === resolvedModel?.id ? 'ai-alias-priority-item-resolved' : 'ai-alias-priority-item-ready'}>
+                                                    {modelId} <span className="ai-model-status-ready"
+                                                        title={nls.localize('theia/ai/core/modelAliasesConfiguration/modelReadyTooltip', 'Ready')}>✓</span>
+                                                </span>
+                                            ) : (
+                                                <span className="ai-model-default-not-ready">
+                                                    {modelId} <span className="ai-model-status-not-ready"
+                                                        title={nls.localize('theia/ai/core/modelAliasesConfiguration/modelNotReadyTooltip', 'Not ready')}>✗</span>
+                                                </span>
+                                            )}
+                                        </li>
+                                    );
+                                })}
+                            </ol>
+                        </ConfigurationSection>
+
+                        <ConfigurationSection
+                            title={nls.localize('theia/ai/core/modelAliasesConfiguration/evaluatesTo', 'Evaluates to')}
+                            className="ai-alias-evaluates-to-section"
+                        >
+                            {resolvedModel ? (
+                                <span className="ai-alias-evaluates-to-value">
+                                    {resolvedModel.name ?? resolvedModel.id}
+                                    {resolvedModel.status.status === 'ready' ? (
+                                        <span className="ai-model-status-ready"
+                                            title={nls.localize('theia/ai/core/modelAliasesConfiguration/modelReadyTooltip', 'Ready')}>✓</span>
+                                    ) : (
+                                        <span className="ai-model-status-not-ready" title={resolvedModel.status.message
+                                            || nls.localize('theia/ai/core/modelAliasesConfiguration/modelNotReadyTooltip', 'Not ready')}>✗</span>
+                                    )}
+                                </span>
+                            ) : (
+                                <span className="ai-alias-evaluates-to-unresolved">
+                                    {nls.localize('theia/ai/core/modelAliasesConfiguration/noResolvedModel', 'No model ready for this alias.')}
+                                </span>
+                            )}
+                        </ConfigurationSection>
+                    </>
+                )}
+
+                <ConfigurationSection
+                    title={nls.localize('theia/ai/core/modelAliasesConfiguration/agents', 'Agents using this Alias')}
+                    className="ai-alias-agents-section"
+                >
+                    <ul>
+                        {agents.length > 0 ? (
+                            agents.map(agent => (
+                                <li key={agent.id}>
+                                    <span>{agent.name}</span>
+                                    {agent.id !== agent.name && <span className="ai-alias-agent-id"> ({agent.id})</span>}
+                                </li>
+                            ))
+                        ) : (
+                            <span>{nls.localize('theia/ai/core/modelAliasesConfiguration/noAgents', 'No agents use this alias.')}</span>
+                        )}
+                    </ul>
+                </ConfigurationSection>
+            </div>
+        );
+    }
+}

packages/ai-ide/src/browser/ai-configuration/prompt-fragments-configuration-widget.tsx

@@ -0,0 +1,735 @@
+// *****************************************************************************
+// 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 { nls } from '@theia/core';
+import { ConfirmDialog, ReactWidget, codicon } from '@theia/core/lib/browser';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import {
+    CustomizedPromptFragment,
+    PromptFragment,
+    isCustomizedPromptFragment,
+    isBasePromptFragment,
+    PromptService,
+    BasePromptFragment
+} from '@theia/ai-core/lib/common/prompt-service';
+import * as React from '@theia/core/shared/react';
+import { AgentService } from '@theia/ai-core/lib/common/agent-service';
+import { Agent } from '@theia/ai-core/lib/common/agent';
+import { CustomizationSource } from '@theia/ai-core/lib/browser/frontend-prompt-customization-service';
+
+/**
+ * Widget for configuring AI prompt fragments and prompt variant sets.
+ * Allows users to view, create, edit, and manage various types of prompt
+ * fragments including their customizations and variants.
+ */
+@injectable()
+export class AIPromptFragmentsConfigurationWidget extends ReactWidget {
+
+    static readonly ID = 'ai-prompt-fragments-configuration';
+    static readonly LABEL = nls.localize('theia/ai/core/promptFragmentsConfiguration/label', 'Prompt Fragments');
+
+    /**
+     * Stores all available prompt fragments by ID
+     */
+    protected promptFragmentMap: Map<string, PromptFragment[]> = new Map<string, PromptFragment[]>();
+
+    /**
+     * Stores prompt variant sets and their variant IDs
+     */
+    protected promptVariantsMap: Map<string, string[]> = new Map<string, string[]>();
+
+    /**
+     * Currently active prompt fragments
+     */
+    protected activePromptFragments: PromptFragment[] = [];
+
+    /**
+     * Tracks expanded state of prompt fragment sections in the UI
+     */
+    protected expandedPromptFragmentIds: Set<string> = new Set();
+
+    /**
+     * Tracks expanded state of prompt content display
+     */
+    protected expandedPromptFragmentTemplates: Set<string> = new Set();
+
+    /**
+     * Tracks expanded state of prompt variant set sections
+     */
+    protected expandedPromptVariantSetIds: Set<string> = new Set();
+
+    /**
+     * All available agents that may use prompts
+     */
+    protected availableAgents: Agent[] = [];
+
+    /**
+     * Maps prompt variant set IDs to their resolved variant IDs
+     */
+    protected effectiveVariantIds: Map<string, string | undefined> = new Map();
+
+    /**
+     * Maps prompt variant set IDs to their default variant IDs
+     */
+    protected defaultVariantIds: Map<string, string | undefined> = new Map();
+
+    /**
+     * Maps prompt variant set IDs to their user selected variant IDs
+     */
+    protected userSelectedVariantIds: Map<string, string | undefined> = new Map();
+
+    @inject(PromptService) protected promptService: PromptService;
+    @inject(AgentService) protected agentService: AgentService;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = AIPromptFragmentsConfigurationWidget.ID;
+        this.title.label = AIPromptFragmentsConfigurationWidget.LABEL;
+        this.title.caption = AIPromptFragmentsConfigurationWidget.LABEL;
+        this.title.closable = true;
+        this.addClass('ai-configuration-tab-content');
+        this.loadPromptFragments();
+        this.loadAgents();
+
+        this.toDispose.pushAll([
+            this.promptService.onPromptsChange(() => {
+                this.loadPromptFragments();
+            }),
+            this.agentService.onDidChangeAgents(() => {
+                this.loadAgents();
+            })
+        ]);
+    }
+
+    /**
+     * Loads all prompt fragments and prompt variant sets from the prompt service.
+     * Preserves UI expansion states and updates variant information.
+     */
+    protected loadPromptFragments(): void {
+        this.promptFragmentMap = this.promptService.getAllPromptFragments();
+        this.promptVariantsMap = this.promptService.getPromptVariantSets();
+        this.activePromptFragments = this.promptService.getActivePromptFragments();
+
+        // Preserve expansion state when reloading
+        const existingExpandedFragmentIds = new Set(this.expandedPromptFragmentIds);
+        const existingExpandedPromptVariantIds = new Set(this.expandedPromptVariantSetIds);
+        const existingExpandedTemplates = new Set(this.expandedPromptFragmentTemplates);
+
+        if (existingExpandedFragmentIds.size > 0) {
+            // Keep existing expansion state but remove entries for fragments that no longer exist
+            this.expandedPromptFragmentIds = new Set(
+                Array.from(existingExpandedFragmentIds).filter(id => this.promptFragmentMap.has(id))
+            );
+        }
+
+        if (existingExpandedPromptVariantIds.size === 0) {
+            // Start with variant sets collapsed by default
+            this.expandedPromptVariantSetIds = new Set();
+        } else {
+            // Keep existing expansion state but remove entries for prompt variant sets that no longer exist
+            this.expandedPromptVariantSetIds = new Set(
+                Array.from(existingExpandedPromptVariantIds).filter(id => this.promptVariantsMap.has(id))
+            );
+        }
+
+        // For templates, preserve existing expanded states - don't expand by default
+        this.expandedPromptFragmentTemplates = new Set(
+            Array.from(existingExpandedTemplates).filter(id => {
+                const [fragmentId] = id.split('_');
+                return this.promptFragmentMap.has(fragmentId);
+            })
+        );
+
+        // Update variant information (selected/default/effective) for prompt variant sets
+        for (const promptVariantSetId of this.promptVariantsMap.keys()) {
+            const effectiveId = this.promptService.getEffectiveVariantId(promptVariantSetId);
+            const defaultId = this.promptService.getDefaultVariantId(promptVariantSetId);
+            const selectedId = this.promptService.getSelectedVariantId(promptVariantSetId) ?? defaultId;
+            this.userSelectedVariantIds.set(promptVariantSetId, selectedId);
+            this.effectiveVariantIds.set(promptVariantSetId, effectiveId);
+            this.defaultVariantIds.set(promptVariantSetId, defaultId);
+        }
+
+        this.update();
+    }
+
+    /**
+     * Loads all available agents from the agent service
+     */
+    protected loadAgents(): void {
+        this.availableAgents = this.agentService.getAllAgents();
+        this.update();
+    }
+
+    /**
+     * Finds agents that use a specific prompt variant set
+     * @param promptVariantSetId ID of the prompt variant set to match
+     * @returns Array of agents that use the prompt variant set
+     */
+    protected getAgentsUsingPromptVariantId(promptVariantSetId: string): Agent[] {
+        return this.availableAgents.filter((agent: Agent) =>
+            agent.prompts.find(promptVariantSet => promptVariantSet.id === promptVariantSetId)
+        );
+    }
+
+    protected togglePromptVariantSetExpansion = (promptVariantSetId: string): void => {
+        if (this.expandedPromptVariantSetIds.has(promptVariantSetId)) {
+            this.expandedPromptVariantSetIds.delete(promptVariantSetId);
+        } else {
+            this.expandedPromptVariantSetIds.add(promptVariantSetId);
+        }
+        this.update();
+    };
+
+    protected togglePromptFragmentExpansion = (promptFragmentId: string): void => {
+        if (this.expandedPromptFragmentIds.has(promptFragmentId)) {
+            this.expandedPromptFragmentIds.delete(promptFragmentId);
+        } else {
+            this.expandedPromptFragmentIds.add(promptFragmentId);
+        }
+        this.update();
+    };
+
+    protected toggleTemplateExpansion = (fragmentKey: string, event: React.MouseEvent): void => {
+        event.stopPropagation();
+        if (this.expandedPromptFragmentTemplates.has(fragmentKey)) {
+            this.expandedPromptFragmentTemplates.delete(fragmentKey);
+        } else {
+            this.expandedPromptFragmentTemplates.add(fragmentKey);
+        }
+        this.update();
+    };
+
+    /**
+     * Call the edit action for the provided customized prompt fragment
+     * @param promptFragment Fragment to edit
+     * @param event Mouse event
+     */
+    protected editPromptCustomization = (promptFragment: CustomizedPromptFragment, event: React.MouseEvent): void => {
+        event.stopPropagation();
+        this.promptService.editCustomization(promptFragment.id, promptFragment.customizationId);
+    };
+
+    /**
+     * Determines if a prompt fragment is currently the active one for its ID
+     * @param promptFragment The prompt fragment to check
+     * @returns True if this prompt fragment is the active customization
+     */
+    protected isActiveCustomization(promptFragment: PromptFragment): boolean {
+        const activePromptFragment = this.activePromptFragments.find(activePrompt => activePrompt.id === promptFragment.id);
+        if (!activePromptFragment) {
+            return false;
+        }
+
+        if (isCustomizedPromptFragment(activePromptFragment) && isCustomizedPromptFragment(promptFragment)) {
+            return (
+                activePromptFragment.id === promptFragment.id &&
+                activePromptFragment.template === promptFragment.template &&
+                activePromptFragment.customizationId === promptFragment.customizationId &&
+                activePromptFragment.priority === promptFragment.priority
+            );
+        }
+
+        if (isBasePromptFragment(activePromptFragment) && isBasePromptFragment(promptFragment)) {
+            return (
+                activePromptFragment.id === promptFragment.id &&
+                activePromptFragment.template === promptFragment.template
+            );
+        }
+
+        return false;
+    }
+
+    /**
+     * Resets a prompt fragment to use a specific customization (with confirmation dialog)
+     * @param customization customization to reset to
+     * @param event Mouse event
+     */
+    protected resetToPromptFragment = async (customization: PromptFragment, event: React.MouseEvent): Promise<void> => {
+        event.stopPropagation();
+
+        if (isCustomizedPromptFragment(customization)) {
+            // Get the customization type to show in the confirmation dialog
+            const type = await this.promptService.getCustomizationType(customization.id, customization.customizationId);
+
+            const dialog = new ConfirmDialog({
+                title: nls.localize('theia/ai/core/promptFragmentsConfiguration/resetToCustomizationDialogTitle', 'Reset to Customization'),
+                msg: nls.localize('theia/ai/core/promptFragmentsConfiguration/resetToCustomizationDialogMsg',
+                    'Are you sure you want to reset the prompt fragment "{0}" to use the {1} customization? This will remove all higher-priority customizations.',
+                    customization.id, type),
+                ok: nls.localizeByDefault('Reset'),
+                cancel: nls.localizeByDefault('Cancel')
+            });
+
+            const shouldReset = await dialog.open();
+            if (shouldReset) {
+                await this.promptService.resetToCustomization(customization.id, customization.customizationId);
+            }
+        } else {
+            const dialog = new ConfirmDialog({
+                title: nls.localize('theia/ai/core/promptFragmentsConfiguration/resetToBuiltInDialogTitle', 'Reset to Built-in'),
+                msg: nls.localize('theia/ai/core/promptFragmentsConfiguration/resetToBuiltInDialogMsg',
+                    'Are you sure you want to reset the prompt fragment "{0}" to its built-in version? This will remove all customizations.', customization.id),
+                ok: nls.localizeByDefault('Reset'),
+                cancel: nls.localizeByDefault('Cancel')
+            });
+
+            const shouldReset = await dialog.open();
+            if (shouldReset) {
+                await this.promptService.resetToBuiltIn(customization.id);
+            }
+        }
+    };
+
+    /**
+     * Creates a new customization for a built-in prompt fragment
+     * @param promptFragment Built-in prompt fragment to customize
+     * @param event Mouse event
+     */
+    protected createPromptFragmentCustomization = (promptFragment: BasePromptFragment, event: React.MouseEvent): void => {
+        event.stopPropagation();
+        this.promptService.createBuiltInCustomization(promptFragment.id);
+    };
+
+    /**
+     * Deletes a customization with confirmation dialog
+     * @param customization Customized prompt fragment to delete
+     * @param event Mouse event
+     */
+    protected deletePromptFragmentCustomization = async (customization: CustomizedPromptFragment, event: React.MouseEvent): Promise<void> => {
+        event.stopPropagation();
+
+        // First get the customization type and description to show in the confirmation dialog
+        const type = await this.promptService.getCustomizationType(customization.id, customization.customizationId) || '';
+        const description = await this.promptService.getCustomizationDescription(customization.id, customization.customizationId) || '';
+
+        const dialog = new ConfirmDialog({
+            title: nls.localize('theia/ai/core/promptFragmentsConfiguration/removeCustomizationDialogTitle', 'Remove Customization'),
+            msg: description ?
+                nls.localize('theia/ai/core/promptFragmentsConfiguration/removeCustomizationWithDescDialogMsg',
+                    'Are you sure you want to remove the {0} customization for prompt fragment "{1}" ({2})?', type, customization.id, description) :
+                nls.localize('theia/ai/core/promptFragmentsConfiguration/removeCustomizationDialogMsg',
+                    'Are you sure you want to remove the {0} customization for prompt fragment "{1}"?', type, customization.id),
+            ok: nls.localizeByDefault('Remove'),
+            cancel: nls.localizeByDefault('Cancel')
+        });
+
+        const shouldDelete = await dialog.open();
+        if (shouldDelete) {
+            await this.promptService.removeCustomization(customization.id, customization.customizationId);
+        }
+    };
+
+    /**
+     * Removes all prompt customizations (resets to built-in versions) with confirmation
+     */
+    protected removeAllCustomizations = async (): Promise<void> => {
+        const dialog = new ConfirmDialog({
+            title: nls.localize('theia/ai/core/promptFragmentsConfiguration/resetAllCustomizationsDialogTitle', 'Reset All Customizations'),
+            msg: nls.localize('theia/ai/core/promptFragmentsConfiguration/resetAllCustomizationsDialogMsg',
+                'Are you sure you want to reset all prompt fragments to their built-in versions? This will remove all customizations.'),
+            ok: nls.localize('theia/ai/core/promptFragmentsConfiguration/resetAllButton', 'Reset All'),
+            cancel: nls.localizeByDefault('Cancel')
+        });
+
+        const shouldReset = await dialog.open();
+        if (shouldReset) {
+            this.promptService.resetAllToBuiltIn();
+        }
+    };
+
+    /**
+     * Main render method for the widget
+     * @returns Complete UI for the configuration widget
+     */
+    protected render(): React.ReactNode {
+        const nonSystemPromptFragments = this.getNonPromptVariantSetFragments();
+
+        return (
+            <div className='ai-prompt-fragments-configuration'>
+                <div className="prompt-fragments-header">
+                    <h2>{nls.localize('theia/ai/core/promptFragmentsConfiguration/headerTitle', 'Prompt Fragments')}</h2>
+                    <div className="global-actions">
+                        <button
+                            className="global-action-button"
+                            onClick={this.removeAllCustomizations}
+                            title={nls.localize('theia/ai/core/promptFragmentsConfiguration/resetAllCustomizationsTitle', 'Reset all customizations')}
+                        >
+                            {nls.localize('theia/ai/core/promptFragmentsConfiguration/resetAllPromptFragments',
+                                'Reset all prompt fragments')} <span className={codicon('clear-all')}></span>
+                        </button>
+                    </div>
+                </div>
+
+                <div className="prompt-variants-container">
+                    <h3 className="section-header">{nls.localize('theia/ai/core/promptFragmentsConfiguration/promptVariantsHeader', 'Prompt Variant Sets')}</h3>
+                    {Array.from(this.promptVariantsMap.entries()).map(([promptVariantSetId, variantIds]) =>
+                        this.renderPromptVariantSet(promptVariantSetId, variantIds)
+                    )}
+                </div>
+
+                {nonSystemPromptFragments.size > 0 && <div className="prompt-fragments-container">
+                    <h3 className="section-header">{nls.localize('theia/ai/core/promptFragmentsConfiguration/otherPromptFragmentsHeader', 'Other Prompt Fragments')}</h3>
+                    {Array.from(nonSystemPromptFragments.entries()).map(([promptFragmentId, fragments]) =>
+                        this.renderPromptFragment(promptFragmentId, fragments)
+                    )}
+                </div>}
+
+                {this.promptFragmentMap.size === 0 && (
+                    <div className="no-fragments">
+                        <p>{nls.localize('theia/ai/core/promptFragmentsConfiguration/noFragmentsAvailable', 'No prompt fragments available.')}</p>
+                    </div>
+                )}
+            </div>
+        );
+    }
+
+    /**
+     * Renders a prompt variant set with its variants
+     * @param promptVariantSetId ID of the prompt variant set
+     * @param variantIds Array of variant IDs
+     * @returns React node for the prompt variant set group
+     */
+    protected renderPromptVariantSet(promptVariantSetId: string, variantIds: string[]): React.ReactNode {
+        const isSectionExpanded = this.expandedPromptVariantSetIds.has(promptVariantSetId);
+
+        // Get selected, effective, and default variant IDs from our class properties
+        const selectedVariantId = this.userSelectedVariantIds.get(promptVariantSetId);
+        const effectiveVariantId = this.effectiveVariantIds.get(promptVariantSetId);
+        const defaultVariantId = this.defaultVariantIds.get(promptVariantSetId);
+
+        // Get variant fragments grouped by ID
+        const variantGroups = new Map<string, PromptFragment[]>();
+
+        // First, collect all actual fragments for each variant ID
+        for (const variantId of variantIds) {
+            if (this.promptFragmentMap.has(variantId)) {
+                variantGroups.set(variantId, this.promptFragmentMap.get(variantId)!);
+            }
+        }
+
+        const relatedAgents = this.getAgentsUsingPromptVariantId(promptVariantSetId);
+
+        // Determine warning/error state
+        let variantSetMessage: React.ReactNode | undefined = undefined;
+        if (effectiveVariantId === undefined) {
+            // Error: effectiveId is undefined, so nothing works
+            variantSetMessage = (
+                <div className="prompt-variant-error">
+                    <span className="codicon codicon-error"></span>
+                    {nls.localize('theia/ai/core/promptFragmentsConfiguration/variantSetError',
+                        'The selected variant does not exist and no default could be found. Please check your configuration.')}
+                </div>
+            );
+        } else {
+            const needsWarning = selectedVariantId ? effectiveVariantId !== selectedVariantId : effectiveVariantId !== defaultVariantId;
+            if (needsWarning) {
+                // Warning: selectedId is set but does not exist, so default is used
+                variantSetMessage = (
+                    <div className="prompt-variant-warning">
+                        <span className="codicon codicon-warning"></span>
+                        {nls.localize('theia/ai/core/promptFragmentsConfiguration/variantSetWarning',
+                            'The selected variant does not exist. The default variant is being used instead.')}
+                    </div>
+                );
+            }
+        }
+
+        return (
+            <div className="prompt-fragment-section" key={`variant-${promptVariantSetId}`}>
+                <div
+                    className={`prompt-fragment-header ${isSectionExpanded ? 'expanded' : ''}`}
+                    onClick={() => this.togglePromptVariantSetExpansion(promptVariantSetId)}
+                >
+                    <div className="prompt-fragment-title">
+                        <span className="expansion-icon">{isSectionExpanded ? '▼' : '▶'}</span>
+                        <h2>{promptVariantSetId}</h2>
+                    </div>
+                    {relatedAgents.length > 0 && (
+                        <div className="agent-chips-container">
+                            {relatedAgents.map(agent => (
+                                <span key={agent.id} className="agent-chip"
+                                    title={nls.localize('theia/ai/core/promptFragmentsConfiguration/usedByAgentTitle', 'Used by agent: {0}', agent.name)}
+                                    onClick={e => e.stopPropagation()}>
+                                    <span className={codicon('copilot')}></span>
+                                    {agent.name}
+                                </span>
+                            ))}
+                        </div>
+                    )}
+                </div>
+                {isSectionExpanded && (
+                    <div className="prompt-fragment-body">
+                        {variantSetMessage}
+                        <div className="prompt-fragment-description">
+                            <p>{nls.localize('theia/ai/core/promptFragmentsConfiguration/variantsOfSystemPrompt', 'Variants of this prompt variant set:')}</p>
+                        </div>
+                        {Array.from(variantGroups.entries()).map(([variantId, fragments]) => {
+                            const isVariantExpanded = this.expandedPromptFragmentIds.has(variantId);
+
+                            return (
+                                <div key={variantId} className={`prompt-fragment-section ${selectedVariantId === variantId ? 'selected-variant' : ''}`}>
+                                    <div
+                                        className={`prompt-fragment-header ${isVariantExpanded ? 'expanded' : ''}`}
+                                        onClick={() => this.togglePromptFragmentExpansion(variantId)}
+                                    >
+                                        <div className="prompt-fragment-title">
+                                            <span className="expansion-icon">{isVariantExpanded ? '▼' : '▶'}</span>
+                                            <h4>{variantId}</h4>
+                                            {defaultVariantId === variantId && (
+                                                <span className="badge default-variant"
+                                                    title={nls.localize('theia/ai/core/promptFragmentsConfiguration/defaultVariantTitle', 'Default variant')}>
+                                                    {nls.localizeByDefault('Default')}
+                                                </span>
+                                            )}
+                                            {selectedVariantId === variantId && (
+                                                <span className="selected-indicator"
+                                                    title={nls.localize('theia/ai/core/promptFragmentsConfiguration/selectedVariantTitle', 'Selected variant')}>
+                                                    {nls.localize('theia/ai/core/promptFragmentsConfiguration/selectedVariantLabel', 'Selected')}
+                                                </span>
+                                            )}
+                                        </div>
+                                    </div>
+                                    {isVariantExpanded && (
+                                        <div className='prompt-fragment-body'>
+                                            {fragments.map(fragment => this.renderPromptFragmentCustomization(fragment))}
+                                        </div>
+                                    )}
+                                </div>
+                            );
+                        })}
+                    </div>
+                )}
+            </div>
+        );
+    }
+
+    /**
+     * Gets fragments that aren't part of any prompt variant set
+     * @returns Map of fragment IDs to their customizations
+     */
+    protected getNonPromptVariantSetFragments(): Map<string, PromptFragment[]> {
+        const nonSystemPromptFragments = new Map<string, PromptFragment[]>();
+        const allVariantIds = new Set<string>();
+
+        // Collect all variant IDs from prompt variant sets
+        this.promptVariantsMap.forEach((variants, _) => {
+            variants.forEach(variantId => allVariantIds.add(variantId));
+        });
+
+        // Add prompt variant set main IDs
+        this.promptVariantsMap.forEach((_, promptVariantSetId) => {
+            allVariantIds.add(promptVariantSetId);
+        });
+
+        // Filter the fragment map to only include non-prompt variant set fragments
+        this.promptFragmentMap.forEach((fragments, promptFragmentId) => {
+            if (!allVariantIds.has(promptFragmentId)) {
+                nonSystemPromptFragments.set(promptFragmentId, fragments);
+            }
+        });
+
+        return nonSystemPromptFragments;
+    }
+
+    /**
+     * Renders a prompt fragment with all of its customizations
+     * @param promptFragmentId ID of the prompt fragment
+     * @param customizations Array of the customizations
+     * @returns React node for the prompt fragment
+     */
+    protected renderPromptFragment(promptFragmentId: string, customizations: PromptFragment[]): React.ReactNode {
+        const isSectionExpanded = this.expandedPromptFragmentIds.has(promptFragmentId);
+
+        return (
+            <div className={'prompt-fragment-group'} key={promptFragmentId}>
+                <div
+                    className={`prompt-fragment-header ${isSectionExpanded ? 'expanded' : ''}`}
+                    onClick={() => this.togglePromptFragmentExpansion(promptFragmentId)}
+                >
+                    <div className="prompt-fragment-title">
+                        <span className="expansion-icon">{isSectionExpanded ? '▼' : '▶'}</span>
+                        {promptFragmentId}
+                    </div>
+                </div>
+                {isSectionExpanded && (
+                    <div className="prompt-fragment-body">
+                        {customizations.map(fragment => this.renderPromptFragmentCustomization(fragment))}
+                    </div>
+                )}
+            </div>
+        );
+    }
+
+    /**
+     * Renders a single prompt fragment customization with its controls and content
+     * @param promptFragment The prompt fragment to render
+     * @returns React node for the prompt fragment
+     */
+    protected renderPromptFragmentCustomization(promptFragment: PromptFragment): React.ReactNode {
+        const isCustomized = isCustomizedPromptFragment(promptFragment);
+        const isActive = this.isActiveCustomization(promptFragment);
+        // Create a unique key for this fragment to track expansion state
+        const fragmentKey = `${promptFragment.id}_${isCustomized ? promptFragment.customizationId : 'built-in'}`;
+        const isTemplateExpanded = this.expandedPromptFragmentTemplates.has(fragmentKey);
+        const hasCustomizedBuiltIn =
+            this.promptFragmentMap.get(promptFragment.id)?.some(fragment => isCustomizedPromptFragment(fragment) && fragment.priority === CustomizationSource.CUSTOMIZED);
+
+        return (
+            <div
+                className={`prompt-customization ${isActive ? 'active-customization' : ''}`}
+                key={fragmentKey}
+            >
+                <div className="prompt-customization-header">
+                    <div className="prompt-customization-title">
+                        <React.Suspense fallback={<div>Loading...</div>}>
+                            <CustomizationTypeBadge promptFragment={promptFragment} promptService={this.promptService} />
+                        </React.Suspense>
+                        {isActive && (
+                            <span className="active-indicator"
+                                title={nls.localize('theia/ai/core/promptFragmentsConfiguration/activeCustomizationTitle', 'Active customization')}>
+                                {nls.localizeByDefault('Active')}
+                            </span>
+                        )}
+                    </div>
+                    <div className="prompt-customization-actions">
+                        {!isCustomized && !hasCustomizedBuiltIn && (
+                            <button
+                                className="template-action-button config-button"
+                                onClick={e => this.createPromptFragmentCustomization(promptFragment, e)}
+                                title={nls.localize('theia/ai/core/promptFragmentsConfiguration/createCustomizationTitle', 'Create Customization')}
+                            >
+                                <span className={codicon('add')}></span>
+                            </button>
+                        )}
+                        {isCustomized && (
+                            <button
+                                className="source-uri-button"
+                                onClick={e => this.editPromptCustomization(promptFragment, e)}
+                                title={nls.localize('theia/ai/core/promptFragmentsConfiguration/editTemplateTitle', 'Edit template')}
+                            >
+                                <span className={codicon('edit')}></span>
+                            </button>
+                        )}
+                        {!isActive && (
+                            <button
+                                className="template-action-button reset-button"
+                                onClick={e => this.resetToPromptFragment(promptFragment, e)}
+                                title={!isCustomized ?
+                                    nls.localize('theia/ai/core/promptFragmentsConfiguration/resetToBuiltInTitle', 'Reset to this built-in') :
+                                    nls.localize('theia/ai/core/promptFragmentsConfiguration/resetToCustomizationTitle', 'Reset to this customization')}
+                            >
+                                <span className={codicon('discard')}></span>
+                            </button>
+                        )}
+                        {isCustomized && (
+                            <button
+                                className="template-action-button delete-button"
+                                onClick={e => this.deletePromptFragmentCustomization(promptFragment, e)}
+                                title={nls.localize('theia/ai/core/promptFragmentsConfiguration/deleteCustomizationTitle', 'Delete Customization')}
+                            >
+                                <span className={codicon('trash')}></span>
+                            </button>
+                        )}
+                    </div>
+                </div>
+
+                {isCustomized && (
+                    <React.Suspense fallback={<div>Loading...</div>}>
+                        <DescriptionBadge promptFragment={promptFragment} promptService={this.promptService} />
+                    </React.Suspense>
+                )}
+
+                <div className="template-content-container">
+                    <div
+                        className="template-toggle-button"
+                        onClick={e => this.toggleTemplateExpansion(fragmentKey, e)}
+                    >
+                        <span className="template-expansion-icon">{isTemplateExpanded ? '▼' : '▶'}</span>
+                        <span>{nls.localize('theia/ai/core/promptFragmentsConfiguration/promptTemplateText', 'Prompt Template Text')}</span>
+                    </div>
+
+                    {isTemplateExpanded && (
+                        <div className="template-content">
+                            <pre>{promptFragment.template}</pre>
+                        </div>
+                    )}
+                </div>
+            </div>
+        );
+    }
+}
+
+/**
+ * Props for the CustomizationTypeBadge component
+ */
+interface CustomizationTypeBadgeProps {
+    promptFragment: PromptFragment;
+    promptService: PromptService;
+}
+
+/**
+ * Displays a badge indicating the type of a prompt fragment customization (built-in, user, workspace)
+ */
+const CustomizationTypeBadge: React.FC<CustomizationTypeBadgeProps> = ({ promptFragment, promptService }) => {
+    const [typeLabel, setTypeLabel] = React.useState<string>('unknown');
+
+    React.useEffect(() => {
+        const fetchCustomizationType = async () => {
+            if (isCustomizedPromptFragment(promptFragment)) {
+                const customizationType = await promptService.getCustomizationType(promptFragment.id, promptFragment.customizationId);
+                setTypeLabel(`${customizationType ?
+                    customizationType + ' ' + nls.localize('theia/ai/core/promptFragmentsConfiguration/customization', 'customization')
+                    : nls.localize('theia/ai/core/promptFragmentsConfiguration/customizationLabel', 'Customization')}`);
+            } else {
+                setTypeLabel(nls.localizeByDefault('Built-in'));
+            }
+        };
+
+        fetchCustomizationType();
+    }, [promptFragment, promptService]);
+
+    return <span>{typeLabel}</span>;
+};
+
+/**
+ * Props for the DescriptionBadge component
+ */
+interface CustomizationDescriptionBadgeProps {
+    promptFragment: CustomizedPromptFragment;
+    promptService: PromptService;
+}
+
+/**
+ * Displays the description of a customized prompt fragment if available
+ */
+const DescriptionBadge: React.FC<CustomizationDescriptionBadgeProps> = ({ promptFragment, promptService }) => {
+    const [description, setDescription] = React.useState<string>('');
+
+    React.useEffect(() => {
+        const fetchDescription = async () => {
+            const customizationDescription = await promptService.getCustomizationDescription(
+                promptFragment.id,
+                promptFragment.customizationId
+            );
+            setDescription(customizationDescription || '');
+        };
+
+        fetchDescription();
+    }, [promptFragment.id, promptFragment.customizationId, promptService]);
+
+    return <span className="prompt-customization-description">{description}</span>;
+};

packages/ai-ide/src/browser/ai-configuration/skills-configuration-widget.spec.ts

@@ -0,0 +1,153 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+FrontendApplicationConfigProvider.set({});
+
+import { expect } from 'chai';
+import * as React from '@theia/core/shared/react';
+import * as ReactDOM from '@theia/core/shared/react-dom';
+
+import { Emitter, URI } from '@theia/core';
+
+import { OpenHandler, OpenerService } from '@theia/core/lib/browser';
+import { Skill } from '@theia/ai-core/lib/common/skill';
+import { SkillService } from '@theia/ai-core/lib/browser/skill-service';
+
+import { AISkillsConfigurationWidget } from './skills-configuration-widget';
+
+disableJSDOM();
+
+describe('AISkillsConfigurationWidget', () => {
+    let host: HTMLElement;
+
+    before(() => {
+        disableJSDOM = enableJSDOM();
+    });
+
+    after(() => {
+        disableJSDOM();
+    });
+
+    beforeEach(() => {
+        host = document.createElement('div');
+        document.body.appendChild(host);
+    });
+
+    afterEach(() => {
+        ReactDOM.unmountComponentAtNode(host);
+        host.remove();
+    });
+
+    function renderWidget(widget: AISkillsConfigurationWidget): void {
+        const element = (widget as unknown as { render: () => React.ReactNode }).render();
+        ReactDOM.render(element as React.ReactElement, host);
+    }
+
+    it('renders empty state when SkillService.getSkills() returns []', () => {
+        const widget = new AISkillsConfigurationWidget();
+
+        const onSkillsChangedEmitter = new Emitter<void>();
+        const skillService: Partial<SkillService> = {
+            getSkills: () => [],
+            onSkillsChanged: onSkillsChangedEmitter.event
+        };
+        (widget as unknown as { skillService: SkillService }).skillService = skillService as SkillService;
+
+        (widget as unknown as { openerService: OpenerService }).openerService = {} as OpenerService;
+
+        (widget as unknown as { init: () => void }).init();
+        renderWidget(widget);
+
+        expect(host.querySelectorAll('tbody tr').length).to.equal(0);
+    });
+
+    it('renders multiple skills with correct name/description/location', () => {
+        const widget = new AISkillsConfigurationWidget();
+
+        const skills: Skill[] = [
+            { name: 'Skill A', description: 'Desc A', location: '/path/a' } as Skill,
+            { name: 'Skill B', description: 'Desc B', location: '/path/b' } as Skill
+        ];
+
+        const onSkillsChangedEmitter = new Emitter<void>();
+        const skillService: Partial<SkillService> = {
+            getSkills: () => skills,
+            onSkillsChanged: onSkillsChangedEmitter.event
+        };
+        (widget as unknown as { skillService: SkillService }).skillService = skillService as SkillService;
+
+        (widget as unknown as { openerService: OpenerService }).openerService = {} as OpenerService;
+
+        (widget as unknown as { init: () => void }).init();
+        renderWidget(widget);
+
+        const rows = Array.from(host.querySelectorAll('tbody tr'));
+        expect(rows.length).to.equal(2);
+
+        expect(rows[0].querySelector('.skill-name-column')?.textContent).to.contain('Skill A');
+        expect(rows[0].querySelector('.skill-description-column')?.textContent).to.contain('Desc A');
+        expect(rows[0].querySelector('.skill-location-column')?.textContent).to.contain('/path/a');
+
+        expect(rows[1].querySelector('.skill-name-column')?.textContent).to.contain('Skill B');
+        expect(rows[1].querySelector('.skill-description-column')?.textContent).to.contain('Desc B');
+        expect(rows[1].querySelector('.skill-location-column')?.textContent).to.contain('/path/b');
+    });
+
+    it('clicking "Open" calls opener with URI.fromFilePath(skill.location)', async () => {
+        const widget = new AISkillsConfigurationWidget();
+
+        const skills: Skill[] = [
+            { name: 'Skill A', description: 'Desc A', location: '/path/a' } as Skill
+        ];
+
+        const onSkillsChangedEmitter = new Emitter<void>();
+        const skillService: Partial<SkillService> = {
+            getSkills: () => skills,
+            onSkillsChanged: onSkillsChangedEmitter.event
+        };
+        (widget as unknown as { skillService: SkillService }).skillService = skillService as SkillService;
+
+        let openedUri: URI | undefined;
+        const opener: OpenHandler = {
+            id: 'test-opener',
+            canHandle: async () => 1,
+            open: async (uri: URI) => { openedUri = uri; }
+        };
+        const openerService: Partial<OpenerService> = {
+            getOpener: async () => opener,
+            // The widget calls `open(openerService, uri)` which internally uses `getOpener`.
+            // Provide `getOpeners` as well in case other code paths expect it.
+            getOpeners: async () => [opener]
+        };
+        (widget as unknown as { openerService: OpenerService }).openerService = openerService as OpenerService;
+
+        (widget as unknown as { init: () => void }).init();
+        renderWidget(widget);
+
+        const button = host.querySelector('button[title="Open"]');
+        expect(button).not.to.equal(undefined);
+
+        (button as HTMLButtonElement).click();
+
+        await Promise.resolve();
+
+        expect(openedUri?.toString()).to.equal(URI.fromFilePath('/path/a').toString());
+    });
+});

packages/ai-ide/src/browser/ai-configuration/skills-configuration-widget.tsx

@@ -0,0 +1,97 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 { nls, URI } from '@theia/core';
+import { OpenerService, open } from '@theia/core/lib/browser';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+import { Skill } from '@theia/ai-core/lib/common/skill';
+import { SkillService } from '@theia/ai-core/lib/browser/skill-service';
+import { AITableConfigurationWidget, TableColumn } from './base/ai-table-configuration-widget';
+
+@injectable()
+export class AISkillsConfigurationWidget extends AITableConfigurationWidget<Skill> {
+    static readonly ID = 'ai-skills-configuration-widget';
+    static readonly LABEL = nls.localize('theia/ai/ide/skillsConfiguration/label', 'Skills');
+
+    @inject(SkillService)
+    protected readonly skillService: SkillService;
+
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = AISkillsConfigurationWidget.ID;
+        this.title.label = AISkillsConfigurationWidget.LABEL;
+        this.title.closable = false;
+        this.addClass('ai-configuration-widget');
+
+        this.loadItems().then(() => this.update());
+        this.toDispose.push(this.skillService.onSkillsChanged(() => {
+            this.loadItems().then(() => this.update());
+        }));
+    }
+
+    protected async loadItems(): Promise<void> {
+        this.items = this.skillService.getSkills();
+    }
+
+    protected getItemId(item: Skill): string {
+        return item.name;
+    }
+
+    protected getColumns(): TableColumn<Skill>[] {
+        return [
+            {
+                id: 'skill-name',
+                label: nls.localizeByDefault('Name'),
+                className: 'skill-name-column',
+                renderCell: (item: Skill) => <span>{item.name}</span>
+            },
+            {
+                id: 'skill-description',
+                label: nls.localizeByDefault('Description'),
+                className: 'skill-description-column',
+                renderCell: (item: Skill) => <span>{item.description}</span>
+            },
+            {
+                id: 'skill-location',
+                label: nls.localize('theia/ai/ide/skillsConfiguration/location/label', 'Location'),
+                className: 'skill-location-column',
+                renderCell: (item: Skill) => <span>{item.location}</span>
+            },
+            {
+                id: 'skill-open',
+                label: '',
+                className: 'skill-open-column',
+                renderCell: (item: Skill) => (
+                    <button
+                        className="theia-button secondary"
+                        onClick={() => this.openSkill(item)}
+                        title={nls.localizeByDefault('Open')}
+                    >
+                        {nls.localizeByDefault('Open')}
+                    </button>
+                )
+            }
+        ];
+    }
+
+    protected openSkill(skill: Skill): void {
+        open(this.openerService, URI.fromFilePath(skill.location));
+    }
+}

packages/ai-ide/src/browser/ai-configuration/template-settings-renderer.tsx

@@ -0,0 +1,125 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { isCustomizedPromptFragment, PromptService, PromptVariantSet } from '@theia/ai-core/lib/common';
+import * as React from '@theia/core/shared/react';
+import { nls } from '@theia/core/lib/common/nls';
+
+export interface PromptVariantRendererProps {
+    agentId: string;
+    promptVariantSet: PromptVariantSet;
+    promptService: PromptService;
+}
+
+export const PromptVariantRenderer: React.FC<PromptVariantRendererProps> = ({
+    agentId,
+    promptVariantSet,
+    promptService,
+}) => {
+    const variantIds = promptService.getVariantIds(promptVariantSet.id);
+    const defaultVariantId = promptService.getDefaultVariantId(promptVariantSet.id);
+    const [selectedVariant, setSelectedVariant] = React.useState<string>(defaultVariantId!);
+
+    const isVariantCustomized = (variantId: string): boolean => {
+        const fragment = promptService.getRawPromptFragment(variantId);
+        return fragment ? isCustomizedPromptFragment(fragment) : false;
+    };
+
+    React.useEffect(() => {
+        const currentVariant = promptService.getSelectedVariantId(promptVariantSet.id);
+        setSelectedVariant(currentVariant ?? defaultVariantId!);
+
+        const disposable = promptService.onSelectedVariantChange(notification => {
+            if (notification.promptVariantSetId === promptVariantSet.id) {
+                setSelectedVariant(notification.variantId ?? defaultVariantId!);
+            }
+        });
+        return () => {
+            disposable.dispose();
+        };
+    }, [promptVariantSet.id, promptService, defaultVariantId]);
+
+    const isInvalidVariant = !variantIds.includes(selectedVariant);
+
+    const handleVariantChange = async (event: React.ChangeEvent<HTMLSelectElement>) => {
+        const newVariant = event.target.value;
+        setSelectedVariant(newVariant);
+        promptService.updateSelectedVariantId(agentId, promptVariantSet.id, newVariant);
+    };
+
+    const openTemplate = () => {
+        promptService.editBuiltInCustomization(selectedVariant);
+    };
+
+    const resetTemplate = () => {
+        promptService.resetToBuiltIn(selectedVariant);
+    };
+
+    return (
+        <>
+            <tr>
+                <td className="template-name-cell">{promptVariantSet.id}</td>
+                <td className="template-variant-cell">
+                    {(variantIds.length > 1 || isInvalidVariant) && (
+                        <select
+                            id={`variant-selector-${promptVariantSet.id}`}
+                            className={`theia-select template-variant-selector ${isInvalidVariant ? 'error' : ''}`}
+                            value={isInvalidVariant ? 'invalid' : selectedVariant}
+                            onChange={handleVariantChange}
+                        >
+                            {isInvalidVariant && (
+                                <option value="invalid" disabled>
+                                    {nls.localize('theia/ai/core/templateSettings/unavailableVariant', 'Unavailable')}
+                                </option>
+                            )}
+                            {variantIds.map(variantId => {
+                                const isEdited = isVariantCustomized(variantId);
+                                const editedPrefix = isEdited ? `[${nls.localize('theia/ai/core/templateSettings/edited', 'edited')}] ` : '';
+                                const defaultSuffix = variantId === defaultVariantId ? ' ' + nls.localizeByDefault('(default)') : '';
+                                return (
+                                    <option key={variantId} value={variantId}>
+                                        {editedPrefix}{variantId}{defaultSuffix}
+                                    </option>
+                                );
+                            })}
+                        </select>
+                    )}
+                    {variantIds.length === 1 && !isInvalidVariant && (
+                        <span>
+                            {isVariantCustomized(selectedVariant)
+                                ? `[${nls.localize('theia/ai/core/templateSettings/edited', 'edited')}] ${selectedVariant}`
+                                : selectedVariant}
+                        </span>
+                    )}
+                </td>
+                <td className="template-actions-cell">
+                    <button
+                        className="template-action-icon-button codicon codicon-edit"
+                        onClick={openTemplate}
+                        disabled={isInvalidVariant}
+                        title={nls.localizeByDefault('Edit')}
+                    />
+                    {isVariantCustomized(selectedVariant) &&
+                        (<button
+                            className="template-action-icon-button codicon codicon-discard"
+                            onClick={resetTemplate}
+                            disabled={isInvalidVariant || !isVariantCustomized(selectedVariant)}
+                            title={nls.localizeByDefault('Reset')}
+                        />)}
+                </td>
+            </tr>
+        </>
+    );
+};

packages/ai-ide/src/browser/ai-configuration/token-usage-configuration-widget.tsx

@@ -0,0 +1,214 @@
+// *****************************************************************************
+// 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 { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+import { MessageService, nls } from '@theia/core';
+import { TokenUsageFrontendService, ModelTokenUsageData } from '@theia/ai-core/lib/browser/token-usage-frontend-service';
+import { formatDistanceToNow } from 'date-fns';
+import { AITableConfigurationWidget, TableColumn } from './base/ai-table-configuration-widget';
+
+@injectable()
+export class AITokenUsageConfigurationWidget extends AITableConfigurationWidget<ModelTokenUsageData> {
+
+    static readonly ID = 'ai-token-usage-configuration-container-widget';
+    static readonly LABEL = nls.localize('theia/ai/tokenUsage/label', 'Token Usage');
+
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
+
+    @inject(TokenUsageFrontendService)
+    protected readonly tokenUsageService: TokenUsageFrontendService;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = AITokenUsageConfigurationWidget.ID;
+        this.title.label = AITokenUsageConfigurationWidget.LABEL;
+        this.title.closable = false;
+        this.addClass('ai-configuration-widget');
+
+        this.loadItems().then(() => this.update());
+
+        this.toDispose.push(
+            this.tokenUsageService.onTokenUsageUpdated(data => {
+                this.items = data;
+                this.update();
+            })
+        );
+    }
+
+    protected async loadItems(): Promise<void> {
+        try {
+            this.items = await this.tokenUsageService.getTokenUsageData();
+        } catch (error) {
+            this.messageService.error(nls.localize('theia/ai/tokenUsage/failedToGetTokenUsageData', 'Failed to fetch token usage data: {0}', error));
+        }
+    }
+
+    protected getItemId(item: ModelTokenUsageData): string {
+        return item.modelId;
+    }
+
+    protected formatNumber(num: number): string {
+        return num.toLocaleString();
+    }
+
+    protected formatDate(date?: Date): string {
+        if (!date) {
+            return nls.localizeByDefault('Never');
+        }
+        return formatDistanceToNow(date, { addSuffix: true });
+    }
+
+    protected hasCacheData(): boolean {
+        return this.items.some(model =>
+            model.cachedInputTokens !== undefined ||
+            model.readCachedInputTokens !== undefined
+        );
+    }
+
+    protected getColumns(): TableColumn<ModelTokenUsageData>[] {
+        const showCacheColumns = this.hasCacheData();
+        const columns: TableColumn<ModelTokenUsageData>[] = [
+            {
+                id: 'model',
+                label: nls.localize('theia/ai/tokenUsage/model', 'Model'),
+                className: 'token-usage-model-column',
+                renderCell: item => <span>{item.modelId}</span>
+            },
+            {
+                id: 'input-tokens',
+                label: nls.localize('theia/ai/tokenUsage/inputTokens', 'Input Tokens'),
+                className: 'token-usage-column',
+                renderCell: item => <span>{this.formatNumber(item.inputTokens)}</span>
+            }
+        ];
+
+        if (showCacheColumns) {
+            columns.push(
+                {
+                    id: 'cached-input-tokens',
+                    label: nls.localize('theia/ai/tokenUsage/cachedInputTokens', 'Input Tokens Written to Cache'),
+                    className: 'token-usage-column',
+                    renderCell: item => (
+                        <span title={nls.localize(
+                            'theia/ai/tokenUsage/cachedInputTokensTooltip',
+                            "Tracked additionally to 'Input Tokens'. Usually more expensive than non-cached tokens."
+                        )}>
+                            {item.cachedInputTokens !== undefined ? this.formatNumber(item.cachedInputTokens) : '-'}
+                        </span>
+                    )
+                },
+                {
+                    id: 'read-cached-input-tokens',
+                    label: nls.localize('theia/ai/tokenUsage/readCachedInputTokens', 'Input Tokens Read From Cache'),
+                    className: 'token-usage-column',
+                    renderCell: item => (
+                        <span title={nls.localize(
+                            'theia/ai/tokenUsage/readCachedInputTokensTooltip',
+                            "Tracked additionally to 'Input Token'. Usually much less expensive than not cached. Usually does not count to rate limits."
+                        )}>
+                            {item.readCachedInputTokens !== undefined ? this.formatNumber(item.readCachedInputTokens) : '-'}
+                        </span>
+                    )
+                }
+            );
+        }
+
+        columns.push(
+            {
+                id: 'output-tokens',
+                label: nls.localize('theia/ai/tokenUsage/outputTokens', 'Output Tokens'),
+                className: 'token-usage-column',
+                renderCell: item => <span>{this.formatNumber(item.outputTokens)}</span>
+            },
+            {
+                id: 'total-tokens',
+                label: nls.localize('theia/ai/tokenUsage/totalTokens', 'Total Tokens'),
+                className: 'token-usage-column',
+                renderCell: item => {
+                    const totalTokens = item.inputTokens + item.outputTokens + (item.cachedInputTokens ?? 0);
+                    return (
+                        <span title={nls.localize('theia/ai/tokenUsage/totalTokensTooltip', "'Input Tokens' + 'Output Tokens'")}>
+                            {this.formatNumber(totalTokens)}
+                        </span>
+                    );
+                }
+            },
+            {
+                id: 'last-used',
+                label: nls.localize('theia/ai/tokenUsage/lastUsed', 'Last Used'),
+                className: 'token-usage-column',
+                renderCell: item => {
+                    const lastUsedDate = item.lastUsed ? new Date(item.lastUsed) : undefined;
+                    const exactDateString = lastUsedDate ? lastUsedDate.toLocaleString() : '';
+                    return <span title={exactDateString}>{this.formatDate(lastUsedDate)}</span>;
+                }
+            }
+        );
+
+        return columns;
+    }
+
+    protected override renderHeader(): React.ReactNode {
+        return undefined;
+    }
+
+    protected override renderFooter(): React.ReactNode {
+        if (this.items.length === 0) {
+            return (
+                <div className="ai-empty-state-content">
+                    <p>{nls.localize('theia/ai/tokenUsage/noData', 'No token usage data available yet.')}</p>
+                </div>
+            );
+        }
+
+        const showCacheColumns = this.hasCacheData();
+        const totalInputTokens = this.items.reduce((sum, model) => sum + model.inputTokens, 0);
+        const totalOutputTokens = this.items.reduce((sum, model) => sum + model.outputTokens, 0);
+        const totalCachedInputTokens = this.items.reduce((sum, model) => sum + (model.cachedInputTokens || 0), 0);
+        const totalReadCachedInputTokens = this.items.reduce((sum, model) => sum + (model.readCachedInputTokens || 0), 0);
+        const totalTokens = totalInputTokens + totalCachedInputTokens + totalOutputTokens;
+
+        return (
+            <div className="ai-configuration-footer-total">
+                <table className="ai-configuration-table">
+                    <tfoot>
+                        <tr className="ai-configuration-footer-total-row">
+                            <td className="token-usage-model-column">{nls.localize('theia/ai/tokenUsage/total', 'Total')}</td>
+                            <td className="token-usage-column">{this.formatNumber(totalInputTokens)}</td>
+                            {showCacheColumns && (
+                                <>
+                                    <td className="token-usage-column">{this.formatNumber(totalCachedInputTokens)}</td>
+                                    <td className="token-usage-column">{this.formatNumber(totalReadCachedInputTokens)}</td>
+                                </>
+                            )}
+                            <td className="token-usage-column">{this.formatNumber(totalOutputTokens)}</td>
+                            <td className="token-usage-column">{this.formatNumber(totalTokens)}</td>
+                            <td className="token-usage-column"></td>
+                        </tr>
+                    </tfoot>
+                </table>
+                <div className="ai-configuration-info-box">
+                    <p className="ai-configuration-info-text">
+                        <i className="codicon codicon-info ai-configuration-info-icon"></i>
+                        {nls.localize('theia/ai/tokenUsage/note', 'Token usage is tracked since the start of the application and is not persisted.')}
+                    </p>
+                </div>
+            </div>
+        );
+    }
+}

packages/ai-ide/src/browser/ai-configuration/tools-configuration-widget.tsx

@@ -0,0 +1,240 @@
+// *****************************************************************************
+// 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 { ConfirmDialog } from '@theia/core/lib/browser';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+import { ToolInvocationRegistry, ToolRequest } from '@theia/ai-core';
+import { nls, PreferenceService } from '@theia/core';
+import { ToolConfirmationManager } from '@theia/ai-chat/lib/browser/chat-tool-preference-bindings';
+import { ToolConfirmationMode } from '@theia/ai-chat/lib/common/chat-tool-preferences';
+import { AITableConfigurationWidget, TableColumn } from './base/ai-table-configuration-widget';
+
+const TOOL_OPTIONS: { value: ToolConfirmationMode, label: string, icon: string }[] = [
+    { value: ToolConfirmationMode.DISABLED, label: nls.localizeByDefault('Disabled'), icon: 'close' },
+    { value: ToolConfirmationMode.CONFIRM, label: nls.localize('theia/ai/ide/toolsConfiguration/toolOptions/confirm/label', 'Confirm'), icon: 'question' },
+    { value: ToolConfirmationMode.ALWAYS_ALLOW, label: nls.localizeByDefault('Always Allow'), icon: 'thumbsup' },
+];
+
+interface ToolItem {
+    name: string;
+}
+
+@injectable()
+export class AIToolsConfigurationWidget extends AITableConfigurationWidget<ToolItem> {
+    static readonly ID = 'ai-tools-configuration-widget';
+    static readonly LABEL = nls.localizeByDefault('Tools');
+
+    @inject(ToolConfirmationManager)
+    protected readonly confirmationManager: ToolConfirmationManager;
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    @inject(ToolInvocationRegistry)
+    protected readonly toolInvocationRegistry: ToolInvocationRegistry;
+
+    protected toolConfirmationModes: Record<string, ToolConfirmationMode> = {};
+    protected defaultState: ToolConfirmationMode;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = AIToolsConfigurationWidget.ID;
+        this.title.label = AIToolsConfigurationWidget.LABEL;
+        this.title.closable = false;
+        this.addClass('ai-configuration-widget');
+
+        this.loadData().then(() => this.update());
+        this.toDispose.pushAll([
+            this.preferenceService.onPreferenceChanged(async e => {
+                if (e.preferenceName === 'ai-features.chat.toolConfirmation') {
+                    this.defaultState = await this.loadDefaultConfirmation();
+                    this.toolConfirmationModes = await this.loadToolConfigurationModes();
+                    this.update();
+                }
+            }),
+            this.toolInvocationRegistry.onDidChange(async () => {
+                await this.loadItems();
+                this.update();
+            })
+        ]);
+    }
+
+    protected async loadData(): Promise<void> {
+        await this.loadItems();
+        this.defaultState = await this.loadDefaultConfirmation();
+        this.toolConfirmationModes = await this.loadToolConfigurationModes();
+    }
+
+    protected async loadItems(): Promise<void> {
+        const toolNames = this.toolInvocationRegistry.getAllFunctions().map(func => func.name);
+        this.items = toolNames.map(name => ({ name }));
+    }
+
+    protected getItemId(item: ToolItem): string {
+        return item.name;
+    }
+    protected async loadDefaultConfirmation(): Promise<ToolConfirmationMode> {
+        return this.confirmationManager.getConfirmationMode('*', 'doesNotMatter');
+    }
+    protected async loadToolConfigurationModes(): Promise<Record<string, ToolConfirmationMode>> {
+        return this.confirmationManager.getAllConfirmationSettings();
+    }
+    protected async updateToolConfirmationMode(tool: string, state: ToolConfirmationMode, toolRequest?: ToolRequest): Promise<void> {
+        await this.confirmationManager.setConfirmationMode(tool, state, toolRequest);
+    }
+    protected async updateDefaultConfirmation(state: ToolConfirmationMode): Promise<void> {
+        await this.confirmationManager.setConfirmationMode('*', state);
+    }
+
+    protected handleToolConfirmationModeChange = async (toolName: string, event: React.ChangeEvent<HTMLSelectElement>): Promise<void> => {
+        const newState = event.target.value as ToolConfirmationMode;
+        const toolRequest = this.toolInvocationRegistry.getFunction(toolName);
+
+        // Check if we need extra confirmation for ALWAYS_ALLOW on confirmAlwaysAllow tools
+        if (newState === ToolConfirmationMode.ALWAYS_ALLOW) {
+            if (toolRequest?.confirmAlwaysAllow) {
+                const confirmed = await this.showConfirmAlwaysAllowDialog(toolName, toolRequest);
+                if (!confirmed) {
+                    // Revert selection by triggering a re-render
+                    this.update();
+                    return;
+                }
+            }
+        }
+
+        await this.updateToolConfirmationMode(toolName, newState, toolRequest);
+        // Reload from preferences to ensure consistency (setConfirmationMode may remove entries that match default)
+        this.toolConfirmationModes = await this.loadToolConfigurationModes();
+        this.update();
+    };
+
+    protected async showConfirmAlwaysAllowDialog(toolName: string, toolRequest: ToolRequest): Promise<boolean> {
+        const warningMessage = typeof toolRequest.confirmAlwaysAllow === 'string'
+            ? toolRequest.confirmAlwaysAllow
+            : nls.localize(
+                'theia/ai/ide/toolsConfiguration/confirmAlwaysAllow/genericWarning',
+                'This tool requires confirmation before auto-approval can be enabled. ' +
+                'Once enabled, all future invocations will execute without confirmation. ' +
+                'Only enable this if you trust this tool and understand the potential risks.'
+            );
+
+        const dialog = new ConfirmDialog({
+            title: nls.localize('theia/ai/ide/toolsConfiguration/confirmAlwaysAllow/title', 'Enable Auto-Approval for "{0}"?', toolName),
+            msg: warningMessage,
+            ok: nls.localize('theia/ai/ide/toolsConfiguration/confirmAlwaysAllow/confirm', 'I understand, enable auto-approval'),
+            cancel: nls.localizeByDefault('Cancel')
+        });
+        return !!await dialog.open();
+    }
+    protected handleDefaultStateChange = async (event: React.ChangeEvent<HTMLSelectElement>) => {
+        const newState = event.target.value as ToolConfirmationMode;
+        await this.updateDefaultConfirmation(newState);
+    };
+
+    protected async resetAllToolsToDefault(): Promise<void> {
+        const dialog = new ConfirmDialog({
+            title: nls.localize('theia/ai/ide/toolsConfiguration/resetAllConfirmDialog/title', 'Reset All Tool Confirmation Modes'),
+            msg: nls.localize('theia/ai/ide/toolsConfiguration/resetAllConfirmDialog/msg',
+                'Are you sure you want to reset all tool confirmation modes to the default? This will remove all custom settings.'),
+            ok: nls.localize('theia/ai/ide/toolsConfiguration/resetAll', 'Reset All'),
+            cancel: nls.localizeByDefault('Cancel')
+        });
+        const shouldReset = await dialog.open();
+        if (shouldReset) {
+            this.confirmationManager.resetAllConfirmationModeSettings();
+        }
+    }
+
+    protected override renderHeader(): React.ReactNode {
+        return (
+            <div className="ai-tools-configuration-header">
+                <div style={{ fontWeight: 500 }}>
+                    {nls.localize('theia/ai/ide/toolsConfiguration/default/label', 'Default Tool Confirmation Mode:')}
+                </div>
+                <select
+                    className="theia-select"
+                    value={this.defaultState}
+                    onChange={this.handleDefaultStateChange}
+                >
+                    {TOOL_OPTIONS.map(opt => (
+                        <option key={opt.value} value={opt.value}>{opt.label}</option>
+                    ))}
+                </select>
+                <button
+                    className='theia-button secondary ai-tools-reset-button'
+                    style={{ marginLeft: 'auto' }}
+                    title={nls.localize('theia/ai/ide/toolsConfiguration/resetAllTooltip', 'Reset all tools to default')}
+                    onClick={() => this.resetAllToolsToDefault()}
+                >
+                    {nls.localize('theia/ai/ide/toolsConfiguration/resetAll', 'Reset All')}
+                </button>
+            </div>
+        );
+    }
+
+    protected getEffectiveState(toolName: string): ToolConfirmationMode {
+        // If there's an explicit setting for this tool, use it
+        const explicitSetting = this.toolConfirmationModes[toolName];
+        if (explicitSetting !== undefined) {
+            return explicitSetting;
+        }
+        // Otherwise, apply confirmAlwaysAllow logic to the default
+        const toolRequest = this.toolInvocationRegistry.getFunction(toolName);
+        if (toolRequest?.confirmAlwaysAllow && this.defaultState === ToolConfirmationMode.ALWAYS_ALLOW) {
+            return ToolConfirmationMode.CONFIRM;
+        }
+        return this.defaultState;
+    }
+
+    protected getColumns(): TableColumn<ToolItem>[] {
+        return [
+            {
+                id: 'tool-name',
+                label: nls.localizeByDefault('Tool'),
+                className: 'tool-name-column',
+                renderCell: (item: ToolItem) => <span>{item.name}</span>
+            },
+            {
+                id: 'confirmation-mode',
+                label: nls.localize('theia/ai/ide/toolsConfiguration/confirmationMode/label', 'Confirmation Mode'),
+                className: 'confirmation-mode-column',
+                renderCell: (item: ToolItem) => {
+                    const effectiveState = this.getEffectiveState(item.name);
+                    return (
+                        <select
+                            className="theia-select"
+                            value={effectiveState}
+                            onChange={e => this.handleToolConfirmationModeChange(item.name, e)}
+                        >
+                            {TOOL_OPTIONS.map(opt => (
+                                <option key={opt.value} value={opt.value}>
+                                    {opt.label}
+                                </option>
+                            ))}
+                        </select>
+                    );
+                }
+            }
+        ];
+    }
+
+    protected override getRowClassName(item: ToolItem): string {
+        const effectiveState = this.getEffectiveState(item.name);
+        const isDefault = effectiveState === this.defaultState;
+        return isDefault ? 'default-mode' : 'custom-mode';
+    }
+}

packages/ai-ide/src/browser/ai-configuration/variable-configuration-widget.tsx

@@ -0,0 +1,159 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { Agent, AgentService, AIVariable, AIVariableService } from '@theia/ai-core/lib/common';
+import { codicon } from '@theia/core/lib/browser';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+import { AIAgentConfigurationWidget } from './agent-configuration-widget';
+import { AIConfigurationSelectionService } from './ai-configuration-service';
+import { nls } from '@theia/core';
+import { AIListDetailConfigurationWidget } from './base/ai-list-detail-configuration-widget';
+
+@injectable()
+export class AIVariableConfigurationWidget extends AIListDetailConfigurationWidget<AIVariable> {
+
+    static readonly ID = 'ai-variable-configuration-container-widget';
+    static readonly LABEL = nls.localizeByDefault('Variables');
+
+    @inject(AIVariableService)
+    protected readonly variableService: AIVariableService;
+
+    @inject(AgentService)
+    protected readonly agentService: AgentService;
+
+    @inject(AIConfigurationSelectionService)
+    protected readonly aiConfigurationSelectionService: AIConfigurationSelectionService;
+
+    @postConstruct()
+    protected init(): void {
+        this.id = AIVariableConfigurationWidget.ID;
+        this.title.label = AIVariableConfigurationWidget.LABEL;
+        this.title.closable = false;
+        this.addClass('ai-configuration-widget');
+
+        this.loadItems().then(() => this.update());
+        this.toDispose.push(this.variableService.onDidChangeVariables(async () => {
+            await this.loadItems();
+            this.update();
+        }));
+    }
+
+    protected async loadItems(): Promise<void> {
+        this.items = this.variableService.getVariables();
+        if (this.items.length > 0 && !this.selectedItem) {
+            this.selectedItem = this.items[0];
+        }
+    }
+
+    protected getItemId(variable: AIVariable): string {
+        return variable.id;
+    }
+
+    protected getItemLabel(variable: AIVariable): string {
+        return variable.name;
+    }
+
+    protected override getEmptySelectionMessage(): string {
+        return nls.localize('theia/ai/ide/variableConfiguration/selectVariable', 'Please select a Variable.');
+    }
+
+    protected renderItemDetail(variable: AIVariable): React.ReactNode {
+        return (
+            <div>
+                <div className="settings-section-title settings-section-category-title">
+                    {variable.name}
+                    <pre className='ai-id-label'>Id: {variable.id}</pre>
+                </div>
+
+                {variable.description && (
+                    <div style={{
+                        marginBottom: 'calc(var(--theia-ui-padding) * 2)',
+                        color: 'var(--theia-descriptionForeground)',
+                        lineHeight: '1.5'
+                    }}>
+                        {variable.description}
+                    </div>
+                )}
+
+                {this.renderArgs(variable)}
+                {this.renderReferencedVariables(variable)}
+            </div>
+        );
+    }
+
+    protected renderArgs(variable: AIVariable): React.ReactNode | undefined {
+        if (variable.args === undefined || variable.args.length === 0) {
+            return undefined;
+        }
+
+        return (
+            <>
+                <div className="settings-section-subcategory-title">
+                    {nls.localize('theia/ai/ide/variableConfiguration/variableArgs', 'Arguments')}
+                </div>
+                <div style={{
+                    display: 'grid',
+                    gridTemplateColumns: 'auto 1fr',
+                    gap: 'calc(var(--theia-ui-padding) / 2) var(--theia-ui-padding)',
+                    alignItems: 'start',
+                    marginBottom: 'calc(var(--theia-ui-padding) * 2)'
+                }}>
+                    {variable.args.map(arg => (
+                        <React.Fragment key={arg.name}>
+                            <span style={{ fontWeight: 500 }}>{arg.name}:</span>
+                            <span style={{ color: 'var(--theia-descriptionForeground)' }}>
+                                {arg.description}
+                            </span>
+                        </React.Fragment>
+                    ))}
+                </div>
+            </>
+        );
+    }
+
+    protected renderReferencedVariables(variable: AIVariable): React.ReactNode | undefined {
+        const agents = this.getAgentsForVariable(variable);
+        if (agents.length === 0) {
+            return undefined;
+        }
+
+        return (
+            <>
+                <div className="settings-section-subcategory-title">
+                    {nls.localize('theia/ai/ide/variableConfiguration/usedByAgents', 'Used by Agents')}
+                </div>
+                <ul className="variable-agent-list">
+                    {agents.map(agent => (
+                        <li key={agent.id} className="variable-agent-item" onClick={() => this.showAgentConfiguration(agent)}>
+                            <span>{agent.name}</span>
+                            <i className={codicon('chevron-right')}></i>
+                        </li>
+                    ))}
+                </ul>
+            </>
+        );
+    }
+
+    protected showAgentConfiguration(agent: Agent): void {
+        this.aiConfigurationSelectionService.setActiveAgent(agent);
+        this.aiConfigurationSelectionService.selectConfigurationTab(AIAgentConfigurationWidget.ID);
+    }
+
+    protected getAgentsForVariable(variable: AIVariable): Agent[] {
+        return this.agentService.getAgents().filter(a => a.variables?.includes(variable.id));
+    }
+}

packages/ai-ide/src/browser/ai-ide-activation-service.ts

@@ -0,0 +1,65 @@
+// *****************************************************************************
+// 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 { inject, injectable } from '@theia/core/shared/inversify';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { Emitter, MaybePromise, Event, PreferenceService, } from '@theia/core';
+import { ContextKeyService, ContextKey } from '@theia/core/lib/browser/context-key-service';
+import { AIActivationService, ENABLE_AI_CONTEXT_KEY } from '@theia/ai-core/lib/browser/ai-activation-service';
+import { PREFERENCE_NAME_ENABLE_AI } from '../common/ai-ide-preferences';
+
+/**
+ * Implements AI Activation Service based on preferences.
+ */
+@injectable()
+export class AIIdeActivationServiceImpl implements AIActivationService, FrontendApplicationContribution {
+    @inject(ContextKeyService)
+    protected readonly contextKeyService: ContextKeyService;
+
+    @inject(PreferenceService)
+    protected preferenceService: PreferenceService;
+
+    protected isAiEnabledKey: ContextKey<boolean>;
+
+    protected onDidChangeAIEnabled = new Emitter<boolean>();
+    get onDidChangeActiveStatus(): Event<boolean> {
+        return this.onDidChangeAIEnabled.event;
+    }
+
+    get isActive(): boolean {
+        return this.isAiEnabledKey.get() ?? false;
+    }
+
+    protected updateEnableValue(value: boolean): void {
+        if (value !== this.isAiEnabledKey.get()) {
+            this.isAiEnabledKey.set(value);
+            this.onDidChangeAIEnabled.fire(value);
+        }
+    }
+
+    initialize(): MaybePromise<void> {
+        this.isAiEnabledKey = this.contextKeyService.createKey(ENABLE_AI_CONTEXT_KEY, false);
+        // make sure we don't miss once preferences are ready
+        this.preferenceService.ready.then(() => {
+            const enableValue = this.preferenceService.get<boolean>(PREFERENCE_NAME_ENABLE_AI, false);
+            this.updateEnableValue(enableValue);
+        });
+        this.preferenceService.onPreferenceChanged(e => {
+            if (e.preferenceName === PREFERENCE_NAME_ENABLE_AI) {
+                this.updateEnableValue(this.preferenceService.get<boolean>(PREFERENCE_NAME_ENABLE_AI, false));
+            }
+        });
+    }
+}

packages/ai-ide/src/browser/ai-terminal-functions.ts

@@ -0,0 +1,104 @@
+// *****************************************************************************
+// 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 { ToolInvocationContext, ToolProvider, ToolRequest } from '@theia/ai-core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
+import { SUGGEST_TERMINAL_COMMAND_ID } from '../common/ai-terminal-functions';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
+import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
+import { waitForEvent } from '@theia/core/lib/common/promise-util';
+import { ApplicationShell } from '@theia/core/lib/browser';
+
+@injectable()
+export class SuggestTerminalCommand implements ToolProvider {
+    static ID = SUGGEST_TERMINAL_COMMAND_ID;
+
+    @inject(TerminalService)
+    protected readonly terminalService: TerminalService;
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    @inject(ApplicationShell)
+    protected readonly applicationShell: ApplicationShell;
+
+    getTool(): ToolRequest {
+        return {
+            id: SuggestTerminalCommand.ID,
+            name: SuggestTerminalCommand.ID,
+            description: `Proposes executing a command in the terminal.\n
+            This tool will automatically write the command into the terminal buffer.\n
+            Execution of the command is up to the user.`,
+            parameters: {
+                type: 'object',
+                properties: {
+                    command: {
+                        type: 'string',
+                        description: `The content of the command to write to the terminal buffer.\n
+                        ALWAYS provide the COMPLETE intended content of the command, without any truncation or omissions.\n
+                        You MUST include ALL parts of the command.`
+                    }
+                },
+                required: ['command']
+            },
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                if (ctx?.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                // Ensure that there is a workspace
+                let activeTerminal: TerminalWidget | undefined = this.terminalService.lastUsedTerminal;
+                if (!activeTerminal || activeTerminal.isDisposed) {
+                    try {
+                        activeTerminal = await this.terminalService.newTerminal({});
+                        this.terminalService.open(activeTerminal, { mode: 'activate' });
+                        await activeTerminal.start();
+                        // Wait until the terminal prompt is emitted
+                        await waitForEvent(activeTerminal.onOutput, 3000);
+                    } catch (error) {
+                        return JSON.stringify({ error: `Error executing tool 'suggestTerminalCommand': ${error}` });
+                    }
+                } else {
+                    this.terminalService.open(activeTerminal, { mode: 'activate' });
+                }
+                let command: string;
+                try {
+                    const { command: parsedCommand } = JSON.parse(args);
+                    command = parsedCommand;
+                } catch (error) {
+                    return JSON.stringify({ error: `Error parsing arguments for tool 'suggestTerminalCommand': ${error}` });
+                }
+                if (!this.isValidCommand(command)) {
+                    return JSON.stringify({ error: 'Error validating command generated by \'suggestTerminalCommand\'' });
+                };
+                // Clear the current input line by sending Ctrl+A (move to start) and Ctrl+K (delete to end)
+                activeTerminal.sendText('\x01\x0b');
+                activeTerminal.sendText(command);
+                return `Proposed executing the terminal command ${command}. The user will review and potentially execute the command.`;
+            }
+        };
+    }
+
+    protected isValidCommand(command: string): boolean {
+        // Command should not be empty and should not contain control characters
+        const CONTROL_CHAR_REGEX = /[\u0000-\u001F\u007F]/; // ASCII control range
+        if (!command || CONTROL_CHAR_REGEX.test(command)) {
+            return false;
+        }
+        return true;
+    }
+}
+

packages/ai-ide/src/browser/analyze-gh-ticket-command-contribution.ts

@@ -0,0 +1,176 @@
+// *****************************************************************************
+// 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 { FrontendApplicationContribution } from '@theia/core/lib/browser';
+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-chat/lib/browser/agent-delegation-tool';
+import { GitHubChatAgentId } from './github-chat-agent';
+
+@injectable()
+export class AnalyzesGhTicketCommandContribution implements FrontendApplicationContribution {
+
+    @inject(PromptService)
+    protected readonly promptService: PromptService;
+
+    onStart(): void {
+        this.registerGitHubTicketCommand();
+    }
+
+    protected registerGitHubTicketCommand(): void {
+        const commandTemplate = this.buildCommandTemplate();
+
+        this.promptService.addBuiltInPromptFragment({
+            id: 'analyze-gh-ticket',
+            template: commandTemplate,
+            isCommand: true,
+            commandName: 'analyze-gh-ticket',
+            commandDescription: nls.localize(
+                'theia/ai-ide/ticketCommand/description',
+                'Analyze a GitHub ticket and create an implementation plan'
+            ),
+            commandArgumentHint: nls.localize(
+                'theia/ai-ide/ticketCommand/argumentHint',
+                '<ticket-number>'
+            ),
+            commandAgents: ['Architect']
+        });
+    }
+
+    protected buildCommandTemplate(): string {
+        return `You have been asked to analyze a GitHub ticket and create an implementation plan.
+
+## Ticket Number
+$ARGUMENTS
+
+## Task Overview
+You need to retrieve details about the specified GitHub ticket and analyze whether it can be implemented by an AI coding agent.
+
+## Step 1: Retrieve Ticket Information
+Use the ~{${AGENT_DELEGATION_FUNCTION_ID}} tool to delegate to the GitHub agent and retrieve comprehensive information about the ticket.
+
+**Agent ID:** '${GitHubChatAgentId}'
+**Prompt:** Ask the GitHub agent to retrieve ALL details about issue/ticket #$ARGUMENTS, specifically requesting:
+- The complete issue title and description/body
+- All comments on the issue (this is critical for understanding the full context)
+- Labels and assignees
+- Issue state (open/closed)
+- Any referenced issues or pull requests mentioned in the description or comments
+- If other issues are referenced, retrieve their details as well
+
+Example delegation prompt:
+\`\`\`
+Please retrieve comprehensive information about issue #$ARGUMENTS. I need:
+1. The complete issue title, body/description, labels, state, and assignees
+2. ALL comments on this issue - every single comment is important for understanding the context
+3. Any issues or PRs that are referenced or linked in the description or comments
+4. For any referenced issues, please also retrieve their titles and descriptions
+
+This is for analyzing whether the issue can be implemented, so completeness is crucial.
+\`\`\`
+
+## Step 2: Analyze AI Solvability
+After receiving the ticket information, analyze whether this ticket can be solved by an AI coding agent. Consider:
+
+### Criteria for AI-Solvable Tickets:
+- **Clear requirements**: The ticket clearly describes what needs to be done
+- **Defined scope**: The scope of changes is well-defined and bounded
+- **Technical feasibility**: The task involves code changes that can be reasoned about
+- **Sufficient context**: Enough information is provided to understand the problem and solution
+- **Reproducible**: For bugs, there's enough information to understand and reproduce the issue
+
+### Criteria for Non-AI-Solvable Tickets:
+- **Ambiguous requirements**: The ticket is vague or open to multiple interpretations
+- **Missing context**: Critical information is missing (e.g., environment details, reproduction steps)
+- **External dependencies**: Requires access to external systems, credentials, or human interaction
+- **Design decisions needed**: Requires architectural decisions that need human judgment
+- **Insufficient information**: Cannot determine what success looks like
+
+## Step 3: Respond Based on Analysis
+
+### If the ticket CANNOT be solved by AI:
+Provide a clear explanation:
+1. **Reason**: Explain specifically why this ticket cannot be solved by AI
+2. **Missing Information**: List what information is missing or unclear
+3. **Questions for Clarification**: Ask specific questions that, if answered, might make the ticket solvable
+
+Example response format:
+\`\`\`
+## Analysis Result: Cannot Be Solved by AI
+
+### Reason
+[Explain why]
+
+### Missing Information
+- [Item 1]
+- [Item 2]
+
+### Questions for Clarification
+1. [Question 1]
+2. [Question 2]
+\`\`\`
+
+### If the ticket CAN be solved by AI:
+Create a detailed implementation plan:
+
+1. **Summary**: Brief summary of what the ticket requests
+2. **Analysis**: Your understanding of the problem and the proposed solution approach
+3. **Implementation Plan**: A step-by-step plan that a coding agent can follow, including:
+   - Files that likely need to be modified or created
+   - Specific changes to be made in each file
+   - Order of operations
+   - Testing considerations
+4. **Potential Challenges**: Any challenges or edge cases to be aware of
+5. **Success Criteria**: How to verify the implementation is correct
+
+Example response format:
+\`\`\`
+## Analysis Result: Can Be Solved by AI
+
+### Summary
+[Brief summary of the ticket]
+
+### Analysis
+[Your understanding of the problem and solution approach]
+
+### Implementation Plan
+
+#### Step 1: [First step]
+- File: \`path/to/file\`
+- Changes: [Description of changes]
+
+#### Step 2: [Second step]
+- File: \`path/to/file\`
+- Changes: [Description of changes]
+
+[Continue with additional steps...]
+
+### Potential Challenges
+- [Challenge 1]
+- [Challenge 2]
+
+### Success Criteria
+- [Criterion 1]
+- [Criterion 2]
+
+### Next Steps
+To implement this plan, you can ask @Coder to execute it.
+\`\`\`
+
+Remember: Be thorough in your analysis. It's better to ask for clarification than to create an incomplete or incorrect implementation plan.`;
+    }
+}

packages/ai-ide/src/browser/app-tester-chat-agent.ts

@@ -0,0 +1,177 @@
+/* eslint-disable max-len */
+
+// *****************************************************************************
+// Copyright (C) 2024 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.
+//
+// @ts-nocheck - Disabled: requires @theia/ai-mcp
+
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { AbstractStreamParsingChatAgent } from '@theia/ai-chat/lib/common/chat-agents';
+import { ErrorChatResponseContentImpl, MarkdownChatResponseContentImpl, MutableChatRequestModel, QuestionResponseContentImpl } from '@theia/ai-chat/lib/common/chat-model';
+import { LanguageModelRequirement } from '@theia/ai-core/lib/common';
+import { MCPFrontendService, MCPServerDescription } from '@theia/ai-mcp/lib/common/mcp-server-manager';
+import { nls } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { MCP_SERVERS_PREF } from '@theia/ai-mcp/lib/common/mcp-preferences';
+import { PreferenceScope, PreferenceService } from '@theia/core/lib/common';
+import { appTesterTemplate, appTesterNextTemplate, appTesterTemplateVariant, REQUIRED_MCP_SERVERS, REQUIRED_MCP_SERVERS_NEXT } from './app-tester-prompt-template';
+
+export const AppTesterChatAgentId = 'AppTester';
+@injectable()
+export class AppTesterChatAgent extends AbstractStreamParsingChatAgent {
+
+    @inject(MCPFrontendService)
+    protected readonly mcpService: MCPFrontendService;
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    id: string = AppTesterChatAgentId;
+    name = AppTesterChatAgentId;
+    languageModelRequirements: LanguageModelRequirement[] = [{
+        purpose: 'chat',
+        identifier: 'default/code',
+    }];
+    protected defaultLanguageModelPurpose: string = 'chat';
+    override description = nls.localize('theia/ai/chat/app-tester/description', 'This agent tests your application user interface to verify user-specified test scenarios through browser automation. '
+        + 'It can automate testing workflows and provide detailed feedback on application functionality.');
+
+    override iconClass: string = 'codicon codicon-beaker';
+    protected override systemPromptId: string = 'app-tester-system';
+    override prompts = [
+        { id: 'app-tester-system', defaultVariant: appTesterTemplate, variants: [appTesterTemplateVariant, appTesterNextTemplate] }
+    ];
+
+    /**
+     * Override invoke to check if the specified MCP server is running, and if not, ask the user if it should be started.
+     */
+    override async invoke(request: MutableChatRequestModel): Promise<void> {
+        const isNextVariant = this.isNextVariant();
+        try {
+            if (await this.requiresStartingServers()) {
+                request.response.response.addContent(new QuestionResponseContentImpl(
+                    isNextVariant
+                        ? nls.localize('theia/ai/ide/app-tester/startChromeDevToolsMcpServers/question',
+                            'The Chrome DevTools MCP server is not running. Would you like to start it now? This may install the Chrome DevTools MCP server.')
+                        : nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/question',
+                            'The Playwright MCP servers are not running. Would you like to start them now? This may install the Playwright MCP servers.'),
+                    [
+                        { text: nls.localize('theia/ai/ide/app-tester/startMcpServers/yes', 'Yes, start the servers'), value: 'yes' },
+                        { text: nls.localize('theia/ai/ide/app-tester/startMcpServers/no', 'No, cancel'), value: 'no' }
+                    ],
+                    request,
+                    async selectedOption => {
+                        if (selectedOption.value === 'yes') {
+                            const progress = request.response.addProgressMessage({
+                                content: isNextVariant
+                                    ? nls.localize('theia/ai/ide/app-tester/startChromeDevToolsMcpServers/progress', 'Starting Chrome DevTools MCP server.')
+                                    : nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/progress', 'Starting Playwright MCP servers.'),
+                                show: 'whileIncomplete'
+                            });
+                            try {
+                                await this.startServers();
+                                request.response.updateProgressMessage({ ...progress, show: 'whileIncomplete', status: 'completed' });
+                                await super.invoke(request);
+                            } catch (error) {
+                                request.response.response.addContent(new ErrorChatResponseContentImpl(
+                                    new Error(isNextVariant
+                                        ? nls.localize('theia/ai/ide/app-tester/startChromeDevToolsMcpServers/error', 'Failed to start Chrome DevTools MCP server: {0}',
+                                            error instanceof Error ? error.message : String(error))
+                                        : nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/error', 'Failed to start Playwright MCP servers: {0}',
+                                            error instanceof Error ? error.message : String(error)))
+                                ));
+                                request.response.complete();
+                            }
+                        } else {
+                            request.response.response.addContent(new MarkdownChatResponseContentImpl(
+                                isNextVariant
+                                    ? nls.localize('theia/ai/ide/app-tester/startChromeDevToolsMcpServers/canceled', 'Please setup the Chrome DevTools MCP server.')
+                                    : nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/canceled', 'Please setup the Playwright MCP servers.')
+                            ));
+                            request.response.complete();
+                        }
+                    }
+                ));
+                request.response.waitForInput();
+                return;
+            }
+            await super.invoke(request);
+        } catch (error) {
+            request.response.response.addContent(new ErrorChatResponseContentImpl(
+                isNextVariant ?
+                    new Error(nls.localize('theia/ai/ide/app-tester/errorCheckingDevToolsServerStatus', 'Error checking DevTools MCP server status: {0}',
+                        error instanceof Error ? error.message : String(error)))
+                    : new Error(nls.localize('theia/ai/ide/app-tester/errorCheckingPlaywrightServerStatus', 'Error checking Playwright MCP server status: {0}',
+                        error instanceof Error ? error.message : String(error)))
+            ));
+            request.response.complete();
+        }
+    }
+
+    protected isNextVariant(): boolean {
+        const effectiveVariantId = this.promptService.getEffectiveVariantId(this.systemPromptId!);
+        return effectiveVariantId === 'app-tester-system-next';
+    }
+
+    protected getRequiredServers(): MCPServerDescription[] {
+        if (this.isNextVariant()) {
+            return REQUIRED_MCP_SERVERS_NEXT;
+        }
+        return REQUIRED_MCP_SERVERS;
+    }
+
+    protected async requiresStartingServers(): Promise<boolean> {
+        const allStarted = await Promise.all(this.getRequiredServers().map(server => this.mcpService.isServerStarted(server.name)));
+        return allStarted.some(started => !started);
+    }
+
+    protected async startServers(): Promise<void> {
+        await this.ensureServersStarted(...this.getRequiredServers());
+    }
+
+    /**
+     * Starts the defined MCP server if it doesn't exist or isn't running.
+     *
+     * @returns A promise that resolves when the server is started
+     */
+    async ensureServersStarted(...servers: MCPServerDescription[]): Promise<void> {
+        try {
+            const serversToInstall: MCPServerDescription[] = [];
+            const serversToStart: MCPServerDescription[] = [];
+
+            for (const server of servers) {
+                if (!(await this.mcpService.hasServer(server.name))) {
+                    serversToInstall.push(server);
+                }
+                if (!(await this.mcpService.isServerStarted(server.name))) {
+                    serversToStart.push(server);
+                }
+            }
+
+            for (const server of serversToInstall) {
+                const currentServers = this.preferenceService.get<Record<string, MCPServerDescription>>(MCP_SERVERS_PREF, {});
+                await this.preferenceService.set(MCP_SERVERS_PREF, { ...currentServers, [server.name]: server }, PreferenceScope.User);
+                await this.mcpService.addOrUpdateServer(server);
+            }
+
+            for (const server of serversToStart) {
+                await this.mcpService.startServer(server.name);
+            }
+        } catch (error) {
+            this.logger.error(`Error starting MCP servers ${servers.map(s => s.name)}: ${error}`);
+            throw error;
+        }
+    }
+}

packages/ai-ide/src/browser/app-tester-chat-agent.ts.bak

@@ -0,0 +1,175 @@
+/* eslint-disable max-len */
+
+// *****************************************************************************
+// Copyright (C) 2024 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 { AbstractStreamParsingChatAgent } from '@theia/ai-chat/lib/common/chat-agents';
+import { ErrorChatResponseContentImpl, MarkdownChatResponseContentImpl, MutableChatRequestModel, QuestionResponseContentImpl } from '@theia/ai-chat/lib/common/chat-model';
+import { LanguageModelRequirement } from '@theia/ai-core/lib/common';
+import { MCPFrontendService, MCPServerDescription } from '@theia/ai-mcp/lib/common/mcp-server-manager';
+import { nls } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { MCP_SERVERS_PREF } from '@theia/ai-mcp/lib/common/mcp-preferences';
+import { PreferenceScope, PreferenceService } from '@theia/core/lib/common';
+import { appTesterTemplate, appTesterNextTemplate, appTesterTemplateVariant, REQUIRED_MCP_SERVERS, REQUIRED_MCP_SERVERS_NEXT } from './app-tester-prompt-template';
+
+export const AppTesterChatAgentId = 'AppTester';
+@injectable()
+export class AppTesterChatAgent extends AbstractStreamParsingChatAgent {
+
+    @inject(MCPFrontendService)
+    protected readonly mcpService: MCPFrontendService;
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    id: string = AppTesterChatAgentId;
+    name = AppTesterChatAgentId;
+    languageModelRequirements: LanguageModelRequirement[] = [{
+        purpose: 'chat',
+        identifier: 'default/code',
+    }];
+    protected defaultLanguageModelPurpose: string = 'chat';
+    override description = nls.localize('theia/ai/chat/app-tester/description', 'This agent tests your application user interface to verify user-specified test scenarios through browser automation. '
+        + 'It can automate testing workflows and provide detailed feedback on application functionality.');
+
+    override iconClass: string = 'codicon codicon-beaker';
+    protected override systemPromptId: string = 'app-tester-system';
+    override prompts = [
+        { id: 'app-tester-system', defaultVariant: appTesterTemplate, variants: [appTesterTemplateVariant, appTesterNextTemplate] }
+    ];
+
+    /**
+     * Override invoke to check if the specified MCP server is running, and if not, ask the user if it should be started.
+     */
+    override async invoke(request: MutableChatRequestModel): Promise<void> {
+        const isNextVariant = this.isNextVariant();
+        try {
+            if (await this.requiresStartingServers()) {
+                request.response.response.addContent(new QuestionResponseContentImpl(
+                    isNextVariant
+                        ? nls.localize('theia/ai/ide/app-tester/startChromeDevToolsMcpServers/question',
+                            'The Chrome DevTools MCP server is not running. Would you like to start it now? This may install the Chrome DevTools MCP server.')
+                        : nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/question',
+                            'The Playwright MCP servers are not running. Would you like to start them now? This may install the Playwright MCP servers.'),
+                    [
+                        { text: nls.localize('theia/ai/ide/app-tester/startMcpServers/yes', 'Yes, start the servers'), value: 'yes' },
+                        { text: nls.localize('theia/ai/ide/app-tester/startMcpServers/no', 'No, cancel'), value: 'no' }
+                    ],
+                    request,
+                    async selectedOption => {
+                        if (selectedOption.value === 'yes') {
+                            const progress = request.response.addProgressMessage({
+                                content: isNextVariant
+                                    ? nls.localize('theia/ai/ide/app-tester/startChromeDevToolsMcpServers/progress', 'Starting Chrome DevTools MCP server.')
+                                    : nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/progress', 'Starting Playwright MCP servers.'),
+                                show: 'whileIncomplete'
+                            });
+                            try {
+                                await this.startServers();
+                                request.response.updateProgressMessage({ ...progress, show: 'whileIncomplete', status: 'completed' });
+                                await super.invoke(request);
+                            } catch (error) {
+                                request.response.response.addContent(new ErrorChatResponseContentImpl(
+                                    new Error(isNextVariant
+                                        ? nls.localize('theia/ai/ide/app-tester/startChromeDevToolsMcpServers/error', 'Failed to start Chrome DevTools MCP server: {0}',
+                                            error instanceof Error ? error.message : String(error))
+                                        : nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/error', 'Failed to start Playwright MCP servers: {0}',
+                                            error instanceof Error ? error.message : String(error)))
+                                ));
+                                request.response.complete();
+                            }
+                        } else {
+                            request.response.response.addContent(new MarkdownChatResponseContentImpl(
+                                isNextVariant
+                                    ? nls.localize('theia/ai/ide/app-tester/startChromeDevToolsMcpServers/canceled', 'Please setup the Chrome DevTools MCP server.')
+                                    : nls.localize('theia/ai/ide/app-tester/startPlaywrightServers/canceled', 'Please setup the Playwright MCP servers.')
+                            ));
+                            request.response.complete();
+                        }
+                    }
+                ));
+                request.response.waitForInput();
+                return;
+            }
+            await super.invoke(request);
+        } catch (error) {
+            request.response.response.addContent(new ErrorChatResponseContentImpl(
+                isNextVariant ?
+                    new Error(nls.localize('theia/ai/ide/app-tester/errorCheckingDevToolsServerStatus', 'Error checking DevTools MCP server status: {0}',
+                        error instanceof Error ? error.message : String(error)))
+                    : new Error(nls.localize('theia/ai/ide/app-tester/errorCheckingPlaywrightServerStatus', 'Error checking Playwright MCP server status: {0}',
+                        error instanceof Error ? error.message : String(error)))
+            ));
+            request.response.complete();
+        }
+    }
+
+    protected isNextVariant(): boolean {
+        const effectiveVariantId = this.promptService.getEffectiveVariantId(this.systemPromptId!);
+        return effectiveVariantId === 'app-tester-system-next';
+    }
+
+    protected getRequiredServers(): MCPServerDescription[] {
+        if (this.isNextVariant()) {
+            return REQUIRED_MCP_SERVERS_NEXT;
+        }
+        return REQUIRED_MCP_SERVERS;
+    }
+
+    protected async requiresStartingServers(): Promise<boolean> {
+        const allStarted = await Promise.all(this.getRequiredServers().map(server => this.mcpService.isServerStarted(server.name)));
+        return allStarted.some(started => !started);
+    }
+
+    protected async startServers(): Promise<void> {
+        await this.ensureServersStarted(...this.getRequiredServers());
+    }
+
+    /**
+     * Starts the defined MCP server if it doesn't exist or isn't running.
+     *
+     * @returns A promise that resolves when the server is started
+     */
+    async ensureServersStarted(...servers: MCPServerDescription[]): Promise<void> {
+        try {
+            const serversToInstall: MCPServerDescription[] = [];
+            const serversToStart: MCPServerDescription[] = [];
+
+            for (const server of servers) {
+                if (!(await this.mcpService.hasServer(server.name))) {
+                    serversToInstall.push(server);
+                }
+                if (!(await this.mcpService.isServerStarted(server.name))) {
+                    serversToStart.push(server);
+                }
+            }
+
+            for (const server of serversToInstall) {
+                const currentServers = this.preferenceService.get<Record<string, MCPServerDescription>>(MCP_SERVERS_PREF, {});
+                await this.preferenceService.set(MCP_SERVERS_PREF, { ...currentServers, [server.name]: server }, PreferenceScope.User);
+                await this.mcpService.addOrUpdateServer(server);
+            }
+
+            for (const server of serversToStart) {
+                await this.mcpService.startServer(server.name);
+            }
+        } catch (error) {
+            this.logger.error(`Error starting MCP servers ${servers.map(s => s.name)}: ${error}`);
+            throw error;
+        }
+    }
+}

packages/ai-ide/src/browser/app-tester-chat-functions.ts

@@ -0,0 +1,172 @@
+// *****************************************************************************
+// 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
+// *****************************************************************************
+// @ts-nocheck - Disabled: requires @theia/ai-mcp
+
+import { type ToolProvider, type ToolRequest } from '@theia/ai-core';
+import { isLocalMCPServerDescription, MCPServerManager } from '@theia/ai-mcp/lib/common';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { CLOSE_BROWSER_FUNCTION_ID, IS_BROWSER_RUNNING_FUNCTION_ID, LAUNCH_BROWSER_FUNCTION_ID, QUERY_DOM_FUNCTION_ID } from '../common/app-tester-chat-functions';
+import { BrowserAutomation } from '../common/browser-automation-protocol';
+
+@injectable()
+export abstract class BrowserAutomationToolProvider implements ToolProvider {
+    @inject(BrowserAutomation)
+    protected readonly browser: BrowserAutomation;
+
+    abstract getTool(): ToolRequest;
+}
+
+@injectable()
+export class LaunchBrowserProvider extends BrowserAutomationToolProvider {
+    static ID = LAUNCH_BROWSER_FUNCTION_ID;
+
+    @inject(MCPServerManager)
+    protected readonly mcpServerManager: MCPServerManager;
+
+    getTool(): ToolRequest {
+        return {
+            id: LaunchBrowserProvider.ID,
+            name: LaunchBrowserProvider.ID,
+            description: 'Start the browser.',
+            parameters: {
+                type: 'object',
+                properties: {},
+                required: []
+            }, handler: async () => {
+                try {
+
+                    const mcp = await this.mcpServerManager.getServerDescription('playwright');
+                    if (!mcp) {
+                        throw new Error('No MCP Playwright instance with name playwright found');
+                    }
+                    if (!isLocalMCPServerDescription(mcp)) {
+                        throw new Error('The MCP Playwright instance must run locally.');
+                    }
+
+                    const cdpEndpointIndex = mcp.args?.findIndex(p => p === '--cdp-endpoint');
+                    if (!cdpEndpointIndex) {
+                        throw new Error('No --cdp-endpoint was provided.');
+                    }
+                    const cdpEndpoint = mcp.args?.[cdpEndpointIndex + 1];
+                    if (!cdpEndpoint) {
+                        throw new Error('No --cdp-endpoint argument was provided.');
+                    }
+
+                    let remoteDebuggingPort = 9222;
+                    try {
+                        const uri = new URL(cdpEndpoint);
+                        if (uri.port) {
+                            remoteDebuggingPort = parseInt(uri.port, 10);
+                        } else {
+                            // Default ports if not specified
+                            remoteDebuggingPort = uri.protocol === 'https:' ? 443 : 80;
+                        }
+                    } catch (error) {
+                        throw new Error(`Invalid --cdp-endpoint format, URL expected: ${cdpEndpoint}`);
+                    }
+
+                    const result = await this.browser.launch(remoteDebuggingPort);
+                    return result;
+                } catch (ex) {
+                    return (`Failed to starting the browser: ${ex.message}`);
+                }
+            }
+        };
+    }
+}
+
+@injectable()
+export class CloseBrowserProvider extends BrowserAutomationToolProvider {
+    static ID = CLOSE_BROWSER_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: CloseBrowserProvider.ID,
+            name: CloseBrowserProvider.ID,
+            description: 'Close the browser.',
+            parameters: {
+                type: 'object',
+                properties: {},
+                required: []
+            },
+            handler: async () => {
+                try {
+                    await this.browser.close();
+                } catch (ex) {
+                    return (`Failed to close browser: ${ex.message}`);
+                }
+            }
+        };
+    }
+}
+
+@injectable()
+export class IsBrowserRunningProvider extends BrowserAutomationToolProvider {
+    static ID = IS_BROWSER_RUNNING_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: IsBrowserRunningProvider.ID,
+            name: IsBrowserRunningProvider.ID,
+            description: 'Check if the browser is running.',
+            parameters: {
+                type: 'object',
+                properties: {},
+                required: []
+            },
+            handler: async () => {
+                try {
+                    const isRunning = await this.browser.isRunning();
+                    return isRunning ? 'Browser is running.' : 'Browser is not running.';
+                } catch (ex) {
+                    return (`Failed to check if browser is running: ${ex.message}`);
+                }
+            }
+        };
+    }
+}
+
+@injectable()
+export class QueryDomProvider extends BrowserAutomationToolProvider {
+    static ID = QUERY_DOM_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: QueryDomProvider.ID,
+            name: QueryDomProvider.ID,
+            description: 'Query the DOM of the active page.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    selector: {
+                        type: 'string',
+                        description: `The selector of the element to get the DOM of. The selector is a 
+                        CSS selector that identifies the element. If not provided, the entire DOM will be returned.`
+                    }
+                },
+                required: []
+            },
+            handler: async arg => {
+                try {
+                    const { selector } = JSON.parse(arg);
+                    return await this.browser.queryDom(selector);
+                } catch (ex) {
+                    return (`Failed to get DOM: ${ex.message}`);
+                }
+            }
+        };
+    }
+}

packages/ai-ide/src/browser/app-tester-chat-functions.ts.bak

@@ -0,0 +1,170 @@
+// *****************************************************************************
+// 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 { type ToolProvider, type ToolRequest } from '@theia/ai-core';
+import { isLocalMCPServerDescription, MCPServerManager } from '@theia/ai-mcp/lib/common';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { CLOSE_BROWSER_FUNCTION_ID, IS_BROWSER_RUNNING_FUNCTION_ID, LAUNCH_BROWSER_FUNCTION_ID, QUERY_DOM_FUNCTION_ID } from '../common/app-tester-chat-functions';
+import { BrowserAutomation } from '../common/browser-automation-protocol';
+
+@injectable()
+export abstract class BrowserAutomationToolProvider implements ToolProvider {
+    @inject(BrowserAutomation)
+    protected readonly browser: BrowserAutomation;
+
+    abstract getTool(): ToolRequest;
+}
+
+@injectable()
+export class LaunchBrowserProvider extends BrowserAutomationToolProvider {
+    static ID = LAUNCH_BROWSER_FUNCTION_ID;
+
+    @inject(MCPServerManager)
+    protected readonly mcpServerManager: MCPServerManager;
+
+    getTool(): ToolRequest {
+        return {
+            id: LaunchBrowserProvider.ID,
+            name: LaunchBrowserProvider.ID,
+            description: 'Start the browser.',
+            parameters: {
+                type: 'object',
+                properties: {},
+                required: []
+            }, handler: async () => {
+                try {
+
+                    const mcp = await this.mcpServerManager.getServerDescription('playwright');
+                    if (!mcp) {
+                        throw new Error('No MCP Playwright instance with name playwright found');
+                    }
+                    if (!isLocalMCPServerDescription(mcp)) {
+                        throw new Error('The MCP Playwright instance must run locally.');
+                    }
+
+                    const cdpEndpointIndex = mcp.args?.findIndex(p => p === '--cdp-endpoint');
+                    if (!cdpEndpointIndex) {
+                        throw new Error('No --cdp-endpoint was provided.');
+                    }
+                    const cdpEndpoint = mcp.args?.[cdpEndpointIndex + 1];
+                    if (!cdpEndpoint) {
+                        throw new Error('No --cdp-endpoint argument was provided.');
+                    }
+
+                    let remoteDebuggingPort = 9222;
+                    try {
+                        const uri = new URL(cdpEndpoint);
+                        if (uri.port) {
+                            remoteDebuggingPort = parseInt(uri.port, 10);
+                        } else {
+                            // Default ports if not specified
+                            remoteDebuggingPort = uri.protocol === 'https:' ? 443 : 80;
+                        }
+                    } catch (error) {
+                        throw new Error(`Invalid --cdp-endpoint format, URL expected: ${cdpEndpoint}`);
+                    }
+
+                    const result = await this.browser.launch(remoteDebuggingPort);
+                    return result;
+                } catch (ex) {
+                    return (`Failed to starting the browser: ${ex.message}`);
+                }
+            }
+        };
+    }
+}
+
+@injectable()
+export class CloseBrowserProvider extends BrowserAutomationToolProvider {
+    static ID = CLOSE_BROWSER_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: CloseBrowserProvider.ID,
+            name: CloseBrowserProvider.ID,
+            description: 'Close the browser.',
+            parameters: {
+                type: 'object',
+                properties: {},
+                required: []
+            },
+            handler: async () => {
+                try {
+                    await this.browser.close();
+                } catch (ex) {
+                    return (`Failed to close browser: ${ex.message}`);
+                }
+            }
+        };
+    }
+}
+
+@injectable()
+export class IsBrowserRunningProvider extends BrowserAutomationToolProvider {
+    static ID = IS_BROWSER_RUNNING_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: IsBrowserRunningProvider.ID,
+            name: IsBrowserRunningProvider.ID,
+            description: 'Check if the browser is running.',
+            parameters: {
+                type: 'object',
+                properties: {},
+                required: []
+            },
+            handler: async () => {
+                try {
+                    const isRunning = await this.browser.isRunning();
+                    return isRunning ? 'Browser is running.' : 'Browser is not running.';
+                } catch (ex) {
+                    return (`Failed to check if browser is running: ${ex.message}`);
+                }
+            }
+        };
+    }
+}
+
+@injectable()
+export class QueryDomProvider extends BrowserAutomationToolProvider {
+    static ID = QUERY_DOM_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: QueryDomProvider.ID,
+            name: QueryDomProvider.ID,
+            description: 'Query the DOM of the active page.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    selector: {
+                        type: 'string',
+                        description: `The selector of the element to get the DOM of. The selector is a 
+                        CSS selector that identifies the element. If not provided, the entire DOM will be returned.`
+                    }
+                },
+                required: []
+            },
+            handler: async arg => {
+                try {
+                    const { selector } = JSON.parse(arg);
+                    return await this.browser.queryDom(selector);
+                } catch (ex) {
+                    return (`Failed to get DOM: ${ex.message}`);
+                }
+            }
+        };
+    }
+}

packages/ai-ide/src/browser/app-tester-prompt-template.ts

@@ -0,0 +1,179 @@
+/* eslint-disable @typescript-eslint/tslint/config */
+// @ts-nocheck - Disabled: requires @theia/ai-mcp
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH and others.
+//
+// This file is licensed under the MIT License.
+// See LICENSE-MIT.txt in the project root for license information.
+// https://opensource.org/license/mit.
+//
+// SPDX-License-Identifier: MIT
+// *****************************************************************************
+
+import { BasePromptFragment } from '@theia/ai-core/lib/common';
+import { CHAT_CONTEXT_DETAILS_VARIABLE_ID } from '@theia/ai-chat';
+import { QUERY_DOM_FUNCTION_ID, LAUNCH_BROWSER_FUNCTION_ID, CLOSE_BROWSER_FUNCTION_ID, IS_BROWSER_RUNNING_FUNCTION_ID } from '../common/app-tester-chat-functions';
+import { MCPServerDescription } from '@theia/ai-mcp/lib/common/mcp-server-manager';
+// @ts-nocheck - Disabled: requires @theia/ai-mcp
+
+import {
+  FILE_CONTENT_FUNCTION_ID,
+  LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID,
+  RUN_LAUNCH_CONFIGURATION_FUNCTION_ID,
+  STOP_LAUNCH_CONFIGURATION_FUNCTION_ID
+} from '../common/workspace-functions';
+
+export const REQUIRED_MCP_SERVERS: MCPServerDescription[] = [
+  {
+    name: 'playwright',
+    command: 'npx',
+    args: ['-y', '@playwright/mcp@latest',
+      '--cdp-endpoint',
+      'http://localhost:9222/'],
+    autostart: false,
+    env: {},
+  },
+  {
+    name: 'playwright-visual',
+    command: 'npx',
+    args: ['-y', '@playwright/mcp@latest', '--vision',
+      '--cdp-endpoint',
+      'http://localhost:9222/'],
+    autostart: false,
+    env: {},
+  }
+];
+
+export const REQUIRED_MCP_SERVERS_NEXT: MCPServerDescription[] = [
+  {
+    name: 'chrome-devtools',
+    command: 'npx',
+    args: ['-y', 'chrome-devtools-mcp@latest', '--cdp-endpoint', 'http://127.0.0.1:9222', '--no-usage-statistics'],
+    autostart: false,
+    env: {},
+  }
+];
+
+export const appTesterTemplate: BasePromptFragment = {
+  id: 'app-tester-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:
+https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution --}}
+
+You are AppTester, an AI assistant integrated into Theia IDE specifically designed to help developers test running applications using Playwright.
+Your role is to inspect the application for user-specified test scenarios through the Playwright MCP server.
+
+## Your Workflow
+1. Help the user build and launch their application
+2. Use Playwright browser automation to validate test scenarios
+3. Report results and provide actionable feedback
+4. Help fix issues when needed
+
+## Available Playwright Testing Tools
+You have access to these powerful automation tools:
+${REQUIRED_MCP_SERVERS.map(server => `{{prompt:mcp_${server.name}_tools}}`)}
+
+- **~{${LAUNCH_BROWSER_FUNCTION_ID}}**: Launch the browser. This is required before performing any browser interactions. Always launch a new browser when starting a test session.
+- **~{${IS_BROWSER_RUNNING_FUNCTION_ID}}**: Check if the browser is running. If a tool fails by saying that the connection failed, you can verify the connection by using this tool.
+- **~{${CLOSE_BROWSER_FUNCTION_ID}}**: Close the browser.
+- **~{${QUERY_DOM_FUNCTION_ID}}**: Query the DOM for specific elements and their properties. Only use when explicitly requested by the user.
+- **~{${LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID}}**: To get a list of all available launch configurations. If there are no launch configurations, ask the user to manually start\
+the App or configure one.
+- **~{${RUN_LAUNCH_CONFIGURATION_FUNCTION_ID}}**: Use this to launch the App under test (in case it is not already running)
+- **~{${STOP_LAUNCH_CONFIGURATION_FUNCTION_ID}}**: To stop Apps once the testing is done
+
+## Workflow Approach
+1. **Understand Requirements**: Ask the user to clearly define what needs to be tested
+2. **Launch Browser**: Start a fresh browser instance for testing
+3. **Navigate and Test**: Execute the test scenario methodically
+4. **Document Results**: Provide detailed results with screenshots when helpful
+5. **Clean Up**: Always close the browser when testing is complete
+
+## Current Context
+Some files and other pieces of data may have been added by the user to the context of the chat. If any have, the details can be found below.
+{{${CHAT_CONTEXT_DETAILS_VARIABLE_ID}}}
+`
+};
+
+export const appTesterNextTemplate: BasePromptFragment = {
+  id: 'app-tester-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:
+https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution
+--}}
+
+You are AppTester, an autonomous testing agent that executes complete test workflows silently and reports results at the end.
+
+## Tools
+${REQUIRED_MCP_SERVERS_NEXT.map(server => `{{prompt:mcp_${server.name}_tools}}`).join('\n')}
+
+- **~{${FILE_CONTENT_FUNCTION_ID}}**: Read workspace files
+- **~{${LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID}}**: List launch configurations
+- **~{${RUN_LAUNCH_CONFIGURATION_FUNCTION_ID}}**: Start application
+- **~{${STOP_LAUNCH_CONFIGURATION_FUNCTION_ID}}**: Stop application
+
+## Protocol: Execute ALL 5 Steps in ONE Response
+
+### Step 1: Discover URL
+If URL not provided in request:
+1. Use ~{${LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID}} to find configs and check names for URL patterns
+2. If needed, use ~{${FILE_CONTENT_FUNCTION_ID}} to read package.json, README.md, or .vscode/launch.json (stop once found)
+3. Common patterns: localhost:3000, localhost:8080, localhost:4200
+
+If app not running, start it with ~{${RUN_LAUNCH_CONFIGURATION_FUNCTION_ID}}.
+
+**Launch Configuration Selection Rules:**
+- Check the project context if the testing URL is specified.
+- **FORBIDDEN: Never launch configs with "Frontend" or "Electron" in the name.** This is a browser testing tool.
+- **PREFERRED: Launch configs with "Backend", "Server", or "Browser" (without "Frontend") in the name.**
+- These should start the application server/backend without opening windows.
+- Running Frontend or Electron configs = test failure. Every time.
+
+### Step 2: Navigate
+The Chrome DevTools MCP server connects to an existing browser at http://127.0.0.1:9222.
+Use Chrome DevTools MCP navigate_to with the discovered URL. Even if already open, reload it.
+**CRITICAL:** Always wait for the networkidle event before proceeding to testing.
+
+### Step 3: Test
+Execute test scenario. Use screenshots only when explicitly requested.
+
+### Step 4: Report
+Provide test results, console errors, bugs, and recommendations.
+
+### Step 5: Cleanup
+If you started an app with ~{${RUN_LAUNCH_CONFIGURATION_FUNCTION_ID}}, close it with ~{${STOP_LAUNCH_CONFIGURATION_FUNCTION_ID}}.
+
+## Output Rules
+- Execute all tool calls silently with ZERO text output during Steps 1-5
+- Produce ONE comprehensive report AFTER all steps complete
+- Response structure: [Tool calls] → [Single report]
+
+## Report Format
+**Test Report: [Test Scenario Name]**
+
+**Results:** [Pass/Fail status with details]
+
+**Issues Found:** [Bugs, errors, problems discovered]
+
+**Console Output:** [Errors, warnings, relevant logs]
+
+## Mandatory Rules
+1. Execute all 5 steps in ONE response
+2. Discover URLs yourself - never ask the user
+3. Zero text during execution; report only after completion
+4. Never launch Frontend or Electron configs
+5. Always wait for networkidle event after navigation before testing
+6. Do not provide screenshots to the user unless explicitly requested
+
+## Context
+{{${CHAT_CONTEXT_DETAILS_VARIABLE_ID}}}
+
+## Project Info
+{{prompt:project-info}}
+`
+};
+
+export const appTesterTemplateVariant: BasePromptFragment = {
+  id: 'app-tester-system-empty',
+  template: '',
+};

packages/ai-ide/src/browser/app-tester-prompt-template.ts.bak

@@ -0,0 +1,176 @@
+/* eslint-disable @typescript-eslint/tslint/config */
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH and others.
+//
+// This file is licensed under the MIT License.
+// See LICENSE-MIT.txt in the project root for license information.
+// https://opensource.org/license/mit.
+//
+// SPDX-License-Identifier: MIT
+// *****************************************************************************
+
+import { BasePromptFragment } from '@theia/ai-core/lib/common';
+import { CHAT_CONTEXT_DETAILS_VARIABLE_ID } from '@theia/ai-chat';
+import { QUERY_DOM_FUNCTION_ID, LAUNCH_BROWSER_FUNCTION_ID, CLOSE_BROWSER_FUNCTION_ID, IS_BROWSER_RUNNING_FUNCTION_ID } from '../common/app-tester-chat-functions';
+import { MCPServerDescription } from '@theia/ai-mcp/lib/common/mcp-server-manager';
+import {
+  FILE_CONTENT_FUNCTION_ID,
+  LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID,
+  RUN_LAUNCH_CONFIGURATION_FUNCTION_ID,
+  STOP_LAUNCH_CONFIGURATION_FUNCTION_ID
+} from '../common/workspace-functions';
+
+export const REQUIRED_MCP_SERVERS: MCPServerDescription[] = [
+  {
+    name: 'playwright',
+    command: 'npx',
+    args: ['-y', '@playwright/mcp@latest',
+      '--cdp-endpoint',
+      'http://localhost:9222/'],
+    autostart: false,
+    env: {},
+  },
+  {
+    name: 'playwright-visual',
+    command: 'npx',
+    args: ['-y', '@playwright/mcp@latest', '--vision',
+      '--cdp-endpoint',
+      'http://localhost:9222/'],
+    autostart: false,
+    env: {},
+  }
+];
+
+export const REQUIRED_MCP_SERVERS_NEXT: MCPServerDescription[] = [
+  {
+    name: 'chrome-devtools',
+    command: 'npx',
+    args: ['-y', 'chrome-devtools-mcp@latest', '--cdp-endpoint', 'http://127.0.0.1:9222', '--no-usage-statistics'],
+    autostart: false,
+    env: {},
+  }
+];
+
+export const appTesterTemplate: BasePromptFragment = {
+  id: 'app-tester-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:
+https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution --}}
+
+You are AppTester, an AI assistant integrated into Theia IDE specifically designed to help developers test running applications using Playwright.
+Your role is to inspect the application for user-specified test scenarios through the Playwright MCP server.
+
+## Your Workflow
+1. Help the user build and launch their application
+2. Use Playwright browser automation to validate test scenarios
+3. Report results and provide actionable feedback
+4. Help fix issues when needed
+
+## Available Playwright Testing Tools
+You have access to these powerful automation tools:
+${REQUIRED_MCP_SERVERS.map(server => `{{prompt:mcp_${server.name}_tools}}`)}
+
+- **~{${LAUNCH_BROWSER_FUNCTION_ID}}**: Launch the browser. This is required before performing any browser interactions. Always launch a new browser when starting a test session.
+- **~{${IS_BROWSER_RUNNING_FUNCTION_ID}}**: Check if the browser is running. If a tool fails by saying that the connection failed, you can verify the connection by using this tool.
+- **~{${CLOSE_BROWSER_FUNCTION_ID}}**: Close the browser.
+- **~{${QUERY_DOM_FUNCTION_ID}}**: Query the DOM for specific elements and their properties. Only use when explicitly requested by the user.
+- **~{${LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID}}**: To get a list of all available launch configurations. If there are no launch configurations, ask the user to manually start\
+the App or configure one.
+- **~{${RUN_LAUNCH_CONFIGURATION_FUNCTION_ID}}**: Use this to launch the App under test (in case it is not already running)
+- **~{${STOP_LAUNCH_CONFIGURATION_FUNCTION_ID}}**: To stop Apps once the testing is done
+
+## Workflow Approach
+1. **Understand Requirements**: Ask the user to clearly define what needs to be tested
+2. **Launch Browser**: Start a fresh browser instance for testing
+3. **Navigate and Test**: Execute the test scenario methodically
+4. **Document Results**: Provide detailed results with screenshots when helpful
+5. **Clean Up**: Always close the browser when testing is complete
+
+## Current Context
+Some files and other pieces of data may have been added by the user to the context of the chat. If any have, the details can be found below.
+{{${CHAT_CONTEXT_DETAILS_VARIABLE_ID}}}
+`
+};
+
+export const appTesterNextTemplate: BasePromptFragment = {
+  id: 'app-tester-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:
+https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution
+--}}
+
+You are AppTester, an autonomous testing agent that executes complete test workflows silently and reports results at the end.
+
+## Tools
+${REQUIRED_MCP_SERVERS_NEXT.map(server => `{{prompt:mcp_${server.name}_tools}}`).join('\n')}
+
+- **~{${FILE_CONTENT_FUNCTION_ID}}**: Read workspace files
+- **~{${LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID}}**: List launch configurations
+- **~{${RUN_LAUNCH_CONFIGURATION_FUNCTION_ID}}**: Start application
+- **~{${STOP_LAUNCH_CONFIGURATION_FUNCTION_ID}}**: Stop application
+
+## Protocol: Execute ALL 5 Steps in ONE Response
+
+### Step 1: Discover URL
+If URL not provided in request:
+1. Use ~{${LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID}} to find configs and check names for URL patterns
+2. If needed, use ~{${FILE_CONTENT_FUNCTION_ID}} to read package.json, README.md, or .vscode/launch.json (stop once found)
+3. Common patterns: localhost:3000, localhost:8080, localhost:4200
+
+If app not running, start it with ~{${RUN_LAUNCH_CONFIGURATION_FUNCTION_ID}}.
+
+**Launch Configuration Selection Rules:**
+- Check the project context if the testing URL is specified.
+- **FORBIDDEN: Never launch configs with "Frontend" or "Electron" in the name.** This is a browser testing tool.
+- **PREFERRED: Launch configs with "Backend", "Server", or "Browser" (without "Frontend") in the name.**
+- These should start the application server/backend without opening windows.
+- Running Frontend or Electron configs = test failure. Every time.
+
+### Step 2: Navigate
+The Chrome DevTools MCP server connects to an existing browser at http://127.0.0.1:9222.
+Use Chrome DevTools MCP navigate_to with the discovered URL. Even if already open, reload it.
+**CRITICAL:** Always wait for the networkidle event before proceeding to testing.
+
+### Step 3: Test
+Execute test scenario. Use screenshots only when explicitly requested.
+
+### Step 4: Report
+Provide test results, console errors, bugs, and recommendations.
+
+### Step 5: Cleanup
+If you started an app with ~{${RUN_LAUNCH_CONFIGURATION_FUNCTION_ID}}, close it with ~{${STOP_LAUNCH_CONFIGURATION_FUNCTION_ID}}.
+
+## Output Rules
+- Execute all tool calls silently with ZERO text output during Steps 1-5
+- Produce ONE comprehensive report AFTER all steps complete
+- Response structure: [Tool calls] → [Single report]
+
+## Report Format
+**Test Report: [Test Scenario Name]**
+
+**Results:** [Pass/Fail status with details]
+
+**Issues Found:** [Bugs, errors, problems discovered]
+
+**Console Output:** [Errors, warnings, relevant logs]
+
+## Mandatory Rules
+1. Execute all 5 steps in ONE response
+2. Discover URLs yourself - never ask the user
+3. Zero text during execution; report only after completion
+4. Never launch Frontend or Electron configs
+5. Always wait for networkidle event after navigation before testing
+6. Do not provide screenshots to the user unless explicitly requested
+
+## Context
+{{${CHAT_CONTEXT_DETAILS_VARIABLE_ID}}}
+
+## Project Info
+{{prompt:project-info}}
+`
+};
+
+export const appTesterTemplateVariant: BasePromptFragment = {
+  id: 'app-tester-system-empty',
+  template: '',
+};

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

@@ -0,0 +1,98 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 {
+    ChatMode, ChatRequestModel, ChatService, ChatSession,
+    MutableChatModel, MutableChatRequestModel
+} from '@theia/ai-chat/lib/common';
+import { TaskContextStorageService } from '@theia/ai-chat/lib/browser/task-context-service';
+import { LanguageModelRequirement } from '@theia/ai-core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { architectSystemVariants, ARCHITECT_DEFAULT_PROMPT_ID, ARCHITECT_PLANNING_PROMPT_ID, ARCHITECT_SIMPLE_PROMPT_ID } from '../common/architect-prompt-template';
+import { nls } from '@theia/core';
+import { MarkdownStringImpl } from '@theia/core/lib/common/markdown-rendering';
+import { AI_SUMMARIZE_SESSION_AS_TASK_FOR_CODER, AI_UPDATE_TASK_CONTEXT_COMMAND, AI_EXECUTE_PLAN_WITH_CODER } from '../common/summarize-session-commands';
+import { AbstractModeAwareChatAgent } from './mode-aware-chat-agent';
+
+@injectable()
+export class ArchitectAgent extends AbstractModeAwareChatAgent {
+    @inject(ChatService) protected readonly chatService: ChatService;
+    @inject(TaskContextStorageService) protected readonly taskContextStorageService: TaskContextStorageService;
+
+    name = 'Architect';
+    id = 'Architect';
+    languageModelRequirements: LanguageModelRequirement[] = [{
+        purpose: 'chat',
+        identifier: 'default/code',
+    }];
+    protected defaultLanguageModelPurpose: string = 'chat';
+
+    override description = nls.localize('theia/ai/workspace/workspaceAgent/description',
+        '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. It cannot modify files. It can therefore answer questions about the current project, project files and source code in the \
+         workspace, such as how to build the project, where to put source code, where to find specific code or configurations, etc.');
+
+    protected readonly modeDefinitions: Omit<ChatMode, 'isDefault'>[] = [
+        {
+            id: ARCHITECT_DEFAULT_PROMPT_ID,
+            name: nls.localize('theia/ai/ide/architectAgent/mode/default', 'Default Mode')
+        },
+        {
+            id: ARCHITECT_SIMPLE_PROMPT_ID,
+            name: nls.localize('theia/ai/ide/architectAgent/mode/simple', 'Simple Mode')
+        },
+        {
+            id: ARCHITECT_PLANNING_PROMPT_ID,
+            name: nls.localize('theia/ai/ide/architectAgent/mode/plan', 'Plan Mode')
+        },
+    ];
+
+    override prompts = [architectSystemVariants];
+    protected override systemPromptId: string | undefined = architectSystemVariants.id;
+
+    override async invoke(request: MutableChatRequestModel): Promise<void> {
+        await super.invoke(request);
+        this.suggest(request);
+    }
+
+    async suggest(context: ChatSession | ChatRequestModel): Promise<void> {
+        const model = ChatRequestModel.is(context) ? context.session : context.model;
+        const session = this.chatService.getSessions().find(candidate => candidate.model.id === model.id);
+        if (!(model instanceof MutableChatModel) || !session) { return; }
+        if (!model.isEmpty()) {
+            // Check if we're using the next prompt variant, if so, we show different actions
+            const lastRequest = model.getRequests().at(-1);
+            const isNextVariant = lastRequest?.response?.promptVariantId === ARCHITECT_PLANNING_PROMPT_ID;
+
+            if (isNextVariant) {
+                const taskContexts = this.taskContextStorageService.getAll().filter(s => s.sessionId === session.id);
+                if (taskContexts.length > 0) {
+                    const suggestions = taskContexts.map(tc =>
+                        new MarkdownStringImpl(`[${nls.localize('theia/ai/ide/architectAgent/suggestion/executePlanWithCoder',
+                            'Execute "{0}" with Coder', tc.label)}](command:${AI_EXECUTE_PLAN_WITH_CODER.id}?${encodeURIComponent(JSON.stringify(tc.id))}).`)
+                    );
+                    model.setSuggestions(suggestions);
+                }
+            } else {
+                model.setSuggestions([
+                    new MarkdownStringImpl(`[${nls.localize('theia/ai/ide/architectAgent/suggestion/summarizeSessionAsTaskForCoder',
+                        'Summarize this session as a task for Coder')}](command:${AI_SUMMARIZE_SESSION_AS_TASK_FOR_CODER.id}).`),
+                    new MarkdownStringImpl(`[${nls.localize('theia/ai/ide/architectAgent/suggestion/updateTaskContext',
+                        'Update current task context')}](command:${AI_UPDATE_TASK_CONTEXT_COMMAND.id}).`)
+                ]);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,113 @@
+// *****************************************************************************
+// 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 {
+    ChatMode, ChatRequestModel, ChatService, ChatSession,
+    MutableChatModel, MutableChatRequestModel
+} from '@theia/ai-chat/lib/common';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import {
+    CODER_SYSTEM_PROMPT_ID,
+    CODER_EDIT_TEMPLATE_ID,
+    CODER_AGENT_MODE_TEMPLATE_ID,
+    CODER_AGENT_MODE_NEXT_TEMPLATE_ID,
+    CODE_OS_AGENT_MODE_TEMPLATE_ID,
+    getCoderAgentModePromptTemplate,
+    getCoderAgentModeNextPromptTemplate,
+    getCoderPromptTemplateEdit,
+    getCoderPromptTemplateEditNext,
+    getCoderPromptTemplateSimpleEdit,
+    getCodeOsAgentModePromptTemplate
+} from '../common/coder-replace-prompt-template';
+import { LanguageModelRequirement, PromptVariantSet } from '@theia/ai-core';
+import { nls } from '@theia/core';
+import { MarkdownStringImpl } from '@theia/core/lib/common/markdown-rendering';
+import { AI_CHAT_NEW_CHAT_WINDOW_COMMAND, ChatCommands } from '@theia/ai-chat-ui/lib/browser/chat-view-commands';
+import { AbstractModeAwareChatAgent } from './mode-aware-chat-agent';
+
+@injectable()
+export class CoderAgent extends AbstractModeAwareChatAgent {
+    @inject(ChatService) protected readonly chatService: ChatService;
+    id: string = 'Coder';
+    name = 'Coder';
+    languageModelRequirements: LanguageModelRequirement[] = [{
+        purpose: 'chat',
+        identifier: 'default/code',
+    }];
+    protected defaultLanguageModelPurpose: string = 'chat';
+
+    override description = nls.localize('theia/ai/workspace/coderAgent/description',
+        '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. Furthermore, it can suggest modifications of files to the user. It can therefore assist the user with coding tasks or other \
+        tasks involving file changes.');
+
+    protected readonly modeDefinitions: Omit<ChatMode, 'isDefault'>[] = [
+        {
+            id: CODE_OS_AGENT_MODE_TEMPLATE_ID,
+            name: nls.localize('theia/ai/ide/coderAgent/mode/codeOs', 'Code OS')
+        },
+        {
+            id: CODER_EDIT_TEMPLATE_ID,
+            name: nls.localize('theia/ai/ide/coderAgent/mode/edit', 'Edit Mode')
+        },
+        {
+            id: CODER_AGENT_MODE_TEMPLATE_ID,
+            name: nls.localizeByDefault('Agent Mode')
+        },
+        {
+            id: CODER_AGENT_MODE_NEXT_TEMPLATE_ID,
+            name: nls.localize('theia/ai/ide/coderAgent/mode/agentNext', 'Agent Mode (Next)')
+        },
+    ];
+
+    override prompts: PromptVariantSet[] = [{
+        id: CODER_SYSTEM_PROMPT_ID,
+        defaultVariant: getCoderPromptTemplateEdit(),
+        variants: [
+            getCoderPromptTemplateSimpleEdit(),
+            getCoderAgentModePromptTemplate(),
+            getCoderAgentModeNextPromptTemplate(),
+            getCoderPromptTemplateEditNext(),
+            getCodeOsAgentModePromptTemplate()
+        ]
+    }];
+    protected override systemPromptId: string | undefined = CODER_SYSTEM_PROMPT_ID;
+    override async invoke(request: MutableChatRequestModel): Promise<void> {
+        await super.invoke(request);
+        this.suggest(request);
+    }
+    async suggest(context: ChatSession | ChatRequestModel): Promise<void> {
+        const contextIsRequest = ChatRequestModel.is(context);
+        const model = contextIsRequest ? context.session : context.model;
+        const session = contextIsRequest ? this.chatService.getSessions().find(candidate => candidate.model.id === model.id) : context;
+        if (!(model instanceof MutableChatModel) || !session) { return; }
+        if (model.isEmpty()) {
+            model.setSuggestions([
+                {
+                    kind: 'callback',
+                    callback: () => this.chatService.sendRequest(session.id, {
+                        text: `@Coder ${nls.localize('theia/ai/ide/coderAgent/suggestion/fixProblems/prompt', 'please look at {1} and fix any problems.', '#_f')}`
+                    }),
+                    content: nls.localize('theia/ai/ide/coderAgent/suggestion/fixProblems/content', '[Fix problems]({0}) in the current file.', '_callback')
+                },
+            ]);
+        } else {
+            model.setSuggestions([new MarkdownStringImpl(nls.localize('theia/ai/ide/coderAgent/suggestion/startNewChat',
+                'Keep chats short and focused. [Start a new chat]({0}) for a new task or [start a new chat with a summary of this one]({1}).',
+                `command:${AI_CHAT_NEW_CHAT_WINDOW_COMMAND.id}`, `command:${ChatCommands.AI_CHAT_NEW_WITH_TASK_CONTEXT.id}`))]);
+        }
+    }
+
+}

packages/ai-ide/src/browser/context-file-validation-service-impl.spec.ts

@@ -0,0 +1,405 @@
+// *****************************************************************************
+// 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 { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+FrontendApplicationConfigProvider.set({});
+
+import { expect } from 'chai';
+import { Container } from '@theia/core/shared/inversify';
+import { URI, PreferenceService } from '@theia/core';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+import { FileStat } from '@theia/filesystem/lib/common/files';
+import { ContextFileValidationService, FileValidationState } from '@theia/ai-chat/lib/browser/context-file-validation-service';
+import { ContextFileValidationServiceImpl } from './context-file-validation-service-impl';
+import { WorkspaceFunctionScope } from './workspace-functions';
+
+disableJSDOM();
+
+describe('ContextFileValidationService', () => {
+    let container: Container;
+    let validationService: ContextFileValidationService;
+    let mockFileService: FileService;
+    let mockWorkspaceService: WorkspaceService;
+    let mockPreferenceService: PreferenceService;
+
+    const workspaceRoot = new URI('file:///home/user/workspace');
+
+    // Store URIs as actual URI strings, exactly as URI.toString() would produce them
+    const existingFiles = new Map<string, boolean>([
+        // Files inside workspace
+        ['file:///home/user/workspace/src/index.tsx', true],
+        ['file:///home/user/workspace/package.json', true],
+        ['file:///home/user/workspace/README.md', true],
+        ['file:///home/user/workspace/src/components/Button.tsx', true],
+        ['file:///home/user/workspace/config.json', true],
+        ['file:///home/user/workspace/src/file%20with%20spaces.tsx', true],
+        // Files outside workspace (these exist but should be rejected)
+        ['file:///etc/passwd', true],
+        ['file:///etc/hosts', true],
+        ['file:///home/other-user/secret.txt', true],
+        ['file:///tmp/temporary-file.log', true]
+    ]);
+
+    before(() => {
+        disableJSDOM = enableJSDOM();
+    });
+
+    after(() => {
+        disableJSDOM();
+    });
+
+    beforeEach(async () => {
+        container = new Container();
+
+        // Mock WorkspaceService
+        mockWorkspaceService = {
+            tryGetRoots: () => [{
+                resource: workspaceRoot,
+                isDirectory: true
+            } as FileStat],
+            roots: Promise.resolve([{
+                resource: workspaceRoot,
+                isDirectory: true
+            } as FileStat])
+        } as unknown as WorkspaceService;
+
+        // Mock FileService
+        mockFileService = {
+            exists: async (uri: URI) => {
+                const normalizedUri = uri.path.normalize();
+                const normalizedUriString = uri.withPath(normalizedUri).toString();
+                const uriString = uri.toString();
+
+                const exists = (existingFiles.has(uriString) && existingFiles.get(uriString) === true) ||
+                    (existingFiles.has(normalizedUriString) && existingFiles.get(normalizedUriString) === true);
+                return exists;
+            },
+            resolve: async (uri: URI) => {
+                const uriString = uri.toString();
+                if (existingFiles.has(uriString) && existingFiles.get(uriString) === true) {
+                    return {
+                        resource: uri,
+                        isDirectory: false
+                    } as FileStat;
+                }
+                throw new Error('File not found');
+            }
+        } as unknown as FileService;
+
+        // Mock PreferenceService
+        mockPreferenceService = {
+            get: () => false
+        } as unknown as PreferenceService;
+
+        container.bind(FileService).toConstantValue(mockFileService);
+        container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
+        container.bind(PreferenceService).toConstantValue(mockPreferenceService);
+        container.bind(WorkspaceFunctionScope).toSelf();
+        container.bind(ContextFileValidationServiceImpl).toSelf();
+        container.bind(ContextFileValidationService).toService(ContextFileValidationServiceImpl);
+
+        validationService = await container.getAsync(ContextFileValidationService);
+    });
+
+    describe('validateFile with relative paths', () => {
+        it('should validate existing file with relative path', async () => {
+            const result = await validationService.validateFile('src/index.tsx');
+            expect(result.state).to.equal(FileValidationState.VALID);
+        });
+
+        it('should reject non-existing file with relative path', async () => {
+            const result = await validationService.validateFile('src/missing.tsx');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should validate nested file with relative path', async () => {
+            const result = await validationService.validateFile('src/components/Button.tsx');
+            expect(result.state).to.equal(FileValidationState.VALID);
+        });
+
+        it('should validate file in root with relative path', async () => {
+            const result = await validationService.validateFile('package.json');
+            expect(result.state).to.equal(FileValidationState.VALID);
+        });
+    });
+
+    describe('validateFile with absolute file paths', () => {
+        it('should validate existing file with absolute path within workspace', async () => {
+            const result = await validationService.validateFile('/home/user/workspace/src/index.tsx');
+            expect(result.state).to.equal(FileValidationState.VALID);
+        });
+
+        it('should reject non-existing file with absolute path within workspace', async () => {
+            const result = await validationService.validateFile('/home/user/workspace/src/missing.tsx');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject existing file with absolute path outside workspace (/etc/passwd)', async () => {
+            const result = await validationService.validateFile('/etc/passwd');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject existing file with absolute path outside workspace (/etc/hosts)', async () => {
+            const result = await validationService.validateFile('/etc/hosts');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject existing file with absolute path in other user directory', async () => {
+            const result = await validationService.validateFile('/home/other-user/secret.txt');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject existing file with absolute path in /tmp', async () => {
+            const result = await validationService.validateFile('/tmp/temporary-file.log');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject non-existing file with absolute path outside workspace', async () => {
+            const result = await validationService.validateFile('/var/log/nonexistent.log');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should validate nested file with absolute path within workspace', async () => {
+            const result = await validationService.validateFile('/home/user/workspace/src/components/Button.tsx');
+            expect(result.state).to.equal(FileValidationState.VALID);
+        });
+    });
+
+    describe('validateFile with file:// URIs', () => {
+        it('should validate existing file with file:// URI within workspace', async () => {
+            const result = await validationService.validateFile('file:///home/user/workspace/src/index.tsx');
+            expect(result.state).to.equal(FileValidationState.VALID);
+        });
+
+        it('should reject non-existing file with file:// URI within workspace', async () => {
+            const result = await validationService.validateFile('file:///home/user/workspace/src/missing.tsx');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject existing file with file:// URI outside workspace (/etc/passwd)', async () => {
+            const result = await validationService.validateFile('file:///etc/passwd');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject existing file with file:// URI outside workspace (/etc/hosts)', async () => {
+            const result = await validationService.validateFile('file:///etc/hosts');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject existing file with file:// URI in other user directory', async () => {
+            const result = await validationService.validateFile('file:///home/other-user/secret.txt');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject existing file with file:// URI in /tmp', async () => {
+            const result = await validationService.validateFile('file:///tmp/temporary-file.log');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject non-existing file with file:// URI outside workspace', async () => {
+            const result = await validationService.validateFile('file:///var/log/nonexistent.log');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should validate file at workspace root with file:// URI', async () => {
+            const result = await validationService.validateFile('file:///home/user/workspace/package.json');
+            expect(result.state).to.equal(FileValidationState.VALID);
+        });
+    });
+
+    describe('validateFile with URI objects', () => {
+        it('should validate existing file with URI object within workspace', async () => {
+            const uri = new URI('file:///home/user/workspace/src/index.tsx');
+            const result = await validationService.validateFile(uri);
+            expect(result.state).to.equal(FileValidationState.VALID);
+        });
+
+        it('should reject non-existing file with URI object within workspace', async () => {
+            const uri = new URI('file:///home/user/workspace/src/missing.tsx');
+            const result = await validationService.validateFile(uri);
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject existing file with URI object outside workspace', async () => {
+            const uri = new URI('file:///etc/passwd');
+            const result = await validationService.validateFile(uri);
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject another existing file with URI object outside workspace', async () => {
+            const uri = new URI('file:///home/other-user/secret.txt');
+            const result = await validationService.validateFile(uri);
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+    });
+
+    describe('validateFile with no workspace', () => {
+        beforeEach(async () => {
+            // Override mock to return no workspace roots
+            mockWorkspaceService.tryGetRoots = () => [];
+        });
+
+        it('should reject any file when no workspace is open', async () => {
+            const result = await validationService.validateFile('src/index.tsx');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject absolute path when no workspace is open', async () => {
+            const result = await validationService.validateFile('/home/user/file.txt');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject file:// URI when no workspace is open', async () => {
+            const result = await validationService.validateFile('file:///home/user/file.txt');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+    });
+
+    describe('validateFile with multiple workspace roots', () => {
+        const workspaceRoot2 = new URI('file:///home/user/other-project');
+
+        beforeEach(async () => {
+            // Override mock to return multiple workspace roots
+            mockWorkspaceService.tryGetRoots = () => [
+                {
+                    resource: workspaceRoot,
+                    isDirectory: true
+                } as FileStat,
+                {
+                    resource: workspaceRoot2,
+                    isDirectory: true
+                } as FileStat
+            ];
+
+            // Add files in the second workspace
+            existingFiles.set('file:///home/user/other-project/index.js', true);
+            existingFiles.set('file:///home/user/other-project/lib/utils.js', true);
+        });
+
+        afterEach(() => {
+            // Clean up files added for this test
+            existingFiles.delete('file:///home/user/other-project/index.js');
+            existingFiles.delete('file:///home/user/other-project/lib/utils.js');
+        });
+
+        it('should validate file in first workspace root', async () => {
+            const result = await validationService.validateFile('src/index.tsx');
+            expect(result.state).to.equal(FileValidationState.VALID);
+        });
+
+        it('should validate file in second workspace root with relative path', async () => {
+            const result = await validationService.validateFile('index.js');
+            expect(result.state).to.equal(FileValidationState.INVALID_SECONDARY);
+        });
+
+        it('should validate file in second workspace root with absolute path', async () => {
+            const result = await validationService.validateFile('/home/user/other-project/index.js');
+            expect(result.state).to.equal(FileValidationState.INVALID_SECONDARY);
+        });
+
+        it('should validate file in second workspace root with file:// URI', async () => {
+            const result = await validationService.validateFile('file:///home/user/other-project/lib/utils.js');
+            expect(result.state).to.equal(FileValidationState.INVALID_SECONDARY);
+        });
+
+        it('should still reject files outside both workspace roots', async () => {
+            const result = await validationService.validateFile('/etc/passwd');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+    });
+
+    describe('validateFile error handling', () => {
+        it('should return false when FileService.exists throws error', async () => {
+            mockFileService.exists = async () => {
+                throw new Error('Permission denied');
+            };
+
+            const result = await validationService.validateFile('src/index.tsx');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should handle Windows-style paths', async () => {
+            // Add a Windows path to existing files
+            // Note: URI encoding will convert 'c:' to 'c%3A'
+            const windowsRoot = new URI('file:///c:/Users/user/project');
+            const windowsFile = new URI('file:///c:/Users/user/project/file.txt');
+            existingFiles.set(windowsFile.toString(), true);
+
+            // Override workspace to use Windows path
+            mockWorkspaceService.tryGetRoots = () => [{
+                resource: windowsRoot,
+                isDirectory: true
+            } as FileStat];
+
+            const result = await validationService.validateFile('file:///c:/Users/user/project/file.txt');
+            expect(result.state).to.equal(FileValidationState.VALID);
+
+            // Clean up
+            existingFiles.delete(windowsFile.toString());
+        });
+
+        it('should reject Windows system files outside workspace', async () => {
+            // Add Windows system file
+            const windowsSystemFile = 'file:///c:/Windows/System32/config/sam';
+            existingFiles.set(windowsSystemFile, true);
+
+            // Keep workspace as Linux for this test
+            const result = await validationService.validateFile('file:///c:/Windows/System32/config/sam');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+
+            // Clean up
+            existingFiles.delete(windowsSystemFile);
+        });
+    });
+
+    describe('edge cases', () => {
+        it('should handle paths with special characters', async () => {
+            const result = await validationService.validateFile('file:///home/user/workspace/src/file%20with%20spaces.tsx');
+            expect(result.state).to.equal(FileValidationState.VALID);
+        });
+
+        it('should handle paths with normalized separators', async () => {
+            const result = await validationService.validateFile('src\\components\\Button.tsx');
+            expect(result.state).to.equal(FileValidationState.VALID);
+        });
+
+        it('should reject empty path', async () => {
+            const result = await validationService.validateFile('');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject parent directory references in relative paths', async () => {
+            // Parent directory references are not allowed for security and clarity
+            const result = await validationService.validateFile('src/../config.json');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject path traversal attempts with parent directory references', async () => {
+            // Path traversal attempts should be rejected
+            const result = await validationService.validateFile('../../../../../../etc/passwd');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+
+        it('should reject absolute paths with parent directory references', async () => {
+            // Even absolute paths with .. should be rejected for consistency
+            const result = await validationService.validateFile('/home/user/workspace/src/../config.json');
+            expect(result.state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        });
+    });
+});

packages/ai-ide/src/browser/context-file-validation-service-impl.ts

@@ -0,0 +1,120 @@
+// *****************************************************************************
+// 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 { injectable, inject } from '@theia/core/shared/inversify';
+import { URI } from '@theia/core';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+import { ContextFileValidationService, FileValidationResult, FileValidationState } from '@theia/ai-chat/lib/browser/context-file-validation-service';
+import { WorkspaceFunctionScope } from './workspace-functions';
+
+@injectable()
+export class ContextFileValidationServiceImpl implements ContextFileValidationService {
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(WorkspaceFunctionScope)
+    protected readonly workspaceScope: WorkspaceFunctionScope;
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    async validateFile(pathOrUri: string | URI): Promise<FileValidationResult> {
+        try {
+            const resolvedUri = await this.workspaceScope.resolveToUri(pathOrUri);
+
+            if (!resolvedUri) {
+                return {
+                    state: FileValidationState.INVALID_NOT_FOUND,
+                    message: 'File does not exist'
+                };
+            }
+
+            const exists = await this.fileService.exists(resolvedUri);
+            if (!exists) {
+                const secondaryRootUri = await this.findInSecondaryWorkspaceRoots(pathOrUri);
+                if (secondaryRootUri) {
+                    return {
+                        state: FileValidationState.INVALID_SECONDARY,
+                        message: 'File is in a secondary workspace root. AI agents can only access files in the first workspace root.'
+                    };
+                }
+                return {
+                    state: FileValidationState.INVALID_NOT_FOUND,
+                    message: 'File does not exist'
+                };
+            }
+
+            if (this.workspaceScope.isInPrimaryWorkspace(resolvedUri)) {
+                return {
+                    state: FileValidationState.VALID
+                };
+            }
+
+            if (this.workspaceScope.isInWorkspace(resolvedUri)) {
+                return {
+                    state: FileValidationState.INVALID_SECONDARY,
+                    message: 'File is in a secondary workspace root. AI agents can only access files in the first workspace root.'
+                };
+            }
+
+            return {
+                state: FileValidationState.INVALID_NOT_FOUND,
+                message: 'File does not exist in the workspace'
+            };
+        } catch (error) {
+            return {
+                state: FileValidationState.INVALID_NOT_FOUND,
+                message: 'File does not exist'
+            };
+        }
+    }
+
+    protected async findInSecondaryWorkspaceRoots(pathOrUri: string | URI): Promise<URI | undefined> {
+        const roots = this.workspaceService.tryGetRoots();
+        if (roots.length <= 1) {
+            return undefined;
+        }
+
+        for (let i = 1; i < roots.length; i++) {
+            const root = roots[i];
+            let candidateUri: URI;
+
+            if (pathOrUri instanceof URI) {
+                candidateUri = pathOrUri;
+            } else if (pathOrUri.includes('://')) {
+                try {
+                    candidateUri = new URI(pathOrUri);
+                } catch {
+                    continue;
+                }
+            } else {
+                candidateUri = root.resource.resolve(pathOrUri);
+            }
+
+            try {
+                if (await this.fileService.exists(candidateUri)) {
+                    return candidateUri;
+                }
+            } catch {
+                continue;
+            }
+        }
+
+        return undefined;
+    }
+}

packages/ai-ide/src/browser/context-functions.spec.ts

@@ -0,0 +1,260 @@
+// *****************************************************************************
+// 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 { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+FrontendApplicationConfigProvider.set({});
+import { expect } from 'chai';
+import { ListChatContext, ResolveChatContext, AddFileToChatContext } from './context-functions';
+import { CancellationTokenSource } from '@theia/core';
+import { ChatContextManager, ChatToolContext, MutableChatModel, MutableChatRequestModel, MutableChatResponseModel } from '@theia/ai-chat';
+import { fail } from 'assert';
+import { AIVariableResolutionRequest, ResolvedAIContextVariable } from '@theia/ai-core';
+import { ContextFileValidationService, FileValidationState } from '@theia/ai-chat/lib/browser/context-file-validation-service';
+disableJSDOM();
+
+describe('Context Functions Cancellation Tests', () => {
+    let cancellationTokenSource: CancellationTokenSource;
+    let mockCtx: ChatToolContext;
+
+    before(() => {
+        disableJSDOM = enableJSDOM();
+    });
+    after(() => {
+        // Disable JSDOM after all tests
+        disableJSDOM();
+    });
+
+    beforeEach(() => {
+        cancellationTokenSource = new CancellationTokenSource();
+        const context: Partial<ChatContextManager> = {
+            addVariables: () => { },
+            getVariables: () => mockCtx.request.context?.variables as ResolvedAIContextVariable[]
+        };
+        const mockRequest = {
+            context: {
+                variables: [{
+                    variable: { id: 'file1', name: 'File' },
+                    arg: '/path/to/file',
+                    contextValue: 'file content'
+                } as ResolvedAIContextVariable]
+            },
+            session: {
+                context
+            } as MutableChatModel
+        } as unknown as MutableChatRequestModel;
+        mockCtx = {
+            cancellationToken: cancellationTokenSource.token,
+            request: mockRequest,
+            response: {} as MutableChatResponseModel
+        };
+    });
+
+    afterEach(() => {
+        cancellationTokenSource.dispose();
+    });
+
+    it('ListChatContext should respect cancellation token', async () => {
+        const listChatContext = new ListChatContext();
+        cancellationTokenSource.cancel();
+
+        const result = await listChatContext.getTool().handler('', mockCtx);
+        if (typeof result !== 'string') {
+            fail(`Wrong tool call result type: ${result}`);
+        }
+        const jsonResponse = JSON.parse(result);
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('ResolveChatContext should respect cancellation token', async () => {
+        const resolveChatContext = new ResolveChatContext();
+        cancellationTokenSource.cancel();
+
+        const result = await resolveChatContext.getTool().handler('{"contextElementId":"file1/path/to/file"}', mockCtx);
+        if (typeof result !== 'string') {
+            fail(`Wrong tool call result type: ${result}`);
+        }
+        const jsonResponse = JSON.parse(result);
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('AddFileToChatContext should respect cancellation token', async () => {
+        const addFileToChatContext = new AddFileToChatContext();
+        cancellationTokenSource.cancel();
+
+        const result = await addFileToChatContext.getTool().handler('{"filesToAdd":["/new/path/to/file"]}', mockCtx);
+        if (typeof result !== 'string') {
+            fail(`Wrong tool call result type: ${result}`);
+        }
+        const jsonResponse = JSON.parse(result);
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+});
+
+describe('AddFileToChatContext Validation Tests', () => {
+    let mockCtx: ChatToolContext;
+    let addedFiles: AIVariableResolutionRequest[];
+
+    before(() => {
+        disableJSDOM = enableJSDOM();
+    });
+    after(() => {
+        disableJSDOM();
+    });
+
+    beforeEach(() => {
+        addedFiles = [];
+        const context: Partial<ChatContextManager> = {
+            addVariables: (...vars: AIVariableResolutionRequest[]) => {
+                addedFiles.push(...vars);
+            },
+            getVariables: () => []
+        };
+        const mockRequest = {
+            context: {
+                variables: []
+            },
+            session: {
+                context
+            } as MutableChatModel
+        } as unknown as MutableChatRequestModel;
+        mockCtx = {
+            cancellationToken: new CancellationTokenSource().token,
+            request: mockRequest,
+            response: {} as MutableChatResponseModel
+        };
+    });
+
+    it('should add valid files to context', async () => {
+        const mockValidationService: ContextFileValidationService = {
+            validateFile: async () => ({ state: FileValidationState.VALID })
+        };
+
+        const addFileToChatContext = new AddFileToChatContext();
+        (addFileToChatContext as unknown as { validationService: ContextFileValidationService }).validationService = mockValidationService;
+
+        const result = await addFileToChatContext.getTool().handler(
+            '{"filesToAdd":["/valid/file1.ts","/valid/file2.ts"]}',
+            mockCtx
+        );
+
+        if (typeof result !== 'string') {
+            fail(`Wrong tool call result type: ${result}`);
+        }
+
+        const jsonResponse = JSON.parse(result);
+        expect(jsonResponse.added).to.have.lengthOf(2);
+        expect(jsonResponse.added).to.include('/valid/file1.ts');
+        expect(jsonResponse.added).to.include('/valid/file2.ts');
+        expect(jsonResponse.rejected).to.have.lengthOf(0);
+        expect(jsonResponse.summary.totalRequested).to.equal(2);
+        expect(jsonResponse.summary.added).to.equal(2);
+        expect(jsonResponse.summary.rejected).to.equal(0);
+        expect(addedFiles).to.have.lengthOf(2);
+    });
+
+    it('should reject non-existent files', async () => {
+        const mockValidationService: ContextFileValidationService = {
+            validateFile: async file => {
+                if (file === '/nonexistent/file.ts') {
+                    return {
+                        state: FileValidationState.INVALID_NOT_FOUND,
+                        message: 'File does not exist'
+                    };
+                }
+                return { state: FileValidationState.VALID };
+            }
+        };
+
+        const addFileToChatContext = new AddFileToChatContext();
+        (addFileToChatContext as unknown as { validationService: ContextFileValidationService }).validationService = mockValidationService;
+
+        const result = await addFileToChatContext.getTool().handler(
+            '{"filesToAdd":["/valid/file.ts","/nonexistent/file.ts"]}',
+            mockCtx
+        );
+
+        if (typeof result !== 'string') {
+            fail(`Wrong tool call result type: ${result}`);
+        }
+
+        const jsonResponse = JSON.parse(result);
+        expect(jsonResponse.added).to.have.lengthOf(1);
+        expect(jsonResponse.added).to.include('/valid/file.ts');
+        expect(jsonResponse.rejected).to.have.lengthOf(1);
+        expect(jsonResponse.rejected[0].file).to.equal('/nonexistent/file.ts');
+        expect(jsonResponse.rejected[0].reason).to.equal('File does not exist');
+        expect(jsonResponse.rejected[0].state).to.equal(FileValidationState.INVALID_NOT_FOUND);
+        expect(jsonResponse.summary.totalRequested).to.equal(2);
+        expect(jsonResponse.summary.added).to.equal(1);
+        expect(jsonResponse.summary.rejected).to.equal(1);
+        expect(addedFiles).to.have.lengthOf(1);
+    });
+
+    it('should reject files in secondary workspace roots', async () => {
+        const mockValidationService: ContextFileValidationService = {
+            validateFile: async file => {
+                if (file === '/secondary/root/file.ts') {
+                    return {
+                        state: FileValidationState.INVALID_SECONDARY,
+                        message: 'File is in a secondary workspace root. AI agents can only access files in the first workspace root.'
+                    };
+                }
+                return { state: FileValidationState.VALID };
+            }
+        };
+
+        const addFileToChatContext = new AddFileToChatContext();
+        (addFileToChatContext as unknown as { validationService: ContextFileValidationService }).validationService = mockValidationService;
+
+        const result = await addFileToChatContext.getTool().handler(
+            '{"filesToAdd":["/secondary/root/file.ts"]}',
+            mockCtx
+        );
+
+        if (typeof result !== 'string') {
+            fail(`Wrong tool call result type: ${result}`);
+        }
+
+        const jsonResponse = JSON.parse(result);
+        expect(jsonResponse.added).to.have.lengthOf(0);
+        expect(jsonResponse.rejected).to.have.lengthOf(1);
+        expect(jsonResponse.rejected[0].file).to.equal('/secondary/root/file.ts');
+        expect(jsonResponse.rejected[0].state).to.equal(FileValidationState.INVALID_SECONDARY);
+        expect(addedFiles).to.have.lengthOf(0);
+    });
+
+    it('should add all files when validation service is not available', async () => {
+        const addFileToChatContext = new AddFileToChatContext();
+
+        const result = await addFileToChatContext.getTool().handler(
+            '{"filesToAdd":["/file1.ts","/file2.ts"]}',
+            mockCtx
+        );
+
+        if (typeof result !== 'string') {
+            fail(`Wrong tool call result type: ${result}`);
+        }
+
+        const jsonResponse = JSON.parse(result);
+        expect(jsonResponse.added).to.have.lengthOf(2);
+        expect(jsonResponse.rejected).to.have.lengthOf(0);
+        expect(jsonResponse.summary.totalRequested).to.equal(2);
+        expect(jsonResponse.summary.added).to.equal(2);
+        expect(jsonResponse.summary.rejected).to.equal(0);
+        expect(addedFiles).to.have.lengthOf(2);
+    });
+});

packages/ai-ide/src/browser/context-functions.ts

@@ -0,0 +1,165 @@
+// *****************************************************************************
+// 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 { assertChatContext } from '@theia/ai-chat';
+import { ToolInvocationContext, ToolProvider, ToolRequest } from '@theia/ai-core';
+import { inject, injectable, optional } from '@theia/core/shared/inversify';
+import { LIST_CHAT_CONTEXT_FUNCTION_ID, RESOLVE_CHAT_CONTEXT_FUNCTION_ID, UPDATE_CONTEXT_FILES_FUNCTION_ID } from '../common/context-functions';
+import { FILE_VARIABLE } from '@theia/ai-core/lib/browser/file-variable-contribution';
+import { ContextFileValidationService, FileValidationState } from '@theia/ai-chat/lib/browser/context-file-validation-service';
+
+@injectable()
+export class ListChatContext implements ToolProvider {
+    static ID = LIST_CHAT_CONTEXT_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: ListChatContext.ID,
+            name: ListChatContext.ID,
+            description: 'Returns the list of context elements (such as files) specified by the user manually as part of the chat request.',
+            handler: async (_: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                const result = ctx.request.context.variables.map(contextElement => ({
+                    id: contextElement.variable.id + contextElement.arg,
+                    type: contextElement.variable.name
+                }));
+                return JSON.stringify(result, undefined, 2);
+            },
+            parameters: {
+                type: 'object',
+                properties: {}
+            },
+        };
+    }
+}
+
+@injectable()
+export class ResolveChatContext implements ToolProvider {
+    static ID = RESOLVE_CHAT_CONTEXT_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: ResolveChatContext.ID,
+            name: ResolveChatContext.ID,
+            description: 'Returns the content of a specific context element (such as files) specified by the user manually as part of the chat request.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    contextElementId: {
+                        type: 'string',
+                        description: 'The id of the context element to resolve.'
+                    }
+                },
+                required: ['contextElementId']
+            },
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+
+                const { contextElementId } = JSON.parse(args) as { contextElementId: string };
+                const variable = ctx.request.context.variables.find(contextElement => contextElement.variable.id + contextElement.arg === contextElementId);
+                if (variable) {
+                    const result = {
+                        type: variable.variable.name,
+                        ref: variable.value,
+                        content: variable.contextValue
+                    };
+                    return JSON.stringify(result, undefined, 2);
+                }
+                return JSON.stringify({ error: 'Context element not found' }, undefined, 2);
+            }
+        };
+    }
+}
+
+@injectable()
+export class AddFileToChatContext implements ToolProvider {
+    static ID = UPDATE_CONTEXT_FILES_FUNCTION_ID;
+
+    @inject(ContextFileValidationService) @optional()
+    protected readonly validationService: ContextFileValidationService | undefined;
+
+    getTool(): ToolRequest {
+        return {
+            id: AddFileToChatContext.ID,
+            name: AddFileToChatContext.ID,
+            parameters: {
+                type: 'object',
+                properties: {
+                    filesToAdd: {
+                        type: 'array',
+                        description: 'Array of relative file paths to bookmark (e.g., ["src/index.ts", "package.json"]). Paths are relative to the workspace root.',
+                        items: { type: 'string' }
+                    }
+                },
+                required: ['filesToAdd']
+            },
+            description: 'Adds one or more files to the context of the current chat session for future reference. ' +
+                'Use this to bookmark important files that you\'ll need to reference multiple times during the conversation - ' +
+                'this is more efficient than re-reading files repeatedly. ' +
+                'Only files that exist within the workspace boundaries will be added. ' +
+                'Files outside the workspace or non-existent files will be rejected. ' +
+                'Returns a detailed status for each file, including which were successfully added and which were rejected with reasons. ' +
+                'Note: Adding a file to context does NOT read its contents - use getFileContent to read the actual content.',
+            handler: async (arg: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+
+                const { filesToAdd } = JSON.parse(arg) as { filesToAdd: string[] };
+
+                const added: string[] = [];
+                const rejected: Array<{ file: string; reason: string; state: string }> = [];
+
+                for (const file of filesToAdd) {
+                    if (this.validationService) {
+                        const validationResult = await this.validationService.validateFile(file);
+
+                        if (validationResult.state === FileValidationState.VALID) {
+                            ctx.request.session.context.addVariables({ arg: file, variable: FILE_VARIABLE });
+                            added.push(file);
+                        } else {
+                            rejected.push({
+                                file,
+                                reason: validationResult.message || 'File validation failed',
+                                state: validationResult.state
+                            });
+                        }
+                    } else {
+                        ctx.request.session.context.addVariables({ arg: file, variable: FILE_VARIABLE });
+                        added.push(file);
+                    }
+                }
+
+                return JSON.stringify({
+                    added,
+                    rejected,
+                    summary: {
+                        totalRequested: filesToAdd.length,
+                        added: added.length,
+                        rejected: rejected.length
+                    }
+                });
+            }
+        };
+    }
+}

packages/ai-ide/src/browser/coolify-deployment-provider.ts

@@ -0,0 +1,584 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { ToolInvocationContext, ToolProvider, ToolRequest } from '@theia/ai-core';
+import { CancellationToken } from '@theia/core';
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { PreferenceService } from '@theia/core/lib/common/preferences/preference-service';
+import {
+    COOLIFY_LIST_PROJECTS_FUNCTION_ID,
+    COOLIFY_LIST_APPLICATIONS_FUNCTION_ID,
+    COOLIFY_CREATE_APPLICATION_FUNCTION_ID,
+    COOLIFY_DEPLOY_APPLICATION_FUNCTION_ID,
+    COOLIFY_GET_DEPLOYMENT_LOGS_FUNCTION_ID,
+    COOLIFY_GET_APPLICATION_STATUS_FUNCTION_ID
+} from '../common/workspace-functions';
+import { COOLIFY_API_URL_PREF, COOLIFY_API_TOKEN_PREF } from '../common/workspace-preferences';
+
+interface CoolifyProject {
+    uuid: string;
+    name: string;
+    description?: string;
+}
+
+interface CoolifyApplication {
+    uuid: string;
+    name: string;
+    description?: string;
+    git_repository?: string;
+    git_branch?: string;
+    status?: string;
+}
+
+@injectable()
+export class CoolifyListProjectsProvider implements ToolProvider {
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    getTool(): ToolRequest {
+        return {
+            id: COOLIFY_LIST_PROJECTS_FUNCTION_ID,
+            name: COOLIFY_LIST_PROJECTS_FUNCTION_ID,
+            description: 'Lists all projects in your Coolify instance. Projects are organizational containers for applications, databases, and services. ' +
+                'Use this to discover existing projects or to get project UUIDs needed for other Coolify operations. ' +
+                'Returns an array of projects with their UUIDs, names, and descriptions.',
+            parameters: {
+                type: 'object',
+                properties: {},
+                required: []
+            },
+            handler: (argString, ctx?: ToolInvocationContext) => this.handleListProjects(ctx?.cancellationToken)
+        };
+    }
+
+    private async handleListProjects(cancellationToken?: CancellationToken): Promise<string> {
+        const { apiUrl, apiToken } = await this.getCoolifyConfig();
+
+        try {
+            const response = await fetch(`${apiUrl}/api/v1/projects`, {
+                method: 'GET',
+                headers: {
+                    'Authorization': `Bearer ${apiToken}`,
+                    'Accept': 'application/json'
+                }
+            });
+
+            if (!response.ok) {
+                return `Error: Failed to fetch projects (${response.status} ${response.statusText})`;
+            }
+
+            const projects: CoolifyProject[] = await response.json();
+
+            if (projects.length === 0) {
+                return 'No projects found. Create your first project in Coolify to get started.';
+            }
+
+            const projectList = projects.map(p =>
+                `- ${p.name} (UUID: ${p.uuid})${p.description ? `\n  Description: ${p.description}` : ''}`
+            ).join('\n');
+
+            return `Found ${projects.length} project(s):\n\n${projectList}`;
+        } catch (error) {
+            return `Error: ${error instanceof Error ? error.message : 'Unknown error occurred'}`;
+        }
+    }
+
+    private async getCoolifyConfig(): Promise<{ apiUrl: string; apiToken: string }> {
+        const apiUrl = this.preferenceService.get<string>(COOLIFY_API_URL_PREF, '');
+        const apiToken = this.preferenceService.get<string>(COOLIFY_API_TOKEN_PREF, '');
+
+        if (!apiUrl || !apiToken) {
+            throw new Error('Coolify API URL and Token must be configured in preferences');
+        }
+
+        return { apiUrl, apiToken };
+    }
+}
+
+@injectable()
+export class CoolifyListApplicationsProvider implements ToolProvider {
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    getTool(): ToolRequest {
+        return {
+            id: COOLIFY_LIST_APPLICATIONS_FUNCTION_ID,
+            name: COOLIFY_LIST_APPLICATIONS_FUNCTION_ID,
+            description: 'Lists all applications within a specific Coolify project. Applications are deployable services like web apps, APIs, or backend services. ' +
+                'Requires a project UUID (get it from coolify_listProjects first). ' +
+                'Returns application details including name, UUID, git repository, branch, and current status.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    projectUuid: {
+                        type: 'string',
+                        description: 'The UUID of the Coolify project to list applications from. Get this from coolify_listProjects.'
+                    }
+                },
+                required: ['projectUuid']
+            },
+            handler: (argString, ctx?: ToolInvocationContext) => this.handleListApplications(argString, ctx?.cancellationToken)
+        };
+    }
+
+    private async handleListApplications(argString: string, cancellationToken?: CancellationToken): Promise<string> {
+        const args = JSON.parse(argString);
+        const { projectUuid } = args;
+
+        const { apiUrl, apiToken } = await this.getCoolifyConfig();
+
+        try {
+            // List all applications and filter by project
+            const response = await fetch(`${apiUrl}/api/v1/applications`, {
+                method: 'GET',
+                headers: {
+                    'Authorization': `Bearer ${apiToken}`,
+                    'Accept': 'application/json'
+                }
+            });
+
+            if (!response.ok) {
+                return `Error: Failed to fetch applications (${response.status} ${response.statusText})`;
+            }
+
+            const allApplications: CoolifyApplication[] = await response.json();
+            // Filter by project UUID if needed (Coolify returns all apps)
+            const applications = projectUuid ? 
+                allApplications.filter((app: any) => app.project_uuid === projectUuid) : 
+                allApplications;
+
+            if (applications.length === 0) {
+                return `No applications found in project ${projectUuid}. Create your first application in Coolify.`;
+            }
+
+            const appList = applications.map(app =>
+                `- ${app.name} (UUID: ${app.uuid})\n` +
+                `  Status: ${app.status || 'unknown'}\n` +
+                `  ${app.git_repository ? `Repository: ${app.git_repository}` : ''}\n` +
+                `  ${app.git_branch ? `Branch: ${app.git_branch}` : ''}`
+            ).join('\n');
+
+            return `Found ${applications.length} application(s):\n\n${appList}`;
+        } catch (error) {
+            return `Error: ${error instanceof Error ? error.message : 'Unknown error occurred'}`;
+        }
+    }
+
+    private async getCoolifyConfig(): Promise<{ apiUrl: string; apiToken: string }> {
+        const apiUrl = this.preferenceService.get<string>(COOLIFY_API_URL_PREF, '');
+        const apiToken = this.preferenceService.get<string>(COOLIFY_API_TOKEN_PREF, '');
+
+        if (!apiUrl || !apiToken) {
+            throw new Error('Coolify API URL and Token must be configured in preferences');
+        }
+
+        return { apiUrl, apiToken };
+    }
+}
+
+@injectable()
+export class CoolifyCreateApplicationProvider implements ToolProvider {
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    getTool(): ToolRequest {
+        return {
+            id: COOLIFY_CREATE_APPLICATION_FUNCTION_ID,
+            name: COOLIFY_CREATE_APPLICATION_FUNCTION_ID,
+            description: 'Creates a new application in Coolify from a Git repository. ' +
+                'This sets up the application configuration but does NOT deploy it yet - use coolify_deployApplication after creation. ' +
+                'Supports both public and private Git repositories (Gitea, GitHub, GitLab, etc.). ' +
+                'Returns the application UUID which you can use for deployment and monitoring.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    projectUuid: {
+                        type: 'string',
+                        description: 'The UUID of the Coolify project to create the application in. Get this from coolify_listProjects.'
+                    },
+                    name: {
+                        type: 'string',
+                        description: 'A human-readable name for the application (e.g., "my-web-app", "api-server").'
+                    },
+                    gitRepository: {
+                        type: 'string',
+                        description: 'The Git repository URL. For Gitea: https://git.vibnai.com/username/repo-name.git'
+                    },
+                    gitBranch: {
+                        type: 'string',
+                        description: 'The Git branch to deploy from. Default: "main"'
+                    },
+                    buildPack: {
+                        type: 'string',
+                        description: 'Build pack to use. Options: "nixpacks" (auto-detects Node.js, Python, etc.), "dockerfile" (uses Dockerfile), "static" (static HTML/JS). Default: "nixpacks"'
+                    },
+                    portsExposes: {
+                        type: 'string',
+                        description: 'The port(s) the application exposes (e.g., "3000", "8080", "3000,8080"). Required for web apps.'
+                    },
+                    fqdn: {
+                        type: 'string',
+                        description: 'The fully qualified domain name for the application (e.g., "my-app.vibnai.com"). This will be the live URL for your app with automatic SSL.'
+                    },
+                    environmentName: {
+                        type: 'string',
+                        description: 'The environment name within the project. Default: "production"'
+                    },
+                    instantDeploy: {
+                        type: 'boolean',
+                        description: 'If true, automatically triggers deployment after creating the application. Default: false'
+                    }
+                },
+                required: ['projectUuid', 'name', 'gitRepository', 'portsExposes', 'fqdn']
+            },
+            handler: (argString, ctx?: ToolInvocationContext) => this.handleCreateApplication(argString, ctx?.cancellationToken)
+        };
+    }
+
+    private async handleCreateApplication(argString: string, cancellationToken?: CancellationToken): Promise<string> {
+        const args = JSON.parse(argString);
+        const {
+            projectUuid,
+            name,
+            gitRepository,
+            gitBranch = 'main',
+            buildPack = 'nixpacks',
+            portsExposes,
+            fqdn,
+            environmentName = 'production',
+            instantDeploy = false
+        } = args;
+
+        const { apiUrl, apiToken } = await this.getCoolifyConfig();
+
+        try {
+            // Get the localhost server UUID (where Coolify deploys apps)
+            const serversResponse = await fetch(`${apiUrl}/api/v1/servers`, {
+                headers: {
+                    'Authorization': `Bearer ${apiToken}`,
+                    'Accept': 'application/json'
+                }
+            });
+
+            if (!serversResponse.ok) {
+                return `Error: Failed to fetch servers (${serversResponse.status})`;
+            }
+
+            const servers = await serversResponse.json();
+            const localhostServer = servers.find((s: any) => s.is_coolify_host === true);
+            
+            if (!localhostServer) {
+                return 'Error: Could not find Coolify host server';
+            }
+
+            const payload: Record<string, any> = {
+                project_uuid: projectUuid,
+                environment_name: environmentName,
+                server_uuid: localhostServer.uuid,
+                name,
+                git_repository: gitRepository,
+                git_branch: gitBranch,
+                build_pack: buildPack,
+                ports_exposes: portsExposes,
+                domains: `https://${fqdn}`, // Coolify expects full URL with protocol
+                instant_deploy: instantDeploy
+            };
+
+            const response = await fetch(`${apiUrl}/api/v1/applications/public`, {
+                method: 'POST',
+                headers: {
+                    'Authorization': `Bearer ${apiToken}`,
+                    'Content-Type': 'application/json',
+                    'Accept': 'application/json'
+                },
+                body: JSON.stringify(payload)
+            });
+
+            if (!response.ok) {
+                const errorText = await response.text();
+                return `Error: Failed to create application (${response.status} ${response.statusText})\n${errorText}`;
+            }
+
+            const result = await response.json();
+
+            return `✅ Application created successfully!\n` +
+                `Name: ${name}\n` +
+                `UUID: ${result.uuid || result.application_uuid || 'N/A'}\n` +
+                `URL: https://${fqdn}\n` +
+                `Repository: ${gitRepository}\n` +
+                `Branch: ${gitBranch}\n` +
+                `${instantDeploy ? 'Deployment initiated automatically. Your app will be live at the URL above once deployment completes.' : 'Use coolify_deployApplication to deploy when ready.'}`;
+        } catch (error) {
+            return `Error: ${error instanceof Error ? error.message : 'Unknown error occurred'}`;
+        }
+    }
+
+    private async getCoolifyConfig(): Promise<{ apiUrl: string; apiToken: string }> {
+        const apiUrl = this.preferenceService.get<string>(COOLIFY_API_URL_PREF, '');
+        const apiToken = this.preferenceService.get<string>(COOLIFY_API_TOKEN_PREF, '');
+
+        if (!apiUrl || !apiToken) {
+            throw new Error('Coolify API URL and Token must be configured in preferences');
+        }
+
+        return { apiUrl, apiToken };
+    }
+}
+
+@injectable()
+export class CoolifyDeployApplicationProvider implements ToolProvider {
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    getTool(): ToolRequest {
+        return {
+            id: COOLIFY_DEPLOY_APPLICATION_FUNCTION_ID,
+            name: COOLIFY_DEPLOY_APPLICATION_FUNCTION_ID,
+            description: 'Triggers a deployment for a specific application in Coolify. This will pull the latest code from git, build, and deploy the application. ' +
+                'Requires the application UUID (get from coolify_listApplications). ' +
+                'Optionally specify a git commit SHA or tag to deploy a specific version. ' +
+                'Returns the deployment UUID which can be used to check logs and status.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    applicationUuid: {
+                        type: 'string',
+                        description: 'The UUID of the application to deploy. Get this from coolify_listApplications.'
+                    },
+                    gitCommitSha: {
+                        type: 'string',
+                        description: 'Optional: Specific git commit SHA or tag to deploy. If not provided, deploys the latest commit from the configured branch.'
+                    },
+                    forceRebuild: {
+                        type: 'boolean',
+                        description: 'Optional: Force a complete rebuild even if the code hasn\'t changed. Default: false.'
+                    }
+                },
+                required: ['applicationUuid']
+            },
+            handler: (argString, ctx?: ToolInvocationContext) => this.handleDeploy(argString, ctx?.cancellationToken)
+        };
+    }
+
+    private async handleDeploy(argString: string, cancellationToken?: CancellationToken): Promise<string> {
+        const args = JSON.parse(argString);
+        const { applicationUuid, gitCommitSha, forceRebuild } = args;
+
+        const { apiUrl, apiToken } = await this.getCoolifyConfig();
+
+        try {
+            const body: Record<string, string | boolean> = {};
+            if (gitCommitSha) {
+                body.git_commit_sha = gitCommitSha;
+            }
+            if (forceRebuild) {
+                body.force_rebuild = true;
+            }
+
+            const response = await fetch(`${apiUrl}/api/v1/applications/${applicationUuid}/deploy`, {
+                method: 'POST',
+                headers: {
+                    'Authorization': `Bearer ${apiToken}`,
+                    'Content-Type': 'application/json',
+                    'Accept': 'application/json'
+                },
+                body: JSON.stringify(body)
+            });
+
+            if (!response.ok) {
+                const errorText = await response.text();
+                return `Error: Deployment failed (${response.status} ${response.statusText})\n${errorText}`;
+            }
+
+            const result = await response.json();
+
+            return `✅ Deployment initiated successfully!\n` +
+                `Deployment UUID: ${result.deployment_uuid || 'N/A'}\n` +
+                `Application: ${applicationUuid}\n` +
+                `${gitCommitSha ? `Commit: ${gitCommitSha}\n` : ''}` +
+                `Use coolify_getDeploymentLogs to monitor progress.`;
+        } catch (error) {
+            return `Error: ${error instanceof Error ? error.message : 'Unknown error occurred'}`;
+        }
+    }
+
+    private async getCoolifyConfig(): Promise<{ apiUrl: string; apiToken: string }> {
+        const apiUrl = this.preferenceService.get<string>(COOLIFY_API_URL_PREF, '');
+        const apiToken = this.preferenceService.get<string>(COOLIFY_API_TOKEN_PREF, '');
+
+        if (!apiUrl || !apiToken) {
+            throw new Error('Coolify API URL and Token must be configured in preferences');
+        }
+
+        return { apiUrl, apiToken };
+    }
+}
+
+@injectable()
+export class CoolifyGetDeploymentLogsProvider implements ToolProvider {
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    getTool(): ToolRequest {
+        return {
+            id: COOLIFY_GET_DEPLOYMENT_LOGS_FUNCTION_ID,
+            name: COOLIFY_GET_DEPLOYMENT_LOGS_FUNCTION_ID,
+            description: 'Retrieves real-time deployment logs for a specific application deployment in Coolify. ' +
+                'Use this to monitor deployment progress, debug build failures, or verify successful deployments. ' +
+                'Requires the application UUID. Returns the most recent deployment logs.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    applicationUuid: {
+                        type: 'string',
+                        description: 'The UUID of the application to get logs for.'
+                    },
+                    limit: {
+                        type: 'number',
+                        description: 'Optional: Maximum number of log lines to return. Default: 100.'
+                    }
+                },
+                required: ['applicationUuid']
+            },
+            handler: (argString, ctx?: ToolInvocationContext) => this.handleGetLogs(argString, ctx?.cancellationToken)
+        };
+    }
+
+    private async handleGetLogs(argString: string, cancellationToken?: CancellationToken): Promise<string> {
+        const args = JSON.parse(argString);
+        const { applicationUuid, limit = 100 } = args;
+
+        const { apiUrl, apiToken } = await this.getCoolifyConfig();
+
+        try {
+            const response = await fetch(`${apiUrl}/api/v1/applications/${applicationUuid}/logs?limit=${limit}`, {
+                method: 'GET',
+                headers: {
+                    'Authorization': `Bearer ${apiToken}`,
+                    'Accept': 'application/json'
+                }
+            });
+
+            if (!response.ok) {
+                return `Error: Failed to fetch logs (${response.status} ${response.statusText})`;
+            }
+
+            const logs = await response.text();
+
+            if (!logs || logs.trim().length === 0) {
+                return `No logs available yet for application ${applicationUuid}. The deployment may not have started.`;
+            }
+
+            return `Deployment logs for ${applicationUuid}:\n\n${logs}`;
+        } catch (error) {
+            return `Error: ${error instanceof Error ? error.message : 'Unknown error occurred'}`;
+        }
+    }
+
+    private async getCoolifyConfig(): Promise<{ apiUrl: string; apiToken: string }> {
+        const apiUrl = this.preferenceService.get<string>(COOLIFY_API_URL_PREF, '');
+        const apiToken = this.preferenceService.get<string>(COOLIFY_API_TOKEN_PREF, '');
+
+        if (!apiUrl || !apiToken) {
+            throw new Error('Coolify API URL and Token must be configured in preferences');
+        }
+
+        return { apiUrl, apiToken };
+    }
+}
+
+@injectable()
+export class CoolifyGetApplicationStatusProvider implements ToolProvider {
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    getTool(): ToolRequest {
+        return {
+            id: COOLIFY_GET_APPLICATION_STATUS_FUNCTION_ID,
+            name: COOLIFY_GET_APPLICATION_STATUS_FUNCTION_ID,
+            description: 'Gets the current status of a Coolify application including running state, health checks, resource usage, and deployment history. ' +
+                'Use this to verify if an application is running correctly or to troubleshoot issues. ' +
+                'Returns detailed status information including container state, URL, and recent deployments.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    applicationUuid: {
+                        type: 'string',
+                        description: 'The UUID of the application to check status for.'
+                    }
+                },
+                required: ['applicationUuid']
+            },
+            handler: (argString, ctx?: ToolInvocationContext) => this.handleGetStatus(argString, ctx?.cancellationToken)
+        };
+    }
+
+    private async handleGetStatus(argString: string, cancellationToken?: CancellationToken): Promise<string> {
+        const args = JSON.parse(argString);
+        const { applicationUuid } = args;
+
+        const { apiUrl, apiToken } = await this.getCoolifyConfig();
+
+        try {
+            const response = await fetch(`${apiUrl}/api/v1/applications/${applicationUuid}`, {
+                method: 'GET',
+                headers: {
+                    'Authorization': `Bearer ${apiToken}`,
+                    'Accept': 'application/json'
+                }
+            });
+
+            if (!response.ok) {
+                return `Error: Failed to fetch application status (${response.status} ${response.statusText})`;
+            }
+
+            const app: any = await response.json();
+
+            const statusInfo = [
+                `Application: ${app.name}`,
+                `UUID: ${app.uuid}`,
+                `Status: ${app.status || 'unknown'}`,
+                `${app.fqdn ? `URL: ${app.fqdn}` : 'URL: Not configured'}`,
+                `${app.git_repository ? `Repository: ${app.git_repository}` : ''}`,
+                `${app.git_branch ? `Branch: ${app.git_branch}` : ''}`,
+                `${app.git_commit_sha ? `Latest Commit: ${app.git_commit_sha.substring(0, 7)}` : ''}`,
+                `Created: ${app.created_at || 'N/A'}`,
+                `Updated: ${app.updated_at || 'N/A'}`
+            ].filter(line => line && !line.endsWith(': ')).join('\n');
+
+            return statusInfo;
+        } catch (error) {
+            return `Error: ${error instanceof Error ? error.message : 'Unknown error occurred'}`;
+        }
+    }
+
+    private async getCoolifyConfig(): Promise<{ apiUrl: string; apiToken: string }> {
+        const apiUrl = this.preferenceService.get<string>(COOLIFY_API_URL_PREF, '');
+        const apiToken = this.preferenceService.get<string>(COOLIFY_API_TOKEN_PREF, '');
+
+        if (!apiUrl || !apiToken) {
+            throw new Error('Coolify API URL and Token must be configured in preferences');
+        }
+
+        return { apiUrl, apiToken };
+    }
+}

packages/ai-ide/src/browser/create-skill-agent.ts

@@ -0,0 +1,59 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 { ChatMode } from '@theia/ai-chat';
+import { LanguageModelRequirement } from '@theia/ai-core';
+import { injectable } from '@theia/core/shared/inversify';
+import {
+    createSkillSystemVariants,
+    CREATE_SKILL_SYSTEM_PROMPT_TEMPLATE_ID,
+    CREATE_SKILL_SYSTEM_DEFAULT_TEMPLATE_ID,
+    CREATE_SKILL_SYSTEM_AGENT_MODE_TEMPLATE_ID,
+} from '../common/create-skill-prompt-template';
+import { AbstractModeAwareChatAgent } from './mode-aware-chat-agent';
+import { nls } from '@theia/core';
+
+@injectable()
+export class CreateSkillAgent extends AbstractModeAwareChatAgent {
+
+    name = 'CreateSkill';
+    id = 'CreateSkill';
+    languageModelRequirements: LanguageModelRequirement[] = [{
+        purpose: 'chat',
+        identifier: 'default/universal',
+    }];
+    protected defaultLanguageModelPurpose: string = 'chat';
+
+    override description = nls.localize('theia/ai/workspace/createSkillAgent/description',
+        'An AI assistant for creating new skills. Skills provide reusable instructions and domain knowledge for AI agents. ' +
+        'This agent helps you create well-structured skills in the .prompts/skills directory with proper YAML frontmatter and markdown content.');
+
+    override tags: string[] = [...this.tags, 'Alpha'];
+
+    protected readonly modeDefinitions: Omit<ChatMode, 'isDefault'>[] = [
+        {
+            id: CREATE_SKILL_SYSTEM_DEFAULT_TEMPLATE_ID,
+            name: nls.localize('theia/ai/ide/createSkillAgent/mode/edit', 'Default Mode')
+        },
+        {
+            id: CREATE_SKILL_SYSTEM_AGENT_MODE_TEMPLATE_ID,
+            name: nls.localizeByDefault('Agent Mode')
+        }
+    ];
+
+    override prompts = [createSkillSystemVariants];
+    protected override systemPromptId: string | undefined = CREATE_SKILL_SYSTEM_PROMPT_TEMPLATE_ID;
+
+}

packages/ai-ide/src/browser/default-chat-agent-recommendation-service.ts

@@ -0,0 +1,43 @@
+// *****************************************************************************
+// 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 { injectable } from '@theia/core/shared/inversify';
+import { ChatAgentRecommendationService, RecommendedAgent } from '@theia/ai-chat/lib/common';
+import { nls } from '@theia/core/lib/common/nls';
+
+@injectable()
+export class DefaultChatAgentRecommendationService implements ChatAgentRecommendationService {
+
+    getRecommendedAgents(): RecommendedAgent[] {
+        return [
+            {
+                id: 'Coder',
+                label: nls.localize('theia/ai/chat/agent/coder', 'Coder'),
+                description: nls.localize('theia/ai/chat/agent/coder/description', 'Code generation and modification')
+            },
+            {
+                id: 'Architect',
+                label: nls.localize('theia/ai/chat/agent/architect', 'Architect'),
+                description: nls.localize('theia/ai/chat/agent/architect/description', 'High-level design and architecture')
+            },
+            {
+                id: 'Universal',
+                label: nls.localize('theia/ai/chat/agent/universal', 'Universal'),
+                description: nls.localize('theia/ai/chat/agent/universal/description', 'General-purpose assistant')
+            }
+        ];
+    }
+}

packages/ai-ide/src/browser/file-changeset-function.spec.ts

@@ -0,0 +1,55 @@
+// *****************************************************************************
+// Copyright (C) 2025 Lonti.com Pty Ltd.
+//
+// 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 { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+FrontendApplicationConfigProvider.set({});
+
+import { ChatToolContext, MutableChatRequestModel, MutableChatResponseModel } from '@theia/ai-chat';
+import { Container } from '@theia/core/shared/inversify';
+import { expect } from 'chai';
+import { DefaultFileChangeSetTitleProvider } from './file-changeset-functions';
+
+disableJSDOM();
+
+describe('DefaultFileChangeSetTitleProvider', () => {
+    let provider: DefaultFileChangeSetTitleProvider;
+
+    before(() => {
+        const container = new Container();
+        container.bind(DefaultFileChangeSetTitleProvider).toSelf();
+
+        provider = container.get(DefaultFileChangeSetTitleProvider);
+        disableJSDOM = enableJSDOM();
+    });
+
+    after(() => {
+        disableJSDOM();
+    });
+
+    it('should provide the title', () => {
+        const ctx: ChatToolContext = {
+            request: {
+                agentId: 'test-agent',
+            } as MutableChatRequestModel,
+            response: {} as MutableChatResponseModel
+        };
+
+        const title = provider.getChangeSetTitle(ctx);
+        expect(title).to.equal('Changes proposed');
+    });
+});

packages/ai-ide/src/browser/file-changeset-functions.spec.ts

@@ -0,0 +1,267 @@
+// *****************************************************************************
+// 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 { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+FrontendApplicationConfigProvider.set({});
+
+import { expect } from 'chai';
+import { CancellationTokenSource } from '@theia/core';
+import {
+    SuggestFileContent,
+    WriteFileContent,
+    SuggestFileReplacements,
+    SuggestFileReplacements_Simple,
+    WriteFileReplacements,
+    WriteFileReplacements_Simple,
+    ClearFileChanges,
+    GetProposedFileState,
+    ReplaceContentInFileFunctionHelper,
+    FileChangeSetTitleProvider,
+    DefaultFileChangeSetTitleProvider,
+    ReplaceContentInFileFunctionHelperV2
+} from './file-changeset-functions';
+import { ChatToolContext, MutableChatRequestModel, MutableChatResponseModel, MutableChatModel } from '@theia/ai-chat';
+import { ChangeSet, ChangeSetElement } from '@theia/ai-chat/lib/common/change-set';
+import { Container } from '@theia/core/shared/inversify';
+import { WorkspaceFunctionScope } from './workspace-functions';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { ChangeSetFileElementFactory, ChangeSetFileElement } from '@theia/ai-chat/lib/browser/change-set-file-element';
+import { URI } from '@theia/core/lib/common/uri';
+
+disableJSDOM();
+
+describe('File Changeset Functions Cancellation Tests', () => {
+    let cancellationTokenSource: CancellationTokenSource;
+    let mockCtx: ChatToolContext;
+    let container: Container;
+    before(() => {
+        disableJSDOM = enableJSDOM();
+    });
+    after(() => {
+        // Disable JSDOM after all tests
+        disableJSDOM();
+    });
+    beforeEach(() => {
+        cancellationTokenSource = new CancellationTokenSource();
+
+        // Create a mock change set that doesn't do anything
+        const mockChangeSet: Partial<ChangeSet> = {
+            addElements: (...elements: ChangeSetElement[]) => true,
+            setTitle: () => { },
+            removeElements: () => true,
+            getElementByURI: () => undefined
+        };
+
+        // Setup mock context
+        const mockRequest = {
+            id: 'test-request-id',
+            session: {
+                id: 'test-session-id',
+                changeSet: mockChangeSet as ChangeSet
+            } as MutableChatModel
+        } as MutableChatRequestModel;
+        mockCtx = {
+            cancellationToken: cancellationTokenSource.token,
+            request: mockRequest,
+            response: {} as MutableChatResponseModel
+        };
+
+        // Create a new container for each test
+        container = new Container();
+
+        // Mock dependencies
+        const mockWorkspaceScope = {
+            resolveRelativePath: async () => new URI('file:///workspace/test.txt')
+        } as unknown as WorkspaceFunctionScope;
+
+        const mockFileService = {
+            exists: async () => true,
+            read: async () => ({ value: { toString: () => 'test content' } })
+        } as unknown as FileService;
+
+        const mockFileChangeFactory: ChangeSetFileElementFactory = () => ({
+            uri: new URI('file:///workspace/test.txt'),
+            type: 'modify',
+            state: 'pending',
+            targetState: 'new content',
+            apply: async () => { },
+        } as ChangeSetFileElement);
+
+        // Register mocks in the container
+        container.bind(WorkspaceFunctionScope).toConstantValue(mockWorkspaceScope);
+        container.bind(FileService).toConstantValue(mockFileService);
+        container.bind(ChangeSetFileElementFactory).toConstantValue(mockFileChangeFactory);
+        container.bind(FileChangeSetTitleProvider).to(DefaultFileChangeSetTitleProvider).inSingletonScope();
+        container.bind(ReplaceContentInFileFunctionHelper).toSelf();
+        container.bind(SuggestFileContent).toSelf();
+        container.bind(WriteFileContent).toSelf();
+        container.bind(SuggestFileReplacements_Simple).toSelf();
+        container.bind(SuggestFileReplacements).toSelf();
+        container.bind(WriteFileReplacements_Simple).toSelf();
+        container.bind(WriteFileReplacements).toSelf();
+        container.bind(ClearFileChanges).toSelf();
+        container.bind(GetProposedFileState).toSelf();
+        container.bind(ReplaceContentInFileFunctionHelperV2).toSelf();
+    });
+
+    afterEach(() => {
+        cancellationTokenSource.dispose();
+    });
+
+    it('SuggestFileContent should respect cancellation token', async () => {
+        const suggestFileContent = container.get(SuggestFileContent);
+        cancellationTokenSource.cancel();
+
+        const handler = suggestFileContent.getTool().handler;
+        const result = await handler(JSON.stringify({ path: 'test.txt', content: 'test content' }), mockCtx);
+
+        const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('WriteFileContent should respect cancellation token', async () => {
+        const writeFileContent = container.get(WriteFileContent);
+        cancellationTokenSource.cancel();
+
+        const handler = writeFileContent.getTool().handler;
+        const result = await handler(JSON.stringify({ path: 'test.txt', content: 'test content' }), mockCtx);
+
+        const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('SuggestFileReplacements_Simple should respect cancellation token', async () => {
+        const suggestFileReplacementsSimple = container.get(SuggestFileReplacements_Simple);
+        cancellationTokenSource.cancel();
+
+        const handler = suggestFileReplacementsSimple.getTool().handler;
+        const result = await handler(
+            JSON.stringify({
+                path: 'test.txt',
+                replacements: [{ oldContent: 'old', newContent: 'new' }]
+            }),
+            mockCtx
+        );
+
+        const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('WriteFileReplacements_Simple should respect cancellation token', async () => {
+        const writeFileReplacementsSimple = container.get(WriteFileReplacements_Simple);
+        cancellationTokenSource.cancel();
+
+        const handler = writeFileReplacementsSimple.getTool().handler;
+        const result = await handler(
+            JSON.stringify({
+                path: 'test.txt',
+                replacements: [{ oldContent: 'old', newContent: 'new' }]
+            }),
+            mockCtx
+        );
+
+        const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('WriteFileReplacements should respect cancellation token with V2 implementation', async () => {
+        const writeFileReplacements = container.get(WriteFileReplacements);
+        cancellationTokenSource.cancel();
+
+        const handler = writeFileReplacements.getTool().handler;
+        const result = await handler(
+            JSON.stringify({
+                path: 'test.txt',
+                replacements: [{ oldContent: 'old', newContent: 'new', multiple: true }]
+            }),
+            mockCtx
+        );
+
+        const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('WriteFileReplacements should have correct ID', () => {
+        const writeFileReplacements = container.get(WriteFileReplacements);
+        expect(WriteFileReplacements.ID).to.equal('writeFileReplacements');
+        expect(writeFileReplacements.getTool().id).to.equal('writeFileReplacements');
+    });
+
+    it('ClearFileChanges should respect cancellation token', async () => {
+        const clearFileChanges = container.get(ClearFileChanges);
+        cancellationTokenSource.cancel();
+
+        const handler = clearFileChanges.getTool().handler;
+        const result = await handler(JSON.stringify({ path: 'test.txt' }), mockCtx);
+
+        const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('GetProposedFileState should respect cancellation token', async () => {
+        const getProposedFileState = container.get(GetProposedFileState);
+        cancellationTokenSource.cancel();
+
+        const handler = getProposedFileState.getTool().handler;
+        const result = await handler(JSON.stringify({ path: 'test.txt' }), mockCtx);
+
+        const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('ReplaceContentInFileFunctionHelper should handle cancellation in common processing', async () => {
+        const helper = container.get(ReplaceContentInFileFunctionHelper);
+        cancellationTokenSource.cancel();
+
+        // Test the underlying helper method through the public methods
+
+        const result = await helper.createChangesetFromToolCall(
+            JSON.stringify({
+                path: 'test.txt',
+                replacements: [{ oldContent: 'old', newContent: 'new' }]
+            }),
+            mockCtx
+        );
+        const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+
+    });
+
+    it('SuggestFileReplacements should respect cancellation token with V2 implementation', async () => {
+        const suggestFileReplacements = container.get(SuggestFileReplacements);
+        cancellationTokenSource.cancel();
+
+        const handler = suggestFileReplacements.getTool().handler;
+        const result = await handler(
+            JSON.stringify({
+                path: 'test.txt',
+                replacements: [{ oldContent: 'old', newContent: 'new', multiple: true }]
+            }),
+            mockCtx
+        );
+
+        const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('SuggestFileReplacements should have correct ID', () => {
+        const suggestFileReplacements = container.get(SuggestFileReplacements);
+        expect(SuggestFileReplacements.ID).to.equal('suggestFileReplacements');
+        expect(suggestFileReplacements.getTool().id).to.equal('suggestFileReplacements');
+    });
+});

packages/ai-ide/src/browser/file-changeset-functions.ts

@@ -0,0 +1,697 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { assertChatContext, ChatToolContext } from '@theia/ai-chat';
+import { ChangeSet } from '@theia/ai-chat/lib/common/change-set';
+import { ChangeSetElementArgs, ChangeSetFileElement, ChangeSetFileElementFactory } from '@theia/ai-chat/lib/browser/change-set-file-element';
+import { ToolInvocationContext, ToolProvider, ToolRequest, ToolRequestParameters, ToolRequestParametersProperties } from '@theia/ai-core';
+import { ContentReplacerV1Impl, Replacement, ContentReplacer } from '@theia/core/lib/common/content-replacer';
+import { ContentReplacerV2Impl } from '@theia/core/lib/common/content-replacer-v2-impl';
+import { URI } from '@theia/core/lib/common/uri';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { WorkspaceFunctionScope } from './workspace-functions';
+
+import { nls } from '@theia/core';
+import {
+    CLEAR_FILE_CHANGES_ID,
+    GET_PROPOSED_CHANGES_ID,
+    SUGGEST_FILE_CONTENT_ID,
+    SUGGEST_FILE_REPLACEMENTS_ID,
+    WRITE_FILE_CONTENT_ID,
+    WRITE_FILE_REPLACEMENTS_ID,
+    SUGGEST_FILE_REPLACEMENTS_SIMPLE_ID,
+    WRITE_FILE_REPLACEMENTS_SIMPLE_ID
+} from '../common/file-changeset-function-ids';
+
+export const FileChangeSetTitleProvider = Symbol('FileChangeSetTitleProvider');
+
+export interface FileChangeSetTitleProvider {
+    getChangeSetTitle(ctx: ChatToolContext): string;
+}
+
+@injectable()
+export class SuggestFileContent implements ToolProvider {
+    static ID = SUGGEST_FILE_CONTENT_ID;
+
+    @inject(WorkspaceFunctionScope)
+    protected readonly workspaceFunctionScope: WorkspaceFunctionScope;
+
+    @inject(FileService)
+    fileService: FileService;
+
+    @inject(ChangeSetFileElementFactory)
+    protected readonly fileChangeFactory: ChangeSetFileElementFactory;
+
+    @inject(FileChangeSetTitleProvider)
+    protected readonly fileChangeSetTitleProvider: FileChangeSetTitleProvider;
+
+    getTool(): ToolRequest {
+        return {
+            id: SuggestFileContent.ID,
+            name: SuggestFileContent.ID,
+            description: `Proposes writing complete content to a file for user review. If the file exists, it will be overwritten with the provided content.
+             If the file does not exist, it will be created. This tool will automatically create any directories needed to write the file.
+             If the new content is empty, the file will be deleted. To move a file, delete it and re-create it at the new location.
+             The proposed changes will be applied when the user accepts. If called again for the same file, previously proposed changes will be overridden.
+             Use this for creating new files or when you need to rewrite an entire file.
+             For targeted edits to existing files, prefer suggestFileReplacements instead - it's more efficient and shows clearer diffs.`,
+            parameters: {
+                type: 'object',
+                properties: {
+                    path: {
+                        type: 'string',
+                        description: 'Relative path to the file within the workspace (e.g., "src/index.ts", "config/settings.json").'
+                    },
+                    content: {
+                        type: 'string',
+                        description: `The COMPLETE content to write to the file. You MUST include ALL parts of the file, even if they haven't been modified.
+                         Do not truncate or omit any sections. Use empty string "" to delete the file.`
+                    }
+                },
+                required: ['path', 'content']
+            },
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                const { path, content } = JSON.parse(args);
+                const chatSessionId = ctx.request.session.id;
+                const uri = await this.workspaceFunctionScope.resolveRelativePath(path);
+                let type: ChangeSetElementArgs['type'] = 'modify';
+                if (content === '') {
+                    type = 'delete';
+                }
+                if (!(await this.fileService.exists(uri))) {
+                    type = 'add';
+                }
+                ctx.request.session.changeSet.addElements(
+                    this.fileChangeFactory({
+                        uri: uri,
+                        type,
+                        state: 'pending',
+                        targetState: content,
+                        requestId: ctx.request.id,
+                        chatSessionId
+                    })
+                );
+
+                ctx.request.session.changeSet.setTitle(this.fileChangeSetTitleProvider.getChangeSetTitle(ctx));
+                return `Proposed writing to file ${path}. The user will review and potentially apply the changes`;
+            }
+        };
+    }
+}
+
+@injectable()
+export class WriteFileContent implements ToolProvider {
+    static ID = WRITE_FILE_CONTENT_ID;
+
+    @inject(WorkspaceFunctionScope)
+    protected readonly workspaceFunctionScope: WorkspaceFunctionScope;
+
+    @inject(FileService)
+    fileService: FileService;
+
+    @inject(ChangeSetFileElementFactory)
+    protected readonly fileChangeFactory: ChangeSetFileElementFactory;
+
+    @inject(FileChangeSetTitleProvider)
+    protected readonly fileChangeSetTitleProvider: FileChangeSetTitleProvider;
+
+    getTool(): ToolRequest {
+        return {
+            id: WriteFileContent.ID,
+            name: WriteFileContent.ID,
+            description: `Immediately writes complete content to a file WITHOUT user confirmation. If the file exists, it will be overwritten.
+             If the file does not exist, it will be created. This tool will automatically create any directories needed to write the file.
+             If the new content is empty, the file will be deleted. To move a file, delete it and re-create it at the new location.
+             Use this for creating new files or complete file rewrites in agent mode.
+             For targeted edits, prefer writeFileReplacements - it's more efficient and less error-prone.
+             CAUTION: Changes are applied immediately and cannot be undone through the chat interface.`,
+            parameters: {
+                type: 'object',
+                properties: {
+                    path: {
+                        type: 'string',
+                        description: 'Relative path to the file within the workspace (e.g., "src/index.ts", "config/settings.json").'
+                    },
+                    content: {
+                        type: 'string',
+                        description: `The COMPLETE content to write to the file. You MUST include ALL parts of the file, even if they haven't been modified.
+                         Do not truncate or omit any sections. Use empty string "" to delete the file.`
+                    }
+                },
+                required: ['path', 'content']
+            },
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                const { path, content } = JSON.parse(args);
+                const chatSessionId = ctx.request.session.id;
+                const uri = await this.workspaceFunctionScope.resolveRelativePath(path);
+                let type = 'modify';
+                if (content === '') {
+                    type = 'delete';
+                }
+                if (!(await this.fileService.exists(uri))) {
+                    type = 'add';
+                }
+
+                const fileElement = this.fileChangeFactory({
+                    uri: uri,
+                    type: type as 'modify' | 'add' | 'delete',
+                    state: 'pending',
+                    targetState: content,
+                    requestId: ctx.request.id,
+                    chatSessionId
+                });
+
+                ctx.request.session.changeSet.setTitle(this.fileChangeSetTitleProvider.getChangeSetTitle(ctx));
+                ctx.request.session.changeSet.addElements(fileElement);
+
+                try {
+                    await fileElement.apply();
+                    return `Successfully wrote content to file ${path}.`;
+                } catch (error) {
+                    return `Failed to write content to file ${path}: ${error.message}`;
+                }
+            }
+        };
+    }
+}
+
+@injectable()
+export class ReplaceContentInFileFunctionHelper {
+    @inject(WorkspaceFunctionScope)
+    protected readonly workspaceFunctionScope: WorkspaceFunctionScope;
+
+    @inject(FileService)
+    fileService: FileService;
+
+    @inject(ChangeSetFileElementFactory)
+    protected readonly fileChangeFactory: ChangeSetFileElementFactory;
+
+    @inject(FileChangeSetTitleProvider)
+    protected readonly fileChangeSetTitleProvider: FileChangeSetTitleProvider;
+
+    private replacer: ContentReplacer;
+
+    constructor() {
+        this.replacer = new ContentReplacerV1Impl();
+    }
+
+    protected setReplacer(replacer: ContentReplacer): void {
+        this.replacer = replacer;
+    }
+
+    getToolMetadata(supportMultipleReplace: boolean = false, immediateApplication: boolean = false): { description: string, parameters: ToolRequestParameters } {
+        const replacementProperties: ToolRequestParametersProperties = {
+            oldContent: {
+                type: 'string',
+                description: 'The exact content to be replaced. Must match exactly, including whitespace, comments, etc.'
+            },
+            newContent: {
+                type: 'string',
+                description: 'The new content to insert in place of matched old content.'
+            }
+        };
+
+        if (supportMultipleReplace) {
+            replacementProperties.multiple = {
+                type: 'boolean',
+                description: 'Set to true if multiple occurrences of the oldContent are expected to be replaced.'
+            };
+        }
+        const replacementParameters = {
+            type: 'object',
+            properties: {
+                path: {
+                    type: 'string',
+                    description: 'Relative path to the file within the workspace (e.g., "src/index.ts"). Must read the file with getFileContent first.'
+                },
+                replacements: {
+                    type: 'array',
+                    items: {
+                        type: 'object',
+                        properties: replacementProperties,
+                        required: ['oldContent', 'newContent']
+                    },
+                    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',
+                    description: 'Set to true to clear any existing pending changes for this file and start fresh. Default is false, which merges with existing changes.'
+                }
+            },
+            required: ['path', 'replacements']
+        } as ToolRequestParameters;
+
+        const replacementSentence = supportMultipleReplace
+            ? 'By default, a single occurrence of each old content in the tuples is expected to be replaced. If the optional \'multiple\' flag is set to true, all occurrences will\
+             be replaced. In either case, if the number of occurrences in the file does not match the expectation the function will return an error. \
+             In that case try a different approach.'
+            : 'A single occurrence of each old content in the tuples is expected to be replaced. If the number of occurrences in the file does not match the expectation,\
+              the function will return an error. In that case try a different approach.';
+
+        const applicationText = immediateApplication
+            ? 'The changes will be applied immediately without user confirmation.'
+            : 'The proposed changes will be applied when the user accepts.';
+
+        const replacementDescription = `Propose to replace sections of content in an existing file by providing a list of tuples with old content to be matched and replaced.
+            ${replacementSentence}. For deletions, use an empty new content in the tuple.
+            Make sure you use the same line endings and whitespace as in the original file content. ${applicationText}
+            Multiple calls for the same file will merge replacements unless the reset parameter is set to true. Use the reset parameter to clear previous changes and start
+            fresh if needed.
+
+            IMPORTANT: Each oldContent must match exactly (including whitespace and indentation).
+            If replacements fail with "Expected 1 occurrence but found 0": re-read the file, the content may have changed or whitespace differs.
+            If replacements fail with "found 2+": include more surrounding context in oldContent to make it unique.
+            Always use getFileContent to read the current file state before making replacements.`;
+
+        return {
+            description: replacementDescription,
+            parameters: replacementParameters
+        };
+    }
+
+    async createChangesetFromToolCall(toolCallString: string, ctx: ChatToolContext): Promise<string> {
+        try {
+            if (ctx.cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+
+            const result = await this.processReplacementsCommon(toolCallString, ctx, this.fileChangeSetTitleProvider.getChangeSetTitle(ctx));
+
+            if (result.errors.length > 0) {
+                return `Errors encountered: ${result.errors.join('; ')}`;
+            }
+
+            if (result.fileElement) {
+                const action = result.reset ? 'reset and applied' : 'applied';
+                return `Proposed replacements ${action} to file ${result.path}. The user will review and potentially apply the changes.`;
+            } else {
+                return `No changes needed for file ${result.path}. Content already matches the requested state.`;
+            }
+        } catch (error) {
+            console.debug('Error processing replacements:', error.message);
+            return JSON.stringify({ error: error.message });
+        }
+    }
+
+    async writeChangesetFromToolCall(toolCallString: string, ctx: ChatToolContext): Promise<string> {
+        try {
+            if (ctx.cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+
+            const result = await this.processReplacementsCommon(toolCallString, ctx, this.fileChangeSetTitleProvider.getChangeSetTitle(ctx));
+
+            if (result.errors.length > 0) {
+                return `Errors encountered: ${result.errors.join('; ')}`;
+            }
+
+            if (result.fileElement) {
+                await result.fileElement.apply();
+
+                const action = result.reset ? 'reset and' : '';
+                return `Successfully ${action} applied replacements to file ${result.path}.`;
+            } else {
+                return `No changes needed for file ${result.path}. Content already matches the requested state.`;
+            }
+        } catch (error) {
+            console.debug('Error processing replacements:', error.message);
+            return JSON.stringify({ error: error.message });
+        }
+    }
+
+    private async processReplacementsCommon(
+        toolCallString: string,
+        ctx: ChatToolContext,
+        changeSetTitle: string
+    ): Promise<{ fileElement: ChangeSetFileElement | undefined, path: string, reset: boolean, errors: string[] }> {
+        if (ctx.cancellationToken?.isCancellationRequested) {
+            throw new Error('Operation cancelled by user');
+        }
+
+        const { path, replacements, reset } = JSON.parse(toolCallString) as { path: string, replacements: Replacement[], reset?: boolean };
+        const fileUri = await this.workspaceFunctionScope.resolveRelativePath(path);
+
+        let startingContent: string;
+        if (reset || !ctx.request.session.changeSet) {
+            startingContent = (await this.fileService.read(fileUri)).value.toString();
+        } else {
+            const existingElement = this.findExistingChangeElement(ctx.request.session.changeSet, fileUri);
+            if (existingElement) {
+                startingContent = existingElement.targetState || (await this.fileService.read(fileUri)).value.toString();
+            } else {
+                startingContent = (await this.fileService.read(fileUri)).value.toString();
+            }
+        }
+
+        if (ctx.cancellationToken?.isCancellationRequested) {
+            throw new Error('Operation cancelled by user');
+        }
+
+        const { updatedContent, errors } = this.replacer.applyReplacements(startingContent, replacements);
+
+        if (errors.length > 0) {
+            return { fileElement: undefined, path, reset: reset || false, errors };
+        }
+
+        const originalContent = (await this.fileService.read(fileUri)).value.toString();
+        if (updatedContent !== originalContent) {
+            ctx.request.session.changeSet.setTitle(changeSetTitle);
+
+            const fileElement = this.fileChangeFactory({
+                uri: fileUri,
+                type: 'modify',
+                state: 'pending',
+                targetState: updatedContent,
+                requestId: ctx.request.id,
+                chatSessionId: ctx.request.session.id
+            });
+
+            ctx.request.session.changeSet.addElements(fileElement);
+
+            return { fileElement, path, reset: reset || false, errors: [] };
+        } else {
+            return { fileElement: undefined, path, reset: reset || false, errors: [] };
+        }
+    }
+
+    private findExistingChangeElement(changeSet: ChangeSet, fileUri: URI): ChangeSetFileElement | undefined {
+        const element = changeSet.getElementByURI(fileUri);
+        if (element instanceof ChangeSetFileElement) {
+            return element;
+        }
+    }
+
+    async clearFileChanges(path: string, ctx: ChatToolContext): Promise<string> {
+        try {
+            if (ctx.cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+
+            const fileUri = await this.workspaceFunctionScope.resolveRelativePath(path);
+            if (ctx.request.session.changeSet.removeElements(fileUri)) {
+                return `Cleared pending change(s) for file ${path}.`;
+            } else {
+                return `No pending changes found for file ${path}.`;
+            }
+        } catch (error) {
+            console.debug('Error clearing file changes:', error.message);
+            return JSON.stringify({ error: error.message });
+        }
+    }
+
+    async getProposedFileState(path: string, ctx: ChatToolContext): Promise<string> {
+        try {
+            if (ctx.cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+
+            const fileUri = await this.workspaceFunctionScope.resolveRelativePath(path);
+
+            if (!ctx.request.session.changeSet) {
+                const originalContent = (await this.fileService.read(fileUri)).value.toString();
+                return `File ${path} has no pending changes. Original content:\n\n${originalContent}`;
+            }
+
+            const existingElement = this.findExistingChangeElement(ctx.request.session.changeSet, fileUri);
+            if (existingElement && existingElement.targetState) {
+                return `File ${path} has pending changes. Proposed content:\n\n${existingElement.targetState}`;
+            } else {
+                const originalContent = (await this.fileService.read(fileUri)).value.toString();
+                return `File ${path} has no pending changes. Original content:\n\n${originalContent}`;
+            }
+        } catch (error) {
+            console.debug('Error getting proposed file state:', error.message);
+            return JSON.stringify({ error: error.message });
+        }
+    }
+}
+
+@injectable()
+export class SimpleSuggestFileReplacements implements ToolProvider {
+    static ID = 'simpleSuggestFileReplacements';
+    @inject(ReplaceContentInFileFunctionHelper)
+    protected readonly replaceContentInFileFunctionHelper: ReplaceContentInFileFunctionHelper;
+
+    getTool(): ToolRequest {
+        const metadata = this.replaceContentInFileFunctionHelper.getToolMetadata();
+        return {
+            id: SimpleSuggestFileReplacements.ID,
+            name: SimpleSuggestFileReplacements.ID,
+            description: metadata.description,
+            parameters: metadata.parameters,
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                return this.replaceContentInFileFunctionHelper.createChangesetFromToolCall(args, ctx);
+            }
+        };
+    }
+}
+
+@injectable()
+export class SimpleWriteFileReplacements implements ToolProvider {
+    static ID = 'simpleWriteFileReplacements';
+    @inject(ReplaceContentInFileFunctionHelper)
+    protected readonly replaceContentInFileFunctionHelper: ReplaceContentInFileFunctionHelper;
+
+    getTool(): ToolRequest {
+        const metadata = this.replaceContentInFileFunctionHelper.getToolMetadata(false, true);
+        return {
+            id: SimpleWriteFileReplacements.ID,
+            name: SimpleWriteFileReplacements.ID,
+            description: metadata.description,
+            parameters: metadata.parameters,
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                return this.replaceContentInFileFunctionHelper.writeChangesetFromToolCall(args, ctx);
+            }
+        };
+    }
+}
+
+@injectable()
+export class SuggestFileReplacements_Simple implements ToolProvider {
+    static ID = SUGGEST_FILE_REPLACEMENTS_SIMPLE_ID;
+    @inject(ReplaceContentInFileFunctionHelper)
+    protected readonly replaceContentInFileFunctionHelper: ReplaceContentInFileFunctionHelper;
+
+    getTool(): ToolRequest {
+        const metadata = this.replaceContentInFileFunctionHelper.getToolMetadata(true);
+        return {
+            id: SuggestFileReplacements_Simple.ID,
+            name: SuggestFileReplacements_Simple.ID,
+            description: metadata.description,
+            parameters: metadata.parameters,
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                return this.replaceContentInFileFunctionHelper.createChangesetFromToolCall(args, ctx);
+            }
+        };
+    }
+}
+
+/**
+ * Legacy WriteFileReplacements implementation using V1 content replacer.
+ * @deprecated Use WriteFileReplacements instead which uses the improved V2 implementation.
+ */
+@injectable()
+export class WriteFileReplacements_Simple implements ToolProvider {
+    static ID = WRITE_FILE_REPLACEMENTS_SIMPLE_ID;
+    @inject(ReplaceContentInFileFunctionHelper)
+    protected readonly replaceContentInFileFunctionHelper: ReplaceContentInFileFunctionHelper;
+
+    getTool(): ToolRequest {
+        const metadata = this.replaceContentInFileFunctionHelper.getToolMetadata(true, true);
+        return {
+            id: WriteFileReplacements_Simple.ID,
+            name: WriteFileReplacements_Simple.ID,
+            description: metadata.description,
+            parameters: metadata.parameters,
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                return this.replaceContentInFileFunctionHelper.writeChangesetFromToolCall(args, ctx);
+            }
+        };
+    }
+}
+
+@injectable()
+export class ClearFileChanges implements ToolProvider {
+    static ID = CLEAR_FILE_CHANGES_ID;
+    @inject(ReplaceContentInFileFunctionHelper)
+    protected readonly replaceContentInFileFunctionHelper: ReplaceContentInFileFunctionHelper;
+
+    getTool(): ToolRequest {
+        return {
+            id: ClearFileChanges.ID,
+            name: ClearFileChanges.ID,
+            description: 'Clears all pending (not yet applied) changes for a specific file, allowing you to start fresh with new modifications. ' +
+                'Use this when previous replacement attempts failed and you want to try a different approach. ' +
+                'Does not affect already-applied changes or the actual file on disk.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    path: {
+                        type: 'string',
+                        description: 'Relative path to the file within the workspace (e.g., "src/index.ts").'
+                    }
+                },
+                required: ['path']
+            },
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                const { path } = JSON.parse(args);
+                return this.replaceContentInFileFunctionHelper.clearFileChanges(path, ctx);
+            }
+        };
+    }
+}
+
+@injectable()
+export class GetProposedFileState implements ToolProvider {
+    static ID = GET_PROPOSED_CHANGES_ID;
+    @inject(ReplaceContentInFileFunctionHelper)
+    protected readonly replaceContentInFileFunctionHelper: ReplaceContentInFileFunctionHelper;
+
+    getTool(): ToolRequest {
+        return {
+            id: GET_PROPOSED_CHANGES_ID,
+            name: GET_PROPOSED_CHANGES_ID,
+            description: 'Returns the current proposed state of a file, including all pending changes that have been proposed ' +
+                'but not yet applied. Use this to see what the file will look like after your changes are applied. ' +
+                'This is useful when making incremental changes to verify the accumulated state is correct. ' +
+                'If no pending changes exist for the file, returns the original file content.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    path: {
+                        type: 'string',
+                        description: 'Relative path to the file within the workspace (e.g., "src/index.ts").'
+                    }
+                },
+                required: ['path']
+            },
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                const { path } = JSON.parse(args);
+                return this.replaceContentInFileFunctionHelper.getProposedFileState(path, ctx);
+            }
+        };
+    }
+}
+
+@injectable()
+export class ReplaceContentInFileFunctionHelperV2 extends ReplaceContentInFileFunctionHelper {
+    constructor() {
+        super();
+        this.setReplacer(new ContentReplacerV2Impl());
+    }
+}
+
+@injectable()
+export class SuggestFileReplacements implements ToolProvider {
+    static ID = SUGGEST_FILE_REPLACEMENTS_ID;
+
+    @inject(ReplaceContentInFileFunctionHelperV2)
+    protected readonly replaceContentInFileFunctionHelper: ReplaceContentInFileFunctionHelperV2;
+
+    getTool(): ToolRequest {
+        const metadata = this.replaceContentInFileFunctionHelper.getToolMetadata(true);
+        return {
+            id: SuggestFileReplacements.ID,
+            name: SuggestFileReplacements.ID,
+            description: `Proposes to replace sections of content in an existing file by providing a list of replacements.
+            Each replacement consists of oldContent to be matched and newContent to insert in its place.
+            By default, a single occurrence of each oldContent is expected. If the 'multiple' flag is set to true, all occurrences will be replaced.
+            For deletions, use an empty newContent.
+            The proposed changes will be applied when the user accepts.
+            Multiple calls for the same file will merge replacements unless the reset parameter is set to true.
+
+            IMPORTANT: Each oldContent must appear exactly once in the file (unless 'multiple' is true).
+            If you see "Expected 1 occurrence but found X" errors:
+            - If found 0: The content doesn't exist, has different whitespace/indentation, or the file changed. Re-read the file first.
+            - If found 2+: Add more surrounding lines to oldContent to make it unique.
+            Common mistakes: Missing/extra trailing newlines, wrong indentation, outdated content.
+            Always read the file with getFileContent before attempting replacements.`,
+            parameters: metadata.parameters,
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                return this.replaceContentInFileFunctionHelper.createChangesetFromToolCall(args, ctx);
+            }
+        };
+    }
+}
+
+@injectable()
+export class WriteFileReplacements implements ToolProvider {
+    static ID = WRITE_FILE_REPLACEMENTS_ID;
+
+    @inject(ReplaceContentInFileFunctionHelperV2)
+    protected readonly replaceContentInFileFunctionHelper: ReplaceContentInFileFunctionHelperV2;
+
+    getTool(): ToolRequest {
+        const metadata = this.replaceContentInFileFunctionHelper.getToolMetadata(true, true);
+        return {
+            id: WriteFileReplacements.ID,
+            name: WriteFileReplacements.ID,
+            description: metadata.description,
+            parameters: metadata.parameters,
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                return this.replaceContentInFileFunctionHelper.writeChangesetFromToolCall(args, ctx);
+            }
+        };
+    }
+}
+
+@injectable()
+export class DefaultFileChangeSetTitleProvider implements FileChangeSetTitleProvider {
+    getChangeSetTitle(_ctx: ChatToolContext): string {
+        return nls.localize('theia/ai-chat/fileChangeSetTitle', 'Changes proposed');
+    }
+}

packages/ai-ide/src/browser/frontend-module.ts

@@ -0,0 +1,347 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 '../../src/browser/style/index.css';
+
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { ChatAgent, ChatAgentRecommendationService } from '@theia/ai-chat/lib/common';
+import { Agent, AIVariableContribution, bindToolProvider } from '@theia/ai-core/lib/common';
+import { ArchitectAgent } from './architect-agent';
+import { CoderAgent } from './coder-agent';
+import { SummarizeSessionCommandContribution } from './summarize-session-command-contribution';
+import {
+    FileContentFunction,
+    FileDiagnosticProvider,
+    FindFilesByPattern,
+    GetWorkspaceDirectoryStructure,
+    GetWorkspaceFileList,
+    WorkspaceFunctionScope
+} from './workspace-functions';
+import { WorkspaceSearchProvider } from './workspace-search-provider';
+import {
+    CoolifyListProjectsProvider,
+    CoolifyListApplicationsProvider,
+    CoolifyCreateApplicationProvider,
+    CoolifyDeployApplicationProvider,
+    CoolifyGetDeploymentLogsProvider,
+    CoolifyGetApplicationStatusProvider
+} from './coolify-deployment-provider';
+import {
+    GiteaCreateRepositoryProvider,
+    GitPushToRemoteProvider
+} from './gitea-provider';
+import {
+    FrontendApplicationContribution,
+    WidgetFactory,
+    bindViewContribution
+    // RemoteConnectionProvider, // Unused after disabling MCP agents
+    // ServiceConnectionProvider // Unused after disabling MCP agents
+} from '@theia/core/lib/browser';
+import { TaskListProvider, TaskRunnerProvider } from './workspace-task-provider';
+import {
+    LaunchListProvider,
+    LaunchRunnerProvider,
+    LaunchStopProvider,
+} from './workspace-launch-provider';
+import { WorkspacePreferencesSchema } from '../common/workspace-preferences';
+import {
+    ClearFileChanges,
+    GetProposedFileState,
+    ReplaceContentInFileFunctionHelper,
+    SuggestFileReplacements,
+    SuggestFileReplacements_Simple,
+    SimpleSuggestFileReplacements,
+    SuggestFileContent,
+    WriteFileContent,
+    WriteFileReplacements,
+    WriteFileReplacements_Simple,
+    SimpleWriteFileReplacements,
+    FileChangeSetTitleProvider,
+    DefaultFileChangeSetTitleProvider,
+    ReplaceContentInFileFunctionHelperV2
+} from './file-changeset-functions';
+import { OrchestratorChatAgent } from '../common/orchestrator-chat-agent';
+import { UniversalChatAgent } from '../common/universal-chat-agent';
+// import { AppTesterChatAgent } from './app-tester-chat-agent'; // Requires @theia/ai-mcp
+// import { GitHubChatAgent } from './github-chat-agent'; // Requires @theia/ai-mcp
+import { CommandChatAgent } from '../common/command-chat-agents';
+import { ListChatContext, ResolveChatContext, AddFileToChatContext } from './context-functions';
+import { AIAgentConfigurationWidget } from './ai-configuration/agent-configuration-widget';
+import { AIConfigurationSelectionService } from './ai-configuration/ai-configuration-service';
+import { AIAgentConfigurationViewContribution } from './ai-configuration/ai-configuration-view-contribution';
+import { AIConfigurationContainerWidget } from './ai-configuration/ai-configuration-widget';
+import { AIVariableConfigurationWidget } from './ai-configuration/variable-configuration-widget';
+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 { TemplatePreferenceContribution } from './template-preference-contribution';
+// import { AIMCPConfigurationWidget } from './ai-configuration/mcp-configuration-widget'; // Requires @theia/ai-mcp
+import { ChatWelcomeMessageProvider } from '@theia/ai-chat-ui/lib/browser/chat-tree-view';
+import { IdeChatWelcomeMessageProvider } from './ide-chat-welcome-message-provider';
+import { DefaultChatAgentRecommendationService } from './default-chat-agent-recommendation-service';
+import { AITokenUsageConfigurationWidget } from './ai-configuration/token-usage-configuration-widget';
+import { AISkillsConfigurationWidget } from './ai-configuration/skills-configuration-widget';
+import { TaskContextSummaryVariableContribution } from './task-background-summary-variable';
+// import { GitHubRepoVariableContribution } from './github-repo-variable-contribution'; // Requires GitHub agent
+import { TaskContextFileStorageService } from './task-context-file-storage-service';
+import { TaskContextStorageService } from '@theia/ai-chat/lib/browser/task-context-service';
+import { CommandContribution, PreferenceContribution } from '@theia/core';
+import { AIPromptFragmentsConfigurationWidget } from './ai-configuration/prompt-fragments-configuration-widget';
+// import { BrowserAutomation, browserAutomationPath } from '../common/browser-automation-protocol'; // Requires AppTester agent
+// import { GitHubRepoService, githubRepoServicePath } from '../common/github-repo-protocol'; // Requires GitHub agent
+// import { CloseBrowserProvider, IsBrowserRunningProvider, LaunchBrowserProvider, QueryDomProvider } from './app-tester-chat-functions'; // Requires @theia/ai-mcp
+import { GetSkillFileContent } from './skill-file-functions';
+import { ModelAliasesConfigurationWidget } from './ai-configuration/model-aliases-configuration-widget';
+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';
+import { TaskContextAgent } from './task-context-agent';
+import { ProjectInfoAgent } from './project-info-agent';
+import { CreateSkillAgent } from './create-skill-agent';
+import { SuggestTerminalCommand } from './ai-terminal-functions';
+import { TodoWriteTool } from './todo-tool';
+import { TodoToolRenderer } from './todo-tool-renderer';
+import { ChatResponsePartRenderer } from '@theia/ai-chat-ui/lib/browser/chat-response-part-renderer';
+import { ContextFileValidationService } from '@theia/ai-chat/lib/browser/context-file-validation-service';
+import { ContextFileValidationServiceImpl } from './context-file-validation-service-impl';
+import { RememberCommandContribution } from './remember-command-contribution';
+import { CreateTaskContextFunction, GetTaskContextFunction, EditTaskContextFunction, ListTaskContextsFunction, RewriteTaskContextFunction } from './task-context-functions';
+// import { FixGitHubTicketCommandContribution } from './implement-gh-ticket-command-contribution'; // Requires GitHub agent
+// import { AnalyzesGhTicketCommandContribution } from './analyze-gh-ticket-command-contribution'; // Requires GitHub agent
+// import { AddressGhReviewCommandContribution } from './address-pr-review-command-contribution'; // Requires GitHub agent
+// import { WithAppTesterCommandContribution } from './with-apptester-command-contribution'; // Requires AppTester agent
+
+export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
+    bind(PreferenceContribution).toConstantValue({ schema: aiIdePreferenceSchema });
+    bind(PreferenceContribution).toConstantValue({ schema: WorkspacePreferencesSchema });
+
+    bind(AIIdeActivationServiceImpl).toSelf().inSingletonScope();
+    // rebinds the default implementation of '@theia/ai-core'
+    rebind(AIActivationService).toService(AIIdeActivationServiceImpl);
+
+    bind(ArchitectAgent).toSelf().inSingletonScope();
+    bind(Agent).toService(ArchitectAgent);
+    bind(ChatAgent).toService(ArchitectAgent);
+
+    bind(CoderAgent).toSelf().inSingletonScope();
+    bind(Agent).toService(CoderAgent);
+    bind(ChatAgent).toService(CoderAgent);
+
+    bind(TaskContextAgent).toSelf().inSingletonScope();
+    bind(Agent).toService(TaskContextAgent);
+    bind(ProjectInfoAgent).toSelf().inSingletonScope();
+    bind(Agent).toService(ProjectInfoAgent);
+    bind(ChatAgent).toService(ProjectInfoAgent);
+
+    bind(CreateSkillAgent).toSelf().inSingletonScope();
+    bind(Agent).toService(CreateSkillAgent);
+    bind(ChatAgent).toService(CreateSkillAgent);
+
+    bind(OrchestratorChatAgent).toSelf().inSingletonScope();
+    bind(Agent).toService(OrchestratorChatAgent);
+    bind(ChatAgent).toService(OrchestratorChatAgent);
+
+    bind(UniversalChatAgent).toSelf().inSingletonScope();
+    bind(Agent).toService(UniversalChatAgent);
+    bind(ChatAgent).toService(UniversalChatAgent);
+
+    // AppTester and GitHub agents disabled - require @theia/ai-mcp
+    // bind(AppTesterChatAgent).toSelf().inSingletonScope();
+    // bind(Agent).toService(AppTesterChatAgent);
+    // bind(ChatAgent).toService(AppTesterChatAgent);
+
+    // bind(GitHubChatAgent).toSelf().inSingletonScope();
+    // bind(Agent).toService(GitHubChatAgent);
+    // bind(ChatAgent).toService(GitHubChatAgent);
+    // bind(BrowserAutomation).toDynamicValue(ctx => {
+    //     const provider = ctx.container.get<ServiceConnectionProvider>(RemoteConnectionProvider);
+    //     return provider.createProxy<BrowserAutomation>(browserAutomationPath);
+    // }).inSingletonScope();
+
+    bind(CommandChatAgent).toSelf().inSingletonScope();
+    bind(Agent).toService(CommandChatAgent);
+    bind(ChatAgent).toService(CommandChatAgent);
+
+    bind(ChatWelcomeMessageProvider).to(IdeChatWelcomeMessageProvider).inSingletonScope();
+    bind(ChatAgentRecommendationService).to(DefaultChatAgentRecommendationService).inSingletonScope();
+
+    bindToolProvider(GetWorkspaceFileList, bind);
+    bindToolProvider(FileContentFunction, bind);
+    bindToolProvider(GetWorkspaceDirectoryStructure, bind);
+    bindToolProvider(FileDiagnosticProvider, bind);
+    bindToolProvider(FindFilesByPattern, bind);
+    bindToolProvider(GetSkillFileContent, bind);
+    bind(WorkspaceFunctionScope).toSelf().inSingletonScope();
+    bindToolProvider(WorkspaceSearchProvider, bind);
+
+    // Coolify deployment tools
+    bindToolProvider(CoolifyListProjectsProvider, bind);
+    bindToolProvider(CoolifyListApplicationsProvider, bind);
+    bindToolProvider(CoolifyCreateApplicationProvider, bind);
+    bindToolProvider(CoolifyDeployApplicationProvider, bind);
+    bindToolProvider(CoolifyGetDeploymentLogsProvider, bind);
+    bindToolProvider(CoolifyGetApplicationStatusProvider, bind);
+
+    bindToolProvider(GiteaCreateRepositoryProvider, bind);
+    bindToolProvider(GitPushToRemoteProvider, bind);
+
+    bindToolProvider(SuggestFileContent, bind);
+    bindToolProvider(WriteFileContent, bind);
+    bindToolProvider(TaskListProvider, bind);
+    bindToolProvider(TaskRunnerProvider, bind);
+    bindToolProvider(LaunchListProvider, bind);
+    bindToolProvider(LaunchRunnerProvider, bind);
+    bindToolProvider(LaunchStopProvider, bind);
+    bind(ReplaceContentInFileFunctionHelper).toSelf().inSingletonScope();
+    bind(FileChangeSetTitleProvider).to(DefaultFileChangeSetTitleProvider).inSingletonScope();
+    bind(ReplaceContentInFileFunctionHelperV2).toSelf().inSingletonScope();
+    bindToolProvider(SuggestFileReplacements, bind);
+    bindToolProvider(SuggestFileReplacements_Simple, bind);
+    bindToolProvider(WriteFileReplacements, bind);
+    bindToolProvider(WriteFileReplacements_Simple, bind);
+    bindToolProvider(ListChatContext, bind);
+    bindToolProvider(ResolveChatContext, bind);
+    bind(AIConfigurationSelectionService).toSelf().inSingletonScope();
+    bind(AIConfigurationContainerWidget).toSelf();
+    bind(WidgetFactory)
+        .toDynamicValue(ctx => ({
+            id: AIConfigurationContainerWidget.ID,
+            createWidget: () => ctx.container.get(AIConfigurationContainerWidget)
+        }))
+        .inSingletonScope();
+
+    // Browser automation tools disabled - require AppTester agent and @theia/ai-mcp
+    // bindToolProvider(LaunchBrowserProvider, bind);
+    // bindToolProvider(CloseBrowserProvider, bind);
+    // bindToolProvider(IsBrowserRunningProvider, bind);
+    // bindToolProvider(QueryDomProvider, bind);
+
+    bindViewContribution(bind, AIAgentConfigurationViewContribution);
+    bind(TabBarToolbarContribution).toService(AIAgentConfigurationViewContribution);
+
+    bind(AIVariableConfigurationWidget).toSelf();
+    bind(WidgetFactory)
+        .toDynamicValue(ctx => ({
+            id: AIVariableConfigurationWidget.ID,
+            createWidget: () => ctx.container.get(AIVariableConfigurationWidget)
+        }))
+        .inSingletonScope();
+
+    bind(AIAgentConfigurationWidget).toSelf();
+    bind(WidgetFactory)
+        .toDynamicValue(ctx => ({
+            id: AIAgentConfigurationWidget.ID,
+            createWidget: () => ctx.container.get(AIAgentConfigurationWidget)
+        }))
+        .inSingletonScope();
+
+    bind(ModelAliasesConfigurationWidget).toSelf();
+    bind(WidgetFactory)
+        .toDynamicValue(ctx => ({
+            id: ModelAliasesConfigurationWidget.ID,
+            createWidget: () => ctx.container.get(ModelAliasesConfigurationWidget)
+        }))
+        .inSingletonScope();
+
+    bindToolProvider(SimpleSuggestFileReplacements, bind);
+    bindToolProvider(SimpleWriteFileReplacements, bind);
+    bindToolProvider(ClearFileChanges, bind);
+    bindToolProvider(GetProposedFileState, bind);
+    bindToolProvider(AddFileToChatContext, bind);
+
+    bind(AIToolsConfigurationWidget).toSelf();
+    bind(WidgetFactory)
+        .toDynamicValue(ctx => ({
+            id: AIToolsConfigurationWidget.ID,
+            createWidget: () => ctx.container.get(AIToolsConfigurationWidget)
+        }))
+        .inSingletonScope();
+
+    bind(AISkillsConfigurationWidget).toSelf();
+    bind(WidgetFactory)
+        .toDynamicValue(ctx => ({
+            id: AISkillsConfigurationWidget.ID,
+            createWidget: () => ctx.container.get(AISkillsConfigurationWidget)
+        }))
+        .inSingletonScope();
+
+    bind(AIVariableContribution).to(ContextFilesVariableContribution).inSingletonScope();
+    bind(PreferenceContribution).toConstantValue({ schema: AiConfigurationPreferences });
+
+    bind(FrontendApplicationContribution).to(TemplatePreferenceContribution);
+
+    // MCP configuration widget disabled - requires @theia/ai-mcp
+    // bind(AIMCPConfigurationWidget).toSelf();
+    // bind(WidgetFactory)
+    //     .toDynamicValue(ctx => ({
+    //         id: AIMCPConfigurationWidget.ID,
+    //         createWidget: () => ctx.container.get(AIMCPConfigurationWidget)
+    //     }))
+    //     .inSingletonScope();
+    // Register the token usage configuration widget
+    bind(AITokenUsageConfigurationWidget).toSelf();
+    bind(WidgetFactory)
+        .toDynamicValue(ctx => ({
+            id: AITokenUsageConfigurationWidget.ID,
+            createWidget: () => ctx.container.get(AITokenUsageConfigurationWidget)
+        }))
+        .inSingletonScope();
+
+    bind(TaskContextSummaryVariableContribution).toSelf().inSingletonScope();
+    bind(AIVariableContribution).toService(TaskContextSummaryVariableContribution);
+
+    // GitHub service disabled - requires GitHub agent and @theia/ai-mcp
+    // bind(GitHubRepoService).toDynamicValue(ctx => {
+    //     const provider = ctx.container.get<ServiceConnectionProvider>(RemoteConnectionProvider);
+    //     return provider.createProxy<GitHubRepoService>(githubRepoServicePath);
+    // }).inSingletonScope();
+
+    // bind(GitHubRepoVariableContribution).toSelf().inSingletonScope();
+    // bind(AIVariableContribution).toService(GitHubRepoVariableContribution);
+    bind(TaskContextFileStorageService).toSelf().inSingletonScope();
+    rebind(TaskContextStorageService).toService(TaskContextFileStorageService);
+
+    bind(CommandContribution).to(SummarizeSessionCommandContribution);
+    bind(AIPromptFragmentsConfigurationWidget).toSelf();
+    bind(WidgetFactory)
+        .toDynamicValue(ctx => ({
+            id: AIPromptFragmentsConfigurationWidget.ID,
+            createWidget: () => ctx.container.get(AIPromptFragmentsConfigurationWidget)
+        }))
+        .inSingletonScope();
+
+    bindToolProvider(SuggestTerminalCommand, bind);
+
+    // Task context functions for Architect planning mode
+    bindToolProvider(CreateTaskContextFunction, bind);
+    bindToolProvider(GetTaskContextFunction, bind);
+    bindToolProvider(EditTaskContextFunction, bind);
+    bindToolProvider(ListTaskContextsFunction, bind);
+    bindToolProvider(RewriteTaskContextFunction, bind);
+    bindToolProvider(TodoWriteTool, bind);
+    bind(ChatResponsePartRenderer).to(TodoToolRenderer).inSingletonScope();
+
+    bind(ContextFileValidationServiceImpl).toSelf().inSingletonScope();
+    bind(ContextFileValidationService).toService(ContextFileValidationServiceImpl);
+
+    bind(FrontendApplicationContribution).to(RememberCommandContribution);
+    // GitHub and AppTester command contributions disabled - require @theia/ai-mcp
+    // bind(FrontendApplicationContribution).to(FixGitHubTicketCommandContribution);
+    // bind(FrontendApplicationContribution).to(AddressGhReviewCommandContribution);
+    // bind(FrontendApplicationContribution).to(AnalyzesGhTicketCommandContribution);
+    // bind(FrontendApplicationContribution).to(WithAppTesterCommandContribution);
+});

packages/ai-ide/src/browser/gitea-provider.ts

@@ -0,0 +1,218 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { ToolInvocationContext, ToolProvider, ToolRequest } from '@theia/ai-core';
+import { CancellationToken } from '@theia/core';
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { PreferenceService } from '@theia/core/lib/common/preferences/preference-service';
+import {
+    GITEA_CREATE_REPOSITORY_FUNCTION_ID,
+    GIT_PUSH_TO_REMOTE_FUNCTION_ID
+} from '../common/workspace-functions';
+import { GITEA_API_URL_PREF, GITEA_API_TOKEN_PREF, GITEA_USERNAME_PREF } from '../common/workspace-preferences';
+
+interface GiteaRepository {
+    id: number;
+    name: string;
+    full_name: string;
+    description?: string;
+    html_url: string;
+    clone_url: string;
+    ssh_url: string;
+}
+
+@injectable()
+export class GiteaCreateRepositoryProvider implements ToolProvider {
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    getTool(): ToolRequest {
+        return {
+            id: GITEA_CREATE_REPOSITORY_FUNCTION_ID,
+            name: GITEA_CREATE_REPOSITORY_FUNCTION_ID,
+            description: 'Creates a new Git repository on Gitea (self-hosted Git service). ' +
+                'The repository is created under the configured username and is ready to receive code pushes. ' +
+                'Returns the repository URL and clone information.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    name: {
+                        type: 'string',
+                        description: 'The repository name (e.g., "my-web-app", "api-server"). Must be lowercase with hyphens or underscores only.'
+                    },
+                    description: {
+                        type: 'string',
+                        description: 'Optional: A brief description of the repository.'
+                    },
+                    isPrivate: {
+                        type: 'boolean',
+                        description: 'Optional: Whether the repository should be private. Default: true for user projects.'
+                    },
+                    autoInit: {
+                        type: 'boolean',
+                        description: 'Optional: Initialize with README. Default: false (will be initialized when pushing code).'
+                    }
+                },
+                required: ['name']
+            },
+            handler: (argString, ctx?: ToolInvocationContext) => this.handleCreateRepository(argString, ctx?.cancellationToken)
+        };
+    }
+
+    private async handleCreateRepository(argString: string, cancellationToken?: CancellationToken): Promise<string> {
+        const args = JSON.parse(argString);
+        const { name, description = '', isPrivate = true, autoInit = false } = args;
+
+        const { apiUrl, apiToken } = await this.getGiteaConfig();
+
+        try {
+            const payload = {
+                name,
+                description,
+                private: isPrivate,
+                auto_init: autoInit,
+                default_branch: 'main'
+            };
+
+            const response = await fetch(`${apiUrl}/api/v1/user/repos`, {
+                method: 'POST',
+                headers: {
+                    'Authorization': `token ${apiToken}`,
+                    'Content-Type': 'application/json',
+                    'Accept': 'application/json'
+                },
+                body: JSON.stringify(payload)
+            });
+
+            if (!response.ok) {
+                const errorText = await response.text();
+                return `Error: Failed to create repository (${response.status} ${response.statusText})\n${errorText}`;
+            }
+
+            const repo: GiteaRepository = await response.json();
+
+            return `✅ Repository created successfully!\n` +
+                `Name: ${repo.full_name}\n` +
+                `URL: ${repo.html_url}\n` +
+                `Clone URL: ${repo.clone_url}\n` +
+                `SSH URL: ${repo.ssh_url}\n` +
+                `Visibility: ${isPrivate ? 'Private' : 'Public'}\n` +
+                `\nNext: Use git_pushToRemote to push your code to this repository.`;
+        } catch (error) {
+            return `Error: ${error instanceof Error ? error.message : 'Unknown error occurred'}`;
+        }
+    }
+
+    private async getGiteaConfig(): Promise<{ apiUrl: string; apiToken: string; username: string }> {
+        const apiUrl = this.preferenceService.get<string>(GITEA_API_URL_PREF, '');
+        const apiToken = this.preferenceService.get<string>(GITEA_API_TOKEN_PREF, '');
+        const username = this.preferenceService.get<string>(GITEA_USERNAME_PREF, '');
+
+        if (!apiUrl || !apiToken || !username) {
+            throw new Error('Gitea API URL, Token, and Username must be configured in preferences');
+        }
+
+        return { apiUrl, apiToken, username };
+    }
+}
+
+@injectable()
+export class GitPushToRemoteProvider implements ToolProvider {
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    getTool(): ToolRequest {
+        return {
+            id: GIT_PUSH_TO_REMOTE_FUNCTION_ID,
+            name: GIT_PUSH_TO_REMOTE_FUNCTION_ID,
+            description: 'Initializes a Git repository in the workspace and pushes code to a remote Gitea repository. ' +
+                'This automates: git init, git add, git commit, git remote add, and git push. ' +
+                'Use this after generating code to push it to Gitea for deployment. ' +
+                'Requires the remote repository URL from gitea_createRepository.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    remoteUrl: {
+                        type: 'string',
+                        description: 'The HTTPS clone URL of the Gitea repository (e.g., https://git.vibnai.com/mark/my-app.git). Get this from gitea_createRepository.'
+                    },
+                    commitMessage: {
+                        type: 'string',
+                        description: 'Optional: Initial commit message. Default: "Initial commit from Theia Code OS"'
+                    },
+                    branch: {
+                        type: 'string',
+                        description: 'Optional: Branch name to push to. Default: "main"'
+                    },
+                    workspacePath: {
+                        type: 'string',
+                        description: 'Optional: Relative path within workspace to push. Default: workspace root (all files)'
+                    }
+                },
+                required: ['remoteUrl']
+            },
+            handler: (argString, ctx?: ToolInvocationContext) => this.handlePushToRemote(argString, ctx?.cancellationToken)
+        };
+    }
+
+    private async handlePushToRemote(argString: string, cancellationToken?: CancellationToken): Promise<string> {
+        const args = JSON.parse(argString);
+        const {
+            remoteUrl,
+            commitMessage = 'Initial commit from Theia Code OS',
+            branch = 'main',
+            workspacePath = '.'
+        } = args;
+
+        const { apiToken, username } = await this.getGiteaConfig();
+
+        // Inject credentials into URL for authentication
+        const authenticatedUrl = remoteUrl.replace('https://', `https://${username}:${apiToken}@`);
+
+        try {
+            // Note: This is a simplified implementation that returns shell commands to execute
+            // In a production environment, this would use the Terminal API or ProcessManager
+            const commands = [
+                `cd ${workspacePath}`,
+                'git init',
+                'git add .',
+                `git commit -m "${commitMessage}"`,
+                `git branch -M ${branch}`,
+                `git remote add origin ${authenticatedUrl}`,
+                `git push -u origin ${branch}`
+            ].join(' && ');
+
+            return `⚠️ Git push not yet implemented - please execute these commands in the terminal:\n\n${commands}\n\n` +
+                `Note: The URL includes authentication credentials automatically.`;
+        } catch (error) {
+            return `Error: ${error instanceof Error ? error.message : 'Unknown error occurred'}`;
+        }
+    }
+
+    private async getGiteaConfig(): Promise<{ apiUrl: string; apiToken: string; username: string }> {
+        const apiUrl = this.preferenceService.get<string>(GITEA_API_URL_PREF, '');
+        const apiToken = this.preferenceService.get<string>(GITEA_API_TOKEN_PREF, '');
+        const username = this.preferenceService.get<string>(GITEA_USERNAME_PREF, '');
+
+        if (!apiUrl || !apiToken || !username) {
+            throw new Error('Gitea API URL, Token, and Username must be configured in preferences');
+        }
+
+        return { apiUrl, apiToken, username };
+    }
+}

packages/ai-ide/src/browser/github-chat-agent.ts

@@ -0,0 +1,249 @@
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+// @ts-nocheck - Disabled: requires @theia/ai-mcp
+
+import { AbstractStreamParsingChatAgent } from '@theia/ai-chat/lib/common/chat-agents';
+import { ErrorChatResponseContentImpl, MarkdownChatResponseContentImpl, MutableChatRequestModel, QuestionResponseContentImpl } from '@theia/ai-chat/lib/common/chat-model';
+import { LanguageModelRequirement } from '@theia/ai-core/lib/common';
+import { MCPFrontendService, MCPServerDescription } from '@theia/ai-mcp/lib/common/mcp-server-manager';
+import { nls, CommandService } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { MCP_SERVERS_PREF } from '@theia/ai-mcp/lib/common/mcp-preferences';
+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 } from './github-prompt-template';
+// import { REQUIRED_GITHUB_MCP_SERVERS } from './github-prompt-template'; // Requires @theia/ai-mcp
+
+export const GitHubChatAgentId = 'GitHub';
+
+@injectable()
+export class GitHubChatAgent extends AbstractStreamParsingChatAgent {
+
+    @inject(MCPFrontendService)
+    protected readonly mcpService: MCPFrontendService;
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    @inject(CommandService)
+    protected readonly commandService: CommandService;
+
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    id: string = GitHubChatAgentId;
+    name = GitHubChatAgentId;
+    languageModelRequirements: LanguageModelRequirement[] = [{
+        purpose: 'chat',
+        identifier: 'default/code',
+    }];
+    protected defaultLanguageModelPurpose: string = 'chat';
+    override description = nls.localize('theia/ai/ide/github/description', 'This agent helps you interact with GitHub repositories, issues, pull requests, and other GitHub '
+        + 'features through the GitHub MCP server. '
+        + 'It can help you manage your repositories, create issues, handle pull requests, and perform various GitHub operations.');
+
+    override iconClass: string = 'codicon codicon-github';
+    protected override systemPromptId: string = 'github-system';
+    override prompts = [{ id: 'github-system', defaultVariant: githubTemplate, variants: [] }];
+
+    /**
+     * Override invoke to check if the GitHub MCP server is configured and running,
+     * and if not, offer to configure or start it.
+     */
+    override async invoke(request: MutableChatRequestModel): Promise<void> {
+        try {
+            if (await this.requiresConfiguration()) {
+                // Ask the user if they want to configure the GitHub server
+                request.response.response.addContent(new QuestionResponseContentImpl(nls.localize('theia/ai/ide/github/configureGitHubServer/question',
+                    'The GitHub MCP server is not configured. Would you like to configure it now? '
+                    + 'This will open the settings.json file where you can add your GitHub access token.'),
+                    [
+                        { text: nls.localize('theia/ai/ide/github/configureGitHubServer/yes', 'Yes, configure GitHub server'), value: 'configure' },
+                        { text: nls.localize('theia/ai/ide/github/configureGitHubServer/no', 'No, cancel'), value: 'cancel' }
+                    ],
+                    request,
+                    async selectedOption => {
+                        if (selectedOption.value === 'configure') {
+                            await this.offerConfiguration();
+                            request.response.response.addContent(new MarkdownChatResponseContentImpl(nls.localize('theia/ai/ide/github/configureGitHubServer/followup',
+                                'Settings file opened. Please add your GitHub Personal Access Token to the `serverAuthToken` property in the GitHub server configuration, then '
+                                + ' save and try again.\n\n' +
+                                'You can create a Personal Access Token at: https://github.com/settings/tokens'
+                            )));
+                            request.response.complete();
+                        } else {
+                            request.response.response.addContent(new MarkdownChatResponseContentImpl(nls.localize('theia/ai/ide/github/configureGitHubServer/canceled',
+                                'GitHub server configuration cancelled. Please configure the GitHub MCP server to use this agent.')));
+                            request.response.complete();
+                        }
+                    }
+                ));
+                request.response.waitForInput();
+                return;
+            }
+
+            if (await this.requiresStartingServer()) {
+                // Ask the user if they want to start the server
+                request.response.response.addContent(new QuestionResponseContentImpl(nls.localize('theia/ai/ide/github/startGitHubServer/question',
+                    'The GitHub MCP server is configured but not running. Would you like to start it now?'),
+                    [
+                        { text: nls.localize('theia/ai/ide/github/startGitHubServer/yes', 'Yes, start the server'), value: 'yes' },
+                        { text: nls.localize('theia/ai/ide/github/startGitHubServer/no', 'No, cancel'), value: 'no' }
+                    ],
+                    request,
+                    async selectedOption => {
+                        if (selectedOption.value === 'yes') {
+                            const progress = request.response.addProgressMessage({
+                                content: nls.localize('theia/ai/ide/github/startGitHubServer/progress', 'Starting GitHub MCP server.'),
+                                show: 'whileIncomplete'
+                            });
+                            try {
+                                await this.startServer();
+                                request.response.updateProgressMessage({ ...progress, show: 'whileIncomplete', status: 'completed' });
+                                await super.invoke(request);
+                            } catch (error) {
+                                request.response.response.addContent(new ErrorChatResponseContentImpl(
+                                    new Error(nls.localize('theia/ai/ide/github/startGitHubServer/error', 'Failed to start GitHub MCP server: {0}',
+                                        error instanceof Error ? error.message : String(error)))
+                                ));
+                                request.response.complete();
+                            }
+                        } else {
+                            request.response.response.addContent(new MarkdownChatResponseContentImpl(nls.localize('theia/ai/ide/github/startGitHubServer/canceled',
+                                'Please start the GitHub MCP server to use this agent.')));
+                            request.response.complete();
+                        }
+                    }
+                ));
+                request.response.waitForInput();
+                return;
+            }
+
+            // If already configured and running, continue as normal
+            await super.invoke(request);
+        } catch (error) {
+            request.response.response.addContent(new ErrorChatResponseContentImpl(
+                new Error(nls.localize('theia/ai/ide/github/errorCheckingGitHubServerStatus', 'Error checking GitHub MCP server status: {0}',
+                    error instanceof Error ? error.message : String(error)))
+            ));
+            request.response.complete();
+        }
+    }
+
+    protected async requiresConfiguration(): Promise<boolean> {
+        const serverConfigured = await this.mcpService.hasServer(REQUIRED_GITHUB_MCP_SERVERS[0].name);
+        return !serverConfigured;
+    }
+
+    protected async requiresStartingServer(): Promise<boolean> {
+        const serverStarted = await this.mcpService.isServerStarted(REQUIRED_GITHUB_MCP_SERVERS[0].name);
+        return !serverStarted;
+    }
+
+    protected async startServer(): Promise<void> {
+        await this.ensureServerStarted(REQUIRED_GITHUB_MCP_SERVERS[0]);
+    }
+
+    protected async offerConfiguration(): Promise<void> {
+        const currentServers = this.preferenceService.get<Record<string, MCPServerDescription>>(MCP_SERVERS_PREF, {});
+        const githubServer = REQUIRED_GITHUB_MCP_SERVERS[0];
+
+        const { name, ...serverWithoutName } = githubServer;
+        await this.preferenceService.set(MCP_SERVERS_PREF, {
+            ...currentServers,
+            [name]: serverWithoutName
+        }, PreferenceScope.User);
+
+        await this.openAndFocusOnGitHubConfig(name);
+    }
+
+    /**
+     * Opens the user preferences JSON file and attempts to focus on the GitHub server configuration.
+     */
+    protected async openAndFocusOnGitHubConfig(serverName: string): Promise<void> {
+        try {
+            const configUri = this.preferenceService.getConfigUri(PreferenceScope.User);
+            if (!configUri) {
+                this.logger.debug('Could not get config URI for user preferences');
+                return;
+            }
+
+            if (!await this.fileService.exists(configUri)) {
+                await this.fileService.create(configUri);
+            }
+
+            const content = await this.fileService.read(configUri);
+            const text = content.value;
+
+            const preferencePattern = `"${MCP_SERVERS_PREF}"`;
+            const preferenceMatch = text.indexOf(preferencePattern);
+
+            let selection: { start: { line: number; character: number } } | undefined;
+
+            if (preferenceMatch !== -1) {
+                const serverPattern = `"${serverName}"`;
+                const serverMatch = text.indexOf(serverPattern, preferenceMatch);
+
+                if (serverMatch !== -1) {
+                    const lines = text.substring(0, serverMatch).split('\n');
+                    const line = lines.length - 1;
+                    const character = lines[lines.length - 1].length;
+
+                    selection = {
+                        start: { line, character }
+                    };
+                }
+            }
+
+            await this.editorManager.open(configUri, {
+                selection
+            });
+        } catch (error) {
+            this.logger.debug('Failed to open and focus on GitHub configuration:', error);
+            // Fallback to just opening the preferences file
+            await this.commandService.executeCommand(PreferencesCommands.OPEN_USER_PREFERENCES_JSON.id);
+        }
+    }
+
+    /**
+     * Starts the GitHub MCP server if it doesn't exist or isn't running.
+     *
+     * @returns A promise that resolves when the server is started
+     */
+    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 { name, ...serverWithoutName } = server;
+                await this.preferenceService.set(MCP_SERVERS_PREF, { ...currentServers, [name]: serverWithoutName }, PreferenceScope.User);
+                await this.mcpService.addOrUpdateServer(server);
+            }
+
+            if (!(await this.mcpService.isServerStarted(server.name))) {
+                await this.mcpService.startServer(server.name);
+            }
+        } catch (error) {
+            this.logger.error(`Error starting GitHub MCP server ${server.name}: ${error}`);
+            throw error;
+        }
+    }
+}

packages/ai-ide/src/browser/github-prompt-template.ts

@@ -0,0 +1,56 @@
+// *****************************************************************************
+// 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 { BasePromptFragment } from '@theia/ai-core/lib/common';
+import { CHAT_CONTEXT_DETAILS_VARIABLE_ID } from '@theia/ai-chat';
+// import { MCPServerDescription } from '@theia/ai-mcp/lib/common/mcp-server-manager';
+
+export const GITHUB_REPO_NAME_VARIABLE_ID = 'githubRepoName';
+
+// Disabled MCP dependency - GitHub agent requires ai-mcp package
+// export const REQUIRED_GITHUB_MCP_SERVERS: MCPServerDescription[] = [
+//     {
+//         'name': 'github',
+//         'serverUrl': 'https://api.githubcopilot.com/mcp/',
+//         'serverAuthToken': 'your_github_token_here'
+//     }
+// ];
+
+export const githubTemplate: BasePromptFragment = {
+    id: 'github-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:
+https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution --}}
+
+You are GitHub Agent, an AI assistant integrated into Theia IDE specifically designed to help developers interact with GitHub repositories.
+Your role is to help users manage GitHub repositories, issues, pull requests, and other GitHub-related tasks through the GitHub MCP server.
+
+## Current Repository Context
+{{${GITHUB_REPO_NAME_VARIABLE_ID}}}
+
+## Available GitHub Tools
+You have access to GitHub functionality through the MCP server:
+{{prompt:mcp_github_tools}}
+
+## Important Notes
+- Be mindful of rate limits and use batch operations when appropriate
+- Provide clear error messages and suggestions for resolution when operations fail
+
+## Current Context
+Some files and other pieces of data may have been added by the user to the context of the chat. If any have, the details can be found below.
+{{${CHAT_CONTEXT_DETAILS_VARIABLE_ID}}}
+`
+};

packages/ai-ide/src/browser/github-repo-variable-contribution.ts

@@ -0,0 +1,93 @@
+// *****************************************************************************
+// 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 { injectable, inject } from '@theia/core/shared/inversify';
+import { MaybePromise, nls } from '@theia/core';
+import {
+    AIVariableContribution,
+    AIVariableResolver,
+    AIVariableService,
+    AIVariableResolutionRequest,
+    AIVariableContext,
+    ResolvedAIVariable,
+    AIVariable
+} from '@theia/ai-core/lib/common';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+
+import { GitHubRepoService } from '../common/github-repo-protocol';
+
+export const GITHUB_REPO_NAME_VARIABLE: AIVariable = {
+    id: 'github-repo-name-provider',
+    name: 'githubRepoName',
+    description: nls.localize('theia/ai/ide/githubRepoName/description', 'The name of the current GitHub repository (e.g., "eclipse-theia/theia")')
+};
+
+@injectable()
+export class GitHubRepoVariableContribution implements AIVariableContribution, AIVariableResolver {
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(GitHubRepoService)
+    protected readonly gitHubRepoService: GitHubRepoService;
+
+    registerVariables(service: AIVariableService): void {
+        service.registerResolver(GITHUB_REPO_NAME_VARIABLE, this);
+    }
+
+    canResolve(request: AIVariableResolutionRequest, _context: AIVariableContext): MaybePromise<number> {
+        if (request.variable.name !== GITHUB_REPO_NAME_VARIABLE.name) {
+            return 0;
+        }
+
+        return 1;
+    }
+
+    async resolve(request: AIVariableResolutionRequest, _context: AIVariableContext): Promise<ResolvedAIVariable | undefined> {
+        if (request.variable.name !== GITHUB_REPO_NAME_VARIABLE.name) {
+            return undefined;
+        }
+
+        try {
+            const workspaceRoots = await this.workspaceService.roots;
+            if (workspaceRoots.length === 0) {
+                return { variable: request.variable, value: 'No GitHub repository is currently selected or detected.' };
+            }
+
+            // Get the filesystem path from the workspace root URI
+            const workspaceRoot = workspaceRoots[0].resource;
+            const workspacePath = workspaceRoot.path.fsPath();
+
+            // Use the backend service to get GitHub repository information
+            const repoInfo = await this.gitHubRepoService.getGitHubRepoInfo(workspacePath);
+
+            if (!repoInfo) {
+                return { variable: request.variable, value: 'No GitHub repository is currently selected or detected.' };
+            }
+
+            const repoName = `${repoInfo.owner}/${repoInfo.repo}`;
+            return { variable: request.variable, value: `You are currently working with the GitHub repository: **${repoName}**` };
+
+        } catch (error) {
+            console.warn('Failed to resolve GitHub repository name:', error);
+            return { variable: request.variable, value: 'No GitHub repository is currently selected or detected.' };
+        }
+    }
+}

packages/ai-ide/src/browser/ide-chat-welcome-message-provider.tsx

@@ -0,0 +1,443 @@
+// *****************************************************************************
+// 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 { ChatWelcomeMessageProvider } from '@theia/ai-chat-ui/lib/browser/chat-tree-view';
+import * as React from '@theia/core/shared/react';
+import { nls } from '@theia/core/lib/common/nls';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { CommonCommands, LocalizedMarkdown, MarkdownRenderer } from '@theia/core/lib/browser';
+import { AlertMessage } from '@theia/core/lib/browser/widgets/alert-message';
+import { OPEN_AI_CONFIG_VIEW } from './ai-configuration/ai-configuration-view-contribution';
+import { CommandRegistry, DisposableCollection, Emitter, Event, PreferenceScope } from '@theia/core';
+import { AgentService, FrontendLanguageModelRegistry } from '@theia/ai-core/lib/common';
+import { PreferenceService } from '@theia/core/lib/common';
+import { DEFAULT_CHAT_AGENT_PREF, BYPASS_MODEL_REQUIREMENT_PREF } from '@theia/ai-chat/lib/common/ai-chat-preferences';
+import { ChatAgentRecommendationService, ChatAgentService } from '@theia/ai-chat/lib/common';
+
+const TheiaIdeAiLogo = ({ width = 200, height = 200, className = '' }) =>
+    <svg
+        xmlns="http://www.w3.org/2000/svg"
+        viewBox="0 0 200 200"
+        width={width}
+        height={height}
+        className={className}
+    >
+        <rect x="55" y="45" width="90" height="85" rx="30" fill="var(--theia-disabledForeground)" />
+
+        <line x1="100" y1="45" x2="100" y2="30" stroke="var(--theia-foreground)" strokeWidth="4" />
+        <circle cx="100" cy="25" r="6" fill="var(--theia-foreground)" />
+
+        <rect x="40" y="75" width="15" height="30" rx="5" fill="var(--theia-foreground)" />
+        <rect x="145" y="75" width="15" height="30" rx="5" fill="var(--theia-foreground)" />
+
+        <circle cx="80" cy="80" r="10" fill="var(--theia-editor-background)" />
+        <circle cx="120" cy="80" r="10" fill="var(--theia-editor-background)" />
+
+        <path d="M85 105 Q100 120 115 105" fill="none" stroke="var(--theia-editor-background)" strokeWidth="4" strokeLinecap="round" />
+
+        <rect x="55" y="135" width="90" height="30" rx="5" fill="var(--theia-foreground)" />
+
+        <rect x="60" y="140" width="10" height="8" rx="2" fill="var(--theia-editor-background)" />
+        <rect x="75" y="140" width="10" height="8" rx="2" fill="var(--theia-editor-background)" />
+        <rect x="90" y="140" width="10" height="8" rx="2" fill="var(--theia-editor-background)" />
+        <rect x="105" y="140" width="10" height="8" rx="2" fill="var(--theia-editor-background)" />
+        <rect x="120" y="140" width="10" height="8" rx="2" fill="var(--theia-editor-background)" />
+
+        <rect x="65" y="152" width="50" height="8" rx="2" fill="var(--theia-editor-background)" />
+        <rect x="120" y="152" width="10" height="8" rx="2" fill="var(--theia-editor-background)" />
+    </svg>;
+
+@injectable()
+export class IdeChatWelcomeMessageProvider implements ChatWelcomeMessageProvider {
+
+    @inject(MarkdownRenderer)
+    protected readonly markdownRenderer: MarkdownRenderer;
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(FrontendLanguageModelRegistry)
+    protected languageModelRegistry: FrontendLanguageModelRegistry;
+
+    @inject(PreferenceService)
+    protected preferenceService: PreferenceService;
+
+    @inject(ChatAgentRecommendationService)
+    protected recommendationService: ChatAgentRecommendationService;
+
+    @inject(ChatAgentService)
+    protected chatAgentService: ChatAgentService;
+
+    @inject(AgentService)
+    protected agentService: AgentService;
+
+    protected readonly toDispose = new DisposableCollection();
+    protected _hasReadyModels = false;
+    protected _modelRequirementBypassed = false;
+    protected _defaultAgent = '';
+    protected modelConfig: { hasModels: boolean; errorMessages: string[] } | undefined;
+
+    protected readonly onStateChangedEmitter = new Emitter<void>();
+
+    get onStateChanged(): Event<void> {
+        return this.onStateChangedEmitter.event;
+    }
+
+    @postConstruct()
+    protected init(): void {
+        this.checkLanguageModelStatus();
+        this.toDispose.push(
+            this.languageModelRegistry.onChange(() => {
+                this.checkLanguageModelStatus();
+            })
+        );
+        this.toDispose.push(
+            this.preferenceService.onPreferenceChanged(e => {
+                if (e.preferenceName === DEFAULT_CHAT_AGENT_PREF) {
+                    const effectiveValue = this.preferenceService.get<string>(DEFAULT_CHAT_AGENT_PREF, '');
+                    if (this._defaultAgent !== effectiveValue) {
+                        this._defaultAgent = effectiveValue;
+                        this.notifyStateChanged();
+                    }
+                } else if (e.preferenceName === BYPASS_MODEL_REQUIREMENT_PREF) {
+                    const effectiveValue = this.preferenceService.get<boolean>(BYPASS_MODEL_REQUIREMENT_PREF, false);
+                    if (this._modelRequirementBypassed !== effectiveValue) {
+                        this._modelRequirementBypassed = effectiveValue;
+                        this.notifyStateChanged();
+                    }
+                }
+            })
+        );
+        this.toDispose.push(
+            this.agentService.onDidChangeAgents(() => {
+                this.notifyStateChanged();
+            })
+        );
+        this.analyzeModelConfiguration().then(config => {
+            this.modelConfig = config;
+            this.notifyStateChanged();
+        });
+        this.preferenceService.ready.then(() => {
+            const defaultAgentValue = this.preferenceService.get(DEFAULT_CHAT_AGENT_PREF, '');
+            const bypassValue = this.preferenceService.get(BYPASS_MODEL_REQUIREMENT_PREF, false);
+            this._defaultAgent = defaultAgentValue;
+            this._modelRequirementBypassed = bypassValue;
+            this.notifyStateChanged();
+        });
+    }
+
+    protected async checkLanguageModelStatus(): Promise<void> {
+        const models = await this.languageModelRegistry.getLanguageModels();
+        this._hasReadyModels = models.some(model => model.status.status === 'ready');
+        this.modelConfig = await this.analyzeModelConfiguration();
+        this.notifyStateChanged();
+    }
+
+    protected async analyzeModelConfiguration(): Promise<{ hasModels: boolean; errorMessages: string[] }> {
+        const models = await this.languageModelRegistry.getLanguageModels();
+        const hasModels = models.length > 0;
+        const unavailableModels = models.filter(model => model.status.status === 'unavailable');
+        const errorMessages = unavailableModels
+            .map(model => model.status.message)
+            .filter((msg): msg is string => !!msg);
+        const uniqueErrorMessages = [...new Set(errorMessages)];
+        return { hasModels, errorMessages: uniqueErrorMessages };
+    }
+
+    protected notifyStateChanged(): void {
+        this.onStateChangedEmitter.fire();
+    }
+
+    get hasReadyModels(): boolean {
+        return this._hasReadyModels;
+    }
+
+    get modelRequirementBypassed(): boolean {
+        return this._modelRequirementBypassed;
+    }
+
+    get defaultAgent(): string {
+        return this._defaultAgent;
+    }
+
+    protected setModelRequirementBypassed(bypassed: boolean): void {
+        this.preferenceService.set(BYPASS_MODEL_REQUIREMENT_PREF, bypassed, PreferenceScope.User);
+    }
+
+    protected setDefaultAgent(agentId: string): void {
+        this.preferenceService.set(DEFAULT_CHAT_AGENT_PREF, agentId, PreferenceScope.User);
+    }
+
+    dispose(): void {
+        this.toDispose.dispose();
+        this.onStateChangedEmitter.dispose();
+    }
+
+    renderWelcomeMessage(): React.ReactNode {
+        if (!this._hasReadyModels && !this._modelRequirementBypassed) {
+            return this.renderModelConfigurationScreen();
+        }
+        if (!this._defaultAgent) {
+            return this.renderAgentSelectionScreen();
+        }
+        return this.renderWelcomeScreen();
+    }
+
+    protected renderWelcomeScreen(): React.ReactNode {
+        return <div className={'theia-WelcomeMessage'} key="normal-welcome">
+            <TheiaIdeAiLogo width={200} height={200} className="theia-WelcomeMessage-Logo" />
+            <LocalizedMarkdown
+                localizationKey="theia/ai/ide/chatWelcomeMessage"
+                defaultMarkdown={`
+# Ask the Theia IDE AI
+
+To talk to a specialized agent, simply start your message with *@* followed by the agent's name: *@{0}*, *@{1}*, *@{2}*, and more.
+
+Attach context: use variables, like *#{3}*, *#{4}* (current file), *#{5}* or click {6}.
+
+Lean more in the [documentation](https://theia-ide.org/docs/user_ai/#chat).
+`}
+                args={['Coder', 'Architect', 'Universal', 'file', '_f', 'selectedText', '<span class="codicon codicon-add"></span>']}
+                markdownRenderer={this.markdownRenderer}
+                className="theia-WelcomeMessage-Content"
+                markdownOptions={{ supportHtml: true }}
+            />
+        </div>;
+    }
+
+    protected renderModelConfigurationScreen(): React.ReactNode {
+        const config = this.modelConfig ?? { hasModels: false, errorMessages: [] };
+        const { hasModels, errorMessages } = config;
+
+        if (!hasModels) {
+            return <div className={'theia-WelcomeMessage'} key="setup-state">
+                <div className="theia-WelcomeMessage-ErrorIcon">⚠️</div>
+                <LocalizedMarkdown
+                    localizationKey="theia/ai/ide/noLanguageModelProviders"
+                    defaultMarkdown={`
+## No Language Model Providers Available
+
+No language model provider packages are installed in this IDE.
+
+This typically happens in custom IDE distributions where Theia AI language model packages have been omitted.
+
+**To resolve this:**
+
+- Install one or more language model provider packages (e.g., '@theia/ai-openai', '@theia/ai-anthropic', '@theia/ai-ollama')
+- Or use agents that don't require Theia Language Models (e.g., Claude Code)
+                `}
+                    markdownRenderer={this.markdownRenderer}
+                    className="theia-WelcomeMessage-Content"
+                />
+                <div className="theia-WelcomeMessage-Actions">
+                    <button
+                        className="theia-button main"
+                        onClick={() => this.setModelRequirementBypassed(true)}>
+                        {nls.localize('theia/ai/ide/continueAnyway', 'Continue Anyway')}
+                    </button>
+                </div>
+                <small className="theia-WelcomeMessage-Hint">
+                    {nls.localize('theia/ai/ide/bypassHint', 'Some agents like Claude Code don\'t require Theia Language Models')}
+                </small>
+            </div>;
+        }
+
+        return <div className={'theia-WelcomeMessage'} key="setup-state">
+            <TheiaIdeAiLogo width={150} height={150} className="theia-WelcomeMessage-Logo" />
+            <LocalizedMarkdown
+                key="configure-provider-hasmodels"
+                localizationKey="theia/ai/ide/configureProvider"
+                defaultMarkdown={`
+# Please configure at least one language model provider
+
+If you want to use [OpenAI]({0}), [Anthropic]({1}) or [GoogleAI]({2}) hosted models, please enter an API key in the settings.
+
+If you want to use another provider such as Ollama, please configure it in the settings and adapt agents or a model alias to use your custom model.
+
+**Note:** Some agents, such as Claude Code do not need a provider to be configured, just continue in this case.
+
+See the [documentation](https://theia-ide.org/docs/user_ai/) for more details.
+            `}
+                args={[
+                    `command:${CommonCommands.OPEN_PREFERENCES.id}?ai-features.languageModels.openai`,
+                    `command:${CommonCommands.OPEN_PREFERENCES.id}?ai-features.languageModels.anthropic`,
+                    `command:${CommonCommands.OPEN_PREFERENCES.id}?ai-features.languageModels.googleai`
+                ]}
+                markdownRenderer={this.markdownRenderer}
+                className="theia-WelcomeMessage-Content"
+                markdownOptions={{
+                    supportHtml: true,
+                    isTrusted: { enabledCommands: [CommonCommands.OPEN_PREFERENCES.id] }
+                }}
+            />
+            {errorMessages.length > 0 && (
+                <>
+                    <LocalizedMarkdown
+                        key="configuration-state"
+                        localizationKey="theia/ai/ide/configurationState"
+                        defaultMarkdown="# Current Configuration State"
+                        markdownRenderer={this.markdownRenderer}
+                        className="theia-WelcomeMessage-Content"
+                    />
+                    <div className="theia-WelcomeMessage-Content">
+                        <ul className="theia-WelcomeMessage-IssuesList">
+                            {errorMessages.map((msg, idx) => <li key={idx}>{msg}</li>)}
+                        </ul>
+                    </div>
+                </>
+            )}
+            <div className="theia-WelcomeMessage-Actions">
+                <button
+                    className="theia-button main"
+                    onClick={() => this.commandRegistry.executeCommand(CommonCommands.OPEN_PREFERENCES.id, 'ai-features')}>
+                    {nls.localize('theia/ai/ide/openSettings', 'Open AI Settings')}
+                </button>
+                <button
+                    className="theia-button secondary"
+                    onClick={() => this.setModelRequirementBypassed(true)}>
+                    {nls.localize('theia/ai/ide/continueAnyway', 'Continue Anyway')}
+                </button>
+            </div>
+            <small className="theia-WelcomeMessage-Hint">
+                {nls.localize('theia/ai/ide/bypassHint', 'Some agents like Claude Code don\'t require Theia Language Models')}
+            </small>
+        </div>;
+    }
+
+    protected renderAgentSelectionScreen(): React.ReactNode {
+        const recommendedAgents = this.recommendationService.getRecommendedAgents()
+            .filter(agent => this.chatAgentService.getAgent(agent.id) !== undefined);
+
+        return <div className={'theia-WelcomeMessage theia-WelcomeMessage-AgentSelection'} key="agent-selection">
+            <TheiaIdeAiLogo width={200} height={200} className="theia-WelcomeMessage-Logo" />
+            <LocalizedMarkdown
+                localizationKey="theia/ai/ide/selectDefaultAgent"
+                defaultMarkdown={`
+## Select a Default Chat Agent
+
+Choose the agent to use by default. You can always override this by mentioning @AgentName in your message.
+`}
+                markdownRenderer={this.markdownRenderer}
+                className="theia-WelcomeMessage-Content"
+            />
+            {recommendedAgents.length > 0 && (
+                <p className="theia-WelcomeMessage-RecommendedNote">
+                    {nls.localize('theia/ai/ide/recommendedAgents', 'Recommended agents:')}
+                </p>
+            )}
+            {recommendedAgents.length > 0 ? (
+                <>
+                    <div className="theia-WelcomeMessage-AgentButtons">
+                        {recommendedAgents.map(agent => (
+                            <button
+                                key={agent.id}
+                                className="theia-WelcomeMessage-AgentButton"
+                                onClick={() => this.setDefaultAgent(agent.id)}
+                                title={agent.description}>
+                                <span className="theia-WelcomeMessage-AgentButton-Icon">@</span>
+                                <span className="theia-WelcomeMessage-AgentButton-Label">{agent.label}</span>
+                            </button>
+                        ))}
+                    </div>
+                    <div className="theia-WelcomeMessage-AlternativeOptions">
+                        <p className="theia-WelcomeMessage-OrDivider">
+                            {nls.localize('theia/ai/ide/or', 'or')}
+                        </p>
+                    </div>
+                </>
+            ) : (
+                <AlertMessage
+                    type='WARNING'
+                    header={nls.localize('theia/ai/ide/noRecommendedAgents', 'No recommended agents are available.')}
+                />
+            )}
+            <AlertMessage
+                type='INFO'
+                header={recommendedAgents.length > 0
+                    ? nls.localize('theia/ai/ide/moreAgentsAvailable/header', 'More agents are available')
+                    : nls.localize('theia/ai/ide/configureAgent/header', 'Configure a default agent')}>
+                <LocalizedMarkdown
+                    localizationKey="theia/ai/ide/moreAgentsAvailable"
+                    defaultMarkdown='Use @AgentName to try others or configure a different default in [preferences]({0}).'
+                    args={[`command:${CommonCommands.OPEN_PREFERENCES.id}?ai-features.chat`]}
+                    markdownRenderer={this.markdownRenderer}
+                    markdownOptions={{ isTrusted: { enabledCommands: [CommonCommands.OPEN_PREFERENCES.id] } }}
+                />
+            </AlertMessage>
+        </div>;
+    }
+
+    renderDisabledMessage(): React.ReactNode {
+        const openAiHistory = 'aiHistory:open';
+
+        return <div className={'theia-ResponseNode'}>
+            <div className='theia-ResponseNode-Content' key={'disabled-message'}>
+                <div className="disable-message">
+                    <span className="section-header">{
+                        nls.localize('theia/ai/chat-ui/chat-view-tree-widget/aiFeatureHeader', '🚀 AI Features Available (Beta Version)!')}
+                    </span>
+                    <div className="section-title">
+                        <p><code>{nls.localize('theia/ai/chat-ui/chat-view-tree-widget/featuresDisabled', 'Currently, all AI Features are disabled!')}</code></p>
+                    </div>
+                    <div className="section-title">
+                        <p>{nls.localize('theia/ai/chat-ui/chat-view-tree-widget/howToEnable', 'How to Enable the AI Features:')}</p>
+                    </div>
+                    <LocalizedMarkdown
+                        localizationKey="theia/ai/ide/chatDisabledMessage/howToEnable"
+                        defaultMarkdown={`
+To enable the AI features, please go to the AI features section of&nbsp;[the settings menu]({0})&nbsp;and
+1. Toggle the switch for **Ai-features: Enable**.
+2. Provide at least one LLM provider (e.g. OpenAI). See [the documentation](https://theia-ide.org/docs/user_ai/)&nbsp;for more information.
+
+This will activate the AI capabilities in the app. Please remember, these features are **in a beta state**, so they may change and we are working on improving them 🚧.\\
+Please support us by [providing feedback](https://github.com/eclipse-theia/theia)!
+`}
+                        args={[`command:${CommonCommands.OPEN_PREFERENCES.id}?ai-features`]}
+                        markdownRenderer={this.markdownRenderer}
+                        className="section-content"
+                        markdownOptions={{ isTrusted: { enabledCommands: [CommonCommands.OPEN_PREFERENCES.id] } }}
+                    />
+
+                    <div className="section-title">
+                        <p>{nls.localize('theia/ai/ide/chatDisabledMessage/featuresTitle', 'Currently Supported Views and Features:')}</p>
+                    </div>
+                    <LocalizedMarkdown
+                        localizationKey="theia/ai/ide/chatDisabledMessage/features"
+                        defaultMarkdown={`
+Once the AI features are enabled, you can access the following views and features:
+- Code Completion
+- Terminal Assistance (via CTRL+I in a terminal)
+- This Chat View (features the following agents):
+  * Universal Chat Agent
+  * Coder Chat Agent
+  * Architect Chat Agent
+  * Command Chat Agent
+  * Orchestrator Chat Agent
+- [AI History View]({0})
+- [AI Configuration View]({1})
+
+See [the documentation](https://theia-ide.org/docs/user_ai/) for more information.
+`}
+                        args={[`command:${openAiHistory}`, `command:${OPEN_AI_CONFIG_VIEW.id}`]}
+                        markdownRenderer={this.markdownRenderer}
+                        className="section-content"
+                        markdownOptions={{ isTrusted: { enabledCommands: [openAiHistory, OPEN_AI_CONFIG_VIEW.id] } }}
+                    />
+                </div>
+            </div>
+        </div>;
+    }
+}

packages/ai-ide/src/browser/implement-gh-ticket-command-contribution.ts

@@ -0,0 +1,160 @@
+// *****************************************************************************
+// 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 { FrontendApplicationContribution } from '@theia/core/lib/browser';
+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-chat/lib/browser/agent-delegation-tool';
+import { GitHubChatAgentId } from './github-chat-agent';
+
+@injectable()
+export class FixGitHubTicketCommandContribution implements FrontendApplicationContribution {
+
+    @inject(PromptService)
+    protected readonly promptService: PromptService;
+
+    onStart(): void {
+        this.registerFixGitHubTicketCommand();
+    }
+
+    protected registerFixGitHubTicketCommand(): void {
+        const commandTemplate = this.buildCommandTemplate();
+
+        this.promptService.addBuiltInPromptFragment({
+            id: 'fix-gh-ticket',
+            template: commandTemplate,
+            isCommand: true,
+            commandName: 'fix-gh-ticket',
+            commandDescription: nls.localize(
+                'theia/ai-ide/fixGhTicketCommand/description',
+                'Analyze a GitHub ticket and implement the solution'
+            ),
+            commandArgumentHint: nls.localize(
+                'theia/ai-ide/fixGhTicketCommand/argumentHint',
+                '<ticket-number>'
+            ),
+            commandAgents: ['Coder']
+        });
+    }
+
+    protected buildCommandTemplate(): string {
+        return `You have been asked to analyze a GitHub ticket and implement the solution.
+
+## Ticket Number
+$ARGUMENTS
+
+## Task Overview
+You need to retrieve details about the specified GitHub ticket, analyze whether it can be implemented, and if so, implement the solution.
+
+## Step 1: Retrieve Ticket Information
+Use the ~{${AGENT_DELEGATION_FUNCTION_ID}} tool to delegate to the GitHub agent and retrieve comprehensive information about the ticket.
+
+**Agent ID:** '${GitHubChatAgentId}'
+**Prompt:** Ask the GitHub agent to retrieve ALL details about issue/ticket #$ARGUMENTS, specifically requesting:
+- The complete issue title and description/body
+- All comments on the issue (this is critical for understanding the full context)
+- Labels and assignees
+- Issue state (open/closed)
+- Any referenced issues or pull requests mentioned in the description or comments
+- If other issues are referenced, retrieve their details as well
+
+Example delegation prompt:
+\`\`\`
+Please retrieve comprehensive information about issue #$ARGUMENTS. I need:
+1. The complete issue title, body/description, labels, state, and assignees
+2. ALL comments on this issue - every single comment is important for understanding the context
+3. Any issues or PRs that are referenced or linked in the description or comments
+4. For any referenced issues, please also retrieve their titles and descriptions
+
+This is for implementing the issue, so completeness is crucial.
+\`\`\`
+
+## Step 2: Analyze AI Solvability
+After receiving the ticket information, analyze whether this ticket can be implemented by you. Consider:
+
+### Criteria for Implementable Tickets:
+- **Clear requirements**: The ticket clearly describes what needs to be done
+- **Defined scope**: The scope of changes is well-defined and bounded
+- **Technical feasibility**: The task involves code changes that can be reasoned about
+- **Sufficient context**: Enough information is provided to understand the problem and solution
+- **Reproducible**: For bugs, there's enough information to understand and reproduce the issue
+
+### Criteria for Non-Implementable Tickets:
+- **Ambiguous requirements**: The ticket is vague or open to multiple interpretations
+- **Missing context**: Critical information is missing (e.g., environment details, reproduction steps)
+- **External dependencies**: Requires access to external systems, credentials, or human interaction
+- **Design decisions needed**: Requires architectural decisions that need human judgment
+- **Insufficient information**: Cannot determine what success looks like
+
+## Step 3: Respond Based on Analysis
+
+### If the ticket CANNOT be implemented:
+Provide a clear explanation:
+1. **Reason**: Explain specifically why this ticket cannot be implemented by AI
+2. **Missing Information**: List what information is missing or unclear
+3. **Questions for Clarification**: Ask specific questions that, if answered, might make the ticket implementable
+
+Example response format:
+\`\`\`
+## Analysis Result: Cannot Be Implemented
+
+### Reason
+[Explain why]
+
+### Missing Information
+- [Item 1]
+- [Item 2]
+
+### Questions for Clarification
+1. [Question 1]
+2. [Question 2]
+
+Please provide the missing information and I will proceed with the implementation.
+\`\`\`
+
+### If the ticket CAN be implemented:
+Proceed with the implementation:
+
+1. **Briefly summarize** what the ticket requests and your implementation approach
+2. **Explore the codebase** to understand the existing code structure and find relevant files
+3. **Implement the solution** by making the necessary code changes using your file modification tools
+4. **Explain your changes** as you make them
+5. **Consider edge cases** and handle them appropriately
+6. **Suggest testing steps** the user should perform to verify the implementation
+
+Example response format:
+\`\`\`
+## Analysis Result: Can Be Implemented
+
+### Summary
+[Brief summary of the ticket and your approach]
+
+### Implementation
+[Proceed to explore the codebase and implement the changes, explaining as you go]
+\`\`\`
+
+## Important Guidelines for Implementation
+- Always explore the codebase first to understand the existing patterns and conventions
+- Follow the existing code style and patterns in the project
+- Make incremental changes and explain each step
+- If you encounter unexpected issues during implementation, explain them and ask for guidance
+- After implementation, summarize what was changed and suggest how to test the changes
+
+Remember: If at any point during implementation you realize you need more information or the task is more complex than initially assessed, stop and ask for clarification rather 
+than making assumptions.`;
+    }
+}

packages/ai-ide/src/browser/mode-aware-chat-agent.ts

@@ -0,0 +1,98 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 {
+    AbstractStreamParsingChatAgent, ChatMode, ChatSessionContext, SystemMessageDescription
+} from '@theia/ai-chat/lib/common';
+import { AIVariableContext } from '@theia/ai-core';
+import { injectable } from '@theia/core/shared/inversify';
+
+/**
+ * An abstract chat agent that supports mode selection for selecting prompt variants.
+ *
+ * Agents extending this class define their available modes via `modeDefinitions`.
+ * The `modes` getter dynamically computes which mode is the default based on the
+ * current prompt variant settings. When a request is made with a specific `modeId`,
+ * that mode's prompt variant is used instead of the settings-configured default.
+ */
+@injectable()
+export abstract class AbstractModeAwareChatAgent extends AbstractStreamParsingChatAgent {
+    /**
+     * Mode definitions without the `isDefault` property.
+     * Subclasses must provide their specific mode definitions.
+     * Each mode's `id` should correspond to a prompt variant ID.
+     */
+    protected abstract readonly modeDefinitions: Omit<ChatMode, 'isDefault'>[];
+
+    /**
+     * The ID of the prompt variant set used for mode selection.
+     * Defaults to `systemPromptId`. Override if a different variant set should be used.
+     */
+    protected get promptVariantSetId(): string | undefined {
+        return this.systemPromptId;
+    }
+
+    /**
+     * Returns the available modes with `isDefault` computed based on current settings.
+     */
+    get modes(): ChatMode[] {
+        const variantSetId = this.promptVariantSetId;
+        if (!variantSetId) {
+            return this.modeDefinitions.map(mode => ({ ...mode, isDefault: false }));
+        }
+        const effectiveVariantId = this.promptService.getEffectiveVariantId(variantSetId);
+        return this.modeDefinitions.map(mode => ({
+            ...mode,
+            isDefault: mode.id === effectiveVariantId
+        }));
+    }
+
+    protected override async getSystemMessageDescription(context: AIVariableContext): Promise<SystemMessageDescription | undefined> {
+        if (this.systemPromptId === undefined) {
+            return undefined;
+        }
+
+        // Check for mode-based override from request
+        const modeId = ChatSessionContext.is(context) ? context.request?.request.modeId : undefined;
+        const effectiveVariantId = this.getEffectiveVariantIdWithMode(modeId);
+
+        if (!effectiveVariantId) {
+            return undefined;
+        }
+
+        const isCustomized = this.promptService.getPromptVariantInfo(effectiveVariantId)?.isCustomized ?? false;
+        const resolvedPrompt = await this.promptService.getResolvedPromptFragment(effectiveVariantId, undefined, context);
+        return resolvedPrompt ? SystemMessageDescription.fromResolvedPromptFragment(resolvedPrompt, effectiveVariantId, isCustomized) : undefined;
+    }
+
+    /**
+     * Determines the effective variant ID, considering mode override.
+     * If modeId is provided and is a valid variant for the prompt set, it takes precedence.
+     * Otherwise falls back to settings-based selection.
+     */
+    protected getEffectiveVariantIdWithMode(modeId?: string): string | undefined {
+        const variantSetId = this.promptVariantSetId;
+        if (!variantSetId) {
+            return undefined;
+        }
+        if (modeId) {
+            const variantIds = this.promptService.getVariantIds(variantSetId);
+            if (variantIds.includes(modeId)) {
+                return modeId;
+            }
+        }
+        return this.promptService.getEffectiveVariantId(variantSetId);
+    }
+}

packages/ai-ide/src/browser/project-info-agent.ts

@@ -0,0 +1,42 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { AbstractStreamParsingChatAgent } from '@theia/ai-chat';
+import { LanguageModelRequirement } from '@theia/ai-core';
+import { injectable } from '@theia/core/shared/inversify';
+import { projectInfoSystemVariants, projectInfoTemplateVariants } from '../common/project-info-prompt-template';
+import { nls } from '@theia/core';
+
+@injectable()
+export class ProjectInfoAgent extends AbstractStreamParsingChatAgent {
+
+    name = 'ProjectInfo';
+    id = 'ProjectInfo';
+    languageModelRequirements: LanguageModelRequirement[] = [{
+        purpose: 'chat',
+        identifier: 'default/code',
+    }];
+    protected defaultLanguageModelPurpose: string = 'chat';
+
+    override description = nls.localize('theia/ai/workspace/projectInfoAgent/description',
+        'An AI assistant for managing project information templates. This agent helps create, update, and review the .prompts/project-info.prompttemplate file which provides ' +
+        'context about your project to other AI agents. It can analyze your workspace to suggest project information or update existing templates based on your requirements.');
+
+    override tags: string[] = [...this.tags, 'Alpha'];
+
+    override prompts = [projectInfoSystemVariants, projectInfoTemplateVariants];
+    protected override systemPromptId: string | undefined = projectInfoSystemVariants.id;
+
+}

packages/ai-ide/src/browser/remember-command-contribution.ts

@@ -0,0 +1,105 @@
+// *****************************************************************************
+// 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 { FrontendApplicationContribution } from '@theia/core/lib/browser';
+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-chat/lib/browser/agent-delegation-tool';
+
+/**
+ * Contribution that registers the `/remember` slash command for AI chat agents.
+ *
+ * This command allows Architect and Coder agents to extract important topics
+ * from the current conversation and delegate to the ProjectInfo agent to update
+ * the persistent project context file.
+ */
+@injectable()
+export class RememberCommandContribution implements FrontendApplicationContribution {
+
+    @inject(PromptService)
+    protected readonly promptService: PromptService;
+
+    onStart(): void {
+        this.registerRememberCommand();
+    }
+
+    protected registerRememberCommand(): void {
+        const commandTemplate = this.buildCommandTemplate();
+
+        this.promptService.addBuiltInPromptFragment({
+            id: 'remember-conversation-context',
+            template: commandTemplate,
+            isCommand: true,
+            commandName: 'remember',
+            commandDescription: nls.localize(
+                'theia/ai-ide/rememberCommand/description',
+                'Extract topics from conversation and update project info'
+            ),
+            commandArgumentHint: nls.localize(
+                'theia/ai-ide/rememberCommand/argumentHint',
+                '[topic-hint]'
+            ),
+            commandAgents: ['Architect', 'Coder']
+        });
+    }
+
+    protected buildCommandTemplate(): string {
+        return `You have been asked to extract and remember important information from the current conversation.
+
+    ## Task Overview
+    Review the conversation history and identify specific information that should be added to the persistent project context.
+
+    ## Focus Area
+    $ARGUMENTS
+
+    ## What to Extract
+    **If a focus area is provided above**: ONLY extract information related to that specific focus area. Ignore all other topics.
+
+    **If no focus area is provided**: Look specifically for information where the user had to correct you or provide clarification:
+    - **User corrections**: When the user corrected your assumptions about the codebase, architecture, or processes
+    - **User-provided context**: Information the user explicitly provided that you couldn't discover yourself
+    - **Project-specific knowledge**: Details about the project that the user shared when you made incorrect assumptions
+
+    **Do NOT extract**:
+    - General information you discovered through code analysis
+    - Standard coding practices you identified yourself
+    - Information you found by exploring the codebase
+    - Common knowledge or widely-known patterns
+    - Details that are already well-documented in the code
+
+    ## Instructions
+    1. **Analyze the conversation**: Review messages for the specific criteria above
+    2. **Extract only relevant information**: For each qualifying item, prepare a clear description that captures:
+    - What the user corrected or clarified
+    - Why your initial understanding was incomplete
+    - The specific project context that was provided
+    3. **Delegate to ProjectInfo agent**: Use the ~{${AGENT_DELEGATION_FUNCTION_ID}} tool to send the extracted information to the ProjectInfo agent:
+    - Agent ID: 'ProjectInfo'
+    - Prompt: Ask the ProjectInfo agent to review the extracted information and update the project information file
+
+    ## Example Delegation
+    \`\`\`
+    Please review and incorporate the following user corrections/clarifications into the project context:
+
+    [Your extracted corrections and user-provided context here]
+
+    Update /.prompts/project-info.prompttemplate by adding this information to the appropriate sections. Focus on information that prevents future misunderstandings.
+    \`\`\`
+
+    Remember: Only extract information that prevents future AI agents from making the same mistakes or assumptions you made that were corrected by the user.`;
+    }
+}

packages/ai-ide/src/browser/skill-file-functions.ts

@@ -0,0 +1,74 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 { ToolProvider, ToolRequest } from '@theia/ai-core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+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 } from '../common/workspace-functions';
+
+@injectable()
+export class GetSkillFileContent implements ToolProvider {
+    static ID = GET_SKILL_FILE_CONTENT_FUNCTION_ID;
+
+    @inject(SkillService)
+    protected readonly skillService: SkillService;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    getTool(): ToolRequest {
+        return {
+            id: GetSkillFileContent.ID,
+            name: GetSkillFileContent.ID,
+            description: 'Returns the content of a skill file by skill name. Use this to read the full instructions of a skill listed in the available_skills. ' +
+                'The skill name must match one of the discovered skills.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    skillName: {
+                        type: 'string',
+                        description: 'The name of the skill to retrieve (e.g., \'pdf-processing\')'
+                    }
+                },
+                required: ['skillName']
+            },
+            handler: (arg_string: string) => this.getSkillFileContent(arg_string)
+        };
+    }
+
+    private async getSkillFileContent(arg_string: string): Promise<string> {
+        const args = JSON.parse(arg_string);
+        const skillName: string = args.skillName;
+
+        const skill = this.skillService.getSkill(skillName);
+
+        if (!skill) {
+            return JSON.stringify({ error: `Skill not found: ${skillName}` });
+        }
+
+        try {
+            const skillFileUri = URI.fromFilePath(skill.location);
+            const fileContent = await this.fileService.read(skillFileUri);
+            const parsed = parseSkillFile(fileContent.value);
+            return parsed.content;
+        } catch (error) {
+            return JSON.stringify({ error: `Failed to load skill content: ${error}` });
+        }
+    }
+}

packages/ai-ide/src/browser/style/ai-configuration-base.css

@@ -0,0 +1,90 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+/* Base styles for all AI configuration widgets */
+
+.ai-configuration-widget-content {
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+}
+
+/* Empty state styling */
+.ai-configuration-empty-state {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  padding: var(--theia-ui-padding);
+}
+
+.ai-empty-state-message {
+  color: var(--theia-descriptionForeground);
+  font-style: italic;
+}
+
+/* Configuration section styling */
+.ai-configuration-section {
+  margin-bottom: calc(var(--theia-ui-padding) * 2);
+}
+
+.ai-configuration-section:last-child {
+  margin-bottom: 0;
+}
+
+.ai-configuration-section-content {
+  padding: var(--theia-ui-padding) 0;
+}
+
+.ai-configuration-section-content ul,
+.ai-configuration-section-content ol {
+  padding-left: calc(var(--theia-ui-padding) * 2);
+  margin: 0 var(--theia-ui-padding) 0;
+}
+
+/* Expandable section styling */
+.ai-expandable-section {
+  margin-bottom: var(--theia-ui-padding);
+}
+
+.ai-expandable-section-header {
+  display: flex;
+  align-items: center;
+  padding: calc(var(--theia-ui-padding) / 2) 0;
+  cursor: pointer;
+  user-select: none;
+}
+
+.ai-expandable-section-header:hover {
+  background-color: var(--theia-list-hoverBackground);
+}
+
+.ai-expandable-section-icon {
+  display: flex;
+  align-items: center;
+  margin-right: calc(var(--theia-ui-padding) / 2);
+  color: var(--theia-icon-foreground);
+}
+
+.ai-expandable-section-title {
+  flex: 1;
+  font-weight: 500;
+}
+
+.ai-expandable-section-content {
+  padding-left: calc(var(--theia-ui-padding) * 2);
+  padding-top: calc(var(--theia-ui-padding) / 2);
+}

packages/ai-ide/src/browser/style/ai-configuration-cards.css

@@ -0,0 +1,60 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+/* Card grid pattern for displaying items in a responsive grid */
+
+.ai-card-grid-configuration-main {
+    padding: var(--theia-ui-padding);
+    height: 100%;
+    overflow: auto;
+}
+
+.ai-configuration-card-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+    gap: var(--theia-ui-padding);
+}
+
+.ai-configuration-card {
+    background-color: var(--theia-sideBar-background);
+    border: var(--theia-border-width) solid var(--theia-widget-border);
+    border-radius: 4px;
+    padding: var(--theia-ui-padding);
+    transition: box-shadow 0.2s ease;
+}
+
+.ai-configuration-card:hover {
+    box-shadow: 0 2px 8px var(--theia-widget-shadow);
+}
+
+/* Responsive grid */
+@media (max-width: 900px) {
+    .ai-configuration-card-grid {
+        grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+    }
+}
+
+@media (max-width: 600px) {
+    .ai-configuration-card-grid {
+        grid-template-columns: 1fr;
+    }
+}
+
+@media (max-width: 400px) {
+    .ai-card-grid-configuration-main {
+        padding: calc(var(--theia-ui-padding) / 2);
+    }
+}

packages/ai-ide/src/browser/style/ai-configuration-hierarchical.css

@@ -0,0 +1,61 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+/* Hierarchical pattern for nested expandable sections */
+
+.ai-hierarchical-configuration-main {
+    padding: var(--theia-ui-padding);
+    height: 100%;
+    overflow: auto;
+}
+
+/* Additional hierarchical-specific expandable section styles */
+.ai-expandable-section .ai-expandable-section {
+    margin-left: var(--theia-ui-padding);
+    border-left: var(--theia-border-width) solid var(--theia-widget-border);
+    padding-left: var(--theia-ui-padding);
+}
+
+.ai-expandable-section-header {
+    transition: background-color 0.15s ease;
+}
+
+.ai-expandable-section-content {
+    animation: expandContent 0.2s ease-out;
+}
+
+@keyframes expandContent {
+    from {
+        opacity: 0;
+        transform: translateY(-8px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+/* Responsive */
+@media (max-width: 600px) {
+    .ai-hierarchical-configuration-main {
+        padding: calc(var(--theia-ui-padding) / 2);
+    }
+
+    .ai-expandable-section .ai-expandable-section {
+        margin-left: calc(var(--theia-ui-padding) / 2);
+        padding-left: calc(var(--theia-ui-padding) / 2);
+    }
+}

packages/ai-ide/src/browser/style/ai-configuration-list-detail.css

@@ -0,0 +1,88 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+/* List-detail pattern: tree on left, detail on right */
+
+.ai-list-detail-configuration-main {
+  display: grid;
+  grid-template-columns: minmax(150px, 280px) 1fr;
+  height: 100%;
+  overflow: hidden;
+  gap: 0;
+}
+
+/* List panel (left side) */
+.ai-configuration-list {
+  overflow-y: auto;
+  overflow-x: hidden;
+  border-right: var(--theia-border-width) solid var(--theia-widget-border);
+  background-color: var(--theia-editor-background);
+}
+
+.ai-configuration-list ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.ai-configuration-list li {
+  padding: calc(var(--theia-ui-padding) / 2) var(--theia-ui-padding);
+  cursor: pointer;
+  user-select: none;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.ai-configuration-list li:hover {
+  background-color: var(--theia-list-hoverBackground);
+}
+
+.ai-configuration-list li.theia-mod-selected {
+  background-color: var(--theia-list-activeSelectionBackground);
+  color: var(--theia-list-activeSelectionForeground);
+}
+
+.ai-configuration-list-item-label {
+  display: inline-block;
+}
+
+/* Detail panel (right side) */
+.ai-configuration-detail {
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding: calc(var(--theia-ui-padding) * 2);
+  padding-left: calc(var(--theia-ui-padding) * 3);
+  background-color: var(--theia-editor-background);
+}
+
+/* Responsive: hide list on narrow screens */
+@media (max-width: 600px) {
+  .ai-list-detail-configuration-main {
+    grid-template-columns: 1fr;
+  }
+
+  .ai-configuration-list {
+    display: none;
+  }
+}
+
+/* Very narrow screens: reduce padding */
+@media (max-width: 400px) {
+  .ai-configuration-detail {
+    padding: calc(var(--theia-ui-padding) / 2);
+  }
+}

packages/ai-ide/src/browser/style/ai-configuration-table.css

@@ -0,0 +1,85 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+/* Table pattern for displaying tabular data */
+
+.ai-table-configuration-main {
+  padding: var(--theia-ui-padding);
+  overflow: auto;
+}
+
+.ai-configuration-table-container {
+  overflow-x: auto;
+}
+
+.ai-configuration-table {
+  width: 100%;
+  border-collapse: collapse;
+  background-color: var(--theia-editor-background);
+}
+
+.ai-configuration-table thead {
+  position: sticky;
+  top: 0;
+  z-index: 1;
+}
+
+.ai-configuration-table th {
+  text-align: left;
+  padding: var(--theia-ui-padding) var(--theia-ui-padding);
+  font-weight: 600;
+  border-bottom: var(--theia-border-width) solid var(--theia-widget-border);
+  color: var(--theia-foreground);
+}
+
+.ai-configuration-table td {
+  padding: calc(var(--theia-ui-padding) / 2) var(--theia-ui-padding);
+  border-bottom: var(--theia-border-width) solid var(--theia-widget-border);
+  color: var(--theia-foreground);
+  vertical-align: top;
+}
+
+.ai-configuration-table .skill-description-column,
+.ai-configuration-table .skill-location-column {
+  overflow-wrap: anywhere;
+  word-break: break-word;
+  max-width: 40em;
+}
+
+.ai-configuration-table .skill-location-column {
+  font-family: var(--theia-code-font-family);
+}
+
+.ai-configuration-table tbody tr:hover {
+  background-color: var(--theia-list-hoverBackground);
+}
+
+.ai-configuration-table tbody tr:last-child td {
+  border-bottom: none;
+}
+
+/* Responsive: horizontal scroll on small screens */
+@media (max-width: 600px) {
+  .ai-table-configuration-main {
+    padding: calc(var(--theia-ui-padding) / 2);
+  }
+
+  .ai-configuration-table th,
+  .ai-configuration-table td {
+    padding: calc(var(--theia-ui-padding) / 3) calc(var(--theia-ui-padding) / 2);
+    font-size: 0.9em;
+  }
+}

packages/ai-ide/src/browser/style/vibn-overrides.css

@@ -0,0 +1,10 @@
+/* ── Vibn IDE Layout Overrides ──────────────────────────────────────────────
+ * Edit this file and run: npm run compile (30s) then restart Theia
+ * CSS changes here do NOT require npm run build:browser
+ * because this file is loaded dynamically via the backend, not webpack.
+ * ─────────────────────────────────────────────────────────────────────────── */
+
+/* Hide the right sidebar tab strip */
+#theia-right-content-panel .theia-app-right.lm-TabBar .lm-TabBar-content-container {
+  display: none;
+}

packages/ai-ide/src/browser/style/widgets/mcp-configuration.css

@@ -0,0 +1,261 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+/* MCP Server Configuration Widget Styles */
+
+/* Container */
+.mcp-configuration-container {
+  padding: calc(var(--theia-ui-padding) * 2);
+  max-width: 1200px;
+}
+
+.mcp-no-servers {
+  padding: calc(var(--theia-ui-padding) * 3);
+  text-align: center;
+  color: var(--theia-descriptionForeground);
+}
+
+/* Server Card */
+.mcp-server-card {
+  border: var(--theia-border-width) solid var(--theia-widget-border);
+  border-radius: 3px;
+  margin-bottom: calc(var(--theia-ui-padding) * 2);
+  background-color: var(--theia-editor-background);
+  overflow: hidden;
+}
+
+/* Server Header */
+.mcp-server-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: calc(var(--theia-ui-padding) * 1.5) calc(var(--theia-ui-padding) * 2);
+  background-color: var(--theia-editorWidget-background);
+  border-bottom: var(--theia-border-width) solid var(--theia-widget-border);
+}
+
+.mcp-server-name {
+  font-weight: 600;
+  font-size: var(--theia-ui-font-size2);
+  color: var(--theia-foreground);
+}
+
+.mcp-server-header-controls {
+  display: flex;
+  align-items: center;
+  gap: calc(var(--theia-ui-padding));
+}
+
+.mcp-status-container {
+  display: flex;
+  align-items: center;
+}
+
+/* Status Badge */
+.mcp-status-badge {
+  padding: calc(var(--theia-ui-padding) / 4) calc(var(--theia-ui-padding) / 1.5);
+  border-radius: 3px;
+  font-size: var(--theia-ui-font-size0);
+  font-weight: 600;
+  display: inline-block;
+}
+
+.mcp-error-indicator {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 18px;
+  height: 18px;
+  border-radius: 50%;
+  background-color: var(--theia-errorBackground);
+  color: var(--theia-errorForeground);
+  font-size: calc(var(--theia-ui-font-size0) * 0.85);
+  font-weight: 600;
+  cursor: pointer;
+  margin-left: calc(var(--theia-ui-padding) / 2);
+}
+
+/* Action Button */
+.mcp-action-button {
+  background: transparent;
+  border: none;
+  cursor: pointer;
+  padding: calc(var(--theia-ui-padding) / 2);
+  color: var(--theia-icon-foreground);
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 3px;
+  transition: background-color 0.2s;
+  font-size: var(--theia-ui-font-size2);
+}
+
+.mcp-action-button:disabled {
+  cursor: default;
+}
+
+.mcp-action-button:disabled:hover {
+  background: inherit;
+}
+
+.mcp-action-button:hover {
+  background-color: var(--theia-list-hoverBackground);
+}
+
+/* Server Content - Property Rows */
+.mcp-server-content {
+  padding: calc(var(--theia-ui-padding) * 2);
+  display: flex;
+  flex-direction: column;
+  gap: calc(var(--theia-ui-padding));
+}
+
+.mcp-property-row {
+  display: grid;
+  grid-template-columns: 6em 1fr;
+  gap: calc(var(--theia-ui-padding) * 2);
+  align-items: start;
+  padding: calc(var(--theia-ui-padding) / 2) 0;
+}
+
+.mcp-property-label {
+  font-weight: 500;
+  color: var(--theia-descriptionForeground);
+  text-align: left;
+}
+
+.mcp-property-value {
+  color: var(--theia-foreground);
+  word-break: break-word;
+}
+
+.mcp-property-value code {
+  background-color: var(--theia-editorWidget-background);
+  padding: calc(var(--theia-ui-padding) / 4) calc(var(--theia-ui-padding) / 2);
+  border-radius: 3px;
+  font-family: var(--monaco-monospace-font);
+  font-size: var(--theia-ui-font-size0);
+  border: var(--theia-border-width) solid var(--theia-widget-border);
+}
+
+.mcp-env-entry {
+  margin-bottom: calc(var(--theia-ui-padding) / 4);
+}
+
+.mcp-env-entry:last-child {
+  margin-bottom: 0;
+}
+
+.mcp-autostart-badge {
+  border-radius: 3px;
+  font-weight: 600;
+}
+
+/* Toggle Indicator */
+.mcp-toggle-indicator {
+  width: 16px;
+  height: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: calc(var(--theia-ui-padding) / 2);
+}
+
+.mcp-toggle-icon {
+  display: inline-block;
+  transition: transform 0.2s ease;
+  font-size: calc(var(--theia-ui-font-size0) * 0.85);
+}
+
+/* Tools Section */
+.mcp-tools-section {
+  padding: calc(var(--theia-ui-padding) * 2);
+  padding-top: calc(var(--theia-ui-padding) * 1.5);
+  border-top: var(--theia-border-width) solid var(--theia-widget-border);
+  background-color: var(--theia-editor-background);
+}
+
+.mcp-tools-header {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  user-select: none;
+  padding: calc(var(--theia-ui-padding) / 2) 0;
+}
+
+.mcp-tools-header:hover {
+  background-color: var(--theia-list-hoverBackground);
+}
+
+.mcp-tools-label-container {
+  flex-grow: 1;
+}
+
+.mcp-tools-actions {
+  display: flex;
+  gap: calc(var(--theia-ui-padding) / 2);
+}
+
+.mcp-section-label {
+  font-weight: 600;
+  color: var(--theia-descriptionForeground);
+  font-size: var(--theia-ui-font-size0);
+}
+
+.mcp-tools-list {
+  margin-top: calc(var(--theia-ui-padding));
+  padding: calc(var(--theia-ui-padding));
+  background-color: var(--theia-editorWidget-background);
+  border-radius: 3px;
+  border: var(--theia-border-width) solid var(--theia-widget-border);
+}
+
+.mcp-tool-item {
+  display: flex;
+  align-items: center;
+  padding: calc(var(--theia-ui-padding) / 2) 0;
+  border-bottom: var(--theia-border-width) solid var(--theia-widget-border);
+}
+
+.mcp-tool-item:last-child {
+  border-bottom: none;
+}
+
+.mcp-tool-content {
+  flex-grow: 1;
+  font-size: var(--theia-ui-font-size0);
+}
+
+.mcp-tool-actions {
+  display: flex;
+  gap: calc(var(--theia-ui-padding) / 2);
+}
+
+.mcp-copy-tool-button {
+  background: transparent;
+  border: none;
+  padding: calc(var(--theia-ui-padding) / 4);
+  cursor: pointer;
+  font-size: var(--theia-ui-font-size0);
+  color: var(--theia-icon-foreground);
+  white-space: nowrap;
+  opacity: 0.8;
+  transition: opacity 0.1s;
+}
+
+.mcp-copy-tool-button:hover {
+  opacity: 1;
+}

packages/ai-ide/src/browser/style/widgets/model-aliases-configuration.css

@@ -0,0 +1,74 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+/* Model Aliases Configuration Widget Specific Styles */
+
+/* Description styling */
+.ai-alias-detail-description {
+    color: var(--theia-descriptionForeground);
+    margin-bottom: calc(var(--theia-ui-padding) * 2);
+    line-height: 1.5;
+}
+
+/* Priority list styling */
+.ai-alias-priority-item-resolved {
+    font-weight: 600;
+    color: var(--theia-textLink-foreground);
+}
+
+.ai-alias-priority-item-ready {
+    color: var(--theia-foreground);
+}
+
+.ai-model-default-not-ready {
+    color: var(--theia-descriptionForeground);
+}
+
+.ai-model-status-ready {
+    color: var(--theia-successForeground, #89d185);
+    margin-left: 4px;
+}
+
+.ai-model-status-not-ready {
+    color: var(--theia-errorForeground);
+    margin-left: 4px;
+}
+
+/* Evaluates to section */
+.ai-alias-evaluates-to-value {
+    color: var(--theia-textLink-foreground);
+    font-weight: 500;
+}
+
+.ai-alias-evaluates-to-unresolved {
+    color: var(--theia-descriptionForeground);
+    font-style: italic;
+}
+
+/* Agent list styling */
+.ai-alias-agent-id {
+    color: var(--theia-descriptionForeground);
+    font-size: 0.9em;
+}
+
+/* Model selection dropdown */
+.ai-language-model-item-ready {
+    color: var(--theia-foreground);
+}
+
+.ai-language-model-item-not-ready {
+    color: var(--theia-descriptionForeground);
+}

packages/ai-ide/src/browser/summarize-session-command-contribution.ts

@@ -0,0 +1,152 @@
+// *****************************************************************************
+// 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 { ChatAgentLocation, ChatService } from '@theia/ai-chat/lib/common';
+import { CommandContribution, CommandRegistry, CommandService } from '@theia/core';
+import { TaskContextStorageService, TaskContextService } from '@theia/ai-chat/lib/browser/task-context-service';
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { AI_SUMMARIZE_SESSION_AS_TASK_FOR_CODER, AI_UPDATE_TASK_CONTEXT_COMMAND, AI_EXECUTE_PLAN_WITH_CODER } from '../common/summarize-session-commands';
+import { CoderAgent } from './coder-agent';
+import { TASK_CONTEXT_VARIABLE } from '@theia/ai-chat/lib/browser/task-context-variable';
+import { TASK_CONTEXT_CREATE_PROMPT_ID, TASK_CONTEXT_UPDATE_PROMPT_ID } from '../common/task-context-prompt-template';
+import { FILE_VARIABLE } from '@theia/ai-core/lib/browser/file-variable-contribution';
+import { AIVariableResolutionRequest } from '@theia/ai-core';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
+import { AICommandHandlerFactory } from '@theia/ai-core/lib/browser';
+
+@injectable()
+export class SummarizeSessionCommandContribution implements CommandContribution {
+    @inject(ChatService)
+    protected readonly chatService: ChatService;
+
+    @inject(TaskContextService)
+    protected readonly taskContextService: TaskContextService;
+
+    @inject(CommandService)
+    protected readonly commandService: CommandService;
+
+    @inject(CoderAgent)
+    protected readonly coderAgent: CoderAgent;
+
+    @inject(TaskContextStorageService)
+    protected readonly taskContextStorageService: TaskContextStorageService;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(WorkspaceService)
+    protected readonly wsService: WorkspaceService;
+
+    @inject(AICommandHandlerFactory)
+    protected readonly commandHandlerFactory: AICommandHandlerFactory;
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(AI_UPDATE_TASK_CONTEXT_COMMAND, this.commandHandlerFactory({
+            execute: async () => {
+                const activeSession = this.chatService.getActiveSession();
+
+                if (!activeSession) {
+                    return;
+                }
+
+                // Check if there is an existing summary for this session
+                if (!this.taskContextService.hasSummary(activeSession)) {
+                    // If no summary exists, create one first
+                    await this.taskContextService.summarize(activeSession, TASK_CONTEXT_CREATE_PROMPT_ID);
+                } else {
+                    // Update existing summary
+                    await this.taskContextService.update(activeSession, TASK_CONTEXT_UPDATE_PROMPT_ID);
+                }
+            }
+        }));
+
+        registry.registerCommand(AI_SUMMARIZE_SESSION_AS_TASK_FOR_CODER, this.commandHandlerFactory({
+            execute: async () => {
+                const activeSession = this.chatService.getActiveSession();
+
+                if (!activeSession) {
+                    return;
+                }
+
+                const summaryId = await this.taskContextService.summarize(activeSession, TASK_CONTEXT_CREATE_PROMPT_ID);
+
+                // Open the summary in a new editor
+                await this.taskContextStorageService.open(summaryId);
+
+                // Add the summary file to the context of the active Architect session
+                const summary = this.taskContextService.getAll().find(s => s.id === summaryId);
+                if (summary?.uri) {
+                    if (await this.fileService.exists(summary?.uri)) {
+                        const wsRelativePath = await this.wsService.getWorkspaceRelativePath(summary?.uri);
+                        // Create a file variable for the summary
+                        const fileVariable: AIVariableResolutionRequest = {
+                            variable: FILE_VARIABLE,
+                            arg: wsRelativePath
+                        };
+
+                        // Add the file to the active session's context
+                        activeSession.model.context.addVariables(fileVariable);
+                    }
+
+                    // Create a new session with the coder agent
+                    const newSession = this.chatService.createSession(ChatAgentLocation.Panel, { focus: true }, this.coderAgent);
+                    const summaryVariable = { variable: TASK_CONTEXT_VARIABLE, arg: summaryId };
+                    newSession.model.context.addVariables(summaryVariable);
+                }
+            }
+        }));
+
+        registry.registerCommand(AI_EXECUTE_PLAN_WITH_CODER, this.commandHandlerFactory({
+            execute: async (taskContextId?: string) => {
+                const activeSession = this.chatService.getActiveSession();
+
+                if (!activeSession) {
+                    return;
+                }
+
+                // Find the task context by ID or fall back to most recent for this session
+                let existingTaskContext;
+                if (taskContextId) {
+                    existingTaskContext = this.taskContextService.getAll().find(s => s.id === taskContextId);
+                } else {
+                    const sessionContexts = this.taskContextService.getAll().filter(s => s.sessionId === activeSession.id);
+                    existingTaskContext = sessionContexts[sessionContexts.length - 1];
+                }
+
+                if (!existingTaskContext) {
+                    console.warn('No task context found. Use createTaskContext to create a plan first.');
+                    return;
+                }
+
+                if (existingTaskContext.uri) {
+                    if (await this.fileService.exists(existingTaskContext.uri)) {
+                        const wsRelativePath = await this.wsService.getWorkspaceRelativePath(existingTaskContext.uri);
+                        const fileVariable: AIVariableResolutionRequest = {
+                            variable: FILE_VARIABLE,
+                            arg: wsRelativePath
+                        };
+                        activeSession.model.context.addVariables(fileVariable);
+                    }
+                }
+
+                const newSession = this.chatService.createSession(ChatAgentLocation.Panel, { focus: true }, this.coderAgent);
+                const summaryVariable = { variable: TASK_CONTEXT_VARIABLE, arg: existingTaskContext.id };
+                newSession.model.context.addVariables(summaryVariable);
+            }
+        }));
+    }
+}

packages/ai-ide/src/browser/task-background-summary-variable.ts

@@ -0,0 +1,79 @@
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH and others.
+//
+// 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 { MaybePromise, nls } from '@theia/core';
+import { injectable } from '@theia/core/shared/inversify';
+import {
+    AIVariable,
+    ResolvedAIVariable,
+    AIVariableContribution,
+    AIVariableService,
+    AIVariableResolutionRequest,
+    AIVariableContext,
+    AIVariableResolverWithVariableDependencies,
+    AIVariableArg
+} 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';
+
+export const TASK_CONTEXT_SUMMARY_VARIABLE: AIVariable = {
+    id: TASK_CONTEXT_SUMMARY_VARIABLE_ID,
+    description: nls.localize('theia/ai/core/taskContextSummary/description', 'Resolves all task context items present in the session context.'),
+    name: TASK_CONTEXT_SUMMARY_VARIABLE_ID,
+};
+
+@injectable()
+/**
+ * @class provides a summary of all TaskContextVariables in the context of a given session. Oriented towards use in prompts.
+ */
+export class TaskContextSummaryVariableContribution implements AIVariableContribution, AIVariableResolverWithVariableDependencies {
+    registerVariables(service: AIVariableService): void {
+        service.registerResolver(TASK_CONTEXT_SUMMARY_VARIABLE, this);
+    }
+
+    canResolve(request: AIVariableResolutionRequest, context: AIVariableContext): MaybePromise<number> {
+        return request.variable.name === TASK_CONTEXT_SUMMARY_VARIABLE.name ? 50 : 0;
+    }
+
+    async resolve(
+        request: AIVariableResolutionRequest,
+        context: AIVariableContext,
+        resolveDependency?: (variable: AIVariableArg) => Promise<ResolvedAIVariable | undefined>
+    ): Promise<ResolvedAIVariable | undefined> {
+        if (!resolveDependency || !ChatSessionContext.is(context) || request.variable.name !== TASK_CONTEXT_SUMMARY_VARIABLE.name) { return undefined; }
+        const allSummaryRequests = context.model.context.getVariables().filter(candidate => candidate.variable.id === TASK_CONTEXT_VARIABLE.id);
+        if (!allSummaryRequests.length) { return { ...request, value: '' }; }
+        const allSummaries = await Promise.all(allSummaryRequests.map(summaryRequest => resolveDependency(summaryRequest).then(resolved => resolved?.value)));
+        const value = `# Current Task Context
+
+The following task context defines the task you are expected to work on. It was explicitly provided by the user and represents your primary objective.
+This context is authoritative: follow it unless you identify issues (e.g., outdated assumptions, technical conflicts, or unclear steps).
+The task context may contain errors or outdated assumptions. You are expected to identify and report these, not blindly execute incorrect instructions.
+Note: This context is a snapshot from the start of the conversation and will not update during this run.
+When deviating from the plan:
+- Explain the deviation and your reasoning before proceeding
+- Summarize all deviations at the end of your response, and suggest updates to the task context if the plan needs revision
+
+---
+
+${allSummaries.map((content, index) => `## Task ${index + 1}\n\n${content}`).join('\n\n')}`;
+        return {
+            ...request,
+            value
+        };
+    }
+}

packages/ai-ide/src/browser/task-context-agent.ts

@@ -0,0 +1,40 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { Agent, LanguageModelRequirement } from '@theia/ai-core';
+import { nls } from '@theia/core';
+import { injectable } from '@theia/core/shared/inversify';
+import { taskContextSystemVariants, taskContextTemplateVariants, taskContextUpdateVariants } from '../common/task-context-prompt-template';
+
+@injectable()
+export class TaskContextAgent implements Agent {
+    static ID = 'TaskContext';
+
+    id = TaskContextAgent.ID;
+    name = 'TaskContext';
+    description = nls.localize('theia/ai/taskcontext/taskContextAgent/description',
+        'An AI assistant that analyzes chat sessions and creates structured task summaries for coding tasks. ' +
+        'This agent specializes in extracting key information from conversations and formatting them into comprehensive task context documents that can be used by other agents.');
+
+    variables = [];
+    prompts = [taskContextSystemVariants, taskContextTemplateVariants, taskContextUpdateVariants];
+    languageModelRequirements: LanguageModelRequirement[] = [{
+        purpose: 'TaskContext Creation/Update',
+        identifier: 'default/code',
+    }];
+    agentSpecificVariables = [];
+    functions = [];
+}

packages/ai-ide/src/browser/task-context-file-storage-service.ts

@@ -0,0 +1,225 @@
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH and others.
+//
+// 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 { 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, 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 '../common/workspace-preferences';
+import { BinaryBuffer } from '@theia/core/lib/common/buffer';
+
+@injectable()
+export class TaskContextFileStorageService implements TaskContextStorageService {
+    @inject(InMemoryTaskContextStorage) protected readonly inMemoryStorage: InMemoryTaskContextStorage;
+    @inject(PreferenceService) protected readonly preferenceService: PreferenceService;
+    @inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
+    @inject(FileService) protected readonly fileService: FileService;
+    @inject(OpenerService) protected readonly openerService: OpenerService;
+    @inject(ILogger) protected readonly logger: ILogger;
+    protected readonly onDidChangeEmitter = new Emitter<void>();
+    readonly onDidChange = this.onDidChangeEmitter.event;
+
+    protected sanitizeLabel(label: string): string {
+        return label.replace(/^[^\p{L}\p{N}]+/ug, '');
+    }
+
+    protected getStorageLocation(): URI | undefined {
+        if (!this.workspaceService.opened) { return; }
+        const values = this.preferenceService.inspect(TASK_CONTEXT_STORAGE_DIRECTORY_PREF);
+        const configuredPath = values?.globalValue === undefined ? values?.defaultValue : values?.globalValue;
+        if (!configuredPath || typeof configuredPath !== 'string') { return; }
+        const asPath = new Path(configuredPath);
+        return asPath.isAbsolute ? new URI(configuredPath) : this.workspaceService.tryGetRoots().at(0)?.resource.resolve(configuredPath);
+    }
+
+    @postConstruct()
+    protected init(): void {
+        this.doInit();
+    }
+
+    protected get ready(): Promise<void> {
+        return Promise.all([
+            this.workspaceService.ready,
+            this.preferenceService.ready,
+        ]).then(() => undefined);
+    }
+
+    protected async doInit(): Promise<void> {
+        await this.ready;
+        this.watchStorage();
+        this.preferenceService.onPreferenceChanged(e => {
+            if (e.preferenceName === TASK_CONTEXT_STORAGE_DIRECTORY_PREF) {
+                this.watchStorage().catch(error => this.logger.error(error));
+            }
+        });
+    }
+
+    protected toDisposeOnStorageChange?: DisposableCollection;
+    protected async watchStorage(): Promise<void> {
+        const newStorage = await this.getStorageLocation();
+        this.toDisposeOnStorageChange?.dispose();
+        this.toDisposeOnStorageChange = undefined;
+        if (!newStorage) { return; }
+        this.toDisposeOnStorageChange = new DisposableCollection(
+            this.fileService.watch(newStorage, { recursive: true, excludes: [] }),
+            this.fileService.onDidFilesChange(event => {
+                const relevantChanges = event.changes.filter(candidate => newStorage.isEqualOrParent(candidate.resource));
+                this.handleChanges(relevantChanges);
+            }),
+            { dispose: () => this.clearInMemoryStorage() },
+        );
+        this.cacheNewTasks(newStorage).catch(this.logger.error.bind(this.logger));
+    }
+
+    protected async handleChanges(changes: FileChange[]): Promise<void> {
+        await Promise.all(changes.map(change => {
+            switch (change.type) {
+                case FileChangeType.DELETED: return this.deleteFileReference(change.resource);
+                case FileChangeType.ADDED:
+                case FileChangeType.UPDATED:
+                    return this.readFile(change.resource);
+                default: return unreachable(change.type);
+            }
+        }));
+    }
+
+    protected clearInMemoryStorage(): void {
+        this.inMemoryStorage.clear();
+    }
+
+    protected deleteFileReference(uri: URI): boolean {
+        if (this.inMemoryStorage.delete(uri.path.base)) {
+            return true;
+        }
+        for (const summary of this.inMemoryStorage.getAll()) {
+            if (summary.uri?.isEqual(uri)) {
+                return this.inMemoryStorage.delete(summary.id);
+            }
+        }
+        return false;
+    }
+
+    protected async cacheNewTasks(storageLocation: URI): Promise<void> {
+        const contents = await this.fileService.resolve(storageLocation).catch(() => undefined);
+        if (!contents?.children?.length) { return; }
+        await Promise.all(contents.children.map(child => this.readFile(child.resource)));
+        this.onDidChangeEmitter.fire();
+    }
+
+    protected async readFile(uri: URI): Promise<void> {
+        const content = await this.fileService.read(uri).then(read => read.value).catch(() => undefined);
+        if (content === undefined) { return; }
+        const { frontmatter, body } = this.maybeReadFrontmatter(content);
+        const rawLabel = frontmatter?.label || uri.path.base.slice(0, (-1 * uri.path.ext.length) || uri.path.base.length);
+        const summary = {
+            ...frontmatter,
+            summary: body,
+            label: this.sanitizeLabel(rawLabel),
+            uri,
+            id: frontmatter?.id || frontmatter?.sessionId || uri.path.base
+        };
+        const existingSummary = !frontmatter?.id && summary.sessionId && this.getAll().find(candidate => candidate.sessionId === summary.sessionId);
+        if (existingSummary) {
+            summary.id = existingSummary.id;
+        }
+        this.inMemoryStorage.store(summary);
+    }
+
+    async store(summary: Summary): Promise<void> {
+        await this.ready;
+        const label = this.sanitizeLabel(summary.label);
+        const storageLocation = this.getStorageLocation();
+        if (storageLocation) {
+            const frontmatter = {
+                id: summary.id,
+                sessionId: summary.sessionId,
+                date: new Date().toISOString(),
+                label,
+            };
+            const derivedName = label.trim().replace(/[^\p{L}\p{N}]/ug, '-').replace(/^-+|-+$/g, '');
+            const filename = (derivedName.length > 32 ? derivedName.slice(0, derivedName.indexOf('-', 32)) : derivedName) + '.md';
+            const content = yaml.dump(frontmatter).trim() + `${EOL}---${EOL}` + summary.summary;
+            const uri = storageLocation.resolve(filename);
+            summary.uri = uri;
+            await this.fileService.writeFile(uri, BinaryBuffer.fromString(content));
+        }
+        this.inMemoryStorage.store({ ...summary, label });
+        this.onDidChangeEmitter.fire();
+    }
+
+    getAll(): Summary[] {
+        return this.inMemoryStorage.getAll();
+    }
+
+    async get(identifier: string): Promise<Summary | undefined> {
+        const cached = this.inMemoryStorage.get(identifier);
+        if (!cached?.uri) {
+            return cached;
+        }
+        // Read fresh content from disk
+        const content = await this.fileService.read(cached.uri).then(read => read.value).catch(reason => {
+            this.logger.error(`Failed to read file ${cached.uri}: ${reason}`);
+            return undefined;
+        });
+        if (content === undefined) {
+            return cached; // Fall back to cache if read fails
+        }
+        const { body } = this.maybeReadFrontmatter(content);
+        return { ...cached, summary: body };
+    }
+
+    async delete(identifier: string): Promise<boolean> {
+        const summary = this.inMemoryStorage.get(identifier);
+        if (summary?.uri) {
+            await this.fileService.delete(summary.uri);
+        }
+        this.inMemoryStorage.delete(identifier);
+        if (summary) {
+            this.onDidChangeEmitter.fire();
+        }
+        return !!summary;
+    }
+
+    protected maybeReadFrontmatter(content: string): { body: string, frontmatter: SummaryMetadata | undefined } {
+        const frontmatterEnd = content.indexOf('---');
+        if (frontmatterEnd !== -1) {
+            try {
+                const frontmatter = yaml.load(content.slice(0, frontmatterEnd));
+                if (this.hasLabel(frontmatter)) {
+                    return { frontmatter, body: content.slice(frontmatterEnd + 3).trim() };
+                }
+            } catch { /* Probably not frontmatter, then. */ }
+        }
+        return { body: content, frontmatter: undefined };
+    }
+
+    protected hasLabel(candidate: unknown): candidate is SummaryMetadata {
+        return !!candidate && typeof candidate === 'object' && !Array.isArray(candidate) && 'label' in candidate && typeof candidate.label === 'string';
+    }
+
+    async open(identifier: string): Promise<void> {
+        const summary = await this.get(identifier);
+        if (!summary) {
+            throw new Error('Unable to open requested task context: none found with specified identifier.');
+        }
+        await (summary.uri ? open(this.openerService, summary.uri) : this.inMemoryStorage.open(identifier));
+    }
+}

packages/ai-ide/src/browser/task-context-functions.ts

@@ -0,0 +1,345 @@
+// *****************************************************************************
+// 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 { assertChatContext } from '@theia/ai-chat';
+import { Summary, TaskContextStorageService } from '@theia/ai-chat/lib/browser/task-context-service';
+import { ToolInvocationContext, ToolProvider, ToolRequest } from '@theia/ai-core';
+import { generateUuid } from '@theia/core';
+import { ContentReplacer, Replacement } from '@theia/core/lib/common/content-replacer';
+import { ContentReplacerV2Impl } from '@theia/core/lib/common/content-replacer-v2-impl';
+import { inject, injectable } from '@theia/core/shared/inversify';
+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';
+
+@injectable()
+export class CreateTaskContextFunction implements ToolProvider {
+    static ID = CREATE_TASK_CONTEXT_FUNCTION_ID;
+
+    @inject(TaskContextStorageService)
+    protected readonly storageService: TaskContextStorageService;
+
+    getTool(): ToolRequest {
+        return {
+            id: CreateTaskContextFunction.ID,
+            name: CreateTaskContextFunction.ID,
+            description: 'Create a new task context (implementation plan) for the current session. ' +
+                'The plan will be stored and opened in the editor so the user can see it. ' +
+                'Use this to document the implementation plan after exploring the codebase.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    title: {
+                        type: 'string',
+                        description: 'Title for the task context (e.g., "Add user authentication feature")'
+                    },
+                    content: {
+                        type: 'string',
+                        description: 'The plan content in markdown format. Should include: Goal, Design, Implementation Steps (with file paths), ' +
+                            'Reference Examples, and Verification.'
+                    }
+                },
+                required: ['title', 'content']
+            },
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+
+                try {
+                    const { title, content } = JSON.parse(args);
+                    const summaryId = generateUuid();
+                    const summary: Summary = {
+                        id: summaryId,
+                        label: title,
+                        summary: content,
+                        sessionId: ctx.request.session.id
+                    };
+
+                    await this.storageService.store(summary);
+                    await this.storageService.open(summaryId);
+
+                    return `Created task context "${title}" (id: ${summaryId}) - now visible in editor. The user can review and edit the plan directly.`;
+                } catch (error) {
+                    return JSON.stringify({ error: `Failed to create task context: ${error.message}` });
+                }
+            }
+        };
+    }
+}
+
+@injectable()
+export class GetTaskContextFunction implements ToolProvider {
+    static ID = GET_TASK_CONTEXT_FUNCTION_ID;
+
+    @inject(TaskContextStorageService)
+    protected readonly storageService: TaskContextStorageService;
+
+    getTool(): ToolRequest {
+        return {
+            id: GetTaskContextFunction.ID,
+            name: GetTaskContextFunction.ID,
+            description: 'Read the current task context (implementation plan). ' +
+                'Always call this before editing to ensure you have the latest version, ' +
+                'as the user may have edited the plan directly in the editor.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    taskContextId: {
+                        type: 'string',
+                        description: 'Optional task context ID. If not provided, returns the task context for the current session.'
+                    }
+                },
+                required: []
+            },
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+
+                try {
+                    const parsed = args ? JSON.parse(args) : {};
+                    const taskContextId: string | undefined = parsed.taskContextId;
+
+                    let summary: Summary | undefined;
+                    if (taskContextId) {
+                        summary = await this.storageService.get(taskContextId);
+                    } else {
+                        const allSummaries = this.storageService.getAll();
+                        const sessionSummaries = allSummaries.filter(s => s.sessionId === ctx.request.session.id);
+                        summary = sessionSummaries[sessionSummaries.length - 1];
+                    }
+
+                    if (!summary) {
+                        return 'No task context found for this session. Use createTaskContext to create one.';
+                    }
+
+                    return summary.summary;
+                } catch (error) {
+                    return JSON.stringify({ error: `Failed to get task context: ${error.message}` });
+                }
+            }
+        };
+    }
+}
+
+@injectable()
+export class EditTaskContextFunction implements ToolProvider {
+    static ID = EDIT_TASK_CONTEXT_FUNCTION_ID;
+
+    @inject(TaskContextStorageService)
+    protected readonly storageService: TaskContextStorageService;
+
+    protected readonly contentReplacer: ContentReplacer = new ContentReplacerV2Impl();
+
+    getTool(): ToolRequest {
+        return {
+            id: EditTaskContextFunction.ID,
+            name: EditTaskContextFunction.ID,
+            description: 'Edit the current task context by replacing specific content. ' +
+                'The plan will be updated and opened in the editor so the user can see the changes. ' +
+                'The oldContent must appear exactly once in the plan. ' +
+                'IMPORTANT: Always call getTaskContext first to read the latest version before editing, ' +
+                'as the user may have edited the plan directly. ' +
+                'If you see "not found" errors: The content does not exist, has different whitespace, or the plan changed. Re-read with getTaskContext first. ' +
+                'If you see "multiple occurrences" errors: Add more surrounding lines to oldContent to make it unique. ' +
+                'Common mistakes: Missing/extra trailing newlines, wrong indentation, outdated content. ' +
+                'If edits continue to fail, use rewriteTaskContext to replace the entire content.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    oldContent: {
+                        type: 'string',
+                        description: 'The exact content to be replaced. Must match exactly, including whitespace and indentation.'
+                    },
+                    newContent: {
+                        type: 'string',
+                        description: 'The replacement text. For deletions, use an empty string.'
+                    },
+                    taskContextId: {
+                        type: 'string',
+                        description: 'Optional task context ID. If not provided, edits the task context for the current session.'
+                    }
+                },
+                required: ['oldContent', 'newContent']
+            },
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+
+                try {
+                    const { oldContent, newContent, taskContextId } = JSON.parse(args);
+
+                    let summary: Summary | undefined;
+                    if (taskContextId) {
+                        summary = await this.storageService.get(taskContextId);
+                    } else {
+                        const allSummaries = this.storageService.getAll();
+                        const sessionSummaries = allSummaries.filter(s => s.sessionId === ctx.request.session.id);
+                        summary = sessionSummaries[sessionSummaries.length - 1];
+                    }
+
+                    if (!summary) {
+                        return 'No task context found for this session. Use createTaskContext to create one first.';
+                    }
+
+                    const replacement: Replacement = { oldContent, newContent };
+                    const { updatedContent, errors } = this.contentReplacer.applyReplacements(summary.summary, [replacement]);
+
+                    if (errors.length > 0) {
+                        return 'Edit failed: ' + errors.join('; ') + '. ' +
+                            'The user may have edited the plan directly. ' +
+                            'Use getTaskContext to read the current content and try again. ' +
+                            'If edits continue to fail, use rewriteTaskContext to replace the entire content.';
+                    }
+
+                    const updatedSummary: Summary = {
+                        ...summary,
+                        summary: updatedContent
+                    };
+                    await this.storageService.store(updatedSummary);
+
+                    await this.storageService.open(summary.id);
+
+                    return 'Task context updated successfully - changes visible in editor.';
+                } catch (error) {
+                    return JSON.stringify({ error: `Failed to edit task context: ${error.message}` });
+                }
+            }
+        };
+    }
+}
+
+@injectable()
+export class ListTaskContextsFunction implements ToolProvider {
+    static ID = LIST_TASK_CONTEXTS_FUNCTION_ID;
+
+    @inject(TaskContextStorageService)
+    protected readonly storageService: TaskContextStorageService;
+
+    getTool(): ToolRequest {
+        return {
+            id: ListTaskContextsFunction.ID,
+            name: ListTaskContextsFunction.ID,
+            description: 'List all task contexts (plans) for the current session. ' +
+                'Use this to see what plans exist and their IDs.',
+            parameters: {
+                type: 'object',
+                properties: {},
+                required: []
+            },
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+
+                try {
+                    const allSummaries = this.storageService.getAll();
+                    const sessionSummaries = allSummaries.filter(s => s.sessionId === ctx.request.session.id);
+
+                    if (sessionSummaries.length === 0) {
+                        return 'No task contexts found for this session.';
+                    }
+
+                    const list = sessionSummaries.map((s, i) =>
+                        `${i + 1}. "${s.label}" (id: ${s.id})`
+                    ).join('\n');
+
+                    return `Task contexts for this session:\n${list}\n\nMost recent: "${sessionSummaries[sessionSummaries.length - 1].label}"`;
+                } catch (error) {
+                    return JSON.stringify({ error: `Failed to list task contexts: ${error.message}` });
+                }
+            }
+        };
+    }
+}
+
+@injectable()
+export class RewriteTaskContextFunction implements ToolProvider {
+    static ID = REWRITE_TASK_CONTEXT_FUNCTION_ID;
+
+    @inject(TaskContextStorageService)
+    protected readonly storageService: TaskContextStorageService;
+
+    getTool(): ToolRequest {
+        return {
+            id: RewriteTaskContextFunction.ID,
+            name: RewriteTaskContextFunction.ID,
+            description: 'Completely rewrite a task context with new content. ' +
+                'Use this as a fallback when editTaskContext fails repeatedly, ' +
+                'for example when the user has made significant changes to the plan. ' +
+                'The plan will be updated and opened in the editor so the user can see the changes.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    content: {
+                        type: 'string',
+                        description: 'The complete new content for the task context in markdown format.'
+                    },
+                    taskContextId: {
+                        type: 'string',
+                        description: 'Optional task context ID. If not provided, rewrites the task context for the current session.'
+                    }
+                },
+                required: ['content']
+            },
+            handler: async (args: string, ctx?: ToolInvocationContext): Promise<string> => {
+                assertChatContext(ctx);
+                if (ctx.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+
+                try {
+                    const { content, taskContextId } = JSON.parse(args);
+
+                    let summary: Summary | undefined;
+                    if (taskContextId) {
+                        summary = await this.storageService.get(taskContextId);
+                    } else {
+                        const allSummaries = this.storageService.getAll();
+                        const sessionSummaries = allSummaries.filter(s => s.sessionId === ctx.request.session.id);
+                        summary = sessionSummaries[sessionSummaries.length - 1];
+                    }
+
+                    if (!summary) {
+                        return 'No task context found for this session. Use createTaskContext to create one first.';
+                    }
+
+                    const updatedSummary: Summary = {
+                        ...summary,
+                        summary: content
+                    };
+                    await this.storageService.store(updatedSummary);
+
+                    await this.storageService.open(summary.id);
+
+                    return 'Task context rewritten successfully - changes visible in editor.';
+                } catch (error) {
+                    return JSON.stringify({ error: `Failed to rewrite task context: ${error.message}` });
+                }
+            }
+        };
+    }
+}

packages/ai-ide/src/browser/template-preference-contribution.ts

@@ -0,0 +1,99 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { 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 '../common/workspace-preferences';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
+import { Path, PreferenceService } from '@theia/core';
+
+@injectable()
+export class TemplatePreferenceContribution implements FrontendApplicationContribution {
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    @inject(DefaultPromptFragmentCustomizationService)
+    protected readonly customizationService: DefaultPromptFragmentCustomizationService;
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    onStart(): void {
+        Promise.all([this.preferenceService.ready, this.workspaceService.ready]).then(() => {
+            // Set initial template configuration from preferences
+            this.updateConfiguration();
+
+            // Listen for preference changes
+            this.preferenceService.onPreferenceChanged(event => {
+                if (event.preferenceName === PROMPT_TEMPLATE_WORKSPACE_DIRECTORIES_PREF ||
+                    event.preferenceName === PROMPT_TEMPLATE_ADDITIONAL_EXTENSIONS_PREF ||
+                    event.preferenceName === PROMPT_TEMPLATE_WORKSPACE_FILES_PREF) {
+                    this.updateConfiguration(event.preferenceName);
+                }
+            });
+
+            // Listen for workspace root changes
+            this.workspaceService.onWorkspaceLocationChanged(() => {
+                this.updateConfiguration();
+            });
+        });
+    }
+
+    /**
+     * Updates the template configuration in the customization service.
+     * If a specific preference name is provided, only that configuration aspect is updated.
+     * @param changedPreference Optional name of the preference that changed
+     */
+    protected async updateConfiguration(changedPreference?: string): Promise<void> {
+        const workspaceRoot = this.workspaceService.tryGetRoots()[0];
+        if (!workspaceRoot) {
+            return;
+        }
+
+        const workspaceRootUri = workspaceRoot.resource;
+        const configProperties: PromptFragmentCustomizationProperties = {};
+
+        if (!changedPreference || changedPreference === PROMPT_TEMPLATE_WORKSPACE_DIRECTORIES_PREF) {
+            const relativeDirectories = this.preferenceService.get<string[]>(PROMPT_TEMPLATE_WORKSPACE_DIRECTORIES_PREF, []);
+            configProperties.directoryPaths = relativeDirectories.map(dir => {
+                const path = new Path(dir);
+                const uri = workspaceRootUri.resolve(path.toString());
+                return uri.path.toString();
+            });
+        }
+
+        if (!changedPreference || changedPreference === PROMPT_TEMPLATE_ADDITIONAL_EXTENSIONS_PREF) {
+            configProperties.extensions = this.preferenceService.get<string[]>(PROMPT_TEMPLATE_ADDITIONAL_EXTENSIONS_PREF, []);
+        }
+
+        if (!changedPreference || changedPreference === PROMPT_TEMPLATE_WORKSPACE_FILES_PREF) {
+            const relativeFilePaths = this.preferenceService.get<string[]>(PROMPT_TEMPLATE_WORKSPACE_FILES_PREF, []);
+            configProperties.filePaths = relativeFilePaths.map(filePath => {
+                const path = new Path(filePath);
+                const uri = workspaceRootUri.resolve(path.toString());
+                return uri.path.toString();
+            });
+        }
+
+        await this.customizationService.updateConfiguration(configProperties);
+    }
+}

packages/ai-ide/src/browser/test/tool-provider-cancellation-test-util.spec.ts

@@ -0,0 +1,60 @@
+// *****************************************************************************
+// 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 { CancellationTokenSource } from '@theia/core';
+import { expect } from 'chai';
+
+// Simple test for cancellation handling
+describe('Tool Provider Cancellation Tests', () => {
+    it('should verify basic cancellation token functionality', () => {
+        // Create a cancellation token source
+        const cts = new CancellationTokenSource();
+
+        // Initially the token should not be cancelled
+        expect(cts.token.isCancellationRequested).to.be.false;
+
+        // After cancellation, the token should report as cancelled
+        cts.cancel();
+        expect(cts.token.isCancellationRequested).to.be.true;
+
+        // Cleanup
+        cts.dispose();
+    });
+
+    it('should trigger cancellation callback when cancelled', async () => {
+        // Create a cancellation token source
+        const cts = new CancellationTokenSource();
+
+        // Create a flag to track if the callback was called
+        let callbackCalled = false;
+
+        // Register a cancellation callback
+        const disposable = cts.token.onCancellationRequested(() => {
+            callbackCalled = true;
+        });
+
+        // Initially the callback should not have been called
+        expect(callbackCalled).to.be.false;
+
+        // After cancellation, the callback should be called
+        cts.cancel();
+        expect(callbackCalled).to.be.true;
+
+        // Cleanup
+        disposable.dispose();
+        cts.dispose();
+    });
+});

packages/ai-ide/src/browser/todo-tool-renderer.tsx

@@ -0,0 +1,153 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 { inject, injectable } from '@theia/core/shared/inversify';
+import { ChatResponsePartRenderer } from '@theia/ai-chat-ui/lib/browser/chat-response-part-renderer';
+import { ResponseNode } from '@theia/ai-chat-ui/lib/browser/chat-tree-view';
+import { ChatResponseContent, ToolCallChatResponseContent } from '@theia/ai-chat/lib/common';
+import { ReactNode } from '@theia/core/shared/react';
+import * as React from '@theia/core/shared/react';
+import { codicon, ContextMenuRenderer } from '@theia/core/lib/browser';
+import { nls } from '@theia/core';
+import { TODO_WRITE_FUNCTION_ID, TodoItem, isValidTodoItem } from './todo-tool';
+import { withToolCallConfirmation } from '@theia/ai-chat-ui/lib/browser/chat-response-renderer/tool-confirmation';
+import { ToolConfirmationManager } from '@theia/ai-chat/lib/browser/chat-tool-preference-bindings';
+import { ToolInvocationRegistry } from '@theia/ai-core';
+
+interface TodoListComponentProps {
+    todos: TodoItem[] | undefined;
+}
+
+const TodoListComponent: React.FC<TodoListComponentProps> = ({ todos }) => {
+    const header = (
+        <div className='todo-tool-header'>
+            <i className={codicon('checklist')} />
+            <span className='todo-tool-title'>{nls.localizeByDefault('Todos')}</span>
+        </div>
+    );
+
+    if (!todos || todos.length === 0) {
+        return (
+            <div className='todo-tool-container'>
+                {header}
+                <div className='todo-tool-empty'>{nls.localize('theia/ai-ide/todoTool/noTasks', 'No tasks')}</div>
+            </div>
+        );
+    }
+
+    return (
+        <div className='todo-tool-container'>
+            {header}
+            <div className='todo-tool-list'>
+                {todos.map((todo, index) => (
+                    <div key={index} className={`todo-tool-item todo-status-${todo.status}`}>
+                        <span className='todo-tool-icon'>{getStatusIcon(todo.status)}</span>
+                        <span className='todo-tool-text'>
+                            {todo.status === 'in_progress' ? todo.activeForm : todo.content}
+                        </span>
+                    </div>
+                ))}
+            </div>
+        </div>
+    );
+};
+
+function getStatusIcon(status: string): ReactNode {
+    switch (status) {
+        case 'pending':
+            return <i className={codicon('circle-large-outline')} />;
+        case 'in_progress':
+            return <i className={`${codicon('sync')} theia-animation-spin`} />;
+        case 'completed':
+            return <i className={codicon('pass-filled')} />;
+        default:
+            return undefined;
+    }
+}
+
+const TodoListWithConfirmation = withToolCallConfirmation(TodoListComponent);
+
+@injectable()
+export class TodoToolRenderer implements ChatResponsePartRenderer<ToolCallChatResponseContent> {
+
+    @inject(ToolConfirmationManager)
+    protected toolConfirmationManager: ToolConfirmationManager;
+
+    @inject(ContextMenuRenderer)
+    protected contextMenuRenderer: ContextMenuRenderer;
+
+    @inject(ToolInvocationRegistry)
+    protected toolInvocationRegistry: ToolInvocationRegistry;
+
+    canHandle(response: ChatResponseContent): number {
+        if (ToolCallChatResponseContent.is(response) && response.name === TODO_WRITE_FUNCTION_ID) {
+            return 20;
+        }
+        return -1;
+    }
+
+    render(response: ToolCallChatResponseContent, parentNode: ResponseNode): ReactNode {
+        if (!response.arguments) {
+            return undefined;
+        }
+
+        if (!this.isLatestTodoWriteInResponse(response, parentNode)) {
+            // eslint-disable-next-line no-null/no-null
+            return null;
+        }
+
+        const chatId = parentNode.sessionId;
+        const toolRequest = this.toolInvocationRegistry.getFunction(TODO_WRITE_FUNCTION_ID);
+        const confirmationMode = this.toolConfirmationManager.getConfirmationMode(TODO_WRITE_FUNCTION_ID, chatId, toolRequest);
+        const todos = this.parseTodos(response.arguments);
+
+        return (
+            <TodoListWithConfirmation
+                todos={todos}
+                response={response}
+                confirmationMode={confirmationMode}
+                toolConfirmationManager={this.toolConfirmationManager}
+                toolRequest={toolRequest}
+                chatId={chatId}
+                requestCanceled={parentNode.response.isCanceled}
+                contextMenuRenderer={this.contextMenuRenderer}
+            />
+        );
+    }
+
+    protected isLatestTodoWriteInResponse(response: ToolCallChatResponseContent, parentNode: ResponseNode): boolean {
+        const todoWriteIds = parentNode.response.response.content
+            .filter(c => ToolCallChatResponseContent.is(c) && c.name === TODO_WRITE_FUNCTION_ID)
+            .map(c => (c as ToolCallChatResponseContent).id);
+
+        return todoWriteIds[todoWriteIds.length - 1] === response.id;
+    }
+
+    protected parseTodos(args: string | undefined): TodoItem[] | undefined {
+        if (!args) {
+            return undefined;
+        }
+        try {
+            const parsed = JSON.parse(args);
+            if (!Array.isArray(parsed.todos)) {
+                return undefined;
+            }
+            return parsed.todos.filter(isValidTodoItem);
+        } catch {
+            return undefined;
+        }
+    }
+}

packages/ai-ide/src/browser/todo-tool.ts

@@ -0,0 +1,77 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 { 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';
+
+export { TODO_WRITE_FUNCTION_ID, TodoItem, isValidTodoItem } from '../common/todo-tool';
+
+@injectable()
+export class TodoWriteTool implements ToolProvider {
+    static ID = TODO_WRITE_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: TodoWriteTool.ID,
+            name: TodoWriteTool.ID,
+            providerName: 'ai-ide',
+            description: 'Write a todo list to track task progress. Use this to plan multi-step tasks ' +
+                'and show progress to the user. Each todo has content (imperative: "Run tests"), ' +
+                'activeForm (continuous: "Running tests"), and status (pending/in_progress/completed). ' +
+                'Call this to update the entire list - it replaces the previous list.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    todos: {
+                        type: 'array',
+                        items: {
+                            type: 'object',
+                            properties: {
+                                content: { type: 'string', description: 'Imperative form: "Run tests"' },
+                                activeForm: { type: 'string', description: 'Continuous form: "Running tests"' },
+                                status: { type: 'string', enum: ['pending', 'in_progress', 'completed'] }
+                            },
+                            required: ['content', 'activeForm', 'status']
+                        }
+                    }
+                },
+                required: ['todos']
+            },
+            handler: async (arg_string: string) => {
+                try {
+                    const { todos } = JSON.parse(arg_string);
+                    if (!Array.isArray(todos)) {
+                        return JSON.stringify({ error: 'todos must be an array' });
+                    }
+                    const validTodos = todos.filter(isValidTodoItem);
+                    const invalidCount = todos.length - validTodos.length;
+                    if (invalidCount > 0) {
+                        return JSON.stringify({
+                            success: true,
+                            count: validTodos.length,
+                            warning: `${invalidCount} invalid todo item(s) were filtered out`
+                        });
+                    }
+                    return JSON.stringify({ success: true, count: validTodos.length });
+                } catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    return JSON.stringify({ error: `Failed to parse todos: ${message}` });
+                }
+            }
+        };
+    }
+}

packages/ai-ide/src/browser/with-apptester-command-contribution.ts

@@ -0,0 +1,87 @@
+// *****************************************************************************
+// 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 { FrontendApplicationContribution } from '@theia/core/lib/browser';
+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-chat/lib/browser/agent-delegation-tool';
+import { RUN_TASK_FUNCTION_ID } from '../common/workspace-functions';
+
+@injectable()
+export class WithAppTesterCommandContribution implements FrontendApplicationContribution {
+
+    @inject(PromptService)
+    protected readonly promptService: PromptService;
+
+    onStart(): void {
+        this.registerWithAppTesterCommand();
+    }
+
+    protected registerWithAppTesterCommand(): void {
+        const commandTemplate = this.buildCommandTemplate();
+
+        this.promptService.addBuiltInPromptFragment({
+            id: 'with-apptester',
+            template: commandTemplate,
+            isCommand: true,
+            commandName: 'with-apptester',
+            commandDescription: nls.localize(
+                'theia/ai-ide/withAppTesterCommand/description',
+                'Delegate testing to the AppTester agent (requires agent mode)'
+            ),
+            commandAgents: ['Coder']
+        });
+    }
+
+    protected buildCommandTemplate(): string {
+        return `After implementing the changes, delegate to the AppTester agent to test the implementation. The changes need to be applied and built.
+
+    Use the ~{${AGENT_DELEGATION_FUNCTION_ID}} tool to delegate to the AppTester agent.
+
+    **Agent ID:** 'AppTester'
+    **Prompt:** Provide a description of what was implemented and should be tested, including:
+    - Summary of changes made
+    - Expected behavior
+    - Areas to focus testing on
+    - **Application URL:** Specify the exact URL if known (e.g., http://localhost:3000)
+    - **Application Status:** Clearly specify whether the application has started, or if the AppTester needs to launch it
+    - **Launch Configuration:** If known, specify which launch configuration to use
+    - **UI Navigation Instructions:** If the feature requires opening a specific view, panel, menu, or using the command palette, provide explicit instructions
+
+    Example prompt format:
+    \`\`\`
+    I have implemented [description of changes].
+
+    Expected behavior: [what should happen]
+
+    Application URL: http://localhost:3000
+    Application status: The application is running.
+    (OR: Application status: Not started yet. Use launch configuration "[config-name]" to start it.)
+    IMPORTANT: You CANNOT start the application using the ${RUN_TASK_FUNCTION_ID} tool, as it will block the delegation.
+
+    UI Navigation: To test this feature, you need to [e.g., "click the AI Chat icon in the left sidebar to open the AI Chat View",
+    or "open the Command Palette and run 'Open Settings'", or "the feature should be visible immediately on the main page"].
+
+    Please test the implementation focusing on [specific areas].
+    \`\`\`
+
+    **IMPORTANT:** Include as much information as possible (URL, port, launch config, UI navigation steps)
+    to guide the AppTester efficiently.
+
+    The AppTester will verify the implementation and report any issues found.`;
+    }
+}

packages/ai-ide/src/browser/workspace-functions.spec.ts

@@ -0,0 +1,197 @@
+// *****************************************************************************
+// 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 { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+FrontendApplicationConfigProvider.set({});
+
+import { expect } from 'chai';
+import { CancellationTokenSource, PreferenceService } from '@theia/core';
+import {
+    GetWorkspaceDirectoryStructure,
+    FileContentFunction,
+    GetWorkspaceFileList,
+    FileDiagnosticProvider,
+    WorkspaceFunctionScope
+} from './workspace-functions';
+import { ToolInvocationContext } from '@theia/ai-core';
+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 { 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';
+
+disableJSDOM();
+
+describe('Workspace Functions Cancellation Tests', () => {
+    let cancellationTokenSource: CancellationTokenSource;
+    let mockCtx: ToolInvocationContext;
+    let container: Container;
+
+    before(() => {
+        disableJSDOM = enableJSDOM();
+    });
+    after(() => {
+        // Disable JSDOM after all tests
+        disableJSDOM();
+    });
+
+    beforeEach(() => {
+        cancellationTokenSource = new CancellationTokenSource();
+
+        // Setup mock context
+        mockCtx = {
+            cancellationToken: cancellationTokenSource.token
+        };
+
+        // Create a new container for each test
+        container = new Container();
+
+        // Mock dependencies
+        const mockWorkspaceService = {
+            roots: [{ resource: new URI('file:///workspace') }]
+        } as unknown as WorkspaceService;
+
+        const mockFileService = {
+            exists: async () => true,
+            resolve: async () => ({
+                isDirectory: true,
+                children: [
+                    {
+                        isDirectory: true,
+                        resource: new URI('file:///workspace/dir'),
+                        path: { base: 'dir' }
+                    }
+                ],
+                resource: new URI('file:///workspace')
+            }),
+            read: async () => ({ value: { toString: () => 'test content' } })
+        } as unknown as FileService;
+
+        const mockPreferenceService = {
+            get: <T>(_path: string, defaultValue: T) => defaultValue
+        };
+
+        const mockMonacoWorkspace = {
+            // eslint-disable-next-line no-null/no-null
+            getTextDocument: () => null
+        } as unknown as MonacoWorkspace;
+
+        const mockProblemManager = {
+            findMarkers: () => [],
+            onDidChangeMarkers: () => ({ dispose: () => { } })
+        } as unknown as ProblemManager;
+
+        const mockMonacoTextModelService = {
+            createModelReference: async () => ({
+                object: {
+                    lineCount: 10,
+                    getText: () => 'test text'
+                },
+                dispose: () => { }
+            })
+        } as unknown as MonacoTextModelService;
+
+        const mockOpenerService = {
+            open: async () => { }
+        };
+
+        // Register mocks in the container
+        container.bind(WorkspaceService).toConstantValue(mockWorkspaceService);
+        container.bind(FileService).toConstantValue(mockFileService);
+        container.bind(PreferenceService).toConstantValue(mockPreferenceService);
+        container.bind(MonacoWorkspace).toConstantValue(mockMonacoWorkspace);
+        container.bind(ProblemManager).toConstantValue(mockProblemManager);
+        container.bind(MonacoTextModelService).toConstantValue(mockMonacoTextModelService);
+        container.bind(OpenerService).toConstantValue(mockOpenerService);
+        container.bind(WorkspaceFunctionScope).toSelf();
+        container.bind(GetWorkspaceDirectoryStructure).toSelf();
+        container.bind(FileContentFunction).toSelf();
+        container.bind(GetWorkspaceFileList).toSelf();
+        container.bind(FileDiagnosticProvider).toSelf();
+    });
+
+    afterEach(() => {
+        cancellationTokenSource.dispose();
+    });
+
+    it('GetWorkspaceDirectoryStructure should respect cancellation token', async () => {
+        const getDirectoryStructure = container.get(GetWorkspaceDirectoryStructure);
+        cancellationTokenSource.cancel();
+
+        const handler = getDirectoryStructure.getTool().handler;
+        const result = await handler(JSON.stringify({}), mockCtx);
+
+        const jsonResponse = typeof result === 'string' ? JSON.parse(result) : result;
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('FileContentFunction should respect cancellation token', async () => {
+        const fileContentFunction = container.get(FileContentFunction);
+        cancellationTokenSource.cancel();
+
+        const handler = fileContentFunction.getTool().handler;
+        const result = await handler(JSON.stringify({ file: 'test.txt' }), mockCtx);
+
+        const jsonResponse = JSON.parse(result as string);
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('GetWorkspaceFileList should respect cancellation token', async () => {
+        const getWorkspaceFileList = container.get(GetWorkspaceFileList);
+        cancellationTokenSource.cancel();
+
+        const handler = getWorkspaceFileList.getTool().handler;
+        const result = await handler(JSON.stringify({ path: '' }), mockCtx);
+
+        expect(result).to.include('Operation cancelled by user');
+    });
+
+    it('GetWorkspaceFileList should check cancellation at multiple points', async () => {
+        const getWorkspaceFileList = container.get(GetWorkspaceFileList);
+
+        // We'll let it pass the first check then cancel
+        const mockFileService = container.get(FileService);
+        const originalResolve = mockFileService.resolve;
+
+        // Mock resolve to cancel the token after it's called
+        mockFileService.resolve = async (...args: unknown[]) => {
+            const innerResult = await originalResolve.apply(mockFileService, args);
+            cancellationTokenSource.cancel();
+            return innerResult;
+        };
+
+        const handler = getWorkspaceFileList.getTool().handler;
+        const result = await handler(JSON.stringify({ path: '' }), mockCtx);
+
+        expect(result).to.include('Operation cancelled by user');
+    });
+
+    it('FileDiagnosticProvider should respect cancellation token', async () => {
+        const fileDiagnosticProvider = container.get(FileDiagnosticProvider);
+        cancellationTokenSource.cancel();
+
+        const handler = fileDiagnosticProvider.getTool().handler;
+        const result = await handler(JSON.stringify({ file: 'test.txt' }), mockCtx);
+
+        const jsonResponse = JSON.parse(result as string);
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+});

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

@@ -0,0 +1,769 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { ToolInvocationContext, ToolProvider, ToolRequest } from '@theia/ai-core';
+import { CancellationToken, Disposable, PreferenceService, URI, Path } 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';
+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, FIND_FILES_BY_PATTERN_FUNCTION_ID
+} from '../common/workspace-functions';
+import ignore from 'ignore';
+import { Minimatch } from 'minimatch';
+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';
+import { DiagnosticSeverity, Range } from '@theia/core/shared/vscode-languageserver-protocol';
+
+@injectable()
+export class WorkspaceFunctionScope {
+    protected readonly GITIGNORE_FILE_NAME = '.gitignore';
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(PreferenceService)
+    protected readonly preferences: PreferenceService;
+
+    private gitignoreMatcher: ReturnType<typeof ignore> | undefined;
+    private gitignoreWatcherInitialized = false;
+
+    async getWorkspaceRoot(): Promise<URI> {
+        const wsRoots = await this.workspaceService.roots;
+        if (wsRoots.length === 0) {
+            throw new Error('No workspace has been opened yet');
+        }
+        return wsRoots[0].resource;
+    }
+
+    ensureWithinWorkspace(targetUri: URI, workspaceRootUri: URI): void {
+        if (!targetUri.toString().startsWith(workspaceRootUri.toString())) {
+            throw new Error('Access outside of the workspace is not allowed');
+        }
+    }
+
+    async resolveRelativePath(relativePath: string): Promise<URI> {
+        const workspaceRoot = await this.getWorkspaceRoot();
+        return workspaceRoot.resolve(relativePath);
+    }
+
+    isInWorkspace(uri: URI): boolean {
+        try {
+            const wsRoots = this.workspaceService.tryGetRoots();
+
+            if (wsRoots.length === 0) {
+                return false;
+            }
+
+            for (const root of wsRoots) {
+                const rootUri = root.resource;
+                if (rootUri.scheme === uri.scheme && rootUri.isEqualOrParent(uri)) {
+                    return true;
+                }
+            }
+
+            return false;
+        } catch {
+            return false;
+        }
+    }
+
+    isInPrimaryWorkspace(uri: URI): boolean {
+        try {
+            const wsRoots = this.workspaceService.tryGetRoots();
+
+            if (wsRoots.length === 0) {
+                return false;
+            }
+
+            const primaryRoot = wsRoots[0].resource;
+            return primaryRoot.scheme === uri.scheme && primaryRoot.isEqualOrParent(uri);
+        } catch {
+            return false;
+        }
+    }
+
+    async resolveToUri(pathOrUri: string | URI): Promise<URI | undefined> {
+        if (pathOrUri instanceof URI) {
+            return pathOrUri;
+        }
+
+        if (!pathOrUri) {
+            return undefined;
+        }
+
+        if (pathOrUri.includes('://')) {
+            try {
+                const uri = new URI(pathOrUri);
+                return uri;
+            } catch (error) {
+            }
+        }
+
+        const normalizedPath = Path.normalizePathSeparator(pathOrUri);
+        const path = new Path(normalizedPath);
+
+        if (normalizedPath.includes('..')) {
+            return undefined;
+        }
+
+        if (path.isAbsolute) {
+            return URI.fromFilePath(normalizedPath);
+        }
+
+        return this.resolveRelativePath(normalizedPath);
+    }
+
+    private async initializeGitignoreWatcher(workspaceRoot: URI): Promise<void> {
+        if (this.gitignoreWatcherInitialized) {
+            return;
+        }
+
+        const gitignoreUri = workspaceRoot.resolve(this.GITIGNORE_FILE_NAME);
+        this.fileService.watch(gitignoreUri);
+
+        this.fileService.onDidFilesChange(async event => {
+            if (event.contains(gitignoreUri)) {
+                this.gitignoreMatcher = undefined;
+            }
+        });
+
+        this.gitignoreWatcherInitialized = true;
+    }
+
+    async shouldExclude(stat: FileStat): Promise<boolean> {
+        const shouldConsiderGitIgnore = this.preferences.get(CONSIDER_GITIGNORE_PREF, false);
+        const userExcludePatterns = this.preferences.get<string[]>(USER_EXCLUDE_PATTERN_PREF, []);
+
+        if (this.isUserExcluded(stat.resource.path.base, userExcludePatterns)) {
+            return true;
+        }
+        const workspaceRoot = await this.getWorkspaceRoot();
+        if (shouldConsiderGitIgnore && (await this.isGitIgnored(stat, workspaceRoot))) {
+            return true;
+        }
+
+        return false;
+    }
+
+    protected isUserExcluded(fileName: string, userExcludePatterns: string[]): boolean {
+        return userExcludePatterns.some(pattern => new Minimatch(pattern, { dot: true }).match(fileName));
+    }
+
+    protected async isGitIgnored(stat: FileStat, workspaceRoot: URI): Promise<boolean> {
+        await this.initializeGitignoreWatcher(workspaceRoot);
+
+        const gitignoreUri = workspaceRoot.resolve(this.GITIGNORE_FILE_NAME);
+
+        try {
+            const fileStat = await this.fileService.resolve(gitignoreUri);
+            if (fileStat) {
+                if (!this.gitignoreMatcher) {
+                    const gitignoreContent = await this.fileService.read(gitignoreUri);
+                    this.gitignoreMatcher = ignore().add(gitignoreContent.value);
+                }
+                const relativePath = workspaceRoot.relative(stat.resource);
+                if (relativePath) {
+                    const relativePathStr = relativePath.toString() + (stat.isDirectory ? '/' : '');
+                    if (this.gitignoreMatcher.ignores(relativePathStr)) {
+                        return true;
+                    }
+                }
+            }
+        } catch {
+            // If .gitignore does not exist or cannot be read, continue without error
+        }
+
+        return false;
+    }
+}
+
+@injectable()
+export class GetWorkspaceDirectoryStructure implements ToolProvider {
+    static ID = GET_WORKSPACE_DIRECTORY_STRUCTURE_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: GetWorkspaceDirectoryStructure.ID,
+            name: GetWorkspaceDirectoryStructure.ID,
+            description: 'Retrieves the complete directory tree structure of the workspace as a nested JSON object. ' +
+                'Lists only directories (no files), excluding common non-essential directories (node_modules, hidden files, etc.). ' +
+                'Useful for getting a high-level overview of project organization. ' +
+                'For listing files within a specific directory, use getWorkspaceFileList instead. ' +
+                'For finding specific files, use findFilesByPattern.',
+            parameters: {
+                type: 'object',
+                properties: {},
+            },
+            handler: (_: string, ctx?: ToolInvocationContext) => this.getDirectoryStructure(ctx?.cancellationToken),
+        };
+    }
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(WorkspaceFunctionScope)
+    protected workspaceScope: WorkspaceFunctionScope;
+
+    private async getDirectoryStructure(cancellationToken?: CancellationToken): Promise<Record<string, unknown>> {
+        if (cancellationToken?.isCancellationRequested) {
+            return { error: 'Operation cancelled by user' };
+        }
+
+        let workspaceRoot;
+        try {
+            workspaceRoot = await this.workspaceScope.getWorkspaceRoot();
+        } catch (error) {
+            return { error: error.message };
+        }
+
+        return this.buildDirectoryStructure(workspaceRoot, cancellationToken);
+    }
+
+    private async buildDirectoryStructure(uri: URI, cancellationToken?: CancellationToken): Promise<Record<string, unknown>> {
+        if (cancellationToken?.isCancellationRequested) {
+            return { error: 'Operation cancelled by user' };
+        }
+
+        const stat = await this.fileService.resolve(uri);
+        const result: Record<string, unknown> = {};
+
+        if (stat && stat.isDirectory && stat.children) {
+            for (const child of stat.children) {
+                if (cancellationToken?.isCancellationRequested) {
+                    return { error: 'Operation cancelled by user' };
+                }
+
+                if (!child.isDirectory || (await this.workspaceScope.shouldExclude(child))) {
+                    continue;
+                }
+                const dirName = child.resource.path.base;
+                result[dirName] = await this.buildDirectoryStructure(child.resource, cancellationToken);
+            }
+        }
+
+        return result;
+    }
+}
+
+@injectable()
+export class FileContentFunction implements ToolProvider {
+    static ID = FILE_CONTENT_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: FileContentFunction.ID,
+            name: FileContentFunction.ID,
+            description: 'Returns the content of a specified file within the workspace as a raw string. ' +
+                '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. ' +
+                'If the file is currently open in an editor with unsaved changes, returns the editor\'s current content (not the saved file on disk). ' +
+                'Binary files may not be readable and will return an error. ' +
+                'Use this tool to read file contents before making any edits with replacement functions. ' +
+                'Do NOT use this for files you haven\'t located yet - use findFilesByPattern or searchInWorkspace first.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    file: {
+                        type: 'string',
+                        description: 'The relative path to the target file within the workspace (e.g., "src/index.ts", "package.json"). ' +
+                            'Must be relative to the workspace root. Absolute paths and paths outside the workspace will result in an error.',
+                    }
+                },
+                required: ['file']
+            },
+            handler: (arg_string: string, ctx?: ToolInvocationContext) => {
+                const file = this.parseArg(arg_string);
+                return this.getFileContent(file, ctx?.cancellationToken);
+            },
+        };
+    }
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(WorkspaceFunctionScope)
+    protected readonly workspaceScope: WorkspaceFunctionScope;
+
+    @inject(MonacoWorkspace)
+    protected readonly monacoWorkspace: MonacoWorkspace;
+
+    private parseArg(arg_string: string): string {
+        const result = JSON.parse(arg_string);
+        return result.file;
+    }
+
+    private async getFileContent(file: string, cancellationToken?: CancellationToken): Promise<string> {
+        if (cancellationToken?.isCancellationRequested) {
+            return JSON.stringify({ error: 'Operation cancelled by user' });
+        }
+
+        let targetUri: URI | undefined;
+        try {
+            const workspaceRoot = await this.workspaceScope.getWorkspaceRoot();
+            targetUri = workspaceRoot.resolve(file);
+            this.workspaceScope.ensureWithinWorkspace(targetUri, workspaceRoot);
+        } catch (error) {
+            return JSON.stringify({ error: error.message });
+        }
+
+        try {
+            if (cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+
+            const openEditorValue = this.monacoWorkspace.getTextDocument(targetUri.toString())?.getText();
+            if (openEditorValue !== undefined) {
+                return openEditorValue;
+            }
+
+            const fileContent = await this.fileService.read(targetUri);
+            return fileContent.value;
+        } catch (error) {
+            return JSON.stringify({ error: 'File not found' });
+        }
+    }
+}
+
+@injectable()
+export class GetWorkspaceFileList implements ToolProvider {
+    static ID = GET_WORKSPACE_FILE_LIST_FUNCTION_ID;
+
+    getTool(): ToolRequest {
+        return {
+            id: GetWorkspaceFileList.ID,
+            name: GetWorkspaceFileList.ID,
+            parameters: {
+                type: 'object',
+                properties: {
+                    path: {
+                        type: 'string',
+                        description: 'Relative path to a directory within the workspace (e.g., "src", "src/components"). ' +
+                            'Use "" or "." to list the workspace root. Paths outside the workspace will result in an error.'
+                    }
+                },
+                required: ['path']
+            },
+            description: 'Lists files and directories within a specified workspace directory. ' +
+                'Returns an array of names where directories are suffixed with "/" (e.g., ["src/", "package.json", "README.md"]). ' +
+                'Use this to explore directory structure step by step. ' +
+                'For finding specific files by pattern, use findFilesByPattern instead. ' +
+                'For searching file contents, use searchInWorkspace instead.',
+            handler: (arg_string: string, ctx?: ToolInvocationContext) => {
+                const args = JSON.parse(arg_string);
+                return this.getProjectFileList(args.path, ctx?.cancellationToken);
+            },
+        };
+    }
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(WorkspaceFunctionScope)
+    protected workspaceScope: WorkspaceFunctionScope;
+
+    async getProjectFileList(path?: string, cancellationToken?: CancellationToken): Promise<string | 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 });
+        }
+
+        const targetUri = path ? workspaceRoot.resolve(path) : workspaceRoot;
+        this.workspaceScope.ensureWithinWorkspace(targetUri, workspaceRoot);
+
+        try {
+            if (cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+
+            const stat = await this.fileService.resolve(targetUri);
+            if (!stat || !stat.isDirectory) {
+                return JSON.stringify({ error: 'Directory not found' });
+            }
+            return await this.listFilesDirectly(targetUri, workspaceRoot, cancellationToken);
+        } catch (error) {
+            return JSON.stringify({ error: 'Directory not found' });
+        }
+    }
+
+    private async listFilesDirectly(uri: URI, workspaceRootUri: URI, cancellationToken?: CancellationToken): Promise<string | string[]> {
+        if (cancellationToken?.isCancellationRequested) {
+            return JSON.stringify({ error: 'Operation cancelled by user' });
+        }
+
+        const stat = await this.fileService.resolve(uri);
+        const result: string[] = [];
+
+        if (stat && stat.isDirectory) {
+            if (await this.workspaceScope.shouldExclude(stat)) {
+                return result;
+            }
+            const children = await this.fileService.resolve(uri);
+            if (children.children) {
+                for (const child of children.children) {
+                    if (cancellationToken?.isCancellationRequested) {
+                        return JSON.stringify({ error: 'Operation cancelled by user' });
+                    }
+
+                    if (await this.workspaceScope.shouldExclude(child)) {
+                        continue;
+                    }
+                    const itemName = child.resource.path.base;
+                    result.push(child.isDirectory ? `${itemName}/` : itemName);
+                }
+            }
+        }
+
+        return result;
+    }
+}
+
+@injectable()
+export class FileDiagnosticProvider implements ToolProvider {
+    static ID = GET_FILE_DIAGNOSTICS_ID;
+
+    @inject(WorkspaceFunctionScope)
+    protected readonly workspaceScope: WorkspaceFunctionScope;
+
+    @inject(ProblemManager)
+    protected readonly problemManager: ProblemManager;
+
+    @inject(MonacoTextModelService)
+    protected readonly modelService: MonacoTextModelService;
+
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
+
+    getTool(): ToolRequest {
+        return {
+            id: FileDiagnosticProvider.ID,
+            name: FileDiagnosticProvider.ID,
+            description:
+                'Retrieves Error and Warning level diagnostics for a specific file in the workspace (Info and Hint level are filtered out). ' +
+                'Returns a list of problems including: surrounding source code context (at least 3 lines), the error/warning message, ' +
+                'and optionally a diagnostic code with description. ' +
+                'Note: If the file was not recently opened, diagnostics may take a few seconds to appear as language services initialize. ' +
+                'If no diagnostics are returned, the file may be error-free OR language services may not be active for this file type. ' +
+                'Use this after making code changes to verify they compile correctly.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    file: {
+                        type: 'string',
+                        description: 'The relative path to the target file within the workspace (e.g., "src/index.ts"). ' +
+                            'Must be relative to the workspace root.'
+                    }
+                },
+                required: ['file']
+            },
+            handler: async (arg: string, ctx?: ToolInvocationContext) => {
+                try {
+                    const { file } = JSON.parse(arg);
+                    const workspaceRoot = await this.workspaceScope.getWorkspaceRoot();
+                    const targetUri = workspaceRoot.resolve(file);
+                    this.workspaceScope.ensureWithinWorkspace(targetUri, workspaceRoot);
+
+                    return this.getDiagnosticsForFile(targetUri, ctx?.cancellationToken);
+                } catch (error) {
+                    return JSON.stringify({ error: error instanceof Error ? error.message : 'Unknown error.' });
+                }
+            }
+        };
+    }
+
+    protected async getDiagnosticsForFile(uri: URI, cancellationToken?: CancellationToken): Promise<string> {
+        const toDispose: Disposable[] = [];
+        try {
+            // Check for early cancellation
+            if (cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+
+            let markers = this.problemManager.findMarkers({ uri });
+            if (markers.length === 0) {
+                // Open editor to ensure that the language services are active.
+                await open(this.openerService, uri);
+
+                // Give some time to fetch problems in a newly opened editor.
+                await new Promise<void>((res, rej) => {
+                    const timeout = setTimeout(res, 5000);
+
+                    // Give another moment for additional markers to come in from different sources.
+                    const listener = this.problemManager.onDidChangeMarkers(changed => changed.isEqual(uri) && setTimeout(res, 500));
+                    toDispose.push(listener);
+
+                    // Handle cancellation
+                    if (cancellationToken) {
+                        const cancelListener =
+                            cancellationToken.onCancellationRequested(() => {
+                                clearTimeout(timeout);
+                                listener.dispose();
+                                rej(new Error('Operation cancelled by user'));
+                            });
+                        toDispose.push(cancelListener);
+                    }
+                });
+
+                markers = this.problemManager.findMarkers({ uri });
+            }
+
+            if (cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+
+            if (markers.length) {
+                const editor = await this.modelService.createModelReference(uri);
+                toDispose.push(editor);
+                return JSON.stringify(markers.filter(marker => marker.data.severity !== DiagnosticSeverity.Information && marker.data.severity !== DiagnosticSeverity.Hint)
+                    .map(marker => {
+                        const contextRange = this.atLeastNLines(3, marker.data.range, editor.object.lineCount);
+                        const text = editor.object.getText(contextRange);
+                        const message = marker.data.message;
+                        const code = marker.data.code;
+                        const codeDescription = marker.data.codeDescription;
+                        return { text, message, code, codeDescription };
+                    })
+                );
+            }
+            return JSON.stringify({
+                error: 'No diagnostics were found. The file may contain no problems, or language services may not be available. Retrying may return fresh results.'
+            });
+        } catch (err) {
+            if (err.message === 'Operation cancelled by user') {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+            console.warn('Error when fetching markers for', uri.toString(), err);
+            return JSON.stringify({ error: err instanceof Error ? err.message : 'Unknown error when fetching for problems for ' + uri.toString() });
+        } finally {
+            toDispose.forEach(disposable => disposable.dispose());
+        }
+    }
+
+    /**
+     * Expands the range provided until it contains at least {@link desiredLines} lines or reaches the end of the document
+     *  to attempt to provide the agent sufficient context to understand the diagnostic.
+     */
+    protected atLeastNLines(desiredLines: number, range: Range, documentLineCount: number): Range {
+        let startLine = range.start.line;
+        let endLine = range.end.line;
+        const desiredDifference = desiredLines - 1;
+
+        while (endLine - startLine < desiredDifference && (startLine > 0 || endLine < documentLineCount - 1)) {
+            if (startLine > 0) {
+                startLine--;
+            } else if (endLine < documentLineCount - 1) {
+                endLine++;
+            }
+            if (endLine < documentLineCount - 1) {
+                endLine++;
+            } else if (startLine > 0) {
+                startLine--;
+            }
+        }
+        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. ' +
+                'Performance note: This traverses directories recursively which may be slow in large workspaces. ' +
+                'For better performance, use specific subdirectory patterns (e.g., \'src/**/*.ts\' instead of \'**/*.ts\'). ' +
+                'Use this to find files by name/extension. Do NOT use this for searching file contents - use searchInWorkspace instead.',
+            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/**/*.spec.ts\' (test files). ' +
+                            'Use specific subdirectory prefixes for better performance (e.g., \'packages/core/**/*.ts\' instead of \'**/*.ts\').'
+                    },
+                    exclude: {
+                        type: 'array',
+                        items: { type: 'string' },
+                        description: 'Optional glob patterns to exclude. ' +
+                            'Examples: [\'**/*.spec.ts\', \'**/node_modules/**\']. ' +
+                            'Common exclusions (node_modules, .git) are applied automatically via gitignore.'
+                    }
+                },
+                required: ['pattern']
+            },
+            handler: (arg_string: string, ctx?: ToolInvocationContext) => {
+                const args = JSON.parse(arg_string);
+                return this.findFiles(args.pattern, args.exclude, ctx?.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
+        }
+    }
+}

packages/ai-ide/src/browser/workspace-launch-provider.spec.ts

@@ -0,0 +1,326 @@
+// *****************************************************************************
+// 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 { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+FrontendApplicationConfigProvider.set({});
+
+import { expect } from 'chai';
+import { Container } from '@theia/core/shared/inversify';
+import {
+    LaunchListProvider,
+    LaunchRunnerProvider,
+    LaunchStopProvider,
+} from './workspace-launch-provider';
+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';
+
+disableJSDOM();
+
+describe('Launch Management Tool Providers', () => {
+    let container: Container;
+    let launchListProvider: LaunchListProvider;
+    let launchRunnerProvider: LaunchRunnerProvider;
+    let launchStopProvider: LaunchStopProvider;
+    let mockDebugConfigurationManager: Partial<DebugConfigurationManager>;
+    let mockDebugSessionManager: Partial<DebugSessionManager>;
+
+    before(() => {
+        disableJSDOM = enableJSDOM();
+    });
+
+    after(() => {
+        disableJSDOM();
+    });
+
+    beforeEach(() => {
+        container = new Container();
+
+        const mockConfigs = createMockConfigurations();
+
+        mockDebugConfigurationManager = {
+            load: () => Promise.resolve(),
+            get all(): IterableIterator<DebugSessionOptions> {
+                function* configIterator(): IterableIterator<DebugSessionOptions> {
+                    for (const config of mockConfigs) {
+                        yield config;
+                    }
+                }
+                return configIterator();
+            },
+        };
+
+        mockDebugSessionManager = {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            start: async (options: DebugSessionOptions | string): Promise<any> => {
+                if (
+                    typeof options === 'string' ||
+                    DebugSessionOptions.isCompound(options)
+                ) {
+                    return true;
+                }
+                return {
+                    id: 'test-session-id',
+                    configuration: { name: 'Test Config' },
+                } as DebugSession;
+            },
+            terminateSession: () => Promise.resolve(),
+            currentSession: undefined,
+            sessions: [],
+        };
+
+        container
+            .bind(DebugConfigurationManager)
+            .toConstantValue(
+                mockDebugConfigurationManager as DebugConfigurationManager
+            );
+        container
+            .bind(DebugSessionManager)
+            .toConstantValue(mockDebugSessionManager as DebugSessionManager);
+
+        launchListProvider = container.resolve(LaunchListProvider);
+        launchRunnerProvider = container.resolve(LaunchRunnerProvider);
+        launchStopProvider = container.resolve(LaunchStopProvider);
+    });
+
+    function createMockConfigurations(): DebugSessionOptions[] {
+        const config1: DebugConfiguration = {
+            name: 'Node.js Debug',
+            type: 'node',
+            request: 'launch',
+            program: '${workspaceFolder}/app.js',
+        };
+
+        const config2: DebugConfiguration = {
+            name: 'Python Debug',
+            type: 'python',
+            request: 'launch',
+            program: '${workspaceFolder}/main.py',
+        };
+
+        const compound: DebugCompound = {
+            name: 'Launch All',
+            configurations: ['Node.js Debug', 'Python Debug'],
+        };
+
+        return [
+            {
+                name: 'Node.js Debug',
+                configuration: config1,
+                workspaceFolderUri: '/workspace',
+            },
+            {
+                name: 'Python Debug',
+                configuration: config2,
+                workspaceFolderUri: '/workspace',
+            },
+            { name: 'Launch All', compound, workspaceFolderUri: '/workspace' },
+        ];
+    }
+
+    describe('LaunchListProvider', () => {
+        it('should provide the correct tool metadata', () => {
+            const tool = launchListProvider.getTool();
+            expect(tool.id).to.equal('listLaunchConfigurations');
+            expect(tool.name).to.equal('listLaunchConfigurations');
+            expect(tool.description).to.contain(
+                'Lists available launch configurations'
+            );
+            expect(tool.parameters.required).to.deep.equal(['filter']);
+        });
+
+        it('should list all configurations without filter', async () => {
+            const tool = launchListProvider.getTool();
+            const result = await tool.handler('{"filter":""}');
+            expect(result).to.be.a('string');
+            const configurations = JSON.parse(result as string);
+
+            expect(configurations).to.be.an('array');
+            expect(configurations).to.have.lengthOf(3);
+            expect(configurations.map((c: { name: string }) => c.name)).to.include('Node.js Debug');
+            expect(configurations.map((c: { name: string }) => c.name)).to.include('Python Debug');
+            expect(configurations.map((c: { name: string }) => c.name)).to.include('Launch All');
+            // All configurations should show running: false since no sessions are active
+            configurations.forEach((config: { name: string; running: boolean }) => {
+                expect(config.running).to.equal(false);
+            });
+        });
+
+        it('should filter configurations by name', async () => {
+            const tool = launchListProvider.getTool();
+            const result = await tool.handler('{"filter":"Node"}');
+            expect(result).to.be.a('string');
+            const configurations = JSON.parse(result as string);
+
+            expect(configurations).to.be.an('array');
+            expect(configurations).to.have.lengthOf(1);
+            expect(configurations[0].name).to.equal('Node.js Debug');
+            expect(configurations[0].running).to.equal(false);
+        });
+
+        it('should handle case-insensitive filtering', async () => {
+            const tool = launchListProvider.getTool();
+            const result = await tool.handler('{"filter":"python"}');
+            expect(result).to.be.a('string');
+            const configurations = JSON.parse(result as string);
+
+            expect(configurations).to.be.an('array');
+            expect(configurations).to.have.lengthOf(1);
+            expect(configurations[0].name).to.equal('Python Debug');
+            expect(configurations[0].running).to.equal(false);
+        });
+    });
+
+    describe('LaunchRunnerProvider', () => {
+        it('should provide the correct tool metadata', () => {
+            const tool = launchRunnerProvider.getTool();
+            expect(tool.id).to.equal('runLaunchConfiguration');
+            expect(tool.name).to.equal('runLaunchConfiguration');
+            expect(tool.description).to.contain(
+                'Executes a specified launch configuration'
+            );
+            expect(tool.parameters.required).to.deep.equal([
+                'configurationName',
+            ]);
+        });
+
+        it('should start a valid configuration', async () => {
+            const tool = launchRunnerProvider.getTool();
+            const result = await tool.handler(
+                '{"configurationName":"Node.js Debug"}'
+            );
+
+            expect(result).to.be.a('string');
+            expect(result).to.contain('Node.js Debug');
+            expect(result).to.contain('started with session ID');
+        });
+
+        it('should handle unknown configuration', async () => {
+            const tool = launchRunnerProvider.getTool();
+            const result = await tool.handler(
+                '{"configurationName":"Unknown Config"}'
+            );
+
+            expect(result).to.be.a('string');
+            expect(result).to.contain('Did not find a launch configuration');
+            expect(result).to.contain('Unknown Config');
+        });
+
+        it('should handle compound configurations', async () => {
+            const tool = launchRunnerProvider.getTool();
+            const result = await tool.handler(
+                '{"configurationName":"Launch All"}'
+            );
+
+            expect(result).to.be.a('string');
+            expect(result).to.contain('Compound launch configuration');
+            expect(result).to.contain('Launch All');
+            expect(result).to.contain('started successfully');
+        });
+    });
+
+    describe('LaunchStopProvider', () => {
+        it('should provide the correct tool metadata', () => {
+            const tool = launchStopProvider.getTool();
+            expect(tool.id).to.equal('stopLaunchConfiguration');
+            expect(tool.name).to.equal('stopLaunchConfiguration');
+            expect(tool.description).to.contain(
+                'Stops an active launch configuration'
+            );
+            expect(tool.parameters.required).to.deep.equal([]);
+        });
+
+        it('should stop current session when no configuration name provided', async () => {
+            (
+                mockDebugSessionManager as { currentSession: unknown }
+            ).currentSession = {
+                id: 'current-session',
+                configuration: { name: 'Current Config' },
+            };
+
+            const tool = launchStopProvider.getTool();
+            const result = await tool.handler('{}');
+
+            expect(result).to.be.a('string');
+            expect(result).to.contain(
+                'Successfully stopped current debug session'
+            );
+            expect(result).to.contain('Current Config');
+        });
+
+        it('should handle no active session', async () => {
+            (
+                mockDebugSessionManager as { currentSession: unknown }
+            ).currentSession = undefined;
+
+            const tool = launchStopProvider.getTool();
+            const result = await tool.handler('{}');
+
+            expect(result).to.be.a('string');
+            expect(result).to.contain('No active debug session to stop');
+        });
+
+        it('should stop specific session by name', async () => {
+            Object.defineProperty(mockDebugSessionManager, 'sessions', {
+                value: [
+                    {
+                        id: 'session-1',
+                        configuration: { name: 'Node.js Debug' },
+                    },
+                    {
+                        id: 'session-2',
+                        configuration: { name: 'Python Debug' },
+                    },
+                ],
+                writable: true,
+                configurable: true,
+            });
+
+            const tool = launchStopProvider.getTool();
+            const result = await tool.handler(
+                '{"configurationName":"Node.js Debug"}'
+            );
+
+            expect(result).to.be.a('string');
+            expect(result).to.contain(
+                'Successfully stopped launch configuration'
+            );
+            expect(result).to.contain('Node.js Debug');
+        });
+
+        it('should handle session not found by name', async () => {
+            Object.defineProperty(mockDebugSessionManager, 'sessions', {
+                value: [],
+                writable: true,
+                configurable: true,
+            });
+
+            const tool = launchStopProvider.getTool();
+            const result = await tool.handler(
+                '{"configurationName":"Unknown Config"}'
+            );
+
+            expect(result).to.be.a('string');
+            expect(result).to.contain('No active session found');
+            expect(result).to.contain('Unknown Config');
+        });
+    });
+});

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

@@ -0,0 +1,244 @@
+// *****************************************************************************
+// 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 { ToolInvocationContext, ToolProvider, ToolRequest } from '@theia/ai-core';
+import { CancellationToken } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+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 { DebugSession } from '@theia/debug/lib/browser/debug-session';
+import {
+    LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID,
+    RUN_LAUNCH_CONFIGURATION_FUNCTION_ID,
+    STOP_LAUNCH_CONFIGURATION_FUNCTION_ID
+} from '../common/workspace-functions';
+
+export interface LaunchConfigurationInfo {
+    name: string;
+    running: boolean;
+}
+
+@injectable()
+export class LaunchListProvider implements ToolProvider {
+
+    @inject(DebugConfigurationManager)
+    protected readonly debugConfigurationManager: DebugConfigurationManager;
+
+    @inject(DebugSessionManager)
+    protected readonly debugSessionManager: DebugSessionManager;
+
+    getTool(): ToolRequest {
+        return {
+            id: LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID,
+            name: LIST_LAUNCH_CONFIGURATIONS_FUNCTION_ID,
+            description: 'Lists available launch configurations in the workspace. Launch configurations can be filtered by name. Each configuration includes its running status.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    filter: {
+                        type: 'string',
+                        description: 'Filter to apply on launch configuration names (empty string to retrieve all configurations).'
+                    }
+                },
+                required: ['filter']
+            },
+            handler: async (argString: string) => {
+                const filterArgs: { filter: string } = JSON.parse(argString);
+                const configurations = await this.getAvailableLaunchConfigurations(filterArgs.filter);
+                return JSON.stringify(configurations);
+            }
+        };
+    }
+
+    private async getAvailableLaunchConfigurations(filter: string = ''): Promise<LaunchConfigurationInfo[]> {
+        await this.debugConfigurationManager.load();
+        const configurations: LaunchConfigurationInfo[] = [];
+        const runningSessions = new Set(
+            this.debugSessionManager.sessions.map(session => session.configuration.name)
+        );
+
+        for (const options of this.debugConfigurationManager.all) {
+            const name = this.getDisplayName(options);
+            if (name.toLowerCase().includes(filter.toLowerCase())) {
+                configurations.push({
+                    name,
+                    running: runningSessions.has(name)
+                });
+            }
+        }
+
+        return configurations;
+    }
+
+    private getDisplayName(options: DebugSessionOptions): string {
+        if (DebugSessionOptions.isConfiguration(options)) {
+            return options.configuration.name;
+        } else if (DebugSessionOptions.isCompound(options)) {
+            return options.compound.name;
+        }
+        return 'Unnamed Configuration';
+    }
+}
+
+@injectable()
+export class LaunchRunnerProvider implements ToolProvider {
+
+    @inject(DebugConfigurationManager)
+    protected readonly debugConfigurationManager: DebugConfigurationManager;
+
+    @inject(DebugSessionManager)
+    protected readonly debugSessionManager: DebugSessionManager;
+
+    getTool(): ToolRequest {
+        return {
+            id: RUN_LAUNCH_CONFIGURATION_FUNCTION_ID,
+            name: RUN_LAUNCH_CONFIGURATION_FUNCTION_ID,
+            description: 'Executes a specified launch configuration to start debugging.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    configurationName: {
+                        type: 'string',
+                        description: 'The name of the launch configuration to execute.'
+                    }
+                },
+                required: ['configurationName']
+            },
+            handler: async (argString: string, ctx?: ToolInvocationContext) => this.handleRunLaunchConfiguration(argString, ctx?.cancellationToken)
+        };
+    }
+
+    private async handleRunLaunchConfiguration(argString: string, cancellationToken?: CancellationToken): Promise<string> {
+        try {
+            const args: { configurationName: string } = JSON.parse(argString);
+
+            await this.debugConfigurationManager.load();
+
+            const options = this.findConfigurationByName(args.configurationName);
+            if (!options) {
+                return `Did not find a launch configuration for the name: '${args.configurationName}'`;
+            }
+
+            const session = await this.debugSessionManager.start(options);
+
+            if (!session) {
+                return `Failed to start launch configuration '${args.configurationName}'`;
+            }
+
+            if (cancellationToken && typeof session !== 'boolean') {
+                cancellationToken.onCancellationRequested(() => {
+                    this.debugSessionManager.terminateSession(session);
+                });
+            }
+
+            const sessionInfo = typeof session === 'boolean'
+                ? `Compound launch configuration '${args.configurationName}' started successfully`
+                : `Launch configuration '${args.configurationName}' started with session ID: ${session.id}`;
+
+            return sessionInfo;
+
+        } catch (error) {
+            return JSON.stringify({
+                success: false,
+                message: error instanceof Error ? error.message : 'Failed to run launch configuration'
+            });
+        }
+    }
+
+    private findConfigurationByName(name: string): DebugSessionOptions | undefined {
+        for (const options of this.debugConfigurationManager.all) {
+            const displayName = this.getDisplayName(options);
+            if (displayName === name) {
+                return options;
+            }
+        }
+        return undefined;
+    }
+
+    private getDisplayName(options: DebugSessionOptions): string {
+        if (DebugSessionOptions.isConfiguration(options)) {
+            return options.configuration.name;
+        } else if (DebugSessionOptions.isCompound(options)) {
+            return options.compound.name;
+        }
+        return 'Unnamed Configuration';
+    }
+}
+
+@injectable()
+export class LaunchStopProvider implements ToolProvider {
+
+    @inject(DebugSessionManager)
+    protected readonly debugSessionManager: DebugSessionManager;
+
+    getTool(): ToolRequest {
+        return {
+            id: STOP_LAUNCH_CONFIGURATION_FUNCTION_ID,
+            name: STOP_LAUNCH_CONFIGURATION_FUNCTION_ID,
+            description: 'Stops an active launch configuration or debug session.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    configurationName: {
+                        type: 'string',
+                        description: 'The name of the launch configuration to stop. If not provided, stops the current active session.'
+                    }
+                },
+                required: []
+            },
+            handler: async (argString: string) => this.handleStopLaunchConfiguration(argString)
+        };
+    }
+
+    private async handleStopLaunchConfiguration(argString: string): Promise<string> {
+        try {
+            const args: { configurationName?: string } = JSON.parse(argString);
+
+            if (args.configurationName) {
+                // Find and stop specific session by configuration name
+                const session = this.findSessionByConfigurationName(args.configurationName);
+                if (!session) {
+                    return `No active session found for launch configuration: '${args.configurationName}'`;
+                }
+
+                await this.debugSessionManager.terminateSession(session);
+                return `Successfully stopped launch configuration: '${args.configurationName}'`;
+            } else {
+                // Stop current active session
+                const currentSession = this.debugSessionManager.currentSession;
+                if (!currentSession) {
+                    return 'No active debug session to stop';
+                }
+
+                await this.debugSessionManager.terminateSession(currentSession);
+                return `Successfully stopped current debug session: '${currentSession.configuration.name}'`;
+            }
+
+        } catch (error) {
+            return JSON.stringify({
+                success: false,
+                message: error instanceof Error ? error.message : 'Failed to stop launch configuration'
+            });
+        }
+    }
+
+    private findSessionByConfigurationName(configurationName: string): DebugSession | undefined {
+        return this.debugSessionManager.sessions.find(
+            session => session.configuration.name === configurationName
+        );
+    }
+}

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

@@ -0,0 +1,102 @@
+// *****************************************************************************
+// 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 { expect } from 'chai';
+import { CancellationTokenSource, PreferenceService } from '@theia/core';
+import { WorkspaceSearchProvider } from './workspace-search-provider';
+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 { 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';
+
+describe('Workspace Search Provider Cancellation Tests', () => {
+    let cancellationTokenSource: CancellationTokenSource;
+    let mockCtx: ToolInvocationContext;
+    let container: Container;
+    let searchService: SearchInWorkspaceService;
+
+    beforeEach(() => {
+        cancellationTokenSource = new CancellationTokenSource();
+
+        // Setup mock context
+        mockCtx = {
+            cancellationToken: cancellationTokenSource.token
+        };
+
+        // Create a new container for each test
+        container = new Container();
+
+        // Mock dependencies
+        searchService = {
+            searchWithCallback: async (
+                query: string,
+                rootUris: string[],
+                callbacks: SearchInWorkspaceCallbacks,
+                options: SearchInWorkspaceOptions
+            ) => {
+                const searchId = 1;
+                return searchId;
+            },
+            cancel: (searchId: number) => {
+                // Mock cancellation
+            }
+        } as unknown as SearchInWorkspaceService;
+
+        const mockWorkspaceScope = {
+            getWorkspaceRoot: async () => new URI('file:///workspace'),
+            ensureWithinWorkspace: () => { },
+            resolveRelativePath: async (path: string) => new URI(`file:///workspace/${path}`)
+        } as unknown as WorkspaceFunctionScope;
+
+        const mockPreferenceService = {
+            get: () => 30
+        };
+
+        const mockFileService = {
+            exists: async () => true,
+            resolve: async () => ({ isDirectory: true })
+        } as unknown as FileService;
+
+        // Register mocks in the container
+        container.bind(SearchInWorkspaceService).toConstantValue(searchService);
+        container.bind(WorkspaceFunctionScope).toConstantValue(mockWorkspaceScope);
+        container.bind(PreferenceService).toConstantValue(mockPreferenceService);
+        container.bind(FileService).toConstantValue(mockFileService);
+        container.bind(WorkspaceSearchProvider).toSelf();
+    });
+
+    afterEach(() => {
+        cancellationTokenSource.dispose();
+    });
+
+    it('should respect cancellation token at the beginning of the search', async () => {
+        const searchProvider = container.get(WorkspaceSearchProvider);
+        cancellationTokenSource.cancel();
+
+        const handler = searchProvider.getTool().handler;
+        const result = await handler(
+            JSON.stringify({ query: 'test', useRegExp: false }),
+            mockCtx
+        );
+
+        const jsonResponse = JSON.parse(result as string);
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+});

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

@@ -0,0 +1,221 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { ToolInvocationContext, ToolProvider, ToolRequest } from '@theia/ai-core';
+import { CancellationToken } from '@theia/core';
+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 '../common/workspace-preferences';
+import { optimizeSearchResults } from '../common/workspace-search-provider-util';
+
+@injectable()
+export class WorkspaceSearchProvider implements ToolProvider {
+
+    @inject(SearchInWorkspaceService)
+    protected readonly searchService: SearchInWorkspaceService;
+
+    @inject(WorkspaceFunctionScope)
+    protected readonly workspaceScope: WorkspaceFunctionScope;
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    getTool(): ToolRequest {
+        return {
+            id: SEARCH_IN_WORKSPACE_FUNCTION_ID,
+            name: SEARCH_IN_WORKSPACE_FUNCTION_ID,
+            description: 'Searches file contents within the workspace for lines matching the given search term. ' +
+            'Returns up to 30 matching results by default (configurable via preferences). If results are truncated, ' +
+            'refine your search with fileExtensions or subDirectoryPath filters. ' +
+            'The search uses case-insensitive string matching or regular expressions (controlled by the `useRegExp` parameter). ' +
+            'Returns a list of matches including: file path, line number, and the matching line content. ' +
+            'Multi-word patterns must match exactly (including spaces, case-insensitively). ' +
+            'For best results, use specific search terms and filter by file extensions or subdirectories. ' +
+            'For complex searches, prefer multiple simpler queries over one complex regex. ' +
+            'Use this for finding code patterns, function usages, or text across the codebase. ' +
+            'Do NOT use this for finding files by name - use findFilesByPattern instead.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    query: {
+                        type: 'string',
+                        description: 'The search term or regular expression pattern.',
+                    },
+                    useRegExp: {
+                        type: 'boolean',
+                        description: 'Set to true if the query is a regular expression.',
+                    },
+                    fileExtensions: {
+                        type: 'array',
+                        items: {
+                            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']
+            },
+            handler: (argString, ctx?: ToolInvocationContext) => this.handleSearch(argString, ctx?.cancellationToken)
+        };
+    }
+
+    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[], subDirectoryPath?: string } = JSON.parse(argString);
+            const results: SearchInWorkspaceResult[] = [];
+            let expectedSearchId: number | undefined;
+            let searchCompleted = false;
+
+            cancellationToken?.onCancellationRequested(() => {
+                if (expectedSearchId !== undefined && !searchCompleted) {
+                    this.searchService.cancel(expectedSearchId);
+                    searchCompleted = true;
+                }
+            });
+            if (cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+
+            const searchPromise = new Promise<SearchInWorkspaceResult[]>(async (resolve, reject) => {
+                const callbacks: SearchInWorkspaceCallbacks = {
+                    onResult: (id, result) => {
+                        if (expectedSearchId !== undefined && id !== expectedSearchId) {
+                            return;
+                        }
+
+                        if (searchCompleted) {
+                            return;
+                        }
+
+                        results.push(result);
+                    },
+                    onDone: (id, error) => {
+                        if (expectedSearchId !== undefined && id !== expectedSearchId) {
+                            return;
+                        }
+
+                        if (searchCompleted) {
+                            return;
+                        }
+
+                        searchCompleted = true;
+                        if (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: maxResultsForTheiaAPI,
+                };
+
+                if (args.fileExtensions && args.fileExtensions.length > 0) {
+                    options.include = args.fileExtensions.map(ext => `**/*.${ext}`);
+                }
+
+                await this.determineSearchRoots(args.subDirectoryPath)
+                    .then(rootUris => this.searchService.searchWithCallback(args.query, rootUris, callbacks, options))
+                    .then(id => {
+                        expectedSearchId = id;
+                        cancellationToken?.onCancellationRequested(() => {
+                            this.searchService.cancel(id);
+                        });
+                    })
+                    .catch(err => {
+                        searchCompleted = true;
+                        reject(err);
+                    });
+            });
+
+            const timeoutPromise = new Promise<SearchInWorkspaceResult[]>((_, reject) => {
+                setTimeout(() => {
+                    if (expectedSearchId !== undefined && !searchCompleted) {
+                        this.searchService.cancel(expectedSearchId);
+                        searchCompleted = true;
+                        reject(new Error('Search timed out after 30 seconds'));
+                    }
+                }, 30000);
+            });
+
+            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 = 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);
+
+        } catch (error) {
+            return JSON.stringify({ error: error.message || 'Failed to execute search' });
+        }
+    }
+}
+

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

@@ -0,0 +1,123 @@
+// *****************************************************************************
+// 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 { expect } from 'chai';
+import { CancellationTokenSource } from '@theia/core';
+import { TaskListProvider, TaskRunnerProvider } from './workspace-task-provider';
+import { 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 } from '@theia/task/lib/common';
+import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
+
+describe('Workspace Task Provider Cancellation Tests', () => {
+    let cancellationTokenSource: CancellationTokenSource;
+    let mockCtx: ToolInvocationContext;
+    let container: Container;
+    let mockTaskService: TaskService;
+    let mockTerminalService: TerminalService;
+
+    beforeEach(() => {
+        cancellationTokenSource = new CancellationTokenSource();
+
+        // Setup mock context
+        mockCtx = {
+            cancellationToken: cancellationTokenSource.token
+        };
+
+        // Create a new container for each test
+        container = new Container();
+
+        // Mock dependencies
+        mockTaskService = {
+            startUserAction: () => 123,
+            getTasks: async (token: number) => [
+                {
+                    label: 'build',
+                    _scope: 'workspace',
+                    type: 'shell'
+                } as TaskConfiguration,
+                {
+                    label: 'test',
+                    _scope: 'workspace',
+                    type: 'shell'
+                } as TaskConfiguration
+            ],
+            runTaskByLabel: async (token: number, taskLabel: string) => {
+                if (taskLabel === 'build' || taskLabel === 'test') {
+                    return {
+                        taskId: 0,
+                        terminalId: 0,
+                        config: {
+                            label: taskLabel,
+                            _scope: 'workspace',
+                            type: 'shell'
+                        }
+                    } as TaskInfo;
+                }
+                return undefined;
+            },
+            terminateTask: async (activeTaskInfo: TaskInfo) => {
+                // Track termination
+            },
+            getTerminateSignal: async () => 'SIGTERM'
+        } as unknown as TaskService;
+
+        mockTerminalService = {
+            getByTerminalId: () => ({
+                buffer: {
+                    length: 10,
+                    getLines: () => ['line1', 'line2', 'line3'],
+                },
+                clearOutput: () => { }
+            } as unknown as TerminalWidget)
+        } as unknown as TerminalService;
+
+        // Register mocks in the container
+        container.bind(TaskService).toConstantValue(mockTaskService);
+        container.bind(TerminalService).toConstantValue(mockTerminalService);
+        container.bind(TaskListProvider).toSelf();
+        container.bind(TaskRunnerProvider).toSelf();
+    });
+
+    afterEach(() => {
+        cancellationTokenSource.dispose();
+    });
+
+    it('TaskListProvider should respect cancellation token', async () => {
+        const taskListProvider = container.get(TaskListProvider);
+        cancellationTokenSource.cancel();
+
+        const handler = taskListProvider.getTool().handler;
+        const result = await handler(JSON.stringify({ filter: '' }), mockCtx);
+
+        const jsonResponse = JSON.parse(result as string);
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+    it('TaskRunnerProvider should respect cancellation token at the beginning', async () => {
+        const taskRunnerProvider = container.get(TaskRunnerProvider);
+        cancellationTokenSource.cancel();
+
+        const handler = taskRunnerProvider.getTool().handler;
+        const result = await handler(JSON.stringify({ taskName: 'build' }), mockCtx);
+
+        const jsonResponse = JSON.parse(result as string);
+        expect(jsonResponse.error).to.equal('Operation cancelled by user');
+    });
+
+});

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

@@ -0,0 +1,148 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { ToolInvocationContext, ToolProvider, ToolRequest } from '@theia/ai-core';
+import { CancellationToken } from '@theia/core';
+import { inject, injectable } 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 { LIST_TASKS_FUNCTION_ID, RUN_TASK_FUNCTION_ID } from '../common/workspace-functions';
+
+@injectable()
+export class TaskListProvider implements ToolProvider {
+
+    @inject(TaskService)
+    protected readonly taskService: TaskService;
+
+    getTool(): ToolRequest {
+        return {
+            id: LIST_TASKS_FUNCTION_ID,
+            name: LIST_TASKS_FUNCTION_ID,
+            description: 'Lists available tasks in the workspace that can be executed with runTask. Returns an array ' +
+                'of task labels (strings). Common task types include npm scripts, shell tasks, and build tasks. ' +
+                'Use the filter parameter with an empty string "" to retrieve all tasks, or provide a substring ' +
+                'to filter (e.g., "test" returns tasks containing "test" in the name). ' +
+                'Example return: ["npm: build", "npm: test", "npm: lint"]. ' +
+                'Always call this before runTask to discover exact task names.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    filter: {
+                        type: 'string',
+                        description: 'Substring filter for task names. Use "" (empty string) to retrieve all tasks, ' +
+                            'or a keyword like "build", "test", "lint" to filter results.'
+                    }
+                },
+                required: ['filter']
+            },
+            handler: async (argString: string, ctx?: ToolInvocationContext) => {
+                if (ctx?.cancellationToken?.isCancellationRequested) {
+                    return JSON.stringify({ error: 'Operation cancelled by user' });
+                }
+                const filterArgs: { filter: string } = JSON.parse(argString);
+                const tasks = await this.getAvailableTasks(filterArgs.filter);
+                const taskString = JSON.stringify(tasks);
+                return taskString;
+            }
+        };
+    }
+    private async getAvailableTasks(filter: string = ''): Promise<string[]> {
+        const userActionToken = this.taskService.startUserAction();
+        const tasks = await this.taskService.getTasks(userActionToken);
+        const filteredTasks = tasks.filter(task => task.label.toLowerCase().includes(filter.toLowerCase()));
+        return filteredTasks.map(task => task.label);
+    }
+}
+
+@injectable()
+export class TaskRunnerProvider implements ToolProvider {
+
+    @inject(TaskService)
+    protected readonly taskService: TaskService;
+
+    @inject(TerminalService)
+    protected readonly terminalService: TerminalService;
+
+    getTool(): ToolRequest {
+        return {
+            id: RUN_TASK_FUNCTION_ID,
+            name: RUN_TASK_FUNCTION_ID,
+            description: 'Executes a specified task by name and waits for completion. Returns the terminal output ' +
+                '(first and last 50 lines if output exceeds this limit). The task must exist in the workspace ' +
+                '(use listTasks to discover available tasks). Common task types include: build tasks ' +
+                '(e.g., "npm: build"), test tasks (e.g., "npm: test"), and lint tasks (e.g., "npm: lint"). ' +
+                'If the task fails, the error output is included in the response. Tasks may take significant ' +
+                'time to complete (builds can take minutes). The operation can be cancelled by the user. ' +
+                'Do NOT use this for tasks you haven\'t discovered via listTasks first.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    taskName: {
+                        type: 'string',
+                        description: 'The exact name/label of the task to execute, as returned by listTasks.'
+                    }
+                },
+                required: ['taskName']
+            },
+            handler: async (argString: string, ctx?: ToolInvocationContext) => this.handleRunTask(argString, ctx?.cancellationToken)
+
+        };
+    }
+
+    private async handleRunTask(argString: string, cancellationToken?: CancellationToken): Promise<string> {
+        try {
+            const args: { taskName: string } = JSON.parse(argString);
+
+            const token = this.taskService.startUserAction();
+
+            const taskInfo = await this.taskService.runTaskByLabel(token, args.taskName);
+            if (!taskInfo) {
+                return `Did not find a task for the label: '${args.taskName}'`;
+            }
+            cancellationToken?.onCancellationRequested(() => {
+                this.taskService.terminateTask(taskInfo);
+            });
+            if (cancellationToken?.isCancellationRequested) {
+                return JSON.stringify({ error: 'Operation cancelled by user' });
+            }
+            const signal = await this.taskService.getTerminateSignal(taskInfo.taskId);
+            if (taskInfo.terminalId) {
+                const terminal = this.terminalService.getByTerminalId(taskInfo.terminalId!);
+
+                const length = terminal?.buffer.length ?? 0;
+                const numberOfLines = Math.min(length, 50);
+                const result: string[] = [];
+                const allLines = terminal?.buffer.getLines(0, length).reverse() ?? [];
+
+                // collect the first 50 lines:
+                const firstLines = allLines.slice(0, numberOfLines);
+                result.push(...firstLines);
+                // collect the last 50 lines:
+                if (length > numberOfLines) {
+                    const lastLines = allLines.slice(length - numberOfLines);
+                    result.push(...lastLines);
+                }
+                terminal?.clearOutput();
+                return result.join('\n');
+            }
+            return `No terminal output available. The terminate signal was :${signal}.`;
+
+        } catch (error) {
+            return JSON.stringify({ success: false, message: error.message || 'Failed to run task' });
+        }
+    }
+}
+

packages/ai-ide/src/common/ai-configuration-preferences.ts

@@ -0,0 +1,49 @@
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH and others.
+//
+// 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 { nls } from '@theia/core';
+import { PreferenceSchema } from '@theia/core/lib/common';
+
+/**
+ * These preferences are not intended to reflect real settings.
+ * They are placeholders to redirect users to the appropriate widget
+ * in case the user looks in the preferences editor UI to find the configuration.
+ */
+export const AiConfigurationPreferences: PreferenceSchema = {
+    properties: {
+        'ai-features.agentSettings.details': {
+            type: 'null',
+            markdownDescription: nls.localize('theia/ai/ide/agent-description',
+                'Configure AI agent settings including enablement, LLM selection, prompt template customization, and custom agent creation in the [AI Configuration View]({0}).',
+                'command:aiConfiguration:open'
+            )
+        },
+        'ai-features.promptTemplates.details': {
+            type: 'null',
+            markdownDescription: nls.localize('theia/ai/ide/prompt-template-description',
+                'Select prompt variants and customize prompt templates for AI agents in the [AI Configuration View]({0}).',
+                'command:aiConfiguration:open'
+            )
+        },
+        'ai-features.modelSelection.details': {
+            type: 'null',
+            markdownDescription: nls.localize('theia/ai/ide/model-selection-description',
+                'Choose which Large Language Models (LLMs) are used by each AI agent in the [AI Configuration View]({0}).',
+                'command:aiConfiguration:open'
+            )
+        }
+    }
+};

packages/ai-ide/src/common/ai-ide-preferences.ts

@@ -0,0 +1,54 @@
+// *****************************************************************************
+// 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 { 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 = 'ai-features.AiEnable.enableAI';
+export const PREFERENCE_NAME_ORCHESTRATOR_EXCLUSION_LIST = 'ai-features.orchestrator.excludedAgents';
+
+export const aiIdePreferenceSchema: PreferenceSchema = {
+    properties: {
+        [PREFERENCE_NAME_ENABLE_AI]: {
+            title: AI_CORE_PREFERENCES_TITLE,
+            markdownDescription: nls.localize('theia/ai/ide/enableAI/mdDescription',
+                '❗ This setting allows you to access the latest AI capabilities (Beta version).\
+            \n\
+            Please note that these features are in a beta phase, which means they may \
+            undergo changes and will be further improved. It is important to be aware that these features may generate\
+            continuous requests to the language models (LLMs) you provide access to. This might incur costs that you\
+            need to monitor closely. By enabling this option, you acknowledge these risks.\
+            \n\
+            **Please note! The settings below in this section will only take effect\n\
+            once the main feature setting is enabled. After enabling the feature, you need to configure at least one\
+            LLM provider below. Also see [the documentation](https://theia-ide.org/docs/user_ai/)**.'),
+            type: 'boolean',
+            default: true,
+        },
+        [PREFERENCE_NAME_ORCHESTRATOR_EXCLUSION_LIST]: {
+            title: AI_CORE_PREFERENCES_TITLE,
+            markdownDescription: nls.localize('theia/ai/ide/orchestrator/excludedAgents/mdDescription',
+                'List of agent IDs that the orchestrator is not allowed to delegate to. ' +
+                'These agents will not be visible to the orchestrator when selecting an agent to handle a request.'),
+            type: 'array',
+            items: {
+                type: 'string'
+            },
+            default: ['ClaudeCode', 'Codex'],
+        }
+    }
+};

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

@@ -0,0 +1,18 @@
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+export const SUGGEST_TERMINAL_COMMAND_ID = 'suggestTerminalCommand';
+

packages/ai-ide/src/common/app-tester-chat-functions.ts

@@ -0,0 +1,20 @@
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+export const LAUNCH_BROWSER_FUNCTION_ID = 'launchBrowser';
+export const IS_BROWSER_RUNNING_FUNCTION_ID = 'isBrowserRunning';
+export const CLOSE_BROWSER_FUNCTION_ID = 'closeBrowser';
+export const QUERY_DOM_FUNCTION_ID = 'queryDom';

packages/ai-ide/src/common/architect-prompt-template.ts

@@ -0,0 +1,265 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { PromptVariantSet } from '@theia/ai-core/lib/common';
+import {
+    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';
+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 './task-context-function-ids';
+
+export const ARCHITECT_PLANNING_PROMPT_ID = 'architect-system-planning-next';
+export const ARCHITECT_SIMPLE_PROMPT_ID = 'architect-system-simple';
+export const ARCHITECT_DEFAULT_PROMPT_ID = 'architect-system-default';
+
+export const architectSystemVariants = <PromptVariantSet>{
+    id: 'architect-system',
+    defaultVariant: {
+        id: ARCHITECT_DEFAULT_PROMPT_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 --}}
+# Instructions
+
+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.\
+
+## Context Retrieval
+Use the following functions to interact with the workspace files if you require context:
+- **~{${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.
+
+## 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}}**
+## Additional Context
+The following files have been provided for additional context. Some of them may also be referred to by the user (e.g. "this file" or "the attachment"). \
+Always look at the relevant files to understand your task using the function ~{${FILE_CONTENT_FUNCTION_ID}}
+{{${CONTEXT_FILES_VARIABLE_ID}}}
+
+{{prompt:project-info}}
+
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
+`
+    },
+    variants: [
+        {
+            id: ARCHITECT_SIMPLE_PROMPT_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 --}}
+# 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 \
+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.\
+    
+Use the following functions to interact with the workspace files as needed:
+- **~{${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
+
+1. **Start at the Root**: For general questions (e.g., "How to build the project"), check root-level documentation files or setup files before browsing subdirectories.
+2. **Confirm Paths**: Always verify paths by listing directories or files as you navigate. Avoid assumptions based on user input alone.
+3. **Navigate Step-by-Step**: Move into subdirectories only as needed, confirming each directory level.
+
+## Additional Context
+The following files have been provided for additional context. Some of them may also be referred to by the user (e.g. "this file" or "the attachment"). \
+Always look at the relevant files to understand your task using the function ~{${FILE_CONTENT_FUNCTION_ID}}
+{{${CONTEXT_FILES_VARIABLE_ID}}}
+
+{{prompt:project-info}}
+`
+        },
+        {
+            id: ARCHITECT_PLANNING_PROMPT_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 --}}
+
+# Identity
+
+You are an AI planning assistant embedded in Theia IDE. Your purpose is to help developers \
+design implementation plans for features, bug fixes, and refactoring tasks.
+
+You create plans that will be executed by the Coder agent. Your plans should be thorough \
+enough that Coder can implement without rediscovering files or patterns.
+
+# Workflow Phases
+
+Follow these phases in order. Do not skip phases or rush to create a plan before understanding.
+
+**Asking questions:** You can ask clarifying questions at any phase - not just at the start. \
+Questions often emerge during or after exploration when you discover new information.
+
+**When to ask:**
+- Requirements are ambiguous and could lead to wasted work
+- Multiple valid approaches exist with significant trade-offs
+- The scope turns out larger or different than expected
+- You discover conflicting patterns in the codebase
+- A design decision needs user input
+
+**When NOT to ask:**
+- Minor technical decisions you can make reasonably
+- Standard coding patterns
+- Things you can figure out by exploring further
+
+## Phase 1: Understand the Request
+
+Before exploring code, get initial clarity on what's being asked:
+- What is the user trying to achieve?
+- What are the acceptance criteria?
+- Are there constraints or requirements?
+
+Ask initial clarifying questions if the request is unclear. But don't try to anticipate everything - \
+you'll learn more during exploration.
+
+## Phase 2: Explore the Codebase
+
+Thoroughly explore before designing. Use parallel tool calls when possible.
+
+As you explore, you may discover new questions or ambiguities. Don't hesitate to ask the user \
+before proceeding if you find something that changes your understanding of the task.
+
+### Search Strategy - Choose the Right Tool
+
+| Situation | Tool | Example |
+|-----------|------|---------|
+| Know exact file path | ~{${FILE_CONTENT_FUNCTION_ID}} | Reading a specific config file |
+| Know file pattern | ~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}} | Find all \`*.spec.ts\` files |
+| Looking for code/text | ~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}} | Find usages of a function |
+| Exploring structure | ~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}} | Understanding project layout |
+
+**Important guidelines:**
+- Never search for files whose paths you already know - read them directly
+- When uncertain about location, search broadly first, then narrow down
+- Look for existing patterns and examples to follow
+- Identify ALL files that will need changes
+- Find relevant tests
+
+### Parallel Exploration
+
+When multiple independent searches are needed, execute them in a single response:
+- Reading multiple files → read them all at once
+- Searching for different patterns → search in parallel
+
+**Never run independent operations one at a time.**
+
+## Phase 3: Design the Plan
+
+Once you understand the requirements and codebase, create the plan using ~{${CREATE_TASK_CONTEXT_FUNCTION_ID}}.
+
+### Plan Structure
+
+\`\`\`markdown
+# [Task Title]
+
+## Goal
+[1-2 sentences: what we're trying to achieve and why]
+
+## Design
+[High-level approach, key design decisions, trade-offs considered]
+
+## Implementation Steps
+
+### Step 1: [Description]
+- \`path/to/file.ts\` - what to change and why
+- \`path/to/related.ts\` - related changes
+
+### Step 2: [Description]
+- \`path/to/next-file.ts\` - what to change
+
+[Continue with additional steps as needed - order matters]
+
+## Reference Examples
+[Existing code Coder should follow as patterns]
+- \`path/to/example.ts:42\` - description of the pattern
+
+## Verification
+[How to test the changes - specific commands or manual steps]
+\`\`\`
+
+### Guidelines for Good Plans
+
+- **Be specific about files** - Use relative paths. Coder should not need to search.
+- **Order steps logically** - Dependencies first, then dependents.
+- **Include line references** - Use \`file.ts:123\` format when referencing specific code.
+- **Show patterns to follow** - Reference existing code that demonstrates the right approach.
+- **Keep it actionable** - Every step should be something Coder can execute.
+
+## Phase 4: Review and Refine
+
+Present your plan to the user. Incorporate feedback using ~{${EDIT_TASK_CONTEXT_FUNCTION_ID}} for targeted updates.
+
+**Before editing:**
+1. Always call ~{${GET_TASK_CONTEXT_FUNCTION_ID}} first - the user may have edited the plan directly
+2. Use ~{${EDIT_TASK_CONTEXT_FUNCTION_ID}} for targeted updates
+3. If ~{${EDIT_TASK_CONTEXT_FUNCTION_ID}} fails repeatedly, use ~{${REWRITE_TASK_CONTEXT_FUNCTION_ID}} to replace the entire content
+4. Summarize what you changed in chat
+
+# Tools Reference
+
+## Workspace Exploration
+- ~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}} — list contents of a directory
+- ~{${FILE_CONTENT_FUNCTION_ID}} — retrieve file content
+- ~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}} — find files by glob pattern (e.g., \`**/*.ts\`)
+- ~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}} — search for text/patterns in the codebase
+
+## Task Context Management
+- ~{${CREATE_TASK_CONTEXT_FUNCTION_ID}} — create a new implementation plan (opens in editor)
+- ~{${GET_TASK_CONTEXT_FUNCTION_ID}} — read the current plan
+- ~{${EDIT_TASK_CONTEXT_FUNCTION_ID}} — update specific sections of the plan (opens in editor)
+- ~{${REWRITE_TASK_CONTEXT_FUNCTION_ID}} — completely replace the plan content (use as fallback)
+- ~{${LIST_TASK_CONTEXTS_FUNCTION_ID}} — list all plans for this session (useful if you need to reference a specific plan by ID)
+
+**Important:**
+- When you create or edit a plan, it opens in the editor so the user can see it directly. \
+  You don't need to repeat the full plan content in chat - just summarize what you created or changed.
+- The user can edit the plan directly in the editor. **Always read the plan with ~{${GET_TASK_CONTEXT_FUNCTION_ID}} \
+  before making edits** to ensure you're working with the latest version.
+- If ~{${EDIT_TASK_CONTEXT_FUNCTION_ID}} fails repeatedly (e.g., because the user made significant changes), \
+  use ~{${REWRITE_TASK_CONTEXT_FUNCTION_ID}} to replace the entire plan content.
+
+# Context
+
+{{${CONTEXT_FILES_VARIABLE_ID}}}
+
+{{prompt:project-info}}
+
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
+`
+        }]
+};

packages/ai-ide/src/common/browser-automation-protocol.ts

@@ -0,0 +1,32 @@
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+export const browserAutomationPath = '/services/automation/browser';
+export const BrowserAutomation = Symbol('BrowserAutomation');
+export interface BrowserAutomation {
+    launch(remoteDebuggingPort: number): Promise<LaunchResult | undefined>;
+    isRunning(): Promise<boolean>;
+    queryDom(selector?: string): Promise<string>;
+    close(): Promise<void>;
+}
+
+export interface LaunchResult {
+    remoteDebuggingPort: number;
+}
+
+export const BrowserAutomationClient = Symbol('BrowserAutomationClient');
+export interface BrowserAutomationClient {
+}

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

@@ -0,0 +1,884 @@
+/* eslint-disable @typescript-eslint/tslint/config */
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH and others.
+//
+// This file is licensed under the MIT License.
+// See LICENSE-MIT.txt in the project root for license information.
+// https://opensource.org/license/mit.
+//
+// SPDX-License-Identifier: MIT
+// *****************************************************************************
+
+import { BasePromptFragment } from '@theia/ai-core/lib/common';
+import { CHANGE_SET_SUMMARY_VARIABLE_ID } from '@theia/ai-chat';
+import {
+    GET_WORKSPACE_FILE_LIST_FUNCTION_ID,
+    FILE_CONTENT_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,
+    COOLIFY_LIST_PROJECTS_FUNCTION_ID,
+    COOLIFY_LIST_APPLICATIONS_FUNCTION_ID,
+    COOLIFY_CREATE_APPLICATION_FUNCTION_ID,
+    COOLIFY_DEPLOY_APPLICATION_FUNCTION_ID,
+    COOLIFY_GET_DEPLOYMENT_LOGS_FUNCTION_ID,
+    COOLIFY_GET_APPLICATION_STATUS_FUNCTION_ID,
+    GITEA_CREATE_REPOSITORY_FUNCTION_ID,
+    GIT_PUSH_TO_REMOTE_FUNCTION_ID
+} from './workspace-functions';
+import { TODO_WRITE_FUNCTION_ID } from './todo-tool';
+import { CONTEXT_FILES_VARIABLE_ID, TASK_CONTEXT_SUMMARY_VARIABLE_ID } from './context-variables';
+import { UPDATE_CONTEXT_FILES_FUNCTION_ID } from './context-functions';
+import {
+    SUGGEST_FILE_CONTENT_ID,
+    WRITE_FILE_CONTENT_ID,
+    SUGGEST_FILE_REPLACEMENTS_ID,
+    WRITE_FILE_REPLACEMENTS_ID,
+    CLEAR_FILE_CHANGES_ID,
+    GET_PROPOSED_CHANGES_ID
+} from './file-changeset-function-ids';
+
+export const CODER_SYSTEM_PROMPT_ID = 'coder-system';
+
+export const CODER_SIMPLE_EDIT_TEMPLATE_ID = 'coder-system-simple-edit';
+export const CODER_EDIT_TEMPLATE_ID = 'coder-system-edit';
+export const CODER_EDIT_NEXT_TEMPLATE_ID = 'coder-system-edit-next';
+export const CODER_AGENT_MODE_TEMPLATE_ID = 'coder-system-agent-mode';
+export const CODER_AGENT_MODE_NEXT_TEMPLATE_ID = 'coder-system-agent-mode-next';
+export const CODE_OS_AGENT_MODE_TEMPLATE_ID = 'code-os-agent-mode';
+
+export function getCoderAgentModePromptTemplate(): BasePromptFragment {
+    return {
+        id: CODER_AGENT_MODE_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 **autonomous AI agent** embedded in the Theia IDE to assist developers with tasks like implementing features, fixing bugs, or improving code quality. 
+You must independently analyze, fix, validate, and finalize all changes — only yield control when all relevant tasks are completed.
+
+# Agent Behavior
+
+## Autonomy and Persistence
+You are an agent. **Do not stop until** the entire task is complete:
+- All code changes are applied
+- The build succeeds
+- All lint issues are resolved
+- All relevant tests pass
+- New tests are written when needed
+
+You must act **without waiting** for user input unless explicitly required. Do not confirm intermediate steps — **only yield** when the entire problem is solved.
+
+## Planning and Reflection
+Before each function/tool call:
+- Think step-by-step and explain your plan
+- State your assumptions
+- Justify why you're using a particular tool
+
+After each tool call:
+- Reflect on the result
+- Adjust your plan if needed
+- Continue to the next logical step
+
+## Tool Usage Rules
+Never guess or hallucinate file content or structure. Use tools for all workspace interactions:
+
+### Workspace Exploration
+- ~{${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
+
+### Code Editing
+- Before editing, always retrieve file content
+- 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)
+  
+- For incremental changes, use multiple ~{${WRITE_FILE_REPLACEMENTS_ID}} calls
+- If ~{${WRITE_FILE_REPLACEMENTS_ID}} continuously fails use ~{${WRITE_FILE_CONTENT_ID}}.
+
+**IMPORTANT: Do not add comments explaining what you changed or why.**
+
+### Validation
+- ~{${GET_FILE_DIAGNOSTICS_ID}} — detect syntax, lint, or type errors
+
+### Testing & Tasks
+- Use ~{${LIST_TASKS_FUNCTION_ID}} to discover available test and lint tasks
+- Use ~{${RUN_TASK_FUNCTION_ID}} to run linting, building, or test suites
+
+### Test Authoring
+If no relevant tests exist:
+- Create new test files (propose using ~{${WRITE_FILE_REPLACEMENTS_ID}} or ~{${WRITE_FILE_CONTENT_ID}})
+- Use patterns from existing tests
+- Ensure new tests validate new behavior or prevent regressions
+
+# Workflow Steps
+
+## 1. Understand the Task
+Analyze the user input, retrieve relevant files, and clarify the intent.
+
+## 2. Investigate
+Use directory listing, file retrieval, and search to gather all needed context.
+
+## 3. Plan and Propose Fixes
+Develop a step-by-step strategy. Modify relevant files via tool calls.
+
+## 4. Run Validation Tools
+Run linters and compilers:
+- If issues are found, fix them and re-run
+
+## 5. Test and Iterate
+Run all relevant tests. If failures are found, debug and fix.
+- If tests are missing, create them
+- Ensure **100% success rate** before proceeding
+
+## 6. Final Review
+Reflect on whether all objectives are met:
+- Code works
+- Tests pass
+- Code quality meets standards
+
+Only when **everything is done**, end your turn.
+
+# Additional Context
+The following files have been provided for additional context. Some of them may also be referred to by the user (e.g. "this file" or "the attachment"). \
+Always look at the relevant files to understand your task using the function ~{${FILE_CONTENT_FUNCTION_ID}}
+{{${CONTEXT_FILES_VARIABLE_ID}}}
+
+# Previously Changed Files
+
+{{changeSetSummary}}
+
+# Project Info
+
+{{prompt:project-info}}
+
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
+
+# Final Instruction
+You are an autonomous AI agent. Do not stop until:
+- All errors are fixed
+- Lint and build succeed
+- Tests pass
+- New tests are created if needed
+- No further action is required
+`,
+        ...({ variantOf: CODER_EDIT_TEMPLATE_ID }),
+    };
+}
+
+export function getCoderAgentModeNextPromptTemplate(): BasePromptFragment {
+    return {
+        id: CODER_AGENT_MODE_NEXT_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 --}}
+
+# Identity
+
+You are an **autonomous AI agent** embedded in the Theia IDE. Your purpose is to assist developers with implementing features, fixing bugs, \
+refactoring code, and improving code quality.
+You must independently analyze, implement, validate, and finalize all changes — only yield control when all relevant tasks are completed.
+
+# Core Principles
+
+## Autonomy and Persistence
+You are an agent. **Do not stop until** the entire task is complete:
+- All code changes are applied
+- The build succeeds
+- All lint issues are resolved
+- All relevant tests pass
+- New tests are written when needed
+
+Act **without waiting** for user input unless explicitly required. Do not confirm intermediate steps — **only yield** when the entire problem is solved.
+
+## Professional Objectivity
+Prioritize technical accuracy over validating assumptions:
+- If the user's approach has issues, point them out respectfully
+- Focus on facts and problem-solving, not praise or unnecessary validation
+- When uncertain, investigate rather than assume the user is correct
+- Provide direct, objective technical guidance
+
+## Parallel Execution
+When multiple independent operations are needed, execute them **all in a single response**:
+- Reading multiple files → read them all at once
+- Searching for different patterns → search in parallel
+- Running independent validations → run together
+**Never run independent operations one at a time.** Only run sequentially when there are true dependencies.
+
+## Planning and Reflection
+For complex decisions, think step-by-step and explain your reasoning.
+After tool calls, reflect on results and adjust your plan if needed.
+
+# Code Quality Guidelines
+
+## Avoid Over-Engineering
+Only make changes that are directly requested or clearly necessary. Keep solutions simple and focused:
+- Do NOT add features, refactor code, or make "improvements" beyond what was asked
+- Do NOT add docstrings, comments, or type annotations to unchanged code
+- Do NOT add error handling for scenarios that cannot happen
+- Do NOT create abstractions for one-time operations
+- Three similar lines of code is better than a premature abstraction
+- Delete unused code completely — no backwards-compatibility hacks, no \`// removed\` comments
+
+## Security Awareness
+Be careful not to introduce security vulnerabilities:
+- Command injection, XSS, SQL injection
+- Hardcoded credentials or secrets
+- Path traversal vulnerabilities
+- OWASP top 10 vulnerabilities
+If you notice insecure code while working, fix it immediately.
+
+# Tools Reference
+
+**Never guess or hallucinate.** Always verify with tool calls:
+- File content or structure
+- Import paths or module names
+- Function signatures or API shapes
+- File paths (use ~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}} if uncertain)
+
+## Workspace Exploration
+- ~{${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\`)
+- ~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}} — locate references or patterns in the codebase
+- ~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}} — bookmark important files for repeated reference
+
+### Search Strategy
+Choose the right tool for the job:
+- **Known exact path** → use ~{${FILE_CONTENT_FUNCTION_ID}} directly
+- **Known file pattern** (e.g., all \`*.ts\` files) → use ~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}}
+- **Looking for code/text content** → use ~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}
+- **Exploring directory structure** → use ~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}}
+- **Never search for files whose paths you already know**
+
+## Code Editing
+
+### Critical Rule: Read Before Edit
+**Always retrieve file content using ~{${FILE_CONTENT_FUNCTION_ID}} BEFORE making any edits.** Never modify files you haven't read in this session.
+
+### Editing Functions
+- ~{${WRITE_FILE_REPLACEMENTS_ID}} — immediately apply targeted code changes (no user review)
+- ~{${WRITE_FILE_CONTENT_ID}} — immediately overwrite a file with new content (no user review)
+
+### Editing Guidelines
+- For incremental changes, use multiple ~{${WRITE_FILE_REPLACEMENTS_ID}} calls
+- If ~{${WRITE_FILE_REPLACEMENTS_ID}} fails, the likely cause is non-unique \`oldContent\`. Re-read the file and include more surrounding context, \
+or switch to ~{${WRITE_FILE_CONTENT_ID}}
+- **Do NOT add comments explaining what you changed or why**
+
+## Validation
+- ~{${GET_FILE_DIAGNOSTICS_ID}} — detect syntax, lint, or type errors
+
+## Testing & Tasks
+- ~{${LIST_TASKS_FUNCTION_ID}} — discover available test, lint, and build tasks
+- ~{${RUN_TASK_FUNCTION_ID}} — execute linting, building, or test suites
+
+## Test Authoring
+If no relevant tests exist for your changes:
+- Find existing test patterns using ~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}} with \`**/*.spec.ts\` or \`**/*.test.ts\`
+- Create new test files using ~{${WRITE_FILE_REPLACEMENTS_ID}} or ~{${WRITE_FILE_CONTENT_ID}}
+- Follow patterns from existing tests in the codebase
+- Ensure new tests validate the new behavior and prevent regressions
+
+## Progress Tracking
+- ~{${TODO_WRITE_FUNCTION_ID}} — track task progress with a todo list visible to the user
+
+Use the todo tool for complex multi-step tasks to:
+- Plan your approach before starting
+- Show the user what you're working on
+- Track completed and remaining steps
+
+# Workflow
+
+## 1. Understand the Task
+Analyze the user input. Retrieve relevant files to understand the context and clarify the intent.
+
+## 2. Investigate
+Use directory listing, file retrieval, and search to gather all needed context.
+Bookmark files you'll reference multiple times with ~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}} — this is more efficient than re-reading repeatedly.
+
+## 3. Plan and Implement
+Develop a step-by-step strategy. Implement changes via tool calls.
+When referencing code locations, use the format \`file_path:line_number\` (e.g., \`src/utils.ts:42\`).
+
+## 4. Validate
+First discover available tasks with ~{${LIST_TASKS_FUNCTION_ID}}, then run them with ~{${RUN_TASK_FUNCTION_ID}}:
+- If issues are found, fix ALL errors before re-running (not one at a time)
+- Continue until validation passes
+
+## 5. Test and Iterate
+Run all relevant tests:
+- If failures are found, debug and fix
+- If tests are missing, create them
+- Ensure **100% success rate** before proceeding
+
+## 6. Final Review
+Reflect on whether all objectives are met:
+- Code works as intended
+- Tests pass
+- Code quality meets standards
+- No security vulnerabilities introduced
+
+Only when **everything is done**, end your turn.
+
+# Error Recovery
+
+When encountering failures:
+1. Read the **full error message** carefully
+2. If a tool call fails repeatedly (3+ times), try an alternative approach
+3. For build/lint errors, fix ALL errors before re-running
+4. If stuck in a loop, step back and reconsider the overall approach
+
+**Common failure patterns:**
+- **Replacement "not found"**: Re-read the file first (content may have changed), then adjust \`oldContent\` to include more context
+- **File not found**: Verify the path exists using ~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}}
+- **Task not found**: Use ~{${LIST_TASKS_FUNCTION_ID}} to discover available task names
+
+# When to Seek Clarification
+
+Ask the user **before proceeding** only if:
+- Multiple valid implementation approaches exist with significant trade-offs
+- Requirements are ambiguous and could lead to substantial wasted work
+- You discover the task scope is significantly larger than initially apparent
+- You encounter blocking issues that cannot be resolved autonomously
+
+Do NOT ask for confirmation on:
+- Intermediate implementation steps
+- Minor technical decisions
+- Standard coding patterns
+
+# Communication Style
+
+- Keep responses concise — focus on what you did and what's next, not detailed explanations of what you're about to do
+- Use markdown formatting for code blocks and structure
+- When referencing code, use \`file_path:line_number\` format (e.g., \`src/utils.ts:42\`)
+
+# Context
+
+## Provided Files
+The following files have been provided for additional context. Some may be referred to by the user (e.g., "this file" or "the attachment"). \
+Always retrieve relevant files using ~{${FILE_CONTENT_FUNCTION_ID}} to understand your task.
+{{${CONTEXT_FILES_VARIABLE_ID}}}
+
+## Previously Changed Files
+{{changeSetSummary}}
+
+## Project Info
+{{prompt:project-info}}
+
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
+
+# Final Instruction
+
+You are an autonomous AI agent. Do not stop until:
+- All errors are fixed
+- Lint and build succeed
+- Tests pass
+- New tests are created if needed
+- No security vulnerabilities are introduced
+- No further action is required
+`,
+        ...({ variantOf: CODER_AGENT_MODE_TEMPLATE_ID }),
+    };
+}
+
+export function getCodeOsAgentModePromptTemplate(): BasePromptFragment {
+    return {
+        id: CODE_OS_AGENT_MODE_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 --}}
+
+# Identity
+
+You are an **autonomous AI coding agent** in the Theia IDE, designed to help developers implement features, fix bugs, refactor code, and improve code quality.
+You must independently analyze, implement, validate, and finalize all changes — only yield control when all relevant tasks are completed.
+
+# Core Principles
+
+## Autonomy and Persistence
+You are an agent. **Do not stop until** the entire task is complete:
+- All code changes are applied
+- The build succeeds
+- All lint issues are resolved
+- All relevant tests pass
+- New tests are written when needed
+
+Act **without waiting** for user input unless explicitly required. Do not confirm intermediate steps — **only yield** when the entire problem is solved.
+
+## Professional Objectivity
+Prioritize technical accuracy over validating assumptions:
+- If the user's approach has issues, point them out respectfully
+- Focus on facts and problem-solving, not praise or unnecessary validation
+- When uncertain, investigate rather than assume the user is correct
+- Provide direct, objective technical guidance
+
+## Parallel Execution
+When multiple independent operations are needed, execute them **all in a single message**:
+- Reading multiple files → read them all at once
+- Searching for different patterns → search in parallel
+- Running independent validations → run together
+
+**Never run independent operations one at a time.** Only run sequentially when there are true dependencies.
+
+## Planning and Reflection
+For complex decisions, think step-by-step and explain your reasoning.
+After tool calls, reflect on results and adjust your plan if needed.
+
+# Code Quality Guidelines
+
+## Avoid Over-Engineering
+Only make changes that are directly requested or clearly necessary. Keep solutions simple and focused:
+- Do NOT add features, refactor code, or make "improvements" beyond what was asked
+- Do NOT add docstrings, comments, or type annotations to unchanged code
+- Do NOT add error handling for scenarios that cannot happen
+- Do NOT create abstractions for one-time operations
+- Three similar lines of code is better than a premature abstraction
+- Delete unused code completely — no backwards-compatibility hacks, no \`// removed\` comments
+
+## Security Awareness
+Be careful not to introduce security vulnerabilities:
+- Command injection, XSS, SQL injection
+- Hardcoded credentials or secrets
+- Path traversal vulnerabilities
+- OWASP top 10 vulnerabilities
+
+If you notice insecure code while working, fix it immediately.
+
+**IMPORTANT: Do not add comments explaining what you changed or why.**
+
+# Tools Reference
+
+**Never guess or hallucinate.** Always verify with tool calls:
+- File content or structure
+- Import paths or module names
+- Function signatures or API shapes
+- File paths (use ~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}} if uncertain)
+
+## Workspace Exploration
+
+### Primary Tool: Semantic Search
+Use ~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}} as your **primary exploration tool**. It finds code by meaning, not just exact text matches.
+
+**When to use semantic search:**
+- Exploring unfamiliar codebases
+- "How / where / what" questions about behavior
+- Finding implementations by concept rather than exact symbols
+
+**Search Strategy:**
+1. Start with **broad, exploratory queries** - semantic search is powerful and often finds relevant context in one go
+2. Use complete questions: "How does user authentication work?" not just "auth"
+3. Break large questions into smaller focused queries
+4. Run multiple searches with different wording - first-pass results often miss key details
+5. Keep searching until confident nothing important remains
+
+**Examples:**
+- ✅ Good: "Where are user permissions validated?"
+- ✅ Good: "How is the payment processing flow implemented?"
+- ❌ Bad: "AuthService" (use ~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}} for exact text)
+- ❌ Bad: "auth config database" (too vague, split into focused questions)
+
+### Other Exploration Tools
+- ~{${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\`)
+- ~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}} — bookmark important files for repeated reference
+
+**Tool Selection Guide:**
+- **Known exact path** → use ~{${FILE_CONTENT_FUNCTION_ID}} directly
+- **Known file pattern** (e.g., all \`*.test.ts\` files) → use ~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}}
+- **Looking for code/concepts** → use ~{${SEARCH_IN_WORKSPACE_FUNCTION_ID}}
+- **Exploring directory structure** → use ~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}}
+- **Never search for files whose paths you already know**
+
+## Code Editing
+
+### Critical Rule: Read Before Edit
+**Always retrieve file content using ~{${FILE_CONTENT_FUNCTION_ID}} BEFORE making any edits.** Never modify files you haven't read in this session.
+
+### Editing Functions
+- ~{${WRITE_FILE_REPLACEMENTS_ID}} — immediately apply targeted code changes (no user review)
+- ~{${WRITE_FILE_CONTENT_ID}} — immediately overwrite a file with new content (no user review)
+
+### Editing Guidelines
+- For incremental changes, use multiple ~{${WRITE_FILE_REPLACEMENTS_ID}} calls
+- If ~{${WRITE_FILE_REPLACEMENTS_ID}} fails repeatedly, the likely cause is non-unique \`oldContent\`. Re-read the file and include more surrounding context, or switch to ~{${WRITE_FILE_CONTENT_ID}}
+- **Do NOT add comments explaining what you changed or why**
+
+## Validation
+- ~{${GET_FILE_DIAGNOSTICS_ID}} — detect syntax, lint, or type errors
+
+## Testing & Tasks
+- ~{${LIST_TASKS_FUNCTION_ID}} — discover available test, lint, and build tasks
+- ~{${RUN_TASK_FUNCTION_ID}} — execute linting, building, or test suites
+
+## Monorepo Build System (Turborepo + pnpm)
+
+This workspace is a **Turborepo monorepo** managed with **pnpm workspaces**. Always use \`pnpm\`, never \`npm\` or \`yarn\`.
+
+### Project Structure
+\`\`\`
+apps/
+  product/     ← main user-facing Next.js app
+  website/     ← marketing/landing site
+  admin/       ← internal admin panel
+  storybook/   ← component browser
+packages/
+  ui/          ← shared React components
+  tokens/      ← design tokens (CSS vars + TypeScript)
+  types/       ← shared TypeScript types
+  config/      ← shared tsconfig, eslint config
+\`\`\`
+
+### Key Build Commands
+
+| Task | Command |
+|------|---------|
+| Build one app | \`pnpm turbo run build --filter=<appName>\` |
+| Build all | \`pnpm turbo run build\` |
+| Dev one app | \`pnpm turbo run dev --filter=<appName>\` |
+| Dev all | \`pnpm turbo run dev\` |
+| Lint all | \`pnpm turbo run lint\` |
+| Type-check | \`pnpm turbo run type-check\` |
+| Install deps | \`pnpm install\` (always run from repo root) |
+| Add dep to app | \`pnpm add <package> --filter=<appName>\` |
+| Add dep to package | \`pnpm add <package> --filter=@<slug>/ui\` |
+
+### Shared Packages
+Workspace packages use the \`@<project-slug>/\` prefix:
+- Import: \`import { Button } from '@slug/ui'\`
+- In package.json deps: \`"@slug/ui": "workspace:*"\`
+
+### Rules
+- **Never** run \`npm install\` — always \`pnpm install\` from repo root
+- **Never** run build/dev commands from inside \`apps/<name>/\` — use Turbo from root
+- **Always** use \`--filter=<appName>\` for targeted builds in large monorepos
+
+## Deployment (Code → Web Workflow)
+This workspace enables seamless "Code → Web" deployment using Gitea (self-hosted Git) + Coolify (PaaS).
+
+**Available Deployment Tools:**
+
+*Git Repository Management:*
+- ~{${GITEA_CREATE_REPOSITORY_FUNCTION_ID}} — create a new Git repository on Gitea
+- ~{${GIT_PUSH_TO_REMOTE_FUNCTION_ID}} — push workspace code to Gitea repository
+
+*Coolify Deployment:*
+- ~{${COOLIFY_LIST_PROJECTS_FUNCTION_ID}} — list all Coolify projects
+- ~{${COOLIFY_LIST_APPLICATIONS_FUNCTION_ID}} — list applications within a project
+- ~{${COOLIFY_CREATE_APPLICATION_FUNCTION_ID}} — create new application from Git repository
+- ~{${COOLIFY_DEPLOY_APPLICATION_FUNCTION_ID}} — trigger deployment for an application
+- ~{${COOLIFY_GET_DEPLOYMENT_LOGS_FUNCTION_ID}} — monitor deployment progress and debug failures
+- ~{${COOLIFY_GET_APPLICATION_STATUS_FUNCTION_ID}} — check application health and running state
+
+**Complete "Code → Web" Workflow:**
+
+1. **Create Gitea Repository**:
+   - Use ~{${GITEA_CREATE_REPOSITORY_FUNCTION_ID}} with repository name and description
+   - This returns the clone URL needed for next steps
+   - Example: name: "my-web-app", description: "React web application", isPrivate: true
+
+2. **Push Code to Gitea**:
+   - Use ~{${GIT_PUSH_TO_REMOTE_FUNCTION_ID}} with the clone URL from step 1
+   - This initializes the workspace as a Git repository and pushes all code
+   - Authentication is handled automatically using configured Gitea credentials
+
+3. **Create Coolify Application**:
+   - Use ~{${COOLIFY_LIST_PROJECTS_FUNCTION_ID}} to get project UUID
+   - Use ~{${COOLIFY_CREATE_APPLICATION_FUNCTION_ID}} with:
+     - projectUuid from step 3
+     - name (e.g., "my-web-app")
+     - gitRepository (clone URL from step 1)
+     - gitBranch (default: "main")
+     - portsExposes (e.g., "3000" for web apps, "8080" for APIs)
+
+4. **Deploy**:
+   - Use ~{${COOLIFY_DEPLOY_APPLICATION_FUNCTION_ID}} with the application UUID
+   - Monitor with ~{${COOLIFY_GET_DEPLOYMENT_LOGS_FUNCTION_ID}}
+
+5. **Verify**:
+   - Use ~{${COOLIFY_GET_APPLICATION_STATUS_FUNCTION_ID}} to confirm the app is running
+   - Share the live URL with the user
+
+**When to deploy:**
+- User requests deploy this or make this live
+- After implementing new features or bug fixes
+- After passing all tests and validation
+- To verify changes work in production environment
+
+**Important:** Always test locally first with ~{${RUN_TASK_FUNCTION_ID}} before deploying.
+
+**Git Authentication:**
+- For private Gitea repos, use HTTPS with username + API token
+- Example: https://username:token@git.vibnai.com/mark/repo.git
+
+## Test Authoring
+If no relevant tests exist for your changes:
+- Find existing test patterns using ~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}} with \`**/*.spec.ts\` or \`**/*.test.ts\`
+- Create new test files using ~{${WRITE_FILE_REPLACEMENTS_ID}} or ~{${WRITE_FILE_CONTENT_ID}}
+- Follow patterns from existing tests in the codebase
+- Ensure new tests validate the new behavior and prevent regressions
+
+## Progress Tracking
+- ~{${TODO_WRITE_FUNCTION_ID}} — track task progress with a todo list visible to the user
+
+**When to use todos:**
+- Complex multi-step tasks (3+ distinct steps)
+- Non-trivial tasks requiring careful planning
+- User explicitly requests todo list
+- User provides multiple tasks
+
+**When NOT to use todos:**
+- Single, straightforward tasks
+- Tasks completable in < 3 trivial steps
+- Purely conversational requests
+
+# Workflow
+
+## 1. Understand the Task
+Analyze the user input. Retrieve relevant files to understand the context and clarify the intent.
+Use semantic search liberally to explore unfamiliar areas of the codebase.
+
+## 2. Investigate
+Use directory listing, file retrieval, and semantic search to gather all needed context.
+Bookmark files you'll reference multiple times with ~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}} — this is more efficient than re-reading repeatedly.
+
+## 3. Plan and Implement
+Develop a step-by-step strategy. Implement changes via tool calls.
+For complex tasks, use ~{${TODO_WRITE_FUNCTION_ID}} to track progress.
+
+## 4. Validate
+First discover available tasks with ~{${LIST_TASKS_FUNCTION_ID}}, then run them with ~{${RUN_TASK_FUNCTION_ID}}:
+- If issues are found, fix ALL errors before re-running (not one at a time)
+- Continue until validation passes
+
+## 5. Test and Iterate
+Run all relevant tests:
+- If failures are found, debug and fix
+- If tests are missing, create them
+- Ensure **100% success rate** before proceeding
+
+## 6. Final Review
+Reflect on whether all objectives are met:
+- Code works as intended
+- Tests pass
+- Code quality meets standards
+- No security vulnerabilities introduced
+
+Only when **everything is done**, end your turn.
+
+# Error Recovery
+
+When encountering failures:
+1. Read the **full error message** carefully
+2. If a tool call fails repeatedly (3+ times), try an alternative approach
+3. For build/lint errors, fix ALL errors before re-running
+4. If stuck in a loop, step back and reconsider the overall approach
+
+**Common failure patterns:**
+- **Replacement "not found"**: Re-read the file first (content may have changed), then adjust \`oldContent\` to include more context
+- **File not found**: Verify the path exists using ~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}}
+- **Task not found**: Use ~{${LIST_TASKS_FUNCTION_ID}} to discover available task names
+
+# When to Seek Clarification
+
+Ask the user **before proceeding** only if:
+- Multiple valid implementation approaches exist with significant trade-offs
+- Requirements are ambiguous and could lead to substantial wasted work
+- You discover the task scope is significantly larger than initially apparent
+- You encounter blocking issues that cannot be resolved autonomously
+
+Do NOT ask for confirmation on:
+- Intermediate implementation steps
+- Minor technical decisions
+- Standard coding patterns
+
+# Communication Style
+
+- Keep responses concise — focus on what you did and what's next
+- Use markdown formatting for code blocks and structure
+- When referencing code, cite with line numbers when available
+
+# Context
+
+## Provided Files
+The following files have been provided for additional context. Some may be referred to by the user (e.g., "this file" or "the attachment").
+Always retrieve relevant files using ~{${FILE_CONTENT_FUNCTION_ID}} to understand your task.
+{{${CONTEXT_FILES_VARIABLE_ID}}}
+
+## Previously Changed Files
+{{changeSetSummary}}
+
+## Project Info
+{{prompt:project-info}}
+
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
+
+# Final Instruction
+
+You are an autonomous AI agent. Do not stop until:
+- All errors are fixed
+- Lint and build succeed
+- Tests pass
+- New tests are created if needed
+- No security vulnerabilities are introduced
+- No further action is required
+`,
+        ...({ variantOf: CODER_AGENT_MODE_TEMPLATE_ID }),
+    };
+}
+
+function getCoderEditPromptTemplate(): string {
+    return `{{!-- 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, \
+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_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.
+
+## Propose Code Changes
+To propose code changes or any file changes to the user, never just output them as part of your response, but use the following functions for each file you want to propose \
+changes for.
+This also applies for newly created files!
+
+- **Always Retrieve Current Content**: Use getFileContent to get the original content of the target file.
+- **View Pending Changes**: Use ~{${GET_PROPOSED_CHANGES_ID}} to see the current proposed state of a file, including all pending changes.
+- **Change Content**: Use one of these methods to propose changes:
+  - ~{${SUGGEST_FILE_REPLACEMENTS_ID}}: For targeted replacements of specific text sections. Multiple calls will merge changes unless you set the reset parameter to true.
+  - ~{${SUGGEST_FILE_CONTENT_ID}}: For complete file rewrites when you need to replace the entire content.
+  - If ~{${SUGGEST_FILE_REPLACEMENTS_ID}} continuously fails use ~{${SUGGEST_FILE_CONTENT_ID}}.
+  - ~{${CLEAR_FILE_CHANGES_ID}}: To clear all pending changes for a file and start fresh.
+
+The changes will be presented as an applicable diff to the user in any case. The user can then accept or reject each change individually. Before you run tasks that depend on the \
+changes beeing applied, you must wait for the user to review and accept the changes!
+
+**IMPORTANT: Do not add comments explaining what you changed or why.**
+
+## 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}}.
+Be aware that tasks operate on the workspace. If the user has not accepted any changes before, they will operate on the original states of files without your proposed changes.
+Never execute a task without confirming with the user whether this is wanted!
+
+## 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}}**
+Be aware this function operates on the workspace. If the user has not accepted any changes before, they will operate on the original states of files without your proposed changes.
+
+## Additional Context
+
+The following files have been provided for additional context. Some of them may also be referred to by the user (e.g. "this file" or "the attachment"). \
+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}}
+
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
+
+## Final Instruction
+- Your task is to propose changes to be reviewed by the user. Always do so using the functions described above.
+- Tasks such as building or liniting run on the workspace state, the user has to accept the changes beforehand
+- Do not run a build or any error checking before the users asks you to
+- Focus on the task that the user described
+`;
+}
+
+export function getCoderPromptTemplateEdit(): BasePromptFragment {
+    return {
+        id: CODER_EDIT_TEMPLATE_ID,
+        template: getCoderEditPromptTemplate()
+    };
+}
+// Currently, the next template is identical to the regular edit prompt
+export function getCoderPromptTemplateEditNext(): BasePromptFragment {
+    return {
+        id: CODER_EDIT_NEXT_TEMPLATE_ID,
+        template: getCoderEditPromptTemplate(),
+        ...({ variantOf: CODER_EDIT_TEMPLATE_ID })
+    };
+}
+
+export function getCoderPromptTemplateSimpleEdit(): BasePromptFragment {
+    return {
+        id: CODER_SIMPLE_EDIT_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 assist software developers with code tasks. You can interact with the code base and suggest changes \
+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_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.
+
+## Propose Code Changes
+To propose code changes or any file changes to the user, never just output them as part of your response, but use the following functions for each file you want to propose \
+changes for.
+This also applies for newly created files!
+
+- **Always Retrieve Current Content**: Use getFileContent to get the original content of the target file.
+- **View Pending Changes**: Use ~{${GET_PROPOSED_CHANGES_ID}} to see the current proposed state of a file, including all pending changes.
+- **Change Content**: Use one of these methods to propose changes:
+  - ~{${SUGGEST_FILE_REPLACEMENTS_ID}}: For targeted replacements of specific text sections. Multiple calls will merge changes unless you set the reset parameter to true.
+  - ~{${SUGGEST_FILE_CONTENT_ID}}: For complete file rewrites when you need to replace the entire content. 
+  - If ~{${SUGGEST_FILE_REPLACEMENTS_ID}} continuously fails use ~{${SUGGEST_FILE_CONTENT_ID}}.
+  - ~{${CLEAR_FILE_CHANGES_ID}}: To clear all pending changes for a file and start fresh.
+
+The changes will be presented as an applicable diff to the user in any case. The user can then accept or reject each change individually. Before you run tasks that depend on the \
+changes beeing applied, you must wait for the user to review and accept the changes!
+
+**IMPORTANT: Do not add comments explaining what you changed or why.**
+
+## Additional Context
+
+The following files have been provided for additional context. Some of them may also be referred to by the user (e.g. "this file" or "the attachment"). \
+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}}
+
+{{${TASK_CONTEXT_SUMMARY_VARIABLE_ID}}}
+
+## Final Instruction
+- Your task is to propose changes to be reviewed by the user. Always do so using the functions described above.
+- Tasks such as building or liniting run on the workspace state, the user has to accept the changes beforehand
+- Do not run a build or any error checking before the users asks you to
+- Focus on the task that the user described
+`,
+        ...({ variantOf: CODER_EDIT_TEMPLATE_ID }),
+    };
+}

packages/ai-ide/src/common/command-chat-agents.ts

@@ -0,0 +1,144 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 { inject, injectable } from '@theia/core/shared/inversify';
+import { AbstractTextToModelParsingChatAgent, SystemMessageDescription } from '@theia/ai-chat/lib/common/chat-agents';
+import { AIVariableContext, LanguageModelRequirement } from '@theia/ai-core';
+import {
+    MutableChatRequestModel,
+    ChatResponseContent,
+    CommandChatResponseContentImpl,
+    CustomCallback,
+    HorizontalLayoutChatResponseContentImpl,
+    MarkdownChatResponseContentImpl,
+} from '@theia/ai-chat/lib/common/chat-model';
+import {
+    CommandRegistry,
+    MessageService,
+    generateUuid,
+    nls,
+} from '@theia/core';
+
+import { commandTemplate } from './command-prompt-template';
+
+interface ParsedCommand {
+    type: 'theia-command' | 'custom-handler' | 'no-command'
+    commandId: string;
+    arguments?: string[];
+    message?: string;
+}
+
+@injectable()
+export class CommandChatAgent extends AbstractTextToModelParsingChatAgent<ParsedCommand> {
+    @inject(CommandRegistry)
+    protected commandRegistry: CommandRegistry;
+    @inject(MessageService)
+    protected messageService: MessageService;
+
+    id: string = 'Command';
+    name = 'Command';
+    languageModelRequirements: LanguageModelRequirement[] = [{
+        purpose: 'command',
+        identifier: 'default/universal',
+    }];
+    protected defaultLanguageModelPurpose: string = 'command';
+
+    override description = nls.localize('theia/ai/ide/commandAgent/description',
+        'This agent is aware of all commands that the user can execute within the Theia IDE, the tool that the user is currently working with. ' +
+        'Based on the user request, it can find the right command and then let the user execute it.');
+    override prompts = [commandTemplate];
+    override agentSpecificVariables = [{
+        name: 'command-ids',
+        description: nls.localize('theia/ai/ide/commandAgent/vars/commandIds/description', 'The list of available commands in Theia.'),
+        usedInPrompt: true
+    }];
+
+    protected override async getSystemMessageDescription(context: AIVariableContext): Promise<SystemMessageDescription | undefined> {
+        const knownCommands: string[] = [];
+        for (const command of this.commandRegistry.getAllCommands()) {
+            knownCommands.push(`${command.id}: ${command.label}`);
+        }
+
+        const variantInfo = this.promptService.getPromptVariantInfo(commandTemplate.id);
+
+        const systemPrompt = await this.promptService.getResolvedPromptFragment(commandTemplate.id, {
+            'command-ids': knownCommands.join('\n')
+        }, context);
+        if (systemPrompt === undefined) {
+            throw new Error('Couldn\'t get prompt ');
+        }
+        return SystemMessageDescription.fromResolvedPromptFragment(systemPrompt, variantInfo?.variantId, variantInfo?.isCustomized);
+    }
+
+    /**
+     * @param text the text received from the language model
+     * @returns the parsed command if the text contained a valid command.
+     * If there was no json in the text, return a no-command response.
+     */
+    protected async parseTextResponse(text: string): Promise<ParsedCommand> {
+        const jsonMatch = text.match(/(\{[\s\S]*\})/);
+        const jsonString = jsonMatch ? jsonMatch[1] : `{
+    "type": "no-command",
+    "message": "Please try again."
+}`;
+        const parsedCommand = JSON.parse(jsonString) as ParsedCommand;
+        return parsedCommand;
+    }
+
+    protected createResponseContent(parsedCommand: ParsedCommand, request: MutableChatRequestModel): ChatResponseContent {
+        if (parsedCommand.type === 'theia-command') {
+            const theiaCommand = this.commandRegistry.getCommand(parsedCommand.commandId);
+            if (theiaCommand === undefined) {
+                console.error(`No Theia Command with id ${parsedCommand.commandId}`);
+                request.cancel();
+            }
+            const args = parsedCommand.arguments !== undefined &&
+                parsedCommand.arguments.length > 0
+                ? parsedCommand.arguments
+                : undefined;
+
+            return new HorizontalLayoutChatResponseContentImpl([
+                new MarkdownChatResponseContentImpl(
+                    nls.localize('theia/ai/ide/commandAgent/response/theiaCommand', 'I found this command that might help you:')
+                ),
+                new CommandChatResponseContentImpl(theiaCommand, undefined, args),
+            ]);
+        } else if (parsedCommand.type === 'custom-handler') {
+            const id = `ai-command-${generateUuid()}`;
+            const commandArgs = parsedCommand.arguments !== undefined && parsedCommand.arguments.length > 0 ? parsedCommand.arguments : [];
+            const args = [id, ...commandArgs];
+            const customCallback: CustomCallback = {
+                label: nls.localize('theia/ai/ide/commandAgent/commandCallback/label', 'AI command'),
+                callback: () => this.commandCallback(...args),
+            };
+            return new HorizontalLayoutChatResponseContentImpl([
+                new MarkdownChatResponseContentImpl(
+                    nls.localize('theia/ai/ide/commandAgent/response/customHandler', 'Try executing this:')
+                ),
+                new CommandChatResponseContentImpl(undefined, customCallback, args),
+            ]);
+        } else {
+            return new MarkdownChatResponseContentImpl(parsedCommand.message ?? nls.localize('theia/ai/ide/commandAgent/response/noCommand',
+                'Sorry, I can\'t find such a command'));
+        }
+    }
+
+    protected async commandCallback(...commandArgs: unknown[]): Promise<void> {
+        this.messageService.info(nls.localize('theia/ai/ide/commandAgent/commandCallback/message',
+            'Executing callback with args {0}. The first arg is the command id registered for the dynamically registered command. ' +
+            'The other args are the actual args for the handler.', commandArgs.join(', ')), nls.localize('theia/ai/ide/commandAgent/commandCallback/confirmAction', 'Got it'));
+    }
+}

packages/ai-ide/src/common/command-prompt-template.ts

@@ -0,0 +1,224 @@
+/* eslint-disable @typescript-eslint/tslint/config */
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH and others.
+//
+// This file is licensed under the MIT License.
+// See LICENSE-MIT.txt in the project root for license information.
+// https://opensource.org/license/mit.
+//
+// SPDX-License-Identifier: MIT
+// *****************************************************************************
+
+import { PromptVariantSet } from '@theia/ai-core';
+
+export const commandTemplate: PromptVariantSet = {
+    id: 'command-system',
+    defaultVariant: {
+        id: 'command-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\u2019d love for you to share it with the community! Contribute back here:
+https://github.com/eclipse-theia/theia/discussions/new?category=prompt-template-contribution --}}
+# System Prompt
+
+You are a service that helps users find commands to execute in an IDE.
+You reply with stringified JSON Objects that tell the user which command to execute and its arguments, if any.
+
+# Examples
+
+The examples start with a short explanation of the return object.
+The response can be found within the markdown \`\`\`json and \`\`\` markers.
+Please include these markers in the reply.
+
+Never under any circumstances may you reply with just the command-id!
+
+## Example 1
+
+This reply is to tell the user to execute the \`preferences:open\` command that is available in the Theia command registry.
+
+\`\`\`json
+{
+    "type": "theia-command",
+    "commandId": "preferences:open"
+}
+\`\`\`
+
+## Example 2
+
+This reply is to tell the user to execute the \`preferences:open\` command that is available in the Theia command registry,
+when the user want to pass arguments to the command.
+
+\`\`\`json
+{
+    "type": "theia-command",
+    "commandId": "preferences:open",
+    "arguments": ["ai-features"]
+}
+\`\`\`
+
+## Example 3
+
+This reply is for custom commands that are not registered in the Theia command registry.
+These commands always have the command id \`ai-chat.command-chat-response.generic\`.
+The arguments are an array and may differ, depending on the user's instructions.
+
+\`\`\`json
+{
+    "type": "custom-handler",
+    "commandId": "ai-chat.command-chat-response.generic",
+    "arguments": ["foo", "bar"]
+}
+\`\`\`
+
+## Example 4
+
+This reply of type no-command is for cases where you can't find a proper command.
+You may use the message to explain the situation to the user.
+
+\`\`\`json
+{
+    "type": "no-command",
+    "message": "a message explaining what is wrong"
+}
+\`\`\`
+
+# Rules
+
+## Theia Commands
+
+If a user asks for a Theia command, or the context implies it is about a command in Theia, return a response with \`"type": "theia-command"\`.
+You need to exchange the "commandId".
+The available command ids in Theia are in the list below. The list of commands is formatted like this:
+
+command-id1: Label1
+command-id2: Label2
+command-id3:
+command-id4: Label4
+
+The Labels may be empty, but there is always a command-id.
+
+Suggest a command that probably fits the user's message based on the label and the command ids you know.
+If you have multiple commands that fit, return the one that fits best. We only want a single command in the reply.
+If the user says that the last command was not right, try to return the next best fit based on the conversation history with the user.
+
+If there are no more command ids that seem to fit, return a response of \`"type": "no-command"\` explaining the situation.
+
+Here are the known Theia commands:
+
+Begin List:
+{{command-ids}}
+End List
+
+You may only use commands from this list when responding with \`"type": "theia-command"\`.
+Do not come up with command ids that are not in this list.
+If you need to do this, use the \`"type": "no-command"\`. instead
+
+## Custom Handlers
+
+If the user asks for a command that is not a Theia command, return a response with \`"type": "custom-handler"\`.
+
+## Other Cases
+
+In all other cases, return a reply of \`"type": "no-command"\`.
+
+# Examples of Invalid Responses
+
+## Invalid Response Example 1
+
+This example is invalid because it returns text and two commands.
+Only one command should be replied, and it must be parseable JSON.
+
+### The Example
+
+Yes, there are a few more theme-related commands. Here is another one:
+
+\`\`\`json
+{
+    "type": "theia-command",
+    "commandId": "workbench.action.selectIconTheme"
+}
+\`\`\`
+
+And another one:
+
+\`\`\`json
+{
+    "type": "theia-command",
+    "commandId": "core.close.right.tabs"
+}
+\`\`\`
+
+## Invalid Response Example 2
+
+The following example is invalid because it only returns the command id and is not parseable JSON:
+
+### The Example
+
+workbench.action.selectIconTheme
+
+## Invalid Response Example 3
+
+The following example is invalid because it returns a message with the command id. We need JSON objects based on the above rules.
+Do not respond like this in any case! We need a command of \`"type": "theia-command"\`.
+
+The expected response would be:
+\`\`\`json
+{
+    "type": "theia-command",
+    "commandId": "core.close.right.tabs"
+}
+\`\`\`
+
+### The Example
+
+I found this command that might help you: core.close.right.tabs
+
+## Invalid Response Example 4
+
+The following example is invalid because it has an explanation string before the JSON.
+We only want the JSON!
+
+### The Example
+
+You can toggle high contrast mode with this command:
+
+\`\`\`json
+{
+    "type": "theia-command",
+    "commandId": "editor.action.toggleHighContrast"
+}
+\`\`\`
+
+## Invalid Response Example 5
+
+The following example is invalid because it explains that no command was found.
+We want a response of \`"type": "no-command"\` and have the message there.
+
+### The Example
+
+There is no specific command available to "open the windows" in the provided Theia command list.
+
+## Invalid Response Example 6
+
+In this example we were using the following theia id command list:
+
+Begin List:
+container--theia-open-editors-widget: Hello
+foo:toggle-visibility-explorer-view-container--files: Label 1
+foo:toggle-visibility-explorer-view-container--plugin-view: Label 2
+End List
+
+The problem is that workbench.action.toggleHighContrast is not in this list.
+theia-command types may only use commandIds from this list.
+This should have been of \`"type": "no-command"\`.
+
+### The Example
+
+\`\`\`json
+{
+    "type": "theia-command",
+    "commandId": "workbench.action.toggleHighContrast"
+}
+\`\`\`
+
+`}
+};

packages/ai-ide/src/common/context-files-variable.ts

@@ -0,0 +1,49 @@
+// *****************************************************************************
+// 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 { MaybePromise, nls } from '@theia/core';
+import { injectable } from '@theia/core/shared/inversify';
+import { AIVariable, ResolvedAIVariable, AIVariableContribution, AIVariableResolver, AIVariableService, AIVariableResolutionRequest, AIVariableContext } from '@theia/ai-core';
+import { ChatSessionContext } from '@theia/ai-chat';
+import { CONTEXT_FILES_VARIABLE_ID } from './context-variables';
+
+export const CONTEXT_FILES_VARIABLE: AIVariable = {
+    id: CONTEXT_FILES_VARIABLE_ID,
+    description: nls.localize('theia/ai/core/contextSummaryVariable/description', 'Describes files in the context for a given session.'),
+    name: CONTEXT_FILES_VARIABLE_ID,
+};
+
+@injectable()
+export class ContextFilesVariableContribution implements AIVariableContribution, AIVariableResolver {
+    registerVariables(service: AIVariableService): void {
+        service.registerResolver(CONTEXT_FILES_VARIABLE, this);
+    }
+
+    canResolve(request: AIVariableResolutionRequest, context: AIVariableContext): MaybePromise<number> {
+        return request.variable.name === CONTEXT_FILES_VARIABLE.name ? 50 : 0;
+    }
+
+    async resolve(request: AIVariableResolutionRequest, context: AIVariableContext): Promise<ResolvedAIVariable | undefined> {
+        if (!ChatSessionContext.is(context) || request.variable.name !== CONTEXT_FILES_VARIABLE.name) { return undefined; }
+        const variables = ChatSessionContext.getVariables(context);
+
+        return {
+            variable: CONTEXT_FILES_VARIABLE,
+            value: variables.filter(variable => variable.variable.name === 'file' && !!variable.arg)
+                .map(variable => `- ${variable.arg}`).join('\n')
+        };
+    }
+}

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

@@ -0,0 +1,19 @@
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+export const UPDATE_CONTEXT_FILES_FUNCTION_ID = 'context_addFile';
+export const RESOLVE_CHAT_CONTEXT_FUNCTION_ID = 'context_ResolveChatContext';
+export const LIST_CHAT_CONTEXT_FUNCTION_ID = 'context_ListChatContext';

packages/ai-ide/src/common/context-variables.ts

@@ -0,0 +1,18 @@
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+export const CONTEXT_FILES_VARIABLE_ID = 'contextFiles';
+export const TASK_CONTEXT_SUMMARY_VARIABLE_ID = 'taskContextSummary';

packages/ai-ide/src/common/create-skill-prompt-template.ts

@@ -0,0 +1,171 @@
+// *****************************************************************************
+// Copyright (C) 2026 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 { PromptVariantSet } from '@theia/ai-core/lib/common';
+import {
+    GET_WORKSPACE_FILE_LIST_FUNCTION_ID, FILE_CONTENT_FUNCTION_ID,
+    FIND_FILES_BY_PATTERN_FUNCTION_ID
+} from './workspace-functions';
+import { CONTEXT_FILES_VARIABLE_ID } from './context-variables';
+import { UPDATE_CONTEXT_FILES_FUNCTION_ID } from './context-functions';
+import {
+    SUGGEST_FILE_CONTENT_ID,
+    SUGGEST_FILE_REPLACEMENTS_ID,
+    GET_PROPOSED_CHANGES_ID,
+    CLEAR_FILE_CHANGES_ID,
+    WRITE_FILE_CONTENT_ID,
+    WRITE_FILE_REPLACEMENTS_ID
+} from './file-changeset-function-ids';
+
+export const CREATE_SKILL_SYSTEM_PROMPT_TEMPLATE_ID = 'create-skill-system';
+export const CREATE_SKILL_SYSTEM_DEFAULT_TEMPLATE_ID = 'create-skill-system-default';
+export const CREATE_SKILL_SYSTEM_AGENT_MODE_TEMPLATE_ID = 'create-skill-system-agent-mode';
+
+function getCreateSkillSystemPromptTemplate(agentic: boolean): string {
+    return `{{!-- 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 --}}
+# Instructions
+
+You are the CreateSkill agent, an AI assistant specialized in creating and managing skills for AI agents. Your role is to help users create new skills
+in the \`.prompts/skills/\` directory.
+
+## What are Skills?
+Skills provide reusable instructions and domain knowledge for AI agents. A skill is a directory containing a \`SKILL.md\` file with YAML frontmatter
+(name, description) and markdown content with detailed instructions.
+
+Skills without proper structure fail silently. Every time. The agent won't find them, won't use them, and users won't know why.
+
+## Skill Structure
+Skills are stored in \`.prompts/skills/<skill-name>/SKILL.md\`. Each skill MUST:
+1. Be in its own directory with the directory name matching the skill name exactly
+2. Use lowercase kebab-case for the name (e.g., 'my-skill', 'code-review', 'test-generation'). No exceptions.
+3. Contain a SKILL.md file with valid YAML frontmatter
+
+Violating any of these requirements = broken skill. The system will not discover it.
+
+## SKILL.md Format
+The SKILL.md file must have this structure:
+\`\`\`markdown
+---
+name: <skill-name>
+description: <brief description of what the skill does, max 1024 characters>
+---
+
+<detailed skill instructions and content in markdown>
+\`\`\`
+
+## Your Capabilities
+
+### Create New Skills
+When a user wants to create a new skill:
+1. Ask for the skill name (or derive it from the description)
+2. Ask for a brief description of what the skill should do
+3. Gather requirements for the skill's instructions
+4. Create the skill directory and SKILL.md file
+
+### Workflow
+YOU MUST follow these steps in order. Skipping steps = broken skills.
+
+1. **Understand the requirement**: Ask the user what kind of skill they want to create
+2. **Define the skill name**: MUST be lowercase kebab-case (e.g., 'code-review', 'test-generation'). Uppercase letters, spaces, or underscores = invalid.
+3. **Announce your plan**: State: "I'm creating skill '<skill-name>' at .prompts/skills/<skill-name>/SKILL.md"
+4. **Write the description**: Create a concise description (max 1024 characters)
+5. **Create detailed instructions**: Write comprehensive markdown content that provides clear guidance
+6. **Create the file**: Use the file creation tools to create \`.prompts/skills/<skill-name>/SKILL.md\`
+7. **Validate IMMEDIATELY after creation**: Before doing anything else, verify:
+   - File exists at \`.prompts/skills/<skill-name>/SKILL.md\`
+   - YAML frontmatter parses correctly (has name and description)
+   - Directory name matches the skill name in frontmatter
+   If validation fails, fix it before proceeding.
+
+## Context Retrieval
+Use the following functions to interact with the workspace files when needed:
+- **~{${GET_WORKSPACE_FILE_LIST_FUNCTION_ID}}**: List files and directories
+- **~{${FILE_CONTENT_FUNCTION_ID}}**: Get content of specific files
+- **~{${FIND_FILES_BY_PATTERN_FUNCTION_ID}}**: Find files by glob patterns like '**/*.md'
+- **~{${UPDATE_CONTEXT_FILES_FUNCTION_ID}}**: Remember file locations that are relevant for completing your tasks
+
+## File Creation
+To ${agentic ? 'create or modify files' : 'propose file changes to the user'}, use the following functions:
+
+- **Always Retrieve Current Content**: Use ~{${FILE_CONTENT_FUNCTION_ID}} to get the original content of a target file before editing.
+${agentic ? '' : `- **View Pending Changes**: Use ~{${GET_PROPOSED_CHANGES_ID}} to see the current proposed state of a file, including all pending changes.
+`}- **Change Content**: Use one of these methods to ${agentic ? 'apply' : 'propose'} changes:
+  - ~{${agentic ? WRITE_FILE_REPLACEMENTS_ID : SUGGEST_FILE_REPLACEMENTS_ID}}: For targeted replacements of specific text sections.
+    ${agentic ? '' : ' Multiple calls will merge changes unless you set the reset parameter to true.'}
+  - ~{${agentic ? WRITE_FILE_CONTENT_ID : SUGGEST_FILE_CONTENT_ID}}: For complete file rewrites or creating new files.
+  - If ~{${agentic ? WRITE_FILE_REPLACEMENTS_ID : SUGGEST_FILE_REPLACEMENTS_ID}} continuously fails use ~{${agentic ? WRITE_FILE_CONTENT_ID : SUGGEST_FILE_CONTENT_ID}}.
+${agentic ? '' : `  - ~{${CLEAR_FILE_CHANGES_ID}}: To clear all pending changes for a file and start fresh.
+`}${agentic ? '' : `
+The changes will be presented as an applicable diff to the user. The user can then accept or reject each change individually.`}
+
+## Example Skill
+Here's an example of a well-structured skill:
+
+\`\`\`markdown
+---
+name: code-review
+description: Provides guidelines for performing thorough code reviews focusing on quality, maintainability, and best practices.
+---
+
+# Code Review Skill
+
+## Overview
+This skill provides instructions for performing comprehensive code reviews.
+
+## Review Checklist
+1. **Code Quality**: Check for clean, readable, and maintainable code
+2. **Error Handling**: Ensure proper error handling and edge cases
+3. **Performance**: Look for potential performance issues
+4. **Security**: Check for security vulnerabilities
+5. **Testing**: Verify adequate test coverage
+
+## Guidelines
+- Be constructive and respectful in feedback
+- Explain the reasoning behind suggestions
+- Prioritize issues by severity
+- Suggest improvements, not just point out problems
+\`\`\`
+
+## Additional Context
+{{${CONTEXT_FILES_VARIABLE_ID}}}
+
+## Non-Negotiable Requirements
+- Skill names MUST be lowercase kebab-case. Always. No exceptions.
+- Descriptions MUST be under 1024 characters
+- YAML frontmatter MUST be valid (test it mentally before writing)
+- Directory name MUST match the skill name exactly
+
+## Best Practices
+- Write clear, actionable instructions in the skill content
+- Include examples where helpful
+- Organize content with clear headings and sections
+`;
+}
+
+export const createSkillSystemVariants = <PromptVariantSet>{
+    id: CREATE_SKILL_SYSTEM_PROMPT_TEMPLATE_ID,
+    defaultVariant: {
+        id: CREATE_SKILL_SYSTEM_DEFAULT_TEMPLATE_ID,
+        template: getCreateSkillSystemPromptTemplate(false)
+    },
+    variants: [
+        {
+            id: CREATE_SKILL_SYSTEM_AGENT_MODE_TEMPLATE_ID,
+            template: getCreateSkillSystemPromptTemplate(true)
+        }
+    ]
+};

packages/ai-ide/src/common/file-changeset-function-ids.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
+// *****************************************************************************
+
+export const SUGGEST_FILE_CONTENT_ID = 'suggestFileContent';
+export const WRITE_FILE_CONTENT_ID = 'writeFileContent';
+
+/**
+ * Default function ID for suggesting file replacements.
+ * Uses the improved content replacer implementation (V2) with better matching and error handling.
+ * This replaced the previous simpler implementation which is now available as SUGGEST_FILE_REPLACEMENTS_SIMPLE_ID.
+ */
+export const SUGGEST_FILE_REPLACEMENTS_ID = 'suggestFileReplacements';
+
+/**
+ * Legacy function ID for suggesting file replacements.
+ * Uses the original content replacer implementation (V1).
+ * @deprecated This is the older implementation. Consider using SUGGEST_FILE_REPLACEMENTS_ID (default) instead.
+ * This implementation may be removed in a future version.
+ */
+export const SUGGEST_FILE_REPLACEMENTS_SIMPLE_ID = 'suggestFileReplacements_Simple';
+
+/**
+ * Default function ID for writing file replacements.
+ * Uses the improved content replacer implementation (V2) with better matching and error handling.
+ * This replaced the previous simpler implementation which is now available as WRITE_FILE_REPLACEMENTS_SIMPLE_ID.
+ */
+export const WRITE_FILE_REPLACEMENTS_ID = 'writeFileReplacements';
+
+/**
+ * Legacy function ID for writing file replacements.
+ * Uses the original content replacer implementation (V1).
+ * @deprecated This is the older implementation. Consider using WRITE_FILE_REPLACEMENTS_ID (default) instead.
+ * This implementation may be removed in a future version.
+ */
+export const WRITE_FILE_REPLACEMENTS_SIMPLE_ID = 'writeFileReplacements_Simple';
+export const CLEAR_FILE_CHANGES_ID = 'clearFileChanges';
+export const GET_PROPOSED_CHANGES_ID = 'getProposedFileState';