@theia/ai-chat 1.57.0 → 1.58.0

package/lib/common/chat-service.d.ts

@@ -46,6 +46,9 @@ export interface ChatService {
     deleteSession(sessionId: string): void;
     setActiveSession(sessionId: string, options?: SessionOptions): void;
     sendRequest(sessionId: string, request: ChatRequest): Promise<ChatRequestInvocation | undefined>;
+    deleteChangeSet(sessionId: string): void;
+    deleteChangeSetElement(sessionId: string, index: number): void;
+    cancelRequest(sessionId: string, requestId: string): Promise<void>;
 }
 interface ChatSessionInternal extends ChatSession {
     model: ChatModelImpl;
@@ -65,8 +68,11 @@ export declare class ChatServiceImpl implements ChatService {
     deleteSession(sessionId: string): void;
     setActiveSession(sessionId: string | undefined, options?: SessionOptions): void;
     sendRequest(sessionId: string, request: ChatRequest): Promise<ChatRequestInvocation | undefined>;
+    cancelRequest(sessionId: string, requestId: string): Promise<void>;
     protected getAgent(parsedRequest: ParsedChatRequest): ChatAgent | undefined;
     protected getMentionedAgent(parsedRequest: ParsedChatRequest): ParsedChatRequestAgentPart | undefined;
+    deleteChangeSet(sessionId: string): void;
+    deleteChangeSetElement(sessionId: string, index: number): void;
 }
 export {};
 //# sourceMappingURL=chat-service.d.ts.map

package/lib/common/chat-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-service.d.ts","sourceRoot":"","sources":["../../src/common/chat-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat-service.d.ts","sourceRoot":"","sources":["../../src/common/chat-service.ts"],"names":[],"mappings":"AAsBA,OAAO,EACH,SAAS,EACT,aAAa,EACb,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EAEpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAiC,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACrH,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAE1E,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC5C;;OAEG;IACH,eAAe,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC5C;;OAEG;IACH,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACjD;AAED,MAAM,WAAW,WAAW;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,yBAAyB;IACtC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,MAAM,WAAW,kBAAkB;IAC/B,EAAE,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,WAAW,eAAwB,CAAC;AACjD,MAAM,WAAW,WAAW;IACxB,sBAAsB,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAExD,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAAC;IAChD,WAAW,IAAI,WAAW,EAAE,CAAC;IAC7B,aAAa,CAAC,QAAQ,CAAC,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,WAAW,CAAC;IACnF,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IAEpE,WAAW,CACP,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,WAAW,GACrB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAC;IAE9C,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/D,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE;AAED,UAAU,mBAAoB,SAAQ,WAAW;IAC7C,KAAK,EAAE,aAAa,CAAC;CACxB;AAED,qBACa,eAAgB,YAAW,WAAW;IAC/C,SAAS,CAAC,QAAQ,CAAC,6BAA6B,qCAA4C;IAC5F,sBAAsB,yDAA4C;IAGlE,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAG7D,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAG/C,SAAS,CAAC,eAAe,EAAE,iBAAiB,CAAC;IAG7C,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAE1B,SAAS,CAAC,SAAS,EAAE,mBAAmB,EAAE,CAAM;IAEhD,WAAW,IAAI,mBAAmB,EAAE;IAIpC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAIvD,aAAa,CAAC,QAAQ,oBAA0B,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,WAAW;IAYxF,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAQtC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI;IAOzE,WAAW,CACb,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,WAAW,GACrB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAmEvC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,iBAAiB,GAAG,SAAS,GAAG,SAAS;IAW3E,SAAS,CAAC,iBAAiB,CAAC,aAAa,EAAE,iBAAiB,GAAG,0BAA0B,GAAG,SAAS;IAIrG,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIxC,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAGjE"}

package/lib/common/chat-service.js

@@ -127,6 +127,10 @@ let ChatServiceImpl = class ChatServiceImpl {
         }
         return invocation;
     }
+    async cancelRequest(sessionId, requestId) {
+        var _a, _b;
+        return (_b = (_a = this.getSession(sessionId)) === null || _a === void 0 ? void 0 : _a.model.getRequest(requestId)) === null || _b === void 0 ? void 0 : _b.response.cancel();
+    }
     getAgent(parsedRequest) {
         var _a;
         const agentPart = this.getMentionedAgent(parsedRequest);
@@ -141,6 +145,14 @@ let ChatServiceImpl = class ChatServiceImpl {
     getMentionedAgent(parsedRequest) {
         return parsedRequest.parts.find(p => p instanceof parsed_chat_request_1.ParsedChatRequestAgentPart);
     }
+    deleteChangeSet(sessionId) {
+        var _a;
+        (_a = this.getSession(sessionId)) === null || _a === void 0 ? void 0 : _a.model.setChangeSet(undefined);
+    }
+    deleteChangeSetElement(sessionId, index) {
+        var _a, _b;
+        (_b = (_a = this.getSession(sessionId)) === null || _a === void 0 ? void 0 : _a.model.changeSet) === null || _b === void 0 ? void 0 : _b.removeElement(index);
+    }
 };
 exports.ChatServiceImpl = ChatServiceImpl;
 tslib_1.__decorate([

package/lib/common/chat-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat-service.js","sourceRoot":"","sources":["../../src/common/chat-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat-service.js","sourceRoot":"","sources":["../../src/common/chat-service.ts"],"names":[],"mappings":"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"}

package/lib/common/chat-tool-request-service.d.ts

@@ -0,0 +1,17 @@
+import { ToolRequest } from '@theia/ai-core';
+import { ChatRequestModelImpl } from './chat-model';
+export interface ChatToolRequest extends ToolRequest {
+    handler: (arg_string: string, context: ChatRequestModelImpl) => Promise<unknown>;
+}
+/**
+ * Wraps tool requests in a chat context.
+ *
+ * This service extracts tool requests from a given chat request model and wraps their
+ * handler functions to provide additional context, such as the chat request model.
+ */
+export declare class ChatToolRequestService {
+    getChatToolRequests(request: ChatRequestModelImpl): ChatToolRequest[];
+    toChatToolRequests(toolRequests: ToolRequest[] | undefined, request: ChatRequestModelImpl): ChatToolRequest[];
+    protected toChatToolRequest(toolRequest: ToolRequest, request: ChatRequestModelImpl): ChatToolRequest;
+}
+//# sourceMappingURL=chat-tool-request-service.d.ts.map

package/lib/common/chat-tool-request-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chat-tool-request-service.d.ts","sourceRoot":"","sources":["../../src/common/chat-tool-request-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEpD,MAAM,WAAW,eAAgB,SAAQ,WAAW;IAChD,OAAO,EAAE,CACL,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,oBAAoB,KAC5B,OAAO,CAAC,OAAO,CAAC,CAAC;CACzB;AAED;;;;;GAKG;AACH,qBACa,sBAAsB;IAE/B,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,eAAe,EAAE;IAQrE,kBAAkB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,oBAAoB,GAAG,eAAe,EAAE;IAO7G,SAAS,CAAC,iBAAiB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,oBAAoB,GAAG,eAAe;CAOxG"}

package/lib/common/chat-tool-request-service.js

@@ -0,0 +1,52 @@
+"use strict";
+// *****************************************************************************
+// 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChatToolRequestService = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+/**
+ * Wraps tool requests in a chat context.
+ *
+ * This service extracts tool requests from a given chat request model and wraps their
+ * handler functions to provide additional context, such as the chat request model.
+ */
+let ChatToolRequestService = class ChatToolRequestService {
+    getChatToolRequests(request) {
+        const toolRequests = request.message.toolRequests.size > 0 ? [...request.message.toolRequests.values()] : undefined;
+        if (!toolRequests) {
+            return [];
+        }
+        return this.toChatToolRequests(toolRequests, request);
+    }
+    toChatToolRequests(toolRequests, request) {
+        if (!toolRequests) {
+            return [];
+        }
+        return toolRequests.map(toolRequest => this.toChatToolRequest(toolRequest, request));
+    }
+    toChatToolRequest(toolRequest, request) {
+        return {
+            ...toolRequest,
+            handler: async (arg_string) => toolRequest.handler(arg_string, request)
+        };
+    }
+};
+exports.ChatToolRequestService = ChatToolRequestService;
+exports.ChatToolRequestService = ChatToolRequestService = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], ChatToolRequestService);
+//# sourceMappingURL=chat-tool-request-service.js.map

package/lib/common/chat-tool-request-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chat-tool-request-service.js","sourceRoot":"","sources":["../../src/common/chat-tool-request-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAGhF,4DAA0D;AAU1D;;;;;GAKG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAE/B,mBAAmB,CAAC,OAA6B;QAC7C,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACpH,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,kBAAkB,CAAC,YAAuC,EAAE,OAA6B;QACrF,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IACzF,CAAC;IAES,iBAAiB,CAAC,WAAwB,EAAE,OAA6B;QAC/E,OAAO;YACH,GAAG,WAAW;YACd,OAAO,EAAE,KAAK,EAAE,UAAkB,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC;SAClF,CAAC;IACN,CAAC;CAEJ,CAAA;AAxBY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAwBlC"}

package/lib/common/command-chat-agents.js

@@ -280,7 +280,7 @@ let CommandChatAgent = class CommandChatAgent extends chat_agents_1.AbstractText
             const theiaCommand = this.commandRegistry.getCommand(parsedCommand.commandId);
             if (theiaCommand === undefined) {
                 console.error(`No Theia Command with id ${parsedCommand.commandId}`);
-                request.response.cancel();
+                request.cancel();
             }
             const args = parsedCommand.arguments !== undefined &&
                 parsedCommand.arguments.length > 0

package/lib/common/command-chat-agents.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-chat-agents.js","sourceRoot":"","sources":["../../src/common/command-chat-agents.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command-chat-agents.js","sourceRoot":"","sources":["../../src/common/command-chat-agents.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@theia/ai-chat",
-  "version": "1.57.0",
+  "version": "1.58.0",
   "description": "Theia - AI Chat Extension",
   "dependencies": {
-    "@theia/ai-core": "1.57.0",
-    "@theia/ai-history": "1.57.0",
-    "@theia/core": "1.57.0",
-    "@theia/filesystem": "1.57.0",
-    "@theia/workspace": "1.57.0",
+    "@theia/ai-core": "1.58.0",
+    "@theia/ai-history": "1.58.0",
+    "@theia/core": "1.58.0",
+    "@theia/editor": "1.58.0",
+    "@theia/filesystem": "1.58.0",
+    "@theia/monaco": "1.58.0",
+    "@theia/workspace": "1.58.0",
     "minimatch": "^5.1.0",
     "tslib": "^2.6.2"
   },
@@ -45,10 +47,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.57.0"
+    "@theia/ext-scripts": "1.58.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "ca1d948d897b9a774f8cd68bb76bd2f335609cd4"
+  "gitHead": "6594f32b9727aea20d88934bf386dee06d08fa5e"
 }

package/src/browser/ai-chat-frontend-module.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { Agent, AgentService, AIVariableContribution } from '@theia/ai-core/lib/common';
-import { bindContributionProvider } from '@theia/core';
+import { bindContributionProvider, ResourceResolver } from '@theia/core';
 import { FrontendApplicationContribution, PreferenceContribution } from '@theia/core/lib/browser';
 import { ContainerModule } from '@theia/core/shared/inversify';
 import {
@@ -34,15 +34,20 @@ import { OrchestratorChatAgent, OrchestratorChatAgentId } from '../common/orches
 import { DefaultResponseContentFactory, DefaultResponseContentMatcherProvider, ResponseContentMatcherProvider } from '../common/response-content-matcher';
 import { UniversalChatAgent } from '../common/universal-chat-agent';
 import { aiChatPreferences } from './ai-chat-preferences';
+import { ChangeSetElementArgs, ChangeSetFileElement, ChangeSetFileElementFactory } from './change-set-file-element';
 import { AICustomAgentsFrontendApplicationContribution } from './custom-agent-frontend-application-contribution';
 import { FrontendChatServiceImpl } from './frontend-chat-service';
 import { CustomAgentFactory } from './custom-agent-factory';
-import { O1ChatAgent } from '../common/o1-chat-agent';
+import { ChatToolRequestService } from '../common/chat-tool-request-service';
+import { ChangeSetFileResourceResolver } from './change-set-file-resource';
+import { ChangeSetFileService } from './change-set-file-service';
 
 export default new ContainerModule(bind => {
     bindContributionProvider(bind, Agent);
     bindContributionProvider(bind, ChatAgent);
 
+    bind(ChatToolRequestService).toSelf().inSingletonScope();
+
     bind(ChatAgentServiceImpl).toSelf().inSingletonScope();
     bind(ChatAgentService).toService(ChatAgentServiceImpl);
     bind(DefaultChatAgentId).toConstantValue({ id: OrchestratorChatAgentId });
@@ -64,10 +69,6 @@ export default new ContainerModule(bind => {
     bind(Agent).toService(OrchestratorChatAgent);
     bind(ChatAgent).toService(OrchestratorChatAgent);
 
-    bind(O1ChatAgent).toSelf().inSingletonScope();
-    bind(Agent).toService(O1ChatAgent);
-    bind(ChatAgent).toService(O1ChatAgent);
-
     bind(UniversalChatAgent).toSelf().inSingletonScope();
     bind(Agent).toService(UniversalChatAgent);
     bind(ChatAgent).toService(UniversalChatAgent);
@@ -95,4 +96,14 @@ export default new ContainerModule(bind => {
             return agent;
         });
     bind(FrontendApplicationContribution).to(AICustomAgentsFrontendApplicationContribution).inSingletonScope();
+
+    bind(ChangeSetFileService).toSelf().inSingletonScope();
+    bind(ChangeSetFileElementFactory).toFactory(ctx => (args: ChangeSetElementArgs) => {
+        const container = ctx.container.createChild();
+        container.bind(ChangeSetElementArgs).toConstantValue(args);
+        container.bind(ChangeSetFileElement).toSelf().inSingletonScope();
+        return container.get(ChangeSetFileElement);
+    });
+    bind(ChangeSetFileResourceResolver).toSelf().inSingletonScope();
+    bind(ResourceResolver).toService(ChangeSetFileResourceResolver);
 });

package/src/browser/change-set-file-element.ts

@@ -0,0 +1,137 @@
+// *****************************************************************************
+// 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 { URI } from '@theia/core';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { ChangeSetElement, ChangeSetImpl } from '../common';
+import { createChangeSetFileUri } from './change-set-file-resource';
+import { ChangeSetFileService } from './change-set-file-service';
+
+export const ChangeSetFileElementFactory = Symbol('ChangeSetFileElementFactory');
+export type ChangeSetFileElementFactory = (elementProps: ChangeSetElementArgs) => ChangeSetFileElement;
+
+export const ChangeSetElementArgs = Symbol('ChangeSetElementArgs');
+export interface ChangeSetElementArgs extends Partial<ChangeSetElement> {
+    /** The URI of the element, expected to be unique within the same change set. */
+    uri: URI;
+    /** The change set containing this element. */
+    changeSet: ChangeSetImpl;
+    /** The id of the chat session containing this change set element. */
+    chatSessionId: string;
+    /**
+     * The state of the file after the changes have been applied.
+     * If `undefined`, there is no change.
+     */
+    targetState?: string;
+};
+
+@injectable()
+export class ChangeSetFileElement implements ChangeSetElement {
+
+    @inject(ChangeSetElementArgs)
+    protected readonly elementProps: ChangeSetElementArgs;
+
+    @inject(ChangeSetFileService)
+    protected readonly changeSetFileService: ChangeSetFileService;
+
+    protected _state: 'pending' | 'applied' | 'discarded' | undefined;
+
+    protected originalContent: string | undefined;
+
+    @postConstruct()
+    init(): void {
+        this.obtainOriginalContent();
+    }
+
+    protected async obtainOriginalContent(): Promise<void> {
+        this.originalContent = await this.changeSetFileService.read(this.uri);
+    }
+
+    get uri(): URI {
+        return this.elementProps.uri;
+    }
+
+    get changedUri(): URI {
+        return createChangeSetFileUri(this.elementProps.chatSessionId, this.uri);
+    }
+
+    get name(): string {
+        return this.elementProps.name ?? this.changeSetFileService.getName(this.uri);
+    }
+
+    get icon(): string | undefined {
+        return this.elementProps.icon ?? this.changeSetFileService.getIcon(this.uri);
+    }
+
+    get additionalInfo(): string | undefined {
+        return this.changeSetFileService.getAdditionalInfo(this.uri);
+    }
+
+    get state(): 'pending' | 'applied' | 'discarded' | undefined {
+        return this._state ?? this.elementProps.state;
+    }
+
+    protected set state(value: 'pending' | 'applied' | 'discarded' | undefined) {
+        this._state = value;
+        this.elementProps.changeSet.notifyChange();
+    }
+
+    get type(): 'add' | 'modify' | 'delete' | undefined {
+        return this.elementProps.type;
+    }
+
+    get data(): { [key: string]: unknown; } | undefined {
+        return this.elementProps.data;
+    };
+
+    get targetState(): string {
+        return this.elementProps.targetState ?? '';
+    }
+
+    async open(): Promise<void> {
+        this.changeSetFileService.open(this);
+    }
+
+    async openChange(): Promise<void> {
+        this.changeSetFileService.openDiff(
+            this.uri,
+            this.changedUri
+        );
+    }
+
+    async accept(contents?: string): Promise<void> {
+        this.state = 'applied';
+        if (this.type === 'delete') {
+            await this.changeSetFileService.delete(this.uri);
+            this.state = 'applied';
+            return;
+        }
+
+        await this.changeSetFileService.write(this.uri, contents !== undefined ? contents : this.targetState);
+    }
+
+    async discard(): Promise<void> {
+        this.state = 'discarded';
+        if (this.type === 'add') {
+            await this.changeSetFileService.delete(this.uri);
+            return;
+        }
+        if (this.originalContent) {
+            await this.changeSetFileService.write(this.uri, this.originalContent);
+        }
+    }
+
+}

package/src/browser/change-set-file-resource.ts

@@ -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
+// *****************************************************************************
+
+import { Resource, ResourceResolver, ResourceSaveOptions, URI } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { ChatService } from '../common';
+import { ChangeSetFileElement } from './change-set-file-element';
+
+export const CHANGE_SET_FILE_RESOURCE_SCHEME = 'changeset-file';
+const QUERY = 'uri=';
+
+export function createChangeSetFileUri(chatSessionId: string, elementUri: URI): URI {
+    return new URI(CHANGE_SET_FILE_RESOURCE_SCHEME + '://' + chatSessionId + '/' + elementUri.path).withQuery(QUERY + encodeURIComponent(elementUri.path.toString()));
+}
+
+/**
+ * A file resource within a chat's change set can be resolved with the following URI:
+ * changeset-file:/<chat-session-id>?uri=<element-uri-without-scheme>
+ */
+@injectable()
+export class ChangeSetFileResourceResolver implements ResourceResolver {
+
+    @inject(ChatService)
+    protected readonly chatService: ChatService;
+
+    async resolve(uri: URI): Promise<Resource> {
+        if (uri.scheme !== CHANGE_SET_FILE_RESOURCE_SCHEME) {
+            throw new Error('The given uri is not a change set file uri: ' + uri);
+        }
+
+        const chatSessionId = uri.authority;
+        const session = this.chatService.getSession(chatSessionId);
+        if (!session) {
+            throw new Error('Chat session not found: ' + chatSessionId);
+        }
+
+        const changeSet = session.model.changeSet;
+        if (!changeSet) {
+            throw new Error('Chat session has no change set: ' + chatSessionId);
+        }
+
+        const fileUri = decodeURIComponent(uri.query.toString().replace(QUERY, ''));
+        const element = changeSet.getElements().find(e => e.uri.path.toString() === fileUri);
+        if (!(element instanceof ChangeSetFileElement)) {
+            throw new Error('Change set element not found: ' + fileUri);
+        }
+
+        return {
+            uri,
+            readOnly: false,
+            initiallyDirty: true,
+            readContents: async () => element.targetState ?? '',
+            saveContents: async (content: string, options?: ResourceSaveOptions): Promise<void> => {
+                element.accept(content);
+            },
+            dispose: () => { }
+        };
+    }
+
+}
+

package/src/browser/change-set-file-service.ts

@@ -0,0 +1,136 @@
+// *****************************************************************************
+// 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 { ILogger, UNTITLED_SCHEME, URI } from '@theia/core';
+import { DiffUris, LabelProvider, OpenerService, open } from '@theia/core/lib/browser';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { EditorManager } from '@theia/editor/lib/browser';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
+import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+import { ChangeSetFileElement } from './change-set-file-element';
+
+@injectable()
+export class ChangeSetFileService {
+    @inject(ILogger)
+    protected readonly logger: ILogger;
+
+    @inject(WorkspaceService)
+    protected readonly wsService: WorkspaceService;
+
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
+
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
+
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    @inject(MonacoWorkspace)
+    protected readonly monacoWorkspace: MonacoWorkspace;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    async read(uri: URI): Promise<string | undefined> {
+        const exists = await this.fileService.exists(uri);
+        if (!exists) {
+            return undefined;
+        }
+        try {
+            const document = this.monacoWorkspace.getTextDocument(uri.toString());
+            if (document) {
+                return document.getText();
+            }
+            return (await this.fileService.readFile(uri)).value.toString();
+        } catch (error) {
+            this.logger.error('Failed to read original content of change set file element.', error);
+            return undefined;
+        }
+    }
+
+    getName(uri: URI): string {
+        return this.labelProvider.getName(uri);
+    }
+
+    getIcon(uri: URI): string | undefined {
+        return this.labelProvider.getIcon(uri);
+    }
+
+    getAdditionalInfo(uri: URI): string | undefined {
+        const wsUri = this.wsService.getWorkspaceRootUri(uri);
+        if (wsUri) {
+            const wsRelative = wsUri.relative(uri);
+            if (wsRelative?.hasDir) {
+                return `${wsRelative.dir.toString()}`;
+            }
+            return '';
+        }
+        return this.labelProvider.getLongName(uri.parent);
+    }
+
+    async open(element: ChangeSetFileElement): Promise<void> {
+        const exists = await this.fileService.exists(element.uri);
+        if (exists) {
+            await open(this.openerService, element.uri);
+            return;
+        }
+        await this.editorManager.open(element.changedUri, {
+            mode: 'reveal'
+        });
+    }
+
+    async openDiff(originalUri: URI, suggestedUri: URI): Promise<void> {
+        const exists = await this.fileService.exists(originalUri);
+        const openedUri = exists ? originalUri : originalUri.withScheme(UNTITLED_SCHEME);
+        // Currently we don't have a great way to show the suggestions in a diff editor with accept/reject buttons
+        // So we just use plain diffs with the suggestions as original and the current state as modified, so users can apply changes in their current state
+        // But this leads to wrong colors and wrong label (revert change instead of accept change)
+        const diffUri = DiffUris.encode(openedUri, suggestedUri,
+            `AI Changes: ${this.labelProvider.getName(originalUri)}`,
+        );
+        open(this.openerService, diffUri);
+    }
+
+    async delete(uri: URI): Promise<void> {
+        const exists = await this.fileService.exists(uri);
+        if (exists) {
+            await this.fileService.delete(uri);
+        }
+    }
+
+    async write(uri: URI, targetState: string): Promise<void> {
+        const exists = await this.fileService.exists(uri);
+        if (!exists) {
+            await this.fileService.create(uri, targetState);
+        }
+        await this.doWrite(uri, targetState);
+    }
+
+    protected async doWrite(uri: URI, text: string): Promise<void> {
+        const document = this.monacoWorkspace.getTextDocument(uri.toString());
+        if (document) {
+            await this.monacoWorkspace.applyBackgroundEdit(document, [{
+                range: document.textEditorModel.getFullModelRange(),
+                text
+            }], (editor, wasDirty) => editor === undefined || !wasDirty);
+        } else {
+            await this.fileService.write(uri, text);
+        }
+    }
+
+}