@theia/plugin-ext 1.63.0-next.24 → 1.63.0

package/package.json

@@ -1,37 +1,38 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.63.0-next.24+83b50cc66",
+  "version": "1.63.0",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/bulk-edit": "1.63.0-next.24+83b50cc66",
-    "@theia/callhierarchy": "1.63.0-next.24+83b50cc66",
-    "@theia/console": "1.63.0-next.24+83b50cc66",
-    "@theia/core": "1.63.0-next.24+83b50cc66",
-    "@theia/debug": "1.63.0-next.24+83b50cc66",
-    "@theia/editor": "1.63.0-next.24+83b50cc66",
-    "@theia/editor-preview": "1.63.0-next.24+83b50cc66",
-    "@theia/file-search": "1.63.0-next.24+83b50cc66",
-    "@theia/filesystem": "1.63.0-next.24+83b50cc66",
-    "@theia/markers": "1.63.0-next.24+83b50cc66",
-    "@theia/messages": "1.63.0-next.24+83b50cc66",
-    "@theia/monaco": "1.63.0-next.24+83b50cc66",
+    "@theia/ai-mcp": "1.63.0",
+    "@theia/bulk-edit": "1.63.0",
+    "@theia/callhierarchy": "1.63.0",
+    "@theia/console": "1.63.0",
+    "@theia/core": "1.63.0",
+    "@theia/debug": "1.63.0",
+    "@theia/editor": "1.63.0",
+    "@theia/editor-preview": "1.63.0",
+    "@theia/file-search": "1.63.0",
+    "@theia/filesystem": "1.63.0",
+    "@theia/markers": "1.63.0",
+    "@theia/messages": "1.63.0",
+    "@theia/monaco": "1.63.0",
     "@theia/monaco-editor-core": "1.96.302",
-    "@theia/navigator": "1.63.0-next.24+83b50cc66",
-    "@theia/notebook": "1.63.0-next.24+83b50cc66",
-    "@theia/output": "1.63.0-next.24+83b50cc66",
-    "@theia/plugin": "1.63.0-next.24+83b50cc66",
-    "@theia/preferences": "1.63.0-next.24+83b50cc66",
-    "@theia/scm": "1.63.0-next.24+83b50cc66",
-    "@theia/search-in-workspace": "1.63.0-next.24+83b50cc66",
-    "@theia/task": "1.63.0-next.24+83b50cc66",
-    "@theia/terminal": "1.63.0-next.24+83b50cc66",
-    "@theia/test": "1.63.0-next.24+83b50cc66",
-    "@theia/timeline": "1.63.0-next.24+83b50cc66",
-    "@theia/typehierarchy": "1.63.0-next.24+83b50cc66",
-    "@theia/variable-resolver": "1.63.0-next.24+83b50cc66",
-    "@theia/workspace": "1.63.0-next.24+83b50cc66",
+    "@theia/navigator": "1.63.0",
+    "@theia/notebook": "1.63.0",
+    "@theia/output": "1.63.0",
+    "@theia/plugin": "1.63.0",
+    "@theia/preferences": "1.63.0",
+    "@theia/scm": "1.63.0",
+    "@theia/search-in-workspace": "1.63.0",
+    "@theia/task": "1.63.0",
+    "@theia/terminal": "1.63.0",
+    "@theia/test": "1.63.0",
+    "@theia/timeline": "1.63.0",
+    "@theia/typehierarchy": "1.63.0",
+    "@theia/variable-resolver": "1.63.0",
+    "@theia/workspace": "1.63.0",
     "@types/mime": "^2.0.1",
     "@vscode/debugprotocol": "^1.51.0",
     "@vscode/proxy-agent": "^0.13.2",
@@ -89,7 +90,7 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.62.0",
+    "@theia/ext-scripts": "1.63.0",
     "@types/decompress": "^4.2.2",
     "@types/escape-html": "^0.0.20",
     "@types/lodash.clonedeep": "^4.5.3",
@@ -98,5 +99,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "83b50cc66b001a5b9100ccd944dcace04cd4ae2e"
+  "gitHead": "facf442522991134333495a0b90cf56a56990280"
 }

package/src/common/lm-protocol.ts

@@ -0,0 +1,137 @@
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource.
+//
+// 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 { UriComponents } from './uri-components';
+
+/**
+ * Protocol interfaces for MCP server definition providers.
+ */
+
+export interface McpStdioServerDefinitionDto {
+    /**
+     * The human-readable name of the server.
+     */
+    readonly label: string;
+
+    /**
+     * The working directory used to start the server.
+     */
+    cwd?: UriComponents;
+
+    /**
+     * The command used to start the server. Node.js-based servers may use
+     * `process.execPath` to use the editor's version of Node.js to run the script.
+     */
+    command: string;
+
+    /**
+     * Additional command-line arguments passed to the server.
+     */
+    args?: string[];
+
+    /**
+     * Optional additional environment information for the server. Variables
+     * in this environment will overwrite or remove (if null) the default
+     * environment variables of the editor's extension host.
+     */
+    env?: Record<string, string | number | null>;
+
+    /**
+     * Optional version identification for the server. If this changes, the
+     * editor will indicate that tools have changed and prompt to refresh them.
+     */
+    version?: string;
+
+}
+
+/**
+ * McpHttpServerDefinition represents an MCP server available using the
+ * Streamable HTTP transport.
+ */
+export interface McpHttpServerDefinitionDto {
+    /**
+     * The human-readable name of the server.
+     */
+    readonly label: string;
+
+    /**
+     * The URI of the server. The editor will make a POST request to this URI
+     * to begin each session.
+     */
+    uri: UriComponents;
+
+    /**
+     * Optional additional heads included with each request to the server.
+     */
+    headers?: Record<string, string>;
+
+    /**
+     * Optional version identification for the server. If this changes, the
+     * editor will indicate that tools have changed and prompt to refresh them.
+     */
+    version?: string;
+}
+
+/**
+ * Definitions that describe different types of Model Context Protocol servers,
+ * which can be returned from the {@link McpServerDefinitionProvider}.
+ */
+export type McpServerDefinitionDto = McpStdioServerDefinitionDto | McpHttpServerDefinitionDto;
+export const isMcpHttpServerDefinitionDto = (definition: McpServerDefinitionDto): definition is McpHttpServerDefinitionDto => 'uri' in definition;
+/**
+ * Main side of the MCP server definition registry.
+ */
+export interface McpServerDefinitionRegistryMain {
+    /**
+     * Register an MCP server definition provider.
+     */
+    $registerMcpServerDefinitionProvider(handle: number, name: string): void;
+
+    /**
+     * Unregister an MCP server definition provider.
+     */
+    $unregisterMcpServerDefinitionProvider(handle: number): void;
+
+    /**
+     * Notify that server definitions have changed.
+     */
+    $onDidChangeMcpServerDefinitions(handle: number): void;
+
+    /**
+     * Get server definitions from a provider.
+     */
+    $getServerDefinitions(handle: number): Promise<McpServerDefinitionDto[]>;
+
+    /**
+     * Resolve a server definition.
+     */
+    $resolveServerDefinition(handle: number, server: McpServerDefinitionDto): Promise<McpServerDefinitionDto | undefined>;
+}
+
+/**
+ * Extension side of the MCP server definition registry.
+ */
+export interface McpServerDefinitionRegistryExt {
+    /**
+     * Request server definitions from a provider.
+     */
+    $provideServerDefinitions(handle: number): Promise<McpServerDefinitionDto[]>;
+
+    /**
+     * Resolve a server definition from a provider.
+     */
+    $resolveServerDefinition(handle: number, server: McpServerDefinitionDto): Promise<McpServerDefinitionDto | undefined>;
+}

package/src/common/plugin-api-rpc.ts

@@ -127,6 +127,7 @@ import { AccessibilityInformation } from '@theia/core/lib/common/accessibility';
 import { TreeDelta } from '@theia/test/lib/common/tree-delta';
 import { TestItemDTO, TestOutputDTO, TestRunDTO, TestRunProfileDTO, TestRunRequestDTO, TestStateChangeDTO } from './test-types';
 import { ArgumentProcessor } from './commands';
+import { McpServerDefinitionRegistryMain, McpServerDefinitionRegistryExt } from './lm-protocol';
 
 export interface PreferenceData {
     [scope: number]: any;
@@ -768,6 +769,9 @@ export interface WorkspaceMain {
     $registerCanonicalUriProvider(scheme: string): Promise<void | undefined>;
     $unregisterCanonicalUriProvider(scheme: string): void;
     $getCanonicalUri(uri: string, targetScheme: string, token: theia.CancellationToken): Promise<string | undefined>;
+    $resolveDecoding(resource: UriComponents | undefined, options?: { encoding?: string }): Promise<{ preferredEncoding: string; guessEncoding: boolean; }>;
+    $resolveEncoding(resource: UriComponents | undefined, options?: { encoding?: string }): Promise<{ encoding: string; hasBOM: boolean }>;
+    $getValidEncoding(uri: UriComponents | undefined, detectedEncoding: string | undefined, opts: { encoding: string; } | undefined): Promise<string>;
 }
 
 export interface WorkspaceExt {
@@ -1366,6 +1370,7 @@ export interface ModelAddedData {
     EOL: string;
     modeId: string;
     isDirty: boolean;
+    encoding: string;
 }
 
 export interface TextEditorAddData {
@@ -1415,13 +1420,14 @@ export interface DocumentsExt {
     $acceptModelSaved(strUrl: UriComponents): void;
     $acceptModelWillSave(strUrl: UriComponents, reason: theia.TextDocumentSaveReason, saveTimeout: number): Promise<SingleEditOperation[]>;
     $acceptDirtyStateChanged(strUrl: UriComponents, isDirty: boolean): void;
+    $acceptEncodingChanged(strUrl: UriComponents, encoding: string): void;
     $acceptModelChanged(strUrl: UriComponents, e: ModelChangedEvent, isDirty: boolean): void;
 }
 
 export interface DocumentsMain {
-    $tryCreateDocument(options?: { language?: string; content?: string; }): Promise<UriComponents>;
+    $tryCreateDocument(options?: { language?: string; content?: string; encoding?: string }): Promise<UriComponents>;
     $tryShowDocument(uri: UriComponents, options?: TextDocumentShowOptions): Promise<void>;
-    $tryOpenDocument(uri: UriComponents): Promise<boolean>;
+    $tryOpenDocument(uri: UriComponents, encoding?: string): Promise<boolean>;
     $trySaveDocument(uri: UriComponents): Promise<boolean>;
 }
 
@@ -2346,7 +2352,8 @@ export const PLUGIN_RPC_CONTEXT = {
     TELEMETRY_MAIN: createProxyIdentifier<TelemetryMain>('TelemetryMain'),
     LOCALIZATION_MAIN: createProxyIdentifier<LocalizationMain>('LocalizationMain'),
     TESTING_MAIN: createProxyIdentifier<TestingMain>('TestingMain'),
-    URI_MAIN: createProxyIdentifier<UriMain>('UriMain')
+    URI_MAIN: createProxyIdentifier<UriMain>('UriMain'),
+    MCP_SERVER_DEFINITION_REGISTRY_MAIN: createProxyIdentifier<McpServerDefinitionRegistryMain>('McpServerDefinitionRegistryMain')
 };
 
 export const MAIN_RPC_CONTEXT = {
@@ -2389,7 +2396,8 @@ export const MAIN_RPC_CONTEXT = {
     TABS_EXT: createProxyIdentifier<TabsExt>('TabsExt'),
     TELEMETRY_EXT: createProxyIdentifier<TelemetryExt>('TelemetryExt)'),
     TESTING_EXT: createProxyIdentifier<TestingExt>('TestingExt'),
-    URI_EXT: createProxyIdentifier<UriExt>('UriExt')
+    URI_EXT: createProxyIdentifier<UriExt>('UriExt'),
+    MCP_SERVER_DEFINITION_REGISTRY_EXT: createProxyIdentifier<McpServerDefinitionRegistryExt>('McpServerDefinitionRegistryExt')
 };
 
 export interface TasksExt {

package/src/common/plugin-protocol.ts

@@ -104,6 +104,7 @@ export interface PluginPackageContribution {
     notebooks?: PluginPackageNotebook[];
     notebookRenderer?: PluginNotebookRendererContribution[];
     notebookPreload?: PluginPackageNotebookPreload[];
+    mcpServerDefinitionProviders?: PluginPackageMcpServerDefinitionProviderContribution[];
 }
 
 export interface PluginPackageNotebook {
@@ -126,6 +127,12 @@ export interface PluginPackageNotebookPreload {
     entrypoint: string;
 }
 
+export interface PluginPackageMcpServerDefinitionProviderContribution {
+    id: string;
+    label: string;
+    description?: string;
+}
+
 export interface PluginPackageAuthenticationProvider {
     id: string;
     label: string;

package/src/hosted/browser/worker/worker-plugin-module.ts

@@ -35,6 +35,7 @@ import { EnvExtImpl } from '../../../plugin/env';
 import { WorkerEnvExtImpl } from './worker-env-ext';
 import { DebugExtImpl } from '../../../plugin/debug/debug-ext';
 import { LocalizationExtImpl } from '../../../plugin/localization-ext';
+import { EncodingService } from '@theia/core/lib/common/encoding-service';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const ctx = self as any;
@@ -70,6 +71,7 @@ export default new ContainerModule(bind => {
         child.bind(DebugExtImpl).toSelf();
         return createDebugExtStub(child);
     }).inSingletonScope();
+    bind(EncodingService).toSelf().inSingletonScope();
     bind(EditorsAndDocumentsExtImpl).toSelf().inSingletonScope();
     bind(WorkspaceExtImpl).toSelf().inSingletonScope();
     bind(MessageRegistryExt).toSelf().inSingletonScope();

package/src/hosted/node/plugin-host-module.ts

@@ -36,6 +36,8 @@ import { WebviewsExtImpl } from '../../plugin/webviews';
 import { TerminalServiceExtImpl } from '../../plugin/terminal-ext';
 import { InternalSecretsExt, SecretsExtImpl } from '../../plugin/secrets-ext';
 import { setupPluginHostLogger } from './plugin-host-logger';
+import { LmExtImpl } from '../../plugin/lm-ext';
+import { EncodingService } from '@theia/core/lib/common/encoding-service';
 
 export default new ContainerModule(bind => {
     const channel = new IPCChannel();
@@ -63,6 +65,8 @@ export default new ContainerModule(bind => {
     bind(SecretsExtImpl).toSelf().inSingletonScope();
     bind(PreferenceRegistryExtImpl).toSelf().inSingletonScope();
     bind(DebugExtImpl).toSelf().inSingletonScope();
+    bind(LmExtImpl).toSelf().inSingletonScope();
+    bind(EncodingService).toSelf().inSingletonScope();
     bind(EditorsAndDocumentsExtImpl).toSelf().inSingletonScope();
     bind(WorkspaceExtImpl).toSelf().inSingletonScope();
     bind(MessageRegistryExt).toSelf().inSingletonScope();

package/src/main/browser/comments/comment-thread-widget.tsx

@@ -57,7 +57,6 @@ export class CommentThreadWidget extends BaseWidget {
     protected readonly zoneWidget: MonacoEditorZoneWidget;
     protected readonly containerNodeRoot: Root;
     protected readonly commentGlyphWidget: CommentGlyphWidget;
-    protected readonly contextMenu: CompoundMenuNode;
     protected readonly commentFormRef: RefObject<CommentForm> = React.createRef<CommentForm>();
 
     protected isExpanded?: boolean;
@@ -101,8 +100,8 @@ export class CommentThreadWidget extends BaseWidget {
         this.toDispose.push(this._commentThread.onDidChangeState(_state => {
             this.update();
         }));
-        this.contextMenu = this.menus.getMenu(COMMENT_THREAD_CONTEXT);
-        this.contextMenu.children.forEach(node => {
+        const contextMenu = this.menus.getMenu(COMMENT_THREAD_CONTEXT);
+        contextMenu?.children.forEach(node => {
             if (node.onDidChange) {
                 this.toDispose.push(node.onDidChange(() => {
                     const commentForm = this.commentFormRef.current;
@@ -560,7 +559,7 @@ export class ReviewComment<P extends ReviewComment.Props = ReviewComment.Props>
                     <span className={'isPending'}>{comment.label}</span>
                     <div className={'theia-comments-inline-actions-container'}>
                         <div className={'theia-comments-inline-actions'} role={'toolbar'}>
-                            {hover && menus.getMenuNode(COMMENT_TITLE) && menus.getMenu(COMMENT_TITLE).children.map((node, index): React.ReactNode => CommandMenu.is(node) &&
+                            {hover && menus.getMenuNode(COMMENT_TITLE) && menus.getMenu(COMMENT_TITLE)?.children.map((node, index): React.ReactNode => CommandMenu.is(node) &&
                                 <CommentsInlineAction key={index} {...{
                                     node, nodePath: [...COMMENT_TITLE, node.id], commands, commentThread, commentUniqueId,
                                     contextKeyService, commentsContext
@@ -662,7 +661,7 @@ export class CommentEditContainer extends React.Component<CommentEditContainer.P
                 </div>
             </div>
             <div className={'form-actions'}>
-                {menus.getMenu(COMMENT_CONTEXT).children.map((node, index): React.ReactNode => {
+                {menus.getMenu(COMMENT_CONTEXT)?.children.map((node, index): React.ReactNode => {
                     const onClick = () => {
                         commands.executeCommand(node.id, {
                             commentControlHandle: commentThread.controllerHandle,
@@ -722,7 +721,7 @@ namespace CommentActions {
         contextKeyService: ContextKeyService;
         commentsContext: CommentsContext;
         menuPath: MenuPath,
-        menu: CompoundMenuNode;
+        menu: CompoundMenuNode | undefined;
         commentThread: CommentThread;
         getInput: () => string;
         clearInput: () => void;
@@ -733,7 +732,7 @@ export class CommentActions extends React.Component<CommentActions.Props> {
     override render(): React.ReactNode {
         const { contextKeyService, commentsContext, menuPath, menu, commentThread, getInput, clearInput } = this.props;
         return <div className={'form-actions'}>
-            {menu.children.map((node, index) => CommandMenu.is(node) &&
+            {menu?.children.map((node, index) => CommandMenu.is(node) &&
                 <CommentAction key={index}
                     nodePath={menuPath}
                     node={node}

package/src/main/browser/documents-main.ts

@@ -16,14 +16,14 @@
 import { DocumentsMain, MAIN_RPC_CONTEXT, DocumentsExt } from '../../common/plugin-api-rpc';
 import { UriComponents } from '../../common/uri-components';
 import { EditorsAndDocumentsMain } from './editors-and-documents-main';
-import { DisposableCollection, Disposable, UntitledResourceResolver, CancellationToken } from '@theia/core';
+import { DisposableCollection, Disposable, UntitledResourceResolver } from '@theia/core';
 import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { EditorModelService } from './text-editor-model-service';
-import { EditorOpenerOptions } from '@theia/editor/lib/browser';
+import { EditorOpenerOptions, EncodingMode } from '@theia/editor/lib/browser';
 import URI from '@theia/core/lib/common/uri';
 import { URI as CodeURI } from '@theia/core/shared/vscode-uri';
-import { ApplicationShell, SaveOptions, SaveReason } from '@theia/core/lib/browser';
+import { ApplicationShell, SaveReason } from '@theia/core/lib/browser';
 import { TextDocumentShowOptions } from '../../common/plugin-api-rpc-model';
 import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
 import { OpenerService } from '@theia/core/lib/browser/opener-service';
@@ -33,8 +33,6 @@ import { MonacoLanguages } from '@theia/monaco/lib/browser/monaco-languages';
 import * as monaco from '@theia/monaco-editor-core';
 import { TextDocumentChangeReason } from '../../plugin/types-impl';
 import { NotebookDocumentsMainImpl } from './notebooks/notebook-documents-main';
-import { MonacoEditorProvider, SAVE_PARTICIPANT_DEFAULT_ORDER } from '@theia/monaco/lib/browser/monaco-editor-provider';
-import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
@@ -99,8 +97,7 @@ export class DocumentsMainImpl implements DocumentsMain, Disposable {
         private openerService: OpenerService,
         private shell: ApplicationShell,
         private untitledResourceResolver: UntitledResourceResolver,
-        private languageService: MonacoLanguages,
-        monacoEditorProvider: MonacoEditorProvider
+        private languageService: MonacoLanguages
     ) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.DOCUMENTS_EXT);
 
@@ -114,39 +111,36 @@ export class DocumentsMainImpl implements DocumentsMain, Disposable {
         this.toDispose.push(modelService.onModelSaved(m => {
             this.proxy.$acceptModelSaved(m.textEditorModel.uri);
         }));
-        this.toDispose.push(monacoEditorProvider.registerSaveParticipant(({
-            order: SAVE_PARTICIPANT_DEFAULT_ORDER,
-            applyChangesOnSave: async (
-                editor: MonacoEditor,
-                cancellationToken: CancellationToken,
-                options: SaveOptions): Promise<void> => {
-
-                const saveReason = options.saveReason ?? SaveReason.Manual;
-
-                const edits = await this.proxy.$acceptModelWillSave(editor.uri.toComponents(), saveReason.valueOf(), this.saveTimeout);
-                const editOperations: monaco.editor.IIdentifiedSingleEditOperation[] = [];
-                for (const edit of edits) {
-                    const { range, text } = edit;
-                    if (!range && !text) {
-                        continue;
-                    }
-                    if (range && range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn && !edit.text) {
-                        continue;
-                    }
-
-                    editOperations.push({
-                        range: range ? monaco.Range.lift(range) : editor.document.textEditorModel.getFullModelRange(),
-                        /* eslint-disable-next-line no-null/no-null */
-                        text: text || null,
-                        forceMoveMarkers: edit.forceMoveMarkers
-                    });
+        this.toDispose.push(modelService.onModelWillSave(async e => {
+
+            const saveReason = e.options?.saveReason ?? SaveReason.Manual;
+
+            const edits = await this.proxy.$acceptModelWillSave(new URI(e.model.uri).toComponents(), saveReason.valueOf(), this.saveTimeout);
+            const editOperations: monaco.editor.IIdentifiedSingleEditOperation[] = [];
+            for (const edit of edits) {
+                const { range, text } = edit;
+                if (!range && !text) {
+                    continue;
+                }
+                if (range && range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn && !edit.text) {
+                    continue;
                 }
-                editor.document.textEditorModel.applyEdits(editOperations);
+
+                editOperations.push({
+                    range: range ? monaco.Range.lift(range) : e.model.textEditorModel.getFullModelRange(),
+                    /* eslint-disable-next-line no-null/no-null */
+                    text: text || null,
+                    forceMoveMarkers: edit.forceMoveMarkers
+                });
             }
-        })));
+            e.model.textEditorModel.applyEdits(editOperations);
+        }));
         this.toDispose.push(modelService.onModelDirtyChanged(m => {
             this.proxy.$acceptDirtyStateChanged(m.textEditorModel.uri, m.dirty);
         }));
+        this.toDispose.push(modelService.onModelEncodingChanged(e => {
+            this.proxy.$acceptEncodingChanged(e.model.textEditorModel.uri, e.encoding);
+        }));
     }
 
     dispose(): void {
@@ -192,10 +186,11 @@ export class DocumentsMainImpl implements DocumentsMain, Disposable {
         }
     }
 
-    async $tryCreateDocument(options?: { language?: string; content?: string; }): Promise<UriComponents> {
+    async $tryCreateDocument(options?: { language?: string; content?: string; encoding?: string }): Promise<UriComponents> {
         const language = options?.language && this.languageService.getExtension(options.language);
         const content = options?.content;
-        const resource = await this.untitledResourceResolver.createUntitledResource(content, language);
+        const encoding = options?.encoding;
+        const resource = await this.untitledResourceResolver.createUntitledResource(content, language, undefined, encoding);
         return monaco.Uri.parse(resource.uri.toString());
     }
 
@@ -217,9 +212,24 @@ export class DocumentsMainImpl implements DocumentsMain, Disposable {
         return this.modelService.save(new URI(CodeURI.revive(uri)));
     }
 
-    async $tryOpenDocument(uri: UriComponents): Promise<boolean> {
-        const ref = await this.modelService.createModelReference(new URI(CodeURI.revive(uri)));
+    async $tryOpenDocument(uri: UriComponents, encoding?: string): Promise<boolean> {
+        // Convert URI to Theia URI
+        const theiaUri = new URI(CodeURI.revive(uri));
+
+        // Create model reference
+        const ref = await this.modelService.createModelReference(theiaUri);
+
         if (ref.object) {
+            // If we have encoding option, make sure to apply it
+            if (encoding && ref.object.setEncoding) {
+                try {
+                    await ref.object.setEncoding(encoding, EncodingMode.Decode);
+                } catch (e) {
+                    // If encoding fails, log error but continue
+                    console.error(`Failed to set encoding ${encoding} for ${theiaUri.toString()}`, e);
+                }
+            }
+
             this.modelReferenceCache.add(ref);
             return true;
         } else {

package/src/main/browser/editors-and-documents-main.ts

@@ -37,6 +37,7 @@ import { SaveableService } from '@theia/core/lib/browser/saveable-service';
 import { TabsMainImpl } from './tabs/tabs-main';
 import { NotebookCellEditorService, NotebookEditorWidgetService } from '@theia/notebook/lib/browser';
 import { SimpleMonacoEditor } from '@theia/monaco/lib/browser/simple-monaco-editor';
+import { EncodingRegistry } from '@theia/core/lib/browser/encoding-registry';
 
 export class EditorsAndDocumentsMain implements Disposable {
 
@@ -48,6 +49,7 @@ export class EditorsAndDocumentsMain implements Disposable {
     private readonly modelService: EditorModelService;
     private readonly editorManager: EditorManager;
     private readonly saveResourceService: SaveableService;
+    private readonly encodingRegistry: EncodingRegistry;
 
     private readonly onTextEditorAddEmitter = new Emitter<TextEditorMain[]>();
     private readonly onTextEditorRemoveEmitter = new Emitter<string[]>();
@@ -69,6 +71,7 @@ export class EditorsAndDocumentsMain implements Disposable {
         this.editorManager = container.get(EditorManager);
         this.modelService = container.get(EditorModelService);
         this.saveResourceService = container.get(SaveableService);
+        this.encodingRegistry = container.get(EncodingRegistry);
 
         this.stateComputer = new EditorAndDocumentStateComputer(d => this.onDelta(d),
             this.editorManager,
@@ -153,7 +156,8 @@ export class EditorsAndDocumentsMain implements Disposable {
             languageId: model.getLanguageId(),
             EOL: model.textEditorModel.getEOL(),
             modeId: model.languageId,
-            isDirty: model.dirty
+            isDirty: model.dirty,
+            encoding: this.encodingRegistry.getEncodingForResource(URI.fromComponents(model.textEditorModel.uri), model.getEncoding())
         };
     }