From a27671488e3ce2b1bca397ea269db106a4b1af45 Mon Sep 17 00:00:00 2001
From: "kengtou.mh" <kengtou.mh@antfin.com>
Date: Mon, 29 Sep 2025 14:46:27 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8E=9F=E6=9C=89?=
 =?UTF-8?q?=20select=20=E8=87=AA=E5=8A=A8=E5=AE=8C=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/components/src/select/index.tsx                 | 9 ++++++++-
 .../src/browser/dialog/file-dialog.view.tsx              | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/select/index.tsx b/packages/components/src/select/index.tsx
index 64a4f17ff8..66d46ab320 100644
--- a/packages/components/src/select/index.tsx
+++ b/packages/components/src/select/index.tsx
@@ -27,6 +27,10 @@ export interface ISelectProps<T = string> {
   disabled?: boolean;
   onChange?: (value: T) => void;
   onSearchChange?: (value: string) => void;
+  /**
+   * 搜索行为不采用默认的 filterOptions 进行筛选，由外部托管
+   */
+  externalSearchBehavior?: boolean;
   /**
    * 当鼠标划过时触发回调
    * @param value 鼠标划过的是第几个 option
@@ -290,6 +294,7 @@ export function Select<T = string>({
   description,
   notMatchWarning,
   onSearchChange,
+  externalSearchBehavior
 }: ISelectProps<T>) {
   const [open, setOpen] = useState<boolean>(false);
   const [searchInput, setSearchInput] = useState('');
@@ -297,6 +302,8 @@ export function Select<T = string>({
   const selectRef = React.useRef<HTMLDivElement | null>(null);
   const overlayRef = React.useRef<HTMLDivElement | null>(null);
 
+  externalSearchBehavior = externalSearchBehavior ?? !!onSearchChange
+
   const handleToggleOpen = useCallback(
     (e: React.MouseEvent) => {
       e.preventDefault();
@@ -526,7 +533,7 @@ export function Select<T = string>({
       {showWarning && <div className='kt-select-warning-text'>{notMatchWarning}</div>}
 
       {open &&
-        !searchInput &&
+        !(externalSearchBehavior && searchInput) &&
         (isDataOptions(filteredOptions) || isDataOptionGroups(filteredOptions) ? (
           <SelectOptionsList
             optionRenderer={optionRenderer}
diff --git a/packages/file-tree-next/src/browser/dialog/file-dialog.view.tsx b/packages/file-tree-next/src/browser/dialog/file-dialog.view.tsx
index eb7b9c2e04..2c28bd6c24 100644
--- a/packages/file-tree-next/src/browser/dialog/file-dialog.view.tsx
+++ b/packages/file-tree-next/src/browser/dialog/file-dialog.view.tsx
@@ -288,6 +288,7 @@ export const FileDialog = ({
           searchPlaceholder={selectPath}
           value={selectPath}
           showSearch={showFilePathSearch}
+          externalSearchBehavior={true}
         >
           {directoryList.map((item, idx) => (
             <Option value={item} key={`${idx} - ${item}`}>

From dba77b2c1be8d3fc7c1f5b5d060acb3f36fb4335 Mon Sep 17 00:00:00 2001
From: "kengtou.mh" <kengtou.mh@antfin.com>
Date: Mon, 1 Dec 2025 01:34:17 +0800
Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=97=B6=E8=A1=A5=E5=85=A8=E5=A4=9A=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vscode/api/main.thread.language.ts        | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/packages/extension/src/browser/vscode/api/main.thread.language.ts b/packages/extension/src/browser/vscode/api/main.thread.language.ts
index dc70f85b47..fa7959028c 100644
--- a/packages/extension/src/browser/vscode/api/main.thread.language.ts
+++ b/packages/extension/src/browser/vscode/api/main.thread.language.ts
@@ -52,6 +52,7 @@ import {
   IdentifiableInlineCompletions,
   IdentifiableInlineEdit,
   MonacoModelIdentifier,
+  RangeSuggestDataDto,
   testGlob,
 } from '../../../common/vscode';
 import { IDocumentFilterDto, fromLanguageSelector } from '../../../common/vscode/converter';
@@ -270,6 +271,22 @@ export class MainThreadLanguages implements IMainThreadLanguages {
 
     const dtoRange = data[ISuggestDataDtoField.range];
 
+    let targetRange: IRange | { insert: IRange; replace: IRange } = defaultRange;
+
+    if (dtoRange) {
+      if (Array.isArray(dtoRange)) {
+        targetRange = MonacoRange.lift({
+          startLineNumber: dtoRange[0],
+          startColumn: dtoRange[1],
+          endLineNumber: dtoRange[2],
+          endColumn: dtoRange[3],
+        })
+      } else {
+        targetRange = dtoRange;
+      }
+    }
+    
+
     return {
       label,
       kind: data[ISuggestDataDtoField.kind] ?? modes.CompletionItemKind.Property,
@@ -280,15 +297,7 @@ export class MainThreadLanguages implements IMainThreadLanguages {
       filterText: data[ISuggestDataDtoField.filterText],
       preselect: data[ISuggestDataDtoField.preselect],
       insertText: data[ISuggestDataDtoField.insertText] ?? (typeof label === 'string' ? label : label.label),
-      range:
-        Array.isArray(dtoRange) && dtoRange.length === 4
-          ? MonacoRange.lift({
-              startLineNumber: dtoRange[0],
-              startColumn: dtoRange[1],
-              endLineNumber: dtoRange[2],
-              endColumn: dtoRange[3],
-            })
-          : defaultRange,
+      range: targetRange,
       insertTextRules: data[ISuggestDataDtoField.insertTextRules],
       commitCharacters: data[ISuggestDataDtoField.commitCharacters],
       additionalTextEdits: data[ISuggestDataDtoField.additionalTextEdits],

From 8e75fe5267eceb7979cf06d63cfa348f1d1bb183 Mon Sep 17 00:00:00 2001
From: "kengtou.mh" <kengtou.mh@antfin.com>
Date: Mon, 11 May 2026 12:17:00 +0800
Subject: [PATCH 3/9] feat: add workspace trust module for security clearance

---
 .claude/workspace-trust-design.md             | 142 ++++++++++++++
 .../references/tsconfig.workspace-trust.json  |   9 +
 configs/ts/tsconfig.build.json                |   3 +
 configs/ts/tsconfig.resolve.json              |   2 +
 packages/extension/package.json               |   1 +
 .../src/browser/extension.service.ts          |  18 ++
 packages/i18n/src/common/en-US.lang.ts        |  25 +++
 packages/i18n/src/common/zh-CN.lang.ts        |  22 +++
 .../browser/preference-settings.service.ts    |   6 +-
 .../startup/src/browser/common-modules.ts     |   2 +
 packages/workspace-trust/package.json         |  30 +++
 packages/workspace-trust/src/browser/index.ts |  37 ++++
 .../workspace-trust-command.contribution.ts   |  56 ++++++
 .../workspace-trust-setting-panel.module.less |  37 ++++
 .../browser/workspace-trust-setting-panel.tsx |  51 +++++
 .../workspace-trust-settings.contribution.ts  |  29 +++
 .../workspace-trust-statusbar.contribution.ts |  34 ++++
 .../browser/workspace-trust.contribution.ts   |  40 ++++
 .../src/browser/workspace-trust.service.ts    | 175 ++++++++++++++++++
 packages/workspace-trust/src/common/index.ts  |  38 ++++
 packages/workspace-trust/src/index.ts         |   2 +
 yarn.lock                                     |  14 ++
 22 files changed, 772 insertions(+), 1 deletion(-)
 create mode 100644 .claude/workspace-trust-design.md
 create mode 100644 configs/ts/references/tsconfig.workspace-trust.json
 create mode 100644 packages/workspace-trust/package.json
 create mode 100644 packages/workspace-trust/src/browser/index.ts
 create mode 100644 packages/workspace-trust/src/browser/workspace-trust-command.contribution.ts
 create mode 100644 packages/workspace-trust/src/browser/workspace-trust-setting-panel.module.less
 create mode 100644 packages/workspace-trust/src/browser/workspace-trust-setting-panel.tsx
 create mode 100644 packages/workspace-trust/src/browser/workspace-trust-settings.contribution.ts
 create mode 100644 packages/workspace-trust/src/browser/workspace-trust-statusbar.contribution.ts
 create mode 100644 packages/workspace-trust/src/browser/workspace-trust.contribution.ts
 create mode 100644 packages/workspace-trust/src/browser/workspace-trust.service.ts
 create mode 100644 packages/workspace-trust/src/common/index.ts
 create mode 100644 packages/workspace-trust/src/index.ts

diff --git a/.claude/workspace-trust-design.md b/.claude/workspace-trust-design.md
new file mode 100644
index 0000000000..c7d029074e
--- /dev/null
+++ b/.claude/workspace-trust-design.md
@@ -0,0 +1,142 @@
+# 工作区信任（受限模式）功能设计文档
+
+## 概述
+
+为 IDE 添加「工作区信任」机制，在首次打开项目时提示用户是否信任该项目目录。若用户选择「受限模式」，则 IDE 仅加载特定的安全插件，防止恶意脚本攻击。
+
+## 背景
+
+当前 IDE 打开项目时会自动加载并激活所有插件（extensions），包括第三方插件。如果项目目录来源不可信，其中的恶意插件脚本可能对用户的系统和数据造成威胁。VS Code 的「Workspace Trust」功能提供了类似的防护机制。
+
+## 核心流程
+
+```
+用户打开项目目录
+    │
+    ├── 查询 globalStorage 中是否已记录该目录的信任状态
+    │       │
+    │       ├── 已记录 → 直接使用已有状态
+    │       └── 未记录 → 弹出信任对话框
+    │                       │
+    │                       ├── 选择「信任」 → 记录为信任状态
+    │                       └── 选择「受限模式」 → 记录为受限状态
+    │
+    ├── 根据信任状态决定是否加载插件
+    │       │
+    │       ├── 信任 → 加载所有插件
+    │       └── 受限 → 仅加载白名单插件
+    │
+    └── 根据信任状态更新 UI
+            │
+            ├── 信任 → 正常 UI
+            └── 受限 → 状态栏显示「受限模式」标识
+```
+
+## 数据设计
+
+### 存储方案
+
+使用 `globalStorage`（全局持久化存储）记录每个目录的信任状态。
+
+存储 key 格式：`workspace_trust_state:<workspace_path>` 存储 value：`"trusted"` | `"restricted"`
+
+例如：
+
+```
+workspace_trust_state:/Users/mahang/Workspace/ide/core = "trusted"
+workspace_trust_state:/tmp/suspicious-project = "restricted"
+```
+
+### 存储模块
+
+使用 `STORAGE_NAMESPACE.GLOBAL_EXTENSIONS` 全局存储空间，以 key-value 形式持久化。
+
+### 信任白名单插件
+
+受限模式下仅允许加载以下插件（可通过配置扩展）：
+
+- `vscode.theme-defaults` - 默认主题
+- `vscode.typescript-language-features` - TypeScript 语言服务
+- `common-extension` - 通用扩展
+
+## 模块设计
+
+### 新增模块：`workspace-trust`
+
+在 `packages/workspace-trust/` 下创建新模块：
+
+#### 文件结构
+
+```
+packages/workspace-trust/
+├── package.json
+├── src/
+│   ├── common/
+│   │   └── index.ts          # 公共常量和类型定义
+│   └── browser/
+│       ├── index.ts                  # 模块入口，BrowserModule 定义
+│       ├── workspace-trust.service.ts    # WorkspaceTrustService
+│       ├── workspace-trust.contribution.ts  # ClientAppContribution, 信任对话框
+│       └── workspace-trust-statusbar.contribution.ts  # 状态栏「受限模式」标识
+```
+
+#### `WorkspaceTrustService` 核心方法
+
+| 方法 | 说明 |
+| --- | --- |
+| `getTrustState(workspacePath: string): WorkspaceTrustState \| undefined` | 获取指定工作区路径的信任状态 |
+| `setTrustState(workspacePath: string, state: WorkspaceTrustState): Promise<void>` | 设置并持久化信任状态 |
+| `isRestricted(): boolean` | 当前工作区是否处于受限模式 |
+| `showTrustDialog(): Promise<WorkspaceTrustState>` | 弹出信任选择对话框 |
+| `ensureTrustDecided(): Promise<void>` | 确保当前工作区已有信任决定（如没有则弹窗） |
+| `getAllowedExtensionIds(): string[]` | 受限模式下允许加载的插件 ID 白名单 |
+
+#### `WorkspaceTrustContribution`
+
+实现 `ClientAppContribution` 接口：
+
+- `initialize()`: 检查当前工作区的信任状态，如果未决定则弹出信任对话框
+  - 此方法在 `ExtensionClientAppContribution.initialize()` 之前执行（通过模块依赖保证）
+
+#### `WorkspaceTrustStatusbarContribution`
+
+- 在受限模式下，于状态栏右侧显示「受限模式」标识
+- 点击可跳转到设置页面解除受限模式
+
+## 集成点
+
+### 1. 信任检查时机
+
+`WorkspaceTrustContribution.initialize()` 在 app 启动的 `initialize` 阶段执行。此时：
+
+1. 获取当前工作区路径（从 `AppConfig.workspaceDir`）
+2. 查询 globalStorage 中是否已有信任状态
+3. 如果没有，弹出信任对话框，等待用户选择
+4. 将用户的决定写入 globalStorage
+
+### 2. 插件过滤时机
+
+修改 `ExtensionServiceImpl.initExtensionMetaData()`，在获取到所有插件元数据后：
+
+1. 检查 `WorkspaceTrustService.isRestricted()`
+2. 如果是受限模式，过滤 `extensionMetaDataArr`，仅保留白名单中的插件
+
+### 3. 状态栏显示
+
+`WorkspaceTrustStatusbarContribution` 在 `onStart()` 阶段：
+
+1. 检查 `WorkspaceTrustService.isRestricted()`
+2. 如果是受限模式，在状态栏右侧添加「受限模式」元素
+
+## 模块依赖
+
+```
+workspace-trust → extension (依赖关系：workspace-trust 模块需要在 extension 之前初始化)
+workspace-trust → workspace (获取工作区路径)
+```
+
+## 后续扩展
+
+- 在设置页面添加「管理工作区信任」入口，允许用户修改已有工作区的信任状态
+- 支持更多类型的白名单插件配置
+- 受限模式下禁用终端、调试等可能存在安全风险的功能
diff --git a/configs/ts/references/tsconfig.workspace-trust.json b/configs/ts/references/tsconfig.workspace-trust.json
new file mode 100644
index 0000000000..c1ded84d43
--- /dev/null
+++ b/configs/ts/references/tsconfig.workspace-trust.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "../../../packages/workspace-trust/src",
+    "outDir": "../../../packages/workspace-trust/lib"
+  },
+  "include": ["../../../packages/workspace-trust/src"],
+  "exclude": ["../../../packages/workspace-trust/__mocks__"]
+}
diff --git a/configs/ts/tsconfig.build.json b/configs/ts/tsconfig.build.json
index 3cc158072a..09b8b4acb1 100644
--- a/configs/ts/tsconfig.build.json
+++ b/configs/ts/tsconfig.build.json
@@ -39,6 +39,9 @@
     {
       "path": "./references/tsconfig.workspace.json"
     },
+    {
+      "path": "./references/tsconfig.workspace-trust.json"
+    },
     {
       "path": "./references/tsconfig.toolbar.json"
     },
diff --git a/configs/ts/tsconfig.resolve.json b/configs/ts/tsconfig.resolve.json
index b56bfd9200..efe6eb17ec 100644
--- a/configs/ts/tsconfig.resolve.json
+++ b/configs/ts/tsconfig.resolve.json
@@ -115,6 +115,8 @@
       "@opensumi/ide-webview/lib/*": ["../packages/webview/src/*"],
       "@opensumi/ide-workspace": ["../packages/workspace/src/index.ts"],
       "@opensumi/ide-workspace/lib/*": ["../packages/workspace/src/*"],
+      "@opensumi/ide-workspace-trust": ["../packages/workspace-trust/src/index.ts"],
+      "@opensumi/ide-workspace-trust/lib/*": ["../packages/workspace-trust/src/*"],
       "@opensumi/ide-workspace-edit": ["../packages/workspace-edit/src/index.ts"],
       "@opensumi/ide-workspace-edit/lib/*": ["../packages/workspace-edit/src/*"],
       "@opensumi/ide-playwright": ["../../../tools/playwright/src/index.ts"],
diff --git a/packages/extension/package.json b/packages/extension/package.json
index cb5a78661e..afb0385e3d 100644
--- a/packages/extension/package.json
+++ b/packages/extension/package.json
@@ -35,6 +35,7 @@
     "@opensumi/ide-terminal-next": "workspace:*",
     "@opensumi/ide-utils": "workspace:*",
     "@opensumi/ide-webview": "workspace:*",
+    "@opensumi/ide-workspace-trust": "workspace:*",
     "address": "^1.1.2",
     "glob-to-regexp": "0.4.1",
     "is-running": "^2.1.0",
diff --git a/packages/extension/src/browser/extension.service.ts b/packages/extension/src/browser/extension.service.ts
index 4eb2e089c3..de16180e3f 100644
--- a/packages/extension/src/browser/extension.service.ts
+++ b/packages/extension/src/browser/extension.service.ts
@@ -37,6 +37,7 @@ import { FileSearchServicePath, IFileSearchService } from '@opensumi/ide-file-se
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 import { IDialogService, IMessageService } from '@opensumi/ide-overlay';
 import { IWorkspaceService } from '@opensumi/ide-workspace';
+import { WorkspaceTrustService } from '@opensumi/ide-workspace-trust';
 
 import {
   ERestartPolicy,
@@ -148,6 +149,9 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi
   @Autowired(IFileServiceClient)
   protected fileServiceClient: IFileServiceClient;
 
+  @Autowired(WorkspaceTrustService)
+  private readonly workspaceTrustService: WorkspaceTrustService;
+
   constructor() {
     super();
 
@@ -235,8 +239,22 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi
     await this.updateExtHostData();
   }
 
+  private isWorkspaceTrustedModuleAvailable() {
+    try {
+      return !!this.workspaceTrustService;
+    } catch (e) {
+      return false;
+    }
+  }
+
   public async activate(): Promise<void> {
     await this.initExtensionMetaData();
+    if (this.isWorkspaceTrustedModuleAvailable()) {
+      // Wait for workspace trust decision before filtering extensions
+      await this.workspaceTrustService.whenTrustDecided();
+      // Apply trust filter if in restricted mode
+      this.extensionMetaDataArr = this.workspaceTrustService.filterExtensions(this.extensionMetaDataArr);
+    }
     await this.initExtensionInstanceData();
     await this.runEagerExtensionsContributes();
     // update nls config by extensions
diff --git a/packages/i18n/src/common/en-US.lang.ts b/packages/i18n/src/common/en-US.lang.ts
index fe3838b588..77744f2fac 100644
--- a/packages/i18n/src/common/en-US.lang.ts
+++ b/packages/i18n/src/common/en-US.lang.ts
@@ -1679,5 +1679,30 @@ export const localizationBundle = {
     'ai.native.mcp.tool.action.edit': 'Edit',
     'ai.native.mcp.tool.action.delete': 'Delete',
     'ai.native.mcp.tool.action.sync': 'Sync',
+
+    // Workspace Trust
+    'workspace.trust.dialog.title': 'Do you trust the authors of the files in this folder?',
+    'workspace.trust.dialog.message':
+      'The current IDE provides features that can automatically execute files in this folder.\n\nIf you do not trust the authors of these files, it is recommended to continue using Restricted Mode, as these files may be malicious.',
+    'workspace.trust.dialog.button.trust': 'Yes, I trust the authors',
+    'workspace.trust.dialog.button.restricted': 'Restricted Mode',
+    'workspace.trust.statusbar.restricted': 'Restricted Mode',
+    'workspace.trust.statusbar.restricted.tooltip': 'Restricted Mode - Some features are disabled for security',
+    'workspace.trust.exitRestricted.label': 'Exit Restricted Mode',
+    'workspace.trust.exitRestricted.description':
+      'Click to trust the authors of files in this workspace and exit Restricted Mode',
+    'workspace.trust.exitRestricted.confirm.message':
+      'Are you sure you want to trust the authors of the files in this workspace and exit Restricted Mode?',
+    'workspace.trust.exitRestricted.confirm.ok': 'Trust and Reload',
+    'workspace.trust.exitRestricted.cancel': 'Cancel',
+    'workspace.trust.settings.group.title': 'Workspace Trust',
+    'workspace.trust.settings.section.title': 'Trust Management',
+    'workspace.trust.settings.trustButton': 'Trust Current Project',
+    'workspace.trust.settings.restrictButton': 'Enter Restricted Mode',
+    'workspace.trust.settings.restrictedDesc':
+      'Currently in Restricted Mode. The current IDE provides features that can automatically execute files in this folder. Click to trust the authors of files in this workspace.',
+    'workspace.trust.settings.trustedDesc':
+      'This workspace is trusted. Click to enter Restricted Mode and disable potentially unsafe features.',
+    'workspace.trust.settings.loading': 'Processing...',
   },
 };
diff --git a/packages/i18n/src/common/zh-CN.lang.ts b/packages/i18n/src/common/zh-CN.lang.ts
index 61c66da50a..6badabda60 100644
--- a/packages/i18n/src/common/zh-CN.lang.ts
+++ b/packages/i18n/src/common/zh-CN.lang.ts
@@ -1436,5 +1436,27 @@ export const localizationBundle = {
     'ai.native.mcp.tool.action.edit': '修改',
     'ai.native.mcp.tool.action.delete': '删除',
     'ai.native.mcp.tool.action.sync': '同步',
+
+    // Workspace Trust
+    'workspace.trust.dialog.title': '是否信任此文件夹中的文件的作者？',
+    'workspace.trust.dialog.message':
+      '当前 IDE 提供可以自动在此文件夹中执行文件的功能。\n\n如果不信任这些文件的作者，则建议继续使用受限模式，因为这些文件可能是恶意文件。',
+    'workspace.trust.dialog.button.trust': '是的，我信任他们',
+    'workspace.trust.dialog.button.restricted': '受限模式',
+    'workspace.trust.statusbar.restricted': '受限模式',
+    'workspace.trust.statusbar.restricted.tooltip': '受限模式 - 部分功能已出于安全考虑被禁用',
+    'workspace.trust.exitRestricted.label': '退出受限模式',
+    'workspace.trust.exitRestricted.description': '点击以信任此工作区中文件的作者并退出受限模式',
+    'workspace.trust.exitRestricted.confirm.message': '您确定要信任此工作区中文件的作者并退出受限模式吗？',
+    'workspace.trust.exitRestricted.confirm.ok': '信任并重新加载',
+    'workspace.trust.exitRestricted.cancel': '取消',
+    'workspace.trust.settings.group.title': '工作区信任',
+    'workspace.trust.settings.section.title': '信任管理',
+    'workspace.trust.settings.trustButton': '信任当前项目',
+    'workspace.trust.settings.restrictButton': '进入受限模式',
+    'workspace.trust.settings.restrictedDesc':
+      '当前处于受限模式。当前 IDE 提供可以自动在此文件夹中执行文件的功能。点击以信任此工作区中文件的作者。',
+    'workspace.trust.settings.trustedDesc': '此工作区已被信任。点击以进入受限模式并禁用可能存在风险的功能。',
+    'workspace.trust.settings.loading': '处理中...',
   },
 };
diff --git a/packages/preferences/src/browser/preference-settings.service.ts b/packages/preferences/src/browser/preference-settings.service.ts
index 955147b68b..89655920cb 100644
--- a/packages/preferences/src/browser/preference-settings.service.ts
+++ b/packages/preferences/src/browser/preference-settings.service.ts
@@ -449,7 +449,11 @@ export class PreferenceSettingsService extends Disposable implements IPreference
           sec.subSections = subSections;
         }
 
-        if ((sec.preferences && sec.preferences.length > 0) || (sec.subSections && sec.subSections.length > 0)) {
+        if (
+          sec.component ||
+          (sec.preferences && sec.preferences.length > 0) ||
+          (sec.subSections && sec.subSections.length > 0)
+        ) {
           result.push(sec);
         }
       });
diff --git a/packages/startup/src/browser/common-modules.ts b/packages/startup/src/browser/common-modules.ts
index e5500de1ac..ffcb9d0c7a 100644
--- a/packages/startup/src/browser/common-modules.ts
+++ b/packages/startup/src/browser/common-modules.ts
@@ -40,6 +40,7 @@ import { VariableModule } from '@opensumi/ide-variable/lib/browser';
 import { WebviewModule } from '@opensumi/ide-webview';
 import { WorkspaceModule } from '@opensumi/ide-workspace/lib/browser';
 import { WorkspaceEditModule } from '@opensumi/ide-workspace-edit/lib/browser';
+import { WorkspaceTrustModule } from '@opensumi/ide-workspace-trust';
 
 export const CommonBrowserModules: ConstructorOf<BrowserModule>[] = [
   MainLayoutModule,
@@ -61,6 +62,7 @@ export const CommonBrowserModules: ConstructorOf<BrowserModule>[] = [
 
   ThemeModule,
   WorkspaceModule,
+  WorkspaceTrustModule,
   ExtensionStorageModule,
   StorageModule,
   OpenedEditorModule,
diff --git a/packages/workspace-trust/package.json b/packages/workspace-trust/package.json
new file mode 100644
index 0000000000..c5d986c5f1
--- /dev/null
+++ b/packages/workspace-trust/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "@opensumi/ide-workspace-trust",
+  "version": "3.9.0",
+  "files": [
+    "lib",
+    "src"
+  ],
+  "license": "MIT",
+  "main": "lib/index.js",
+  "typings": "lib/index.d.ts",
+  "scripts": {
+    "prepublishOnly": "yarn run build",
+    "build": "tsc --build ../../configs/ts/references/tsconfig.workspace-trust.json"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:opensumi/core.git"
+  },
+  "dependencies": {
+    "@opensumi/ide-core-common": "workspace:*",
+    "react": "^18.2.0"
+  },
+  "devDependencies": {
+    "@opensumi/ide-core-browser": "workspace:*",
+    "@opensumi/ide-dev-tool": "workspace:*",
+    "@opensumi/ide-overlay": "workspace:*",
+    "@opensumi/ide-status-bar": "workspace:*",
+    "@opensumi/ide-workspace": "workspace:*"
+  }
+}
diff --git a/packages/workspace-trust/src/browser/index.ts b/packages/workspace-trust/src/browser/index.ts
new file mode 100644
index 0000000000..f5e4f6b895
--- /dev/null
+++ b/packages/workspace-trust/src/browser/index.ts
@@ -0,0 +1,37 @@
+import { Injectable, Provider } from '@opensumi/di';
+import { BrowserModule, createContributionProvider } from '@opensumi/ide-core-browser';
+
+import { AllowedExtensionsContribution } from '../common';
+
+import { WorkspaceTrustCommandContribution } from './workspace-trust-command.contribution';
+import { WorkspaceTrustSettingsContribution } from './workspace-trust-settings.contribution';
+import { WorkspaceTrustStatusBarContribution } from './workspace-trust-statusbar.contribution';
+import { WorkspaceTrustContribution } from './workspace-trust.contribution';
+import { WorkspaceTrustService } from './workspace-trust.service';
+
+@Injectable()
+export class WorkspaceTrustModule extends BrowserModule {
+  contributionProvider = [AllowedExtensionsContribution];
+  providers: Provider[] = [
+    WorkspaceTrustService,
+    WorkspaceTrustContribution,
+    WorkspaceTrustStatusBarContribution,
+    WorkspaceTrustCommandContribution,
+    WorkspaceTrustSettingsContribution,
+  ];
+}
+
+export { WorkspaceTrustService } from './workspace-trust.service';
+export { WorkspaceTrustContribution } from './workspace-trust.contribution';
+export { WorkspaceTrustStatusBarContribution } from './workspace-trust-statusbar.contribution';
+export {
+  WorkspaceTrustCommandContribution,
+  WORKSPACE_TRUST_EXIT_RESTRICTED_COMMAND,
+} from './workspace-trust-command.contribution';
+export { WorkspaceTrustSettingsContribution } from './workspace-trust-settings.contribution';
+export {
+  WorkspaceTrustState,
+  DEFAULT_ALLOWED_EXTENSION_IDS,
+  AllowedExtensionsContribution,
+  IAllowedExtensionsContribution,
+} from '../common';
diff --git a/packages/workspace-trust/src/browser/workspace-trust-command.contribution.ts b/packages/workspace-trust/src/browser/workspace-trust-command.contribution.ts
new file mode 100644
index 0000000000..bbdab8f431
--- /dev/null
+++ b/packages/workspace-trust/src/browser/workspace-trust-command.contribution.ts
@@ -0,0 +1,56 @@
+import { Autowired } from '@opensumi/di';
+import {
+  ClientAppContribution,
+  CommandContribution,
+  CommandRegistry,
+  Domain,
+  IClientApp,
+  localize,
+} from '@opensumi/ide-core-browser';
+import { IDialogService } from '@opensumi/ide-overlay';
+
+import { WorkspaceTrustService } from './workspace-trust.service';
+
+export const WORKSPACE_TRUST_EXIT_RESTRICTED_COMMAND = {
+  id: 'workspace.trust.exitRestricted',
+  label: localize('workspace.trust.exitRestricted.label', 'Exit Restricted Mode'),
+};
+
+@Domain(CommandContribution, ClientAppContribution)
+export class WorkspaceTrustCommandContribution implements CommandContribution, ClientAppContribution {
+  @Autowired(WorkspaceTrustService)
+  private readonly workspaceTrustService: WorkspaceTrustService;
+
+  @Autowired(IClientApp)
+  private readonly clientApp: IClientApp;
+
+  @Autowired(IDialogService)
+  private readonly dialogService: IDialogService;
+
+  registerCommands(commands: CommandRegistry) {
+    commands.registerCommand(WORKSPACE_TRUST_EXIT_RESTRICTED_COMMAND, {
+      execute: async () => {
+        const okText = localize('workspace.trust.exitRestricted.confirm.ok', 'Trust and Reload');
+        const cancelText = localize('workspace.trust.exitRestricted.cancel', 'Cancel');
+
+        const msg = await this.dialogService.open({
+          message: localize(
+            'workspace.trust.exitRestricted.confirm.message',
+            'Are you sure you want to trust the authors of the files in this workspace and exit Restricted Mode?',
+          ),
+          type: 1, // MessageType.Info
+          buttons: [okText, cancelText],
+        });
+
+        if (msg === okText) {
+          await this.workspaceTrustService.setTrustState('trusted' as any);
+          this.clientApp.fireOnReload(true);
+        }
+      },
+    });
+  }
+
+  onStart() {
+    // no-op
+  }
+}
diff --git a/packages/workspace-trust/src/browser/workspace-trust-setting-panel.module.less b/packages/workspace-trust/src/browser/workspace-trust-setting-panel.module.less
new file mode 100644
index 0000000000..8c469a30aa
--- /dev/null
+++ b/packages/workspace-trust/src/browser/workspace-trust-setting-panel.module.less
@@ -0,0 +1,37 @@
+.workspaceTrustPanel {
+  padding: 12px 18px;
+
+  .description {
+    margin-bottom: 12px;
+    color: var(--foreground);
+    font-size: 13px;
+    line-height: 1.5;
+  }
+
+  .button {
+    padding: 6px 16px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 13px;
+    color: #fff;
+    transition: opacity 0.15s;
+
+    &:hover:not(:disabled) {
+      opacity: 0.85;
+    }
+
+    &:disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
+  }
+
+  .buttonTrust {
+    background-color: var(--button-background);
+  }
+
+  .buttonRestrict {
+    background-color: var(--button-background);
+  }
+}
diff --git a/packages/workspace-trust/src/browser/workspace-trust-setting-panel.tsx b/packages/workspace-trust/src/browser/workspace-trust-setting-panel.tsx
new file mode 100644
index 0000000000..dd3563c504
--- /dev/null
+++ b/packages/workspace-trust/src/browser/workspace-trust-setting-panel.tsx
@@ -0,0 +1,51 @@
+import React, { useCallback, useState } from 'react';
+
+import { IClientApp, localize, useInjectable } from '@opensumi/ide-core-browser';
+
+import styles from './workspace-trust-setting-panel.module.less';
+import { WorkspaceTrustService } from './workspace-trust.service';
+
+export const WorkspaceTrustSettingPanel: React.FC<{ scope: number }> = () => {
+  const workspaceTrustService = useInjectable<WorkspaceTrustService>(WorkspaceTrustService);
+  const clientApp = useInjectable<IClientApp>(IClientApp);
+  const [loading, setLoading] = useState(false);
+
+  const isRestricted = workspaceTrustService.isRestricted();
+
+  const handleClick = useCallback(async () => {
+    setLoading(true);
+    if (isRestricted) {
+      await workspaceTrustService.setTrustState('trusted' as any);
+    } else {
+      await workspaceTrustService.setTrustState('restricted' as any);
+    }
+    clientApp.fireOnReload(true);
+  }, [isRestricted, workspaceTrustService, clientApp]);
+
+  const buttonText = isRestricted
+    ? localize('workspace.trust.settings.trustButton', 'Trust Current Project')
+    : localize('workspace.trust.settings.restrictButton', 'Enter Restricted Mode');
+
+  const description = isRestricted
+    ? localize(
+        'workspace.trust.settings.restrictedDesc',
+        '当前处于受限模式。当前 IDE 提供可以自动在此文件夹中执行文件的功能。点击以信任此工作区中文件的作者。',
+      )
+    : localize(
+        'workspace.trust.settings.trustedDesc',
+        '此工作区已被信任。点击以进入受限模式并禁用可能存在风险的功能。',
+      );
+
+  return (
+    <div className={styles.workspaceTrustPanel}>
+      <div className={styles.description}>{description}</div>
+      <button
+        className={`${styles.button} ${isRestricted ? styles.buttonTrust : styles.buttonRestrict}`}
+        onClick={handleClick}
+        disabled={loading}
+      >
+        {loading ? localize('workspace.trust.settings.loading', 'Processing...') : buttonText}
+      </button>
+    </div>
+  );
+};
diff --git a/packages/workspace-trust/src/browser/workspace-trust-settings.contribution.ts b/packages/workspace-trust/src/browser/workspace-trust-settings.contribution.ts
new file mode 100644
index 0000000000..3ab69e4321
--- /dev/null
+++ b/packages/workspace-trust/src/browser/workspace-trust-settings.contribution.ts
@@ -0,0 +1,29 @@
+import { Autowired } from '@opensumi/di';
+import {
+  ClientAppContribution,
+  Domain,
+  IPreferenceSettingsService,
+  getIcon,
+  localize,
+} from '@opensumi/ide-core-browser';
+
+import { WorkspaceTrustSettingPanel } from './workspace-trust-setting-panel';
+
+@Domain(ClientAppContribution)
+export class WorkspaceTrustSettingsContribution implements ClientAppContribution {
+  @Autowired(IPreferenceSettingsService)
+  private readonly preferenceSettingsService: IPreferenceSettingsService;
+
+  onStart() {
+    this.preferenceSettingsService.registerSettingGroup({
+      id: 'workspace-trust',
+      title: localize('workspace.trust.settings.group.title', 'Workspace Trust'),
+      iconClass: getIcon('shield'),
+    });
+
+    this.preferenceSettingsService.registerSettingSection('workspace-trust', {
+      title: localize('workspace.trust.settings.section.title', 'Trust Management'),
+      component: WorkspaceTrustSettingPanel,
+    });
+  }
+}
diff --git a/packages/workspace-trust/src/browser/workspace-trust-statusbar.contribution.ts b/packages/workspace-trust/src/browser/workspace-trust-statusbar.contribution.ts
new file mode 100644
index 0000000000..9692256a44
--- /dev/null
+++ b/packages/workspace-trust/src/browser/workspace-trust-statusbar.contribution.ts
@@ -0,0 +1,34 @@
+import { Autowired } from '@opensumi/di';
+import { ClientAppContribution, Domain, localize, runWhenIdle } from '@opensumi/ide-core-browser';
+import { IStatusBarService, StatusBarAlignment } from '@opensumi/ide-core-browser/lib/services/status-bar-service';
+
+import { WORKSPACE_TRUST_EXIT_RESTRICTED_COMMAND } from './workspace-trust-command.contribution';
+import { WorkspaceTrustService } from './workspace-trust.service';
+
+const RESTRICTED_MODE_STATUSBAR_ID = 'workspace-trust.restricted-mode';
+
+@Domain(ClientAppContribution)
+export class WorkspaceTrustStatusBarContribution implements ClientAppContribution {
+  @Autowired(WorkspaceTrustService)
+  private readonly workspaceTrustService: WorkspaceTrustService;
+
+  @Autowired(IStatusBarService)
+  private readonly statusBarService: IStatusBarService;
+
+  onStart() {
+    runWhenIdle(() => {
+      if (this.workspaceTrustService.isRestricted()) {
+        this.statusBarService.addElement(RESTRICTED_MODE_STATUSBAR_ID, {
+          text: `$(shield) ${localize('workspace.trust.statusbar.restricted', 'Restricted Mode')}`,
+          alignment: StatusBarAlignment.RIGHT,
+          tooltip: localize(
+            'workspace.trust.statusbar.restricted.tooltip',
+            'Restricted Mode - Some features are disabled for security',
+          ),
+          className: 'workspace-trust-restricted-status',
+          command: WORKSPACE_TRUST_EXIT_RESTRICTED_COMMAND.id,
+        });
+      }
+    });
+  }
+}
diff --git a/packages/workspace-trust/src/browser/workspace-trust.contribution.ts b/packages/workspace-trust/src/browser/workspace-trust.contribution.ts
new file mode 100644
index 0000000000..e4a4105e75
--- /dev/null
+++ b/packages/workspace-trust/src/browser/workspace-trust.contribution.ts
@@ -0,0 +1,40 @@
+import { Autowired } from '@opensumi/di';
+import { AppConfig, ClientAppContribution, Domain, ILogger } from '@opensumi/ide-core-browser';
+
+import { WorkspaceTrustService } from './workspace-trust.service';
+
+@Domain(ClientAppContribution)
+export class WorkspaceTrustContribution implements ClientAppContribution {
+  @Autowired(WorkspaceTrustService)
+  private readonly workspaceTrustService: WorkspaceTrustService;
+
+  @Autowired(AppConfig)
+  private readonly appConfig: AppConfig;
+
+  @Autowired(ILogger)
+  private readonly logger: ILogger;
+
+  async initialize() {
+    const workspacePath = this.appConfig.workspaceDir;
+    if (!workspacePath) {
+      this.logger.log('[workspace-trust] No workspace directory, skipping trust check');
+      return;
+    }
+
+    this.logger.log(`[workspace-trust] Initializing trust check for: ${workspacePath}`);
+
+    // Initialize storage and load existing trust state
+    await this.workspaceTrustService.initialize(workspacePath);
+
+    // If no saved trust state, show dialog
+    if (this.workspaceTrustService.getTrustState() === ('undecided' as any)) {
+      await this.workspaceTrustService.ensureTrustDecided();
+    }
+
+    if (this.workspaceTrustService.isRestricted()) {
+      this.logger.log('[workspace-trust] Workspace is in restricted mode');
+    } else {
+      this.logger.log('[workspace-trust] Workspace is trusted');
+    }
+  }
+}
diff --git a/packages/workspace-trust/src/browser/workspace-trust.service.ts b/packages/workspace-trust/src/browser/workspace-trust.service.ts
new file mode 100644
index 0000000000..7716468b2e
--- /dev/null
+++ b/packages/workspace-trust/src/browser/workspace-trust.service.ts
@@ -0,0 +1,175 @@
+import { Autowired, Injectable } from '@opensumi/di';
+import {
+  ContributionProvider,
+  Deferred,
+  IStorage,
+  STORAGE_NAMESPACE,
+  StorageProvider,
+  URI,
+  localize,
+} from '@opensumi/ide-core-browser';
+import { IDialogService } from '@opensumi/ide-overlay';
+
+import {
+  AllowedExtensionsContribution,
+  DEFAULT_ALLOWED_EXTENSION_IDS,
+  IAllowedExtensionsContribution,
+  WORKSPACE_TRUST_STORAGE_KEY,
+  WorkspaceTrustState,
+} from '../common';
+
+/**
+ * Workspace trust service
+ * Manages trust state for workspace directories and controls restricted mode
+ */
+@Injectable()
+export class WorkspaceTrustService {
+  @Autowired(StorageProvider)
+  private readonly storageProvider: StorageProvider;
+
+  @Autowired(IDialogService)
+  private readonly dialogService: IDialogService;
+
+  @Autowired(AllowedExtensionsContribution)
+  private readonly allowedExtensionsContributions: ContributionProvider<IAllowedExtensionsContribution>;
+
+  private trustStorage: IStorage;
+  private currentTrustState: WorkspaceTrustState = WorkspaceTrustState.Undecided;
+  private trustDecidedDeferred = new Deferred<void>();
+  private _workspacePath: string | undefined;
+
+  /**
+   * Initialize the trust service and load current workspace trust state
+   */
+  async initialize(workspacePath: string): Promise<void> {
+    this._workspacePath = workspacePath;
+    this.trustStorage = await this.storageProvider(STORAGE_NAMESPACE.GLOBAL_EXTENSIONS);
+    await this.trustStorage.whenReady;
+
+    const savedState = this.getTrustStateFromStorage(workspacePath);
+    if (savedState) {
+      this.currentTrustState = savedState;
+      this.trustDecidedDeferred.resolve();
+    }
+  }
+
+  /**
+   * Get the trust state for a workspace path from storage
+   */
+  private getTrustStateFromStorage(workspacePath: string): WorkspaceTrustState | undefined {
+    const key = `${WORKSPACE_TRUST_STORAGE_KEY}:${workspacePath}`;
+    const value = this.trustStorage.get<string>(key);
+    if (value === WorkspaceTrustState.Trusted || value === WorkspaceTrustState.Restricted) {
+      return value as WorkspaceTrustState;
+    }
+    return undefined;
+  }
+
+  /**
+   * Save trust state to storage
+   */
+  private async saveTrustState(workspacePath: string, state: WorkspaceTrustState): Promise<void> {
+    const key = `${WORKSPACE_TRUST_STORAGE_KEY}:${workspacePath}`;
+    await this.trustStorage.set(key, state);
+  }
+
+  /**
+   * Set the trust state for the current workspace
+   */
+  async setTrustState(state: WorkspaceTrustState): Promise<void> {
+    if (!this._workspacePath) {
+      return;
+    }
+    this.currentTrustState = state;
+    await this.saveTrustState(this._workspacePath, state);
+    this.trustDecidedDeferred.resolve();
+  }
+
+  /**
+   * Get current workspace trust state
+   */
+  getTrustState(): WorkspaceTrustState {
+    return this.currentTrustState;
+  }
+
+  /**
+   * Check if current workspace is in restricted mode
+   */
+  isRestricted(): boolean {
+    return this.currentTrustState === WorkspaceTrustState.Restricted;
+  }
+
+  /**
+   * Check if current workspace is trusted
+   */
+  isTrusted(): boolean {
+    return this.currentTrustState === WorkspaceTrustState.Trusted;
+  }
+
+  /**
+   * Get the promise that resolves when trust decision is made
+   */
+  whenTrustDecided(): Promise<void> {
+    return this.trustDecidedDeferred.promise;
+  }
+
+  /**
+   * Show trust dialog and wait for user decision
+   */
+  async showTrustDialog(): Promise<WorkspaceTrustState> {
+    const result = await this.dialogService.open({
+      message: `${localize('workspace.trust.dialog.title', '是否信任此文件夹中的文件的作者？')}\n\n${localize(
+        'workspace.trust.dialog.message',
+        '当前 IDE 提供可以自动在此文件夹中执行文件的功能。\n\n如果不信任这些文件的作者，则建议继续使用受限模式，因为这些文件可能是恶意文件。',
+      )}`,
+      type: 1, // MessageType.Info
+      buttons: [
+        localize('workspace.trust.dialog.button.trust', '是的，我信任他们'),
+        localize('workspace.trust.dialog.button.restricted', '受限模式'),
+      ],
+      closable: false,
+    });
+
+    if (result === localize('workspace.trust.dialog.button.trust', 'Yes, I trust the authors')) {
+      await this.setTrustState(WorkspaceTrustState.Trusted);
+      return WorkspaceTrustState.Trusted;
+    } else {
+      await this.setTrustState(WorkspaceTrustState.Restricted);
+      return WorkspaceTrustState.Restricted;
+    }
+  }
+
+  /**
+   * Ensure trust decision is made - shows dialog if not yet decided
+   */
+  async ensureTrustDecided(): Promise<void> {
+    if (this.currentTrustState === WorkspaceTrustState.Undecided) {
+      await this.showTrustDialog();
+    }
+  }
+
+  /**
+   * Get allowed extension IDs in restricted mode (base + contributions)
+   */
+  getAllowedExtensionIds(): string[] {
+    const allIds = new Set(DEFAULT_ALLOWED_EXTENSION_IDS);
+    const contributions = this.allowedExtensionsContributions.getContributions();
+    for (const c of contributions) {
+      for (const id of c.getAllowedExtensionIds()) {
+        allIds.add(id);
+      }
+    }
+    return Array.from(allIds);
+  }
+
+  /**
+   * Filter extension metadata to only include allowed extensions in restricted mode
+   */
+  filterExtensions<T extends { id: string }>(extensions: T[]): T[] {
+    if (!this.isRestricted()) {
+      return extensions;
+    }
+    const allowedIds = new Set(this.getAllowedExtensionIds());
+    return extensions.filter((ext) => allowedIds.has(ext.id));
+  }
+}
diff --git a/packages/workspace-trust/src/common/index.ts b/packages/workspace-trust/src/common/index.ts
new file mode 100644
index 0000000000..7f060fbc40
--- /dev/null
+++ b/packages/workspace-trust/src/common/index.ts
@@ -0,0 +1,38 @@
+/**
+ * Workspace trust state enum
+ */
+export enum WorkspaceTrustState {
+  /** User has not yet decided */
+  Undecided = 'undecided',
+  /** User trusts this workspace - all extensions loaded */
+  Trusted = 'trusted',
+  /** User chose restricted mode - only allowed extensions loaded */
+  Restricted = 'restricted',
+}
+
+/**
+ * Storage key prefix for workspace trust state
+ */
+export const WORKSPACE_TRUST_STORAGE_KEY = 'workspace_trust_state';
+
+/**
+ * Base allowed extension IDs in restricted mode (can be extended via AllowedExtensionsContribution)
+ */
+export const DEFAULT_ALLOWED_EXTENSION_IDS = ['vscode.theme-defaults', 'vscode.typescript-language-features'];
+
+/**
+ * Service token for WorkspaceTrustService
+ */
+export const WorkspaceTrustServiceToken = Symbol('WorkspaceTrustService');
+
+/**
+ * Contribution token for allowed extensions registration
+ */
+export const AllowedExtensionsContribution = Symbol('AllowedExtensionsContribution');
+
+export interface IAllowedExtensionsContribution {
+  /**
+   * Return additional extension IDs allowed in restricted mode
+   */
+  getAllowedExtensionIds(): string[];
+}
diff --git a/packages/workspace-trust/src/index.ts b/packages/workspace-trust/src/index.ts
new file mode 100644
index 0000000000..9fb54076c1
--- /dev/null
+++ b/packages/workspace-trust/src/index.ts
@@ -0,0 +1,2 @@
+export * from './browser';
+export * from './common';
diff --git a/yarn.lock b/yarn.lock
index 36e04defaa..6f371b667d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3846,6 +3846,7 @@ __metadata:
     "@opensumi/ide-webview": "workspace:*"
     "@opensumi/ide-workspace": "workspace:*"
     "@opensumi/ide-workspace-edit": "workspace:*"
+    "@opensumi/ide-workspace-trust": "workspace:*"
     address: "npm:^1.1.2"
     glob-to-regexp: "npm:0.4.1"
     is-running: "npm:^2.1.0"
@@ -4500,6 +4501,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@opensumi/ide-workspace-trust@workspace:*, @opensumi/ide-workspace-trust@workspace:packages/workspace-trust":
+  version: 0.0.0-use.local
+  resolution: "@opensumi/ide-workspace-trust@workspace:packages/workspace-trust"
+  dependencies:
+    "@opensumi/ide-core-browser": "workspace:*"
+    "@opensumi/ide-core-common": "workspace:*"
+    "@opensumi/ide-dev-tool": "workspace:*"
+    "@opensumi/ide-overlay": "workspace:*"
+    "@opensumi/ide-status-bar": "workspace:*"
+    "@opensumi/ide-workspace": "workspace:*"
+  languageName: unknown
+  linkType: soft
+
 "@opensumi/ide-workspace@workspace:*, @opensumi/ide-workspace@workspace:packages/workspace":
   version: 0.0.0-use.local
   resolution: "@opensumi/ide-workspace@workspace:packages/workspace"

From a3af3b5d10280dd41865b0f4f0853dbd004388cf Mon Sep 17 00:00:00 2001
From: "kengtou.mh" <kengtou.mh@antfin.com>
Date: Mon, 11 May 2026 15:10:40 +0800
Subject: [PATCH 4/9] feat: workspace trusted feature to core-browser

---
 .../references/tsconfig.workspace-trust.json  |  9 ---
 configs/ts/tsconfig.build.json                |  3 -
 configs/ts/tsconfig.resolve.json              |  2 -
 .../src/bootstrap/inner-providers.ts          | 13 ++++
 .../core-browser/src/common/common.command.ts | 14 +++-
 packages/core-browser/src/index.ts            |  2 +
 .../src/workspace-trust/common.ts}            | 17 -----
 .../core-browser/src/workspace-trust/index.ts |  9 +++
 .../workspace-trust-command.contribution.ts   | 25 ++++---
 .../workspace-trust-setting-panel.module.less |  0
 .../workspace-trust-setting-panel.tsx         | 10 ++-
 .../workspace-trust-settings.contribution.ts  | 18 +++--
 .../workspace-trust-statusbar.contribution.ts | 10 ++-
 .../workspace-trust.contribution.ts           | 10 ++-
 .../workspace-trust.service.ts                | 65 +++++--------------
 .../src/browser/allowed-extension.service.ts  | 63 ++++++++++++++++++
 .../src/browser/extension.service.ts          | 24 ++-----
 packages/extension/src/browser/index.ts       | 20 +++++-
 .../src/browser/dialog.contribution.ts        | 15 +++++
 .../startup/src/browser/common-modules.ts     |  2 -
 packages/workspace-trust/package.json         | 30 ---------
 packages/workspace-trust/src/browser/index.ts | 37 -----------
 packages/workspace-trust/src/index.ts         |  2 -
 23 files changed, 196 insertions(+), 204 deletions(-)
 delete mode 100644 configs/ts/references/tsconfig.workspace-trust.json
 rename packages/{workspace-trust/src/common/index.ts => core-browser/src/workspace-trust/common.ts} (51%)
 create mode 100644 packages/core-browser/src/workspace-trust/index.ts
 rename packages/{workspace-trust/src/browser => core-browser/src/workspace-trust}/workspace-trust-command.contribution.ts (68%)
 rename packages/{workspace-trust/src/browser => core-browser/src/workspace-trust}/workspace-trust-setting-panel.module.less (100%)
 rename packages/{workspace-trust/src/browser => core-browser/src/workspace-trust}/workspace-trust-setting-panel.tsx (82%)
 rename packages/{workspace-trust/src/browser => core-browser/src/workspace-trust}/workspace-trust-settings.contribution.ts (58%)
 rename packages/{workspace-trust/src/browser => core-browser/src/workspace-trust}/workspace-trust-statusbar.contribution.ts (76%)
 rename packages/{workspace-trust/src/browser => core-browser/src/workspace-trust}/workspace-trust.contribution.ts (77%)
 rename packages/{workspace-trust/src/browser => core-browser/src/workspace-trust}/workspace-trust.service.ts (68%)
 create mode 100644 packages/extension/src/browser/allowed-extension.service.ts
 delete mode 100644 packages/workspace-trust/package.json
 delete mode 100644 packages/workspace-trust/src/browser/index.ts
 delete mode 100644 packages/workspace-trust/src/index.ts

diff --git a/configs/ts/references/tsconfig.workspace-trust.json b/configs/ts/references/tsconfig.workspace-trust.json
deleted file mode 100644
index c1ded84d43..0000000000
--- a/configs/ts/references/tsconfig.workspace-trust.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": "../../../packages/workspace-trust/src",
-    "outDir": "../../../packages/workspace-trust/lib"
-  },
-  "include": ["../../../packages/workspace-trust/src"],
-  "exclude": ["../../../packages/workspace-trust/__mocks__"]
-}
diff --git a/configs/ts/tsconfig.build.json b/configs/ts/tsconfig.build.json
index 09b8b4acb1..3cc158072a 100644
--- a/configs/ts/tsconfig.build.json
+++ b/configs/ts/tsconfig.build.json
@@ -39,9 +39,6 @@
     {
       "path": "./references/tsconfig.workspace.json"
     },
-    {
-      "path": "./references/tsconfig.workspace-trust.json"
-    },
     {
       "path": "./references/tsconfig.toolbar.json"
     },
diff --git a/configs/ts/tsconfig.resolve.json b/configs/ts/tsconfig.resolve.json
index efe6eb17ec..b56bfd9200 100644
--- a/configs/ts/tsconfig.resolve.json
+++ b/configs/ts/tsconfig.resolve.json
@@ -115,8 +115,6 @@
       "@opensumi/ide-webview/lib/*": ["../packages/webview/src/*"],
       "@opensumi/ide-workspace": ["../packages/workspace/src/index.ts"],
       "@opensumi/ide-workspace/lib/*": ["../packages/workspace/src/*"],
-      "@opensumi/ide-workspace-trust": ["../packages/workspace-trust/src/index.ts"],
-      "@opensumi/ide-workspace-trust/lib/*": ["../packages/workspace-trust/src/*"],
       "@opensumi/ide-workspace-edit": ["../packages/workspace-edit/src/index.ts"],
       "@opensumi/ide-workspace-edit/lib/*": ["../packages/workspace-edit/src/*"],
       "@opensumi/ide-playwright": ["../../../tools/playwright/src/index.ts"],
diff --git a/packages/core-browser/src/bootstrap/inner-providers.ts b/packages/core-browser/src/bootstrap/inner-providers.ts
index b88562d791..a007de7d24 100644
--- a/packages/core-browser/src/bootstrap/inner-providers.ts
+++ b/packages/core-browser/src/bootstrap/inner-providers.ts
@@ -1,3 +1,4 @@
+/* eslint-disable sort-imports */
 import { Injector, Provider } from '@opensumi/di';
 import {
   AppLifeCycleServiceToken,
@@ -79,6 +80,13 @@ import { NextToolbarRegistryImpl, ToolbarClientAppContribution } from '../toolba
 import { VariableContribution, VariableRegistry, VariableRegistryImpl } from '../variable';
 import { IWindowService } from '../window';
 import { WindowService } from '../window/window.service';
+import {
+  WorkspaceTrustService,
+  WorkspaceTrustContribution,
+  WorkspaceTrustStatusBarContribution,
+  WorkspaceTrustCommandContribution,
+  WorkspaceTrustSettingsContribution,
+} from '../workspace-trust';
 
 import { ClientAppContextContribution } from './context-contribution';
 import { AppLifeCycleService } from './lifecycle.service';
@@ -275,6 +283,11 @@ export function injectInnerProviders(injector: Injector) {
       token: ConnectionHelperFactory,
       useFactory: ConnectionHelperFactory,
     },
+    WorkspaceTrustService,
+    WorkspaceTrustContribution,
+    WorkspaceTrustStatusBarContribution,
+    WorkspaceTrustCommandContribution,
+    WorkspaceTrustSettingsContribution,
   ];
   injector.addProviders(...providers);
 }
diff --git a/packages/core-browser/src/common/common.command.ts b/packages/core-browser/src/common/common.command.ts
index add28d0991..fa6f69818f 100644
--- a/packages/core-browser/src/common/common.command.ts
+++ b/packages/core-browser/src/common/common.command.ts
@@ -3,7 +3,7 @@
  * because the `localize` func maybe cannot get the correct languageId at the beginning of whole lifecycle.
  */
 
-import { Command } from '@opensumi/ide-core-common';
+import { Command, MessageType } from '@opensumi/ide-core-common';
 
 import { getIcon } from '../style/icon/icon';
 
@@ -872,6 +872,13 @@ export namespace KEYBOARD_COMMANDS {
   };
 }
 
+export interface OpenDialogArgs {
+  message: string;
+  type: MessageType;
+  buttons?: string[];
+  closable?: boolean;
+}
+
 export namespace DIALOG_COMMANDS {
   const CATEGORY = 'dialog';
 
@@ -879,6 +886,11 @@ export namespace DIALOG_COMMANDS {
     id: 'dialog.ensure',
     category: CATEGORY,
   };
+
+  export const OPEN: Command = {
+    id: 'dialog.open',
+    category: CATEGORY,
+  };
 }
 
 export namespace TERMINAL_COMMANDS {
diff --git a/packages/core-browser/src/index.ts b/packages/core-browser/src/index.ts
index 86d1566414..12fddf00e8 100644
--- a/packages/core-browser/src/index.ts
+++ b/packages/core-browser/src/index.ts
@@ -45,3 +45,5 @@ export * from './extensions';
 
 export * from './static-resource';
 export * from './context-key';
+
+export * from './workspace-trust';
diff --git a/packages/workspace-trust/src/common/index.ts b/packages/core-browser/src/workspace-trust/common.ts
similarity index 51%
rename from packages/workspace-trust/src/common/index.ts
rename to packages/core-browser/src/workspace-trust/common.ts
index 7f060fbc40..c0d01bbac2 100644
--- a/packages/workspace-trust/src/common/index.ts
+++ b/packages/core-browser/src/workspace-trust/common.ts
@@ -15,24 +15,7 @@ export enum WorkspaceTrustState {
  */
 export const WORKSPACE_TRUST_STORAGE_KEY = 'workspace_trust_state';
 
-/**
- * Base allowed extension IDs in restricted mode (can be extended via AllowedExtensionsContribution)
- */
-export const DEFAULT_ALLOWED_EXTENSION_IDS = ['vscode.theme-defaults', 'vscode.typescript-language-features'];
-
 /**
  * Service token for WorkspaceTrustService
  */
 export const WorkspaceTrustServiceToken = Symbol('WorkspaceTrustService');
-
-/**
- * Contribution token for allowed extensions registration
- */
-export const AllowedExtensionsContribution = Symbol('AllowedExtensionsContribution');
-
-export interface IAllowedExtensionsContribution {
-  /**
-   * Return additional extension IDs allowed in restricted mode
-   */
-  getAllowedExtensionIds(): string[];
-}
diff --git a/packages/core-browser/src/workspace-trust/index.ts b/packages/core-browser/src/workspace-trust/index.ts
new file mode 100644
index 0000000000..5a7a29a604
--- /dev/null
+++ b/packages/core-browser/src/workspace-trust/index.ts
@@ -0,0 +1,9 @@
+export { WorkspaceTrustService } from './workspace-trust.service';
+export { WorkspaceTrustContribution } from './workspace-trust.contribution';
+export { WorkspaceTrustStatusBarContribution } from './workspace-trust-statusbar.contribution';
+export {
+  WorkspaceTrustCommandContribution,
+  WORKSPACE_TRUST_EXIT_RESTRICTED_COMMAND,
+} from './workspace-trust-command.contribution';
+export { WorkspaceTrustSettingsContribution } from './workspace-trust-settings.contribution';
+export { WorkspaceTrustState } from './common';
diff --git a/packages/workspace-trust/src/browser/workspace-trust-command.contribution.ts b/packages/core-browser/src/workspace-trust/workspace-trust-command.contribution.ts
similarity index 68%
rename from packages/workspace-trust/src/browser/workspace-trust-command.contribution.ts
rename to packages/core-browser/src/workspace-trust/workspace-trust-command.contribution.ts
index bbdab8f431..0dc2ebfc15 100644
--- a/packages/workspace-trust/src/browser/workspace-trust-command.contribution.ts
+++ b/packages/core-browser/src/workspace-trust/workspace-trust-command.contribution.ts
@@ -1,14 +1,11 @@
 import { Autowired } from '@opensumi/di';
-import {
-  ClientAppContribution,
-  CommandContribution,
-  CommandRegistry,
-  Domain,
-  IClientApp,
-  localize,
-} from '@opensumi/ide-core-browser';
-import { IDialogService } from '@opensumi/ide-overlay';
+import { CommandContribution, CommandRegistry, CommandService, MessageType, localize } from '@opensumi/ide-core-common';
+import { Domain } from '@opensumi/ide-core-common/lib/di-helper';
 
+import { IClientApp } from '../browser-module';
+import { ClientAppContribution } from '../common/common.define';
+
+import { WorkspaceTrustState } from './common';
 import { WorkspaceTrustService } from './workspace-trust.service';
 
 export const WORKSPACE_TRUST_EXIT_RESTRICTED_COMMAND = {
@@ -24,8 +21,8 @@ export class WorkspaceTrustCommandContribution implements CommandContribution, C
   @Autowired(IClientApp)
   private readonly clientApp: IClientApp;
 
-  @Autowired(IDialogService)
-  private readonly dialogService: IDialogService;
+  @Autowired(CommandService)
+  private readonly commandService: CommandService;
 
   registerCommands(commands: CommandRegistry) {
     commands.registerCommand(WORKSPACE_TRUST_EXIT_RESTRICTED_COMMAND, {
@@ -33,17 +30,17 @@ export class WorkspaceTrustCommandContribution implements CommandContribution, C
         const okText = localize('workspace.trust.exitRestricted.confirm.ok', 'Trust and Reload');
         const cancelText = localize('workspace.trust.exitRestricted.cancel', 'Cancel');
 
-        const msg = await this.dialogService.open({
+        const msg = await this.commandService.executeCommand<string>('dialog.open', {
           message: localize(
             'workspace.trust.exitRestricted.confirm.message',
             'Are you sure you want to trust the authors of the files in this workspace and exit Restricted Mode?',
           ),
-          type: 1, // MessageType.Info
+          type: MessageType.Info,
           buttons: [okText, cancelText],
         });
 
         if (msg === okText) {
-          await this.workspaceTrustService.setTrustState('trusted' as any);
+          await this.workspaceTrustService.setTrustState(WorkspaceTrustState.Trusted);
           this.clientApp.fireOnReload(true);
         }
       },
diff --git a/packages/workspace-trust/src/browser/workspace-trust-setting-panel.module.less b/packages/core-browser/src/workspace-trust/workspace-trust-setting-panel.module.less
similarity index 100%
rename from packages/workspace-trust/src/browser/workspace-trust-setting-panel.module.less
rename to packages/core-browser/src/workspace-trust/workspace-trust-setting-panel.module.less
diff --git a/packages/workspace-trust/src/browser/workspace-trust-setting-panel.tsx b/packages/core-browser/src/workspace-trust/workspace-trust-setting-panel.tsx
similarity index 82%
rename from packages/workspace-trust/src/browser/workspace-trust-setting-panel.tsx
rename to packages/core-browser/src/workspace-trust/workspace-trust-setting-panel.tsx
index dd3563c504..046d666882 100644
--- a/packages/workspace-trust/src/browser/workspace-trust-setting-panel.tsx
+++ b/packages/core-browser/src/workspace-trust/workspace-trust-setting-panel.tsx
@@ -1,7 +1,11 @@
 import React, { useCallback, useState } from 'react';
 
-import { IClientApp, localize, useInjectable } from '@opensumi/ide-core-browser';
+import { localize } from '@opensumi/ide-core-common';
 
+import { IClientApp } from '../browser-module';
+import { useInjectable } from '../react-hooks/injectable-hooks';
+
+import { WorkspaceTrustState } from './common';
 import styles from './workspace-trust-setting-panel.module.less';
 import { WorkspaceTrustService } from './workspace-trust.service';
 
@@ -15,9 +19,9 @@ export const WorkspaceTrustSettingPanel: React.FC<{ scope: number }> = () => {
   const handleClick = useCallback(async () => {
     setLoading(true);
     if (isRestricted) {
-      await workspaceTrustService.setTrustState('trusted' as any);
+      await workspaceTrustService.setTrustState(WorkspaceTrustState.Trusted);
     } else {
-      await workspaceTrustService.setTrustState('restricted' as any);
+      await workspaceTrustService.setTrustState(WorkspaceTrustState.Restricted);
     }
     clientApp.fireOnReload(true);
   }, [isRestricted, workspaceTrustService, clientApp]);
diff --git a/packages/workspace-trust/src/browser/workspace-trust-settings.contribution.ts b/packages/core-browser/src/workspace-trust/workspace-trust-settings.contribution.ts
similarity index 58%
rename from packages/workspace-trust/src/browser/workspace-trust-settings.contribution.ts
rename to packages/core-browser/src/workspace-trust/workspace-trust-settings.contribution.ts
index 3ab69e4321..0962f5a753 100644
--- a/packages/workspace-trust/src/browser/workspace-trust-settings.contribution.ts
+++ b/packages/core-browser/src/workspace-trust/workspace-trust-settings.contribution.ts
@@ -1,11 +1,9 @@
-import { Autowired } from '@opensumi/di';
-import {
-  ClientAppContribution,
-  Domain,
-  IPreferenceSettingsService,
-  getIcon,
-  localize,
-} from '@opensumi/ide-core-browser';
+import { Autowired, Injectable } from '@opensumi/di';
+import { Domain } from '@opensumi/ide-core-common/lib/di-helper';
+
+import { ClientAppContribution } from '../common/common.define';
+import { IPreferenceSettingsService } from '../preferences/settings';
+import { getIcon } from '../style/icon/icon';
 
 import { WorkspaceTrustSettingPanel } from './workspace-trust-setting-panel';
 
@@ -17,12 +15,12 @@ export class WorkspaceTrustSettingsContribution implements ClientAppContribution
   onStart() {
     this.preferenceSettingsService.registerSettingGroup({
       id: 'workspace-trust',
-      title: localize('workspace.trust.settings.group.title', 'Workspace Trust'),
+      title: '%workspace.trust.settings.group.title%',
       iconClass: getIcon('shield'),
     });
 
     this.preferenceSettingsService.registerSettingSection('workspace-trust', {
-      title: localize('workspace.trust.settings.section.title', 'Trust Management'),
+      title: '%workspace.trust.settings.section.title%',
       component: WorkspaceTrustSettingPanel,
     });
   }
diff --git a/packages/workspace-trust/src/browser/workspace-trust-statusbar.contribution.ts b/packages/core-browser/src/workspace-trust/workspace-trust-statusbar.contribution.ts
similarity index 76%
rename from packages/workspace-trust/src/browser/workspace-trust-statusbar.contribution.ts
rename to packages/core-browser/src/workspace-trust/workspace-trust-statusbar.contribution.ts
index 9692256a44..d948eaca82 100644
--- a/packages/workspace-trust/src/browser/workspace-trust-statusbar.contribution.ts
+++ b/packages/core-browser/src/workspace-trust/workspace-trust-statusbar.contribution.ts
@@ -1,6 +1,9 @@
 import { Autowired } from '@opensumi/di';
-import { ClientAppContribution, Domain, localize, runWhenIdle } from '@opensumi/ide-core-browser';
-import { IStatusBarService, StatusBarAlignment } from '@opensumi/ide-core-browser/lib/services/status-bar-service';
+import { localize, runWhenIdle } from '@opensumi/ide-core-common';
+import { Domain } from '@opensumi/ide-core-common/lib/di-helper';
+
+import { ClientAppContribution } from '../common/common.define';
+import { IStatusBarService, StatusBarAlignment } from '../services/status-bar-service';
 
 import { WORKSPACE_TRUST_EXIT_RESTRICTED_COMMAND } from './workspace-trust-command.contribution';
 import { WorkspaceTrustService } from './workspace-trust.service';
@@ -16,7 +19,8 @@ export class WorkspaceTrustStatusBarContribution implements ClientAppContributio
   private readonly statusBarService: IStatusBarService;
 
   onStart() {
-    runWhenIdle(() => {
+    runWhenIdle(async () => {
+      await this.workspaceTrustService.whenTrustDecided();
       if (this.workspaceTrustService.isRestricted()) {
         this.statusBarService.addElement(RESTRICTED_MODE_STATUSBAR_ID, {
           text: `$(shield) ${localize('workspace.trust.statusbar.restricted', 'Restricted Mode')}`,
diff --git a/packages/workspace-trust/src/browser/workspace-trust.contribution.ts b/packages/core-browser/src/workspace-trust/workspace-trust.contribution.ts
similarity index 77%
rename from packages/workspace-trust/src/browser/workspace-trust.contribution.ts
rename to packages/core-browser/src/workspace-trust/workspace-trust.contribution.ts
index e4a4105e75..f3fbd3bc8f 100644
--- a/packages/workspace-trust/src/browser/workspace-trust.contribution.ts
+++ b/packages/core-browser/src/workspace-trust/workspace-trust.contribution.ts
@@ -1,5 +1,9 @@
 import { Autowired } from '@opensumi/di';
-import { AppConfig, ClientAppContribution, Domain, ILogger } from '@opensumi/ide-core-browser';
+import { ILogger } from '@opensumi/ide-core-common';
+import { Domain } from '@opensumi/ide-core-common/lib/di-helper';
+
+import { ClientAppContribution } from '../common/common.define';
+import { AppConfig } from '../react-providers/config-provider';
 
 import { WorkspaceTrustService } from './workspace-trust.service';
 
@@ -14,7 +18,7 @@ export class WorkspaceTrustContribution implements ClientAppContribution {
   @Autowired(ILogger)
   private readonly logger: ILogger;
 
-  async initialize() {
+  async onStart() {
     const workspacePath = this.appConfig.workspaceDir;
     if (!workspacePath) {
       this.logger.log('[workspace-trust] No workspace directory, skipping trust check');
@@ -27,7 +31,7 @@ export class WorkspaceTrustContribution implements ClientAppContribution {
     await this.workspaceTrustService.initialize(workspacePath);
 
     // If no saved trust state, show dialog
-    if (this.workspaceTrustService.getTrustState() === ('undecided' as any)) {
+    if (this.workspaceTrustService.getTrustState() === 'undecided') {
       await this.workspaceTrustService.ensureTrustDecided();
     }
 
diff --git a/packages/workspace-trust/src/browser/workspace-trust.service.ts b/packages/core-browser/src/workspace-trust/workspace-trust.service.ts
similarity index 68%
rename from packages/workspace-trust/src/browser/workspace-trust.service.ts
rename to packages/core-browser/src/workspace-trust/workspace-trust.service.ts
index 7716468b2e..afa2c40d9c 100644
--- a/packages/workspace-trust/src/browser/workspace-trust.service.ts
+++ b/packages/core-browser/src/workspace-trust/workspace-trust.service.ts
@@ -1,22 +1,17 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import {
-  ContributionProvider,
+  CommandService,
   Deferred,
   IStorage,
+  MessageType,
   STORAGE_NAMESPACE,
   StorageProvider,
-  URI,
   localize,
-} from '@opensumi/ide-core-browser';
-import { IDialogService } from '@opensumi/ide-overlay';
+} from '@opensumi/ide-core-common';
 
-import {
-  AllowedExtensionsContribution,
-  DEFAULT_ALLOWED_EXTENSION_IDS,
-  IAllowedExtensionsContribution,
-  WORKSPACE_TRUST_STORAGE_KEY,
-  WorkspaceTrustState,
-} from '../common';
+import { OpenDialogArgs } from '../common/common.command';
+
+import { WORKSPACE_TRUST_STORAGE_KEY, WorkspaceTrustState } from './common';
 
 /**
  * Workspace trust service
@@ -27,11 +22,8 @@ export class WorkspaceTrustService {
   @Autowired(StorageProvider)
   private readonly storageProvider: StorageProvider;
 
-  @Autowired(IDialogService)
-  private readonly dialogService: IDialogService;
-
-  @Autowired(AllowedExtensionsContribution)
-  private readonly allowedExtensionsContributions: ContributionProvider<IAllowedExtensionsContribution>;
+  @Autowired(CommandService)
+  private readonly commandService: CommandService;
 
   private trustStorage: IStorage;
   private currentTrustState: WorkspaceTrustState = WorkspaceTrustState.Undecided;
@@ -117,20 +109,20 @@ export class WorkspaceTrustService {
    * Show trust dialog and wait for user decision
    */
   async showTrustDialog(): Promise<WorkspaceTrustState> {
-    const result = await this.dialogService.open({
+    const trustLabel = localize('workspace.trust.dialog.button.trust', 'Yes, I trust the authors');
+    const restrictedLabel = localize('workspace.trust.dialog.button.restricted', 'Restricted Mode');
+
+    const result = await this.commandService.executeCommand<string>('dialog.open', {
       message: `${localize('workspace.trust.dialog.title', '是否信任此文件夹中的文件的作者？')}\n\n${localize(
         'workspace.trust.dialog.message',
         '当前 IDE 提供可以自动在此文件夹中执行文件的功能。\n\n如果不信任这些文件的作者，则建议继续使用受限模式，因为这些文件可能是恶意文件。',
       )}`,
-      type: 1, // MessageType.Info
-      buttons: [
-        localize('workspace.trust.dialog.button.trust', '是的，我信任他们'),
-        localize('workspace.trust.dialog.button.restricted', '受限模式'),
-      ],
+      type: MessageType.Info,
+      buttons: [trustLabel, restrictedLabel],
       closable: false,
-    });
+    } as OpenDialogArgs);
 
-    if (result === localize('workspace.trust.dialog.button.trust', 'Yes, I trust the authors')) {
+    if (result === trustLabel) {
       await this.setTrustState(WorkspaceTrustState.Trusted);
       return WorkspaceTrustState.Trusted;
     } else {
@@ -147,29 +139,4 @@ export class WorkspaceTrustService {
       await this.showTrustDialog();
     }
   }
-
-  /**
-   * Get allowed extension IDs in restricted mode (base + contributions)
-   */
-  getAllowedExtensionIds(): string[] {
-    const allIds = new Set(DEFAULT_ALLOWED_EXTENSION_IDS);
-    const contributions = this.allowedExtensionsContributions.getContributions();
-    for (const c of contributions) {
-      for (const id of c.getAllowedExtensionIds()) {
-        allIds.add(id);
-      }
-    }
-    return Array.from(allIds);
-  }
-
-  /**
-   * Filter extension metadata to only include allowed extensions in restricted mode
-   */
-  filterExtensions<T extends { id: string }>(extensions: T[]): T[] {
-    if (!this.isRestricted()) {
-      return extensions;
-    }
-    const allowedIds = new Set(this.getAllowedExtensionIds());
-    return extensions.filter((ext) => allowedIds.has(ext.id));
-  }
 }
diff --git a/packages/extension/src/browser/allowed-extension.service.ts b/packages/extension/src/browser/allowed-extension.service.ts
new file mode 100644
index 0000000000..c4dc60f6c8
--- /dev/null
+++ b/packages/extension/src/browser/allowed-extension.service.ts
@@ -0,0 +1,63 @@
+import { Autowired, Injectable } from '@opensumi/di';
+import { WorkspaceTrustService, WorkspaceTrustState } from '@opensumi/ide-core-browser';
+import { ContributionProvider, createContributionProvider } from '@opensumi/ide-core-common';
+
+
+/**
+ * Base allowed extension IDs in restricted mode
+ */
+export const DEFAULT_ALLOWED_EXTENSION_IDS = ['vscode.theme-defaults', 'vscode.typescript-language-features'];
+
+/**
+ * Contribution token for allowed extensions registration
+ */
+export const AllowedExtensionsContribution = Symbol('AllowedExtensionsContribution');
+
+export interface IAllowedExtensionsContribution {
+  /**
+   * Return additional extension IDs allowed in restricted mode
+   */
+  getAllowedExtensionIds(): string[];
+}
+
+@Injectable()
+export class AllowedExtensionService {
+  @Autowired(WorkspaceTrustService)
+  private readonly workspaceTrustService: WorkspaceTrustService;
+
+  @Autowired(AllowedExtensionsContribution)
+  private readonly contributions: ContributionProvider<IAllowedExtensionsContribution>;
+
+  /**
+   * Get all allowed extension IDs (base + contributions)
+   */
+  getAllowedExtensionIds(): string[] {
+    const allIds = new Set(DEFAULT_ALLOWED_EXTENSION_IDS);
+    const contribs = this.contributions.getContributions();
+    for (const c of contribs) {
+      for (const id of c.getAllowedExtensionIds()) {
+        allIds.add(id);
+      }
+    }
+    return Array.from(allIds);
+  }
+
+  /**
+   * Filter extension metadata to only include allowed extensions in restricted mode
+   */
+  filterExtensions<T extends { id: string }>(extensions: T[]): T[] {
+    if (!this.workspaceTrustService.isRestricted()) {
+      return extensions;
+    }
+    const allowedIds = new Set(this.getAllowedExtensionIds());
+    return extensions.filter((ext) => allowedIds.has(ext.id));
+  }
+
+  /**
+   * Wait for trust decision then filter extensions
+   */
+  async filterExtensionsAfterTrustDecided<T extends { id: string }>(extensions: T[]): Promise<T[]> {
+    await this.workspaceTrustService.whenTrustDecided();
+    return this.filterExtensions(extensions);
+  }
+}
diff --git a/packages/extension/src/browser/extension.service.ts b/packages/extension/src/browser/extension.service.ts
index de16180e3f..9a056124da 100644
--- a/packages/extension/src/browser/extension.service.ts
+++ b/packages/extension/src/browser/extension.service.ts
@@ -37,7 +37,6 @@ import { FileSearchServicePath, IFileSearchService } from '@opensumi/ide-file-se
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 import { IDialogService, IMessageService } from '@opensumi/ide-overlay';
 import { IWorkspaceService } from '@opensumi/ide-workspace';
-import { WorkspaceTrustService } from '@opensumi/ide-workspace-trust';
 
 import {
   ERestartPolicy,
@@ -58,6 +57,7 @@ import {
 import { MainThreadAPIIdentifier } from '../common/vscode';
 
 import { ActivationEventServiceImpl } from './activation.service';
+import { AllowedExtensionService } from './allowed-extension.service';
 import { Extension } from './extension';
 import { SumiContributionsService, SumiContributionsServiceToken } from './sumi/contributes';
 import {
@@ -149,8 +149,8 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi
   @Autowired(IFileServiceClient)
   protected fileServiceClient: IFileServiceClient;
 
-  @Autowired(WorkspaceTrustService)
-  private readonly workspaceTrustService: WorkspaceTrustService;
+  @Autowired(AllowedExtensionService)
+  private readonly allowedExtensionService: AllowedExtensionService;
 
   constructor() {
     super();
@@ -239,22 +239,12 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi
     await this.updateExtHostData();
   }
 
-  private isWorkspaceTrustedModuleAvailable() {
-    try {
-      return !!this.workspaceTrustService;
-    } catch (e) {
-      return false;
-    }
-  }
-
   public async activate(): Promise<void> {
     await this.initExtensionMetaData();
-    if (this.isWorkspaceTrustedModuleAvailable()) {
-      // Wait for workspace trust decision before filtering extensions
-      await this.workspaceTrustService.whenTrustDecided();
-      // Apply trust filter if in restricted mode
-      this.extensionMetaDataArr = this.workspaceTrustService.filterExtensions(this.extensionMetaDataArr);
-    }
+    // Apply trust filter if in restricted mode
+    this.extensionMetaDataArr = await this.allowedExtensionService.filterExtensionsAfterTrustDecided(
+      this.extensionMetaDataArr,
+    );
     await this.initExtensionInstanceData();
     await this.runEagerExtensionsContributes();
     // update nls config by extensions
diff --git a/packages/extension/src/browser/index.ts b/packages/extension/src/browser/index.ts
index f049d13e79..30162b524c 100644
--- a/packages/extension/src/browser/index.ts
+++ b/packages/extension/src/browser/index.ts
@@ -1,5 +1,5 @@
 import { Injectable, Provider } from '@opensumi/di';
-import { BrowserModule } from '@opensumi/ide-core-browser';
+import { BrowserModule, createContributionProvider } from '@opensumi/ide-core-browser';
 import { DebugSessionContributionRegistry } from '@opensumi/ide-debug/lib/browser/debug-session-contribution';
 import { IDebugServer } from '@opensumi/ide-debug/lib/common';
 import { FileSearchServicePath } from '@opensumi/ide-file-search/lib/common';
@@ -26,6 +26,7 @@ import {
 } from '../common/main.thread.extender';
 
 import { ActivationEventServiceImpl } from './activation.service';
+import { AllowedExtensionService, AllowedExtensionsContribution } from './allowed-extension.service';
 import { ExtCommandManagementImpl as ExtCommandManagementImpl } from './extension-command-management';
 import { ExtInstanceManagementService } from './extension-instance-management';
 import { ExtensionManagementService } from './extension-management.service';
@@ -42,8 +43,16 @@ import { VSCodeContributesService, VSCodeContributesServiceToken } from './vscod
 
 @Injectable()
 export class ExtensionModule extends BrowserModule {
-  contributionProvider = [RequireInterceptorContribution, MainThreadExtenderContribution];
+  contributionProvider = [
+    RequireInterceptorContribution,
+    MainThreadExtenderContribution,
+    AllowedExtensionsContribution,
+  ];
   providers: Provider[] = [
+    {
+      token: AllowedExtensionService,
+      useClass: AllowedExtensionService,
+    },
     {
       token: ExtensionService,
       useClass: ExtensionServiceImpl,
@@ -120,3 +129,10 @@ export class ExtensionModule extends BrowserModule {
     },
   ];
 }
+
+export {
+  AllowedExtensionService,
+  AllowedExtensionsContribution,
+  IAllowedExtensionsContribution,
+  DEFAULT_ALLOWED_EXTENSION_IDS,
+} from './allowed-extension.service';
diff --git a/packages/overlay/src/browser/dialog.contribution.ts b/packages/overlay/src/browser/dialog.contribution.ts
index 9cccbb9174..691b55de95 100644
--- a/packages/overlay/src/browser/dialog.contribution.ts
+++ b/packages/overlay/src/browser/dialog.contribution.ts
@@ -33,6 +33,21 @@ export class DialogContribution implements CommandContribution, KeybindingContri
         },
       },
     );
+
+    registry.registerCommand(
+      {
+        id: DIALOG_COMMANDS.OPEN.id,
+      },
+      {
+        execute: (args: { message: string; type: number; buttons?: string[]; closable?: boolean }) =>
+          this.dialogService.open<string>({
+            message: args.message,
+            type: args.type,
+            buttons: args.buttons,
+            closable: args.closable,
+          }),
+      },
+    );
   }
 
   registerKeybindings(bindings: KeybindingRegistry) {
diff --git a/packages/startup/src/browser/common-modules.ts b/packages/startup/src/browser/common-modules.ts
index ffcb9d0c7a..e5500de1ac 100644
--- a/packages/startup/src/browser/common-modules.ts
+++ b/packages/startup/src/browser/common-modules.ts
@@ -40,7 +40,6 @@ import { VariableModule } from '@opensumi/ide-variable/lib/browser';
 import { WebviewModule } from '@opensumi/ide-webview';
 import { WorkspaceModule } from '@opensumi/ide-workspace/lib/browser';
 import { WorkspaceEditModule } from '@opensumi/ide-workspace-edit/lib/browser';
-import { WorkspaceTrustModule } from '@opensumi/ide-workspace-trust';
 
 export const CommonBrowserModules: ConstructorOf<BrowserModule>[] = [
   MainLayoutModule,
@@ -62,7 +61,6 @@ export const CommonBrowserModules: ConstructorOf<BrowserModule>[] = [
 
   ThemeModule,
   WorkspaceModule,
-  WorkspaceTrustModule,
   ExtensionStorageModule,
   StorageModule,
   OpenedEditorModule,
diff --git a/packages/workspace-trust/package.json b/packages/workspace-trust/package.json
deleted file mode 100644
index c5d986c5f1..0000000000
--- a/packages/workspace-trust/package.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "@opensumi/ide-workspace-trust",
-  "version": "3.9.0",
-  "files": [
-    "lib",
-    "src"
-  ],
-  "license": "MIT",
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
-  "scripts": {
-    "prepublishOnly": "yarn run build",
-    "build": "tsc --build ../../configs/ts/references/tsconfig.workspace-trust.json"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:opensumi/core.git"
-  },
-  "dependencies": {
-    "@opensumi/ide-core-common": "workspace:*",
-    "react": "^18.2.0"
-  },
-  "devDependencies": {
-    "@opensumi/ide-core-browser": "workspace:*",
-    "@opensumi/ide-dev-tool": "workspace:*",
-    "@opensumi/ide-overlay": "workspace:*",
-    "@opensumi/ide-status-bar": "workspace:*",
-    "@opensumi/ide-workspace": "workspace:*"
-  }
-}
diff --git a/packages/workspace-trust/src/browser/index.ts b/packages/workspace-trust/src/browser/index.ts
deleted file mode 100644
index f5e4f6b895..0000000000
--- a/packages/workspace-trust/src/browser/index.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Injectable, Provider } from '@opensumi/di';
-import { BrowserModule, createContributionProvider } from '@opensumi/ide-core-browser';
-
-import { AllowedExtensionsContribution } from '../common';
-
-import { WorkspaceTrustCommandContribution } from './workspace-trust-command.contribution';
-import { WorkspaceTrustSettingsContribution } from './workspace-trust-settings.contribution';
-import { WorkspaceTrustStatusBarContribution } from './workspace-trust-statusbar.contribution';
-import { WorkspaceTrustContribution } from './workspace-trust.contribution';
-import { WorkspaceTrustService } from './workspace-trust.service';
-
-@Injectable()
-export class WorkspaceTrustModule extends BrowserModule {
-  contributionProvider = [AllowedExtensionsContribution];
-  providers: Provider[] = [
-    WorkspaceTrustService,
-    WorkspaceTrustContribution,
-    WorkspaceTrustStatusBarContribution,
-    WorkspaceTrustCommandContribution,
-    WorkspaceTrustSettingsContribution,
-  ];
-}
-
-export { WorkspaceTrustService } from './workspace-trust.service';
-export { WorkspaceTrustContribution } from './workspace-trust.contribution';
-export { WorkspaceTrustStatusBarContribution } from './workspace-trust-statusbar.contribution';
-export {
-  WorkspaceTrustCommandContribution,
-  WORKSPACE_TRUST_EXIT_RESTRICTED_COMMAND,
-} from './workspace-trust-command.contribution';
-export { WorkspaceTrustSettingsContribution } from './workspace-trust-settings.contribution';
-export {
-  WorkspaceTrustState,
-  DEFAULT_ALLOWED_EXTENSION_IDS,
-  AllowedExtensionsContribution,
-  IAllowedExtensionsContribution,
-} from '../common';
diff --git a/packages/workspace-trust/src/index.ts b/packages/workspace-trust/src/index.ts
deleted file mode 100644
index 9fb54076c1..0000000000
--- a/packages/workspace-trust/src/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './browser';
-export * from './common';

From bc634956f3b1b53646a19c8215291dc9ac32eec2 Mon Sep 17 00:00:00 2001
From: "kengtou.mh" <kengtou.mh@antfin.com>
Date: Mon, 11 May 2026 15:18:50 +0800
Subject: [PATCH 5/9] chore: restore yarn.lock

---
 yarn.lock | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6f371b667d..36e04defaa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3846,7 +3846,6 @@ __metadata:
     "@opensumi/ide-webview": "workspace:*"
     "@opensumi/ide-workspace": "workspace:*"
     "@opensumi/ide-workspace-edit": "workspace:*"
-    "@opensumi/ide-workspace-trust": "workspace:*"
     address: "npm:^1.1.2"
     glob-to-regexp: "npm:0.4.1"
     is-running: "npm:^2.1.0"
@@ -4501,19 +4500,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@opensumi/ide-workspace-trust@workspace:*, @opensumi/ide-workspace-trust@workspace:packages/workspace-trust":
-  version: 0.0.0-use.local
-  resolution: "@opensumi/ide-workspace-trust@workspace:packages/workspace-trust"
-  dependencies:
-    "@opensumi/ide-core-browser": "workspace:*"
-    "@opensumi/ide-core-common": "workspace:*"
-    "@opensumi/ide-dev-tool": "workspace:*"
-    "@opensumi/ide-overlay": "workspace:*"
-    "@opensumi/ide-status-bar": "workspace:*"
-    "@opensumi/ide-workspace": "workspace:*"
-  languageName: unknown
-  linkType: soft
-
 "@opensumi/ide-workspace@workspace:*, @opensumi/ide-workspace@workspace:packages/workspace":
   version: 0.0.0-use.local
   resolution: "@opensumi/ide-workspace@workspace:packages/workspace"

From 170eb331fa0d1f9c747501661d67f411bf187b1c Mon Sep 17 00:00:00 2001
From: "kengtou.mh" <kengtou.mh@antfin.com>
Date: Mon, 11 May 2026 15:21:49 +0800
Subject: [PATCH 6/9] fix: fix dep

---
 packages/extension/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/extension/package.json b/packages/extension/package.json
index afb0385e3d..cb5a78661e 100644
--- a/packages/extension/package.json
+++ b/packages/extension/package.json
@@ -35,7 +35,6 @@
     "@opensumi/ide-terminal-next": "workspace:*",
     "@opensumi/ide-utils": "workspace:*",
     "@opensumi/ide-webview": "workspace:*",
-    "@opensumi/ide-workspace-trust": "workspace:*",
     "address": "^1.1.2",
     "glob-to-regexp": "0.4.1",
     "is-running": "^2.1.0",

From f136fdb684b314881c7f2fc366ede29b7c1fbcf7 Mon Sep 17 00:00:00 2001
From: "kengtou.mh" <kengtou.mh@antfin.com>
Date: Mon, 11 May 2026 16:11:23 +0800
Subject: [PATCH 7/9] chore: better description

---
 .../workspace-trust-settings.contribution.ts               | 7 ++++---
 .../extension/src/browser/allowed-extension.service.ts     | 3 +--
 packages/i18n/src/common/zh-CN.lang.ts                     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/core-browser/src/workspace-trust/workspace-trust-settings.contribution.ts b/packages/core-browser/src/workspace-trust/workspace-trust-settings.contribution.ts
index 0962f5a753..2b0d5f9990 100644
--- a/packages/core-browser/src/workspace-trust/workspace-trust-settings.contribution.ts
+++ b/packages/core-browser/src/workspace-trust/workspace-trust-settings.contribution.ts
@@ -1,4 +1,5 @@
-import { Autowired, Injectable } from '@opensumi/di';
+import { Autowired } from '@opensumi/di';
+import { localize } from '@opensumi/ide-core-common';
 import { Domain } from '@opensumi/ide-core-common/lib/di-helper';
 
 import { ClientAppContribution } from '../common/common.define';
@@ -15,12 +16,12 @@ export class WorkspaceTrustSettingsContribution implements ClientAppContribution
   onStart() {
     this.preferenceSettingsService.registerSettingGroup({
       id: 'workspace-trust',
-      title: '%workspace.trust.settings.group.title%',
+      title: localize('workspace.trust.settings.group.title'),
       iconClass: getIcon('shield'),
     });
 
     this.preferenceSettingsService.registerSettingSection('workspace-trust', {
-      title: '%workspace.trust.settings.section.title%',
+      title: localize('workspace.trust.settings.section.title'),
       component: WorkspaceTrustSettingPanel,
     });
   }
diff --git a/packages/extension/src/browser/allowed-extension.service.ts b/packages/extension/src/browser/allowed-extension.service.ts
index c4dc60f6c8..61aa1669d5 100644
--- a/packages/extension/src/browser/allowed-extension.service.ts
+++ b/packages/extension/src/browser/allowed-extension.service.ts
@@ -2,7 +2,6 @@ import { Autowired, Injectable } from '@opensumi/di';
 import { WorkspaceTrustService, WorkspaceTrustState } from '@opensumi/ide-core-browser';
 import { ContributionProvider, createContributionProvider } from '@opensumi/ide-core-common';
 
-
 /**
  * Base allowed extension IDs in restricted mode
  */
@@ -32,7 +31,7 @@ export class AllowedExtensionService {
    * Get all allowed extension IDs (base + contributions)
    */
   getAllowedExtensionIds(): string[] {
-    const allIds = new Set(DEFAULT_ALLOWED_EXTENSION_IDS);
+    const allIds = new Set<string>(DEFAULT_ALLOWED_EXTENSION_IDS);
     const contribs = this.contributions.getContributions();
     for (const c of contribs) {
       for (const id of c.getAllowedExtensionIds()) {
diff --git a/packages/i18n/src/common/zh-CN.lang.ts b/packages/i18n/src/common/zh-CN.lang.ts
index 6badabda60..10fb94810f 100644
--- a/packages/i18n/src/common/zh-CN.lang.ts
+++ b/packages/i18n/src/common/zh-CN.lang.ts
@@ -1441,8 +1441,8 @@ export const localizationBundle = {
     'workspace.trust.dialog.title': '是否信任此文件夹中的文件的作者？',
     'workspace.trust.dialog.message':
       '当前 IDE 提供可以自动在此文件夹中执行文件的功能。\n\n如果不信任这些文件的作者，则建议继续使用受限模式，因为这些文件可能是恶意文件。',
-    'workspace.trust.dialog.button.trust': '是的，我信任他们',
-    'workspace.trust.dialog.button.restricted': '受限模式',
+    'workspace.trust.dialog.button.trust': '我信任该文件夹',
+    'workspace.trust.dialog.button.restricted': '使用受限模式',
     'workspace.trust.statusbar.restricted': '受限模式',
     'workspace.trust.statusbar.restricted.tooltip': '受限模式 - 部分功能已出于安全考虑被禁用',
     'workspace.trust.exitRestricted.label': '退出受限模式',

From 4950b3338f065ba4e3aaa58f6bb29db3ec8073e5 Mon Sep 17 00:00:00 2001
From: "kengtou.mh" <kengtou.mh@antfin.com>
Date: Thu, 14 May 2026 15:11:07 +0800
Subject: [PATCH 8/9] feat: add command register awaiter

---
 .../workspace-trust.service.ts                |  1 +
 packages/core-common/src/command.ts           | 55 +++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/packages/core-browser/src/workspace-trust/workspace-trust.service.ts b/packages/core-browser/src/workspace-trust/workspace-trust.service.ts
index afa2c40d9c..d9fce3c05a 100644
--- a/packages/core-browser/src/workspace-trust/workspace-trust.service.ts
+++ b/packages/core-browser/src/workspace-trust/workspace-trust.service.ts
@@ -112,6 +112,7 @@ export class WorkspaceTrustService {
     const trustLabel = localize('workspace.trust.dialog.button.trust', 'Yes, I trust the authors');
     const restrictedLabel = localize('workspace.trust.dialog.button.restricted', 'Restricted Mode');
 
+    await this.commandService.waitCommandHandlerRegistered('dialog.open');
     const result = await this.commandService.executeCommand<string>('dialog.open', {
       message: `${localize('workspace.trust.dialog.title', '是否信任此文件夹中的文件的作者？')}\n\n${localize(
         'workspace.trust.dialog.message',
diff --git a/packages/core-common/src/command.ts b/packages/core-common/src/command.ts
index bfa9a61a71..de865eb8d8 100644
--- a/packages/core-common/src/command.ts
+++ b/packages/core-common/src/command.ts
@@ -153,6 +153,13 @@ export interface CommandService {
   tryExecuteCommand<T>(commandId: string, ...args: any[]): Promise<T | undefined>;
   onWillExecuteCommand: Event<ICommandEvent>;
   onDidExecuteCommand: Event<ICommandEvent>;
+  /**
+   * Wait until a command handler is registered for the given command id.
+   * Resolves immediately if a handler already exists.
+   * @param commandId command id to wait for
+   * @param timeoutMs max wait time in milliseconds, default 30000
+   */
+  waitCommandHandlerRegistered(commandId: string, timeoutMs?: number): Promise<void>;
 }
 
 /**
@@ -243,6 +250,13 @@ interface CoreCommandRegistry {
    * @param args
    */
   isPermittedCommand(commandId: string, extensionInfo: IExtensionInfo, ...args: any[]): boolean;
+  /**
+   * Wait until a command handler is registered for the given command id.
+   * Resolves immediately if a handler already exists.
+   * @param commandId command id to wait for
+   * @param timeoutMs max wait time in milliseconds, default 30000
+   */
+  waitCommandHandlerRegistered(commandId: string, timeoutMs?: number): Promise<void>;
 }
 
 export interface CommandRegistry extends CoreCommandRegistry {
@@ -272,6 +286,9 @@ export class CoreCommandRegistryImpl implements CoreCommandRegistry {
 
   private readonly logger = getDebugLogger();
 
+  // Emitters waiting for a handler to be registered for a specific command
+  private readonly _handlerWaitingEmitters = new Map<string, Emitter<void>>();
+
   /**
    * 命令执行方法
    * @param commandId 命令执行方法
@@ -407,6 +424,15 @@ export class CoreCommandRegistryImpl implements CoreCommandRegistry {
       this._handlers[commandId] = handlers = [];
     }
     handlers.unshift(handler);
+
+    // Notify any waiters that a handler is now registered
+    const waitingEmitter = this._handlerWaitingEmitters.get(commandId);
+    if (waitingEmitter) {
+      waitingEmitter.fire();
+      waitingEmitter.dispose();
+      this._handlerWaitingEmitters.delete(commandId);
+    }
+
     return {
       dispose: () => {
         const idx = handlers.indexOf(handler);
@@ -512,6 +538,31 @@ export class CoreCommandRegistryImpl implements CoreCommandRegistry {
     );
   }
 
+  waitCommandHandlerRegistered(commandId: string, timeoutMs = 30000): Promise<void> {
+    // Resolve immediately if a handler already exists
+    if (this.getActiveHandler(commandId)) {
+      return Promise.resolve();
+    }
+
+    return new Promise<void>((resolve, reject) => {
+      let waitingEmitter = this._handlerWaitingEmitters.get(commandId);
+      if (!waitingEmitter) {
+        waitingEmitter = new Emitter<void>();
+        this._handlerWaitingEmitters.set(commandId, waitingEmitter);
+      }
+
+      const timer = setTimeout(() => {
+        listener.dispose();
+        reject(new Error(`Timeout waiting for command handler registration: ${commandId}`));
+      }, timeoutMs);
+
+      const listener = waitingEmitter.event(() => {
+        clearTimeout(timer);
+        resolve();
+      });
+    });
+  }
+
   /**
    * 获取可切换的命令处理函数
    * @param commandId 命令 id
@@ -727,4 +778,8 @@ export class CommandServiceImpl implements CommandService {
       getDebugLogger().warn(err);
     }
   }
+
+  waitCommandHandlerRegistered(commandId: string, timeoutMs?: number): Promise<void> {
+    return this.commandRegistry.waitCommandHandlerRegistered(commandId, timeoutMs);
+  }
 }

From 922f3911b1754143d2348ca35e8e07bf81cdc75b Mon Sep 17 00:00:00 2001
From: "kengtou.mh" <kengtou.mh@antfin.com>
Date: Thu, 14 May 2026 19:13:01 +0800
Subject: [PATCH 9/9] feat: fix theme stuck

---
 .../src/browser/allowed-extension.service.ts  | 11 +++----
 .../src/browser/extension.service.ts          | 33 +++++++++++++++----
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/packages/extension/src/browser/allowed-extension.service.ts b/packages/extension/src/browser/allowed-extension.service.ts
index 61aa1669d5..bd18e921ed 100644
--- a/packages/extension/src/browser/allowed-extension.service.ts
+++ b/packages/extension/src/browser/allowed-extension.service.ts
@@ -1,6 +1,6 @@
 import { Autowired, Injectable } from '@opensumi/di';
-import { WorkspaceTrustService, WorkspaceTrustState } from '@opensumi/ide-core-browser';
-import { ContributionProvider, createContributionProvider } from '@opensumi/ide-core-common';
+import { WorkspaceTrustService } from '@opensumi/ide-core-browser';
+import { ContributionProvider } from '@opensumi/ide-core-common';
 
 /**
  * Base allowed extension IDs in restricted mode
@@ -53,10 +53,9 @@ export class AllowedExtensionService {
   }
 
   /**
-   * Wait for trust decision then filter extensions
+   * Wait for trust decision to be made
    */
-  async filterExtensionsAfterTrustDecided<T extends { id: string }>(extensions: T[]): Promise<T[]> {
-    await this.workspaceTrustService.whenTrustDecided();
-    return this.filterExtensions(extensions);
+  waitTrustDecided(): Promise<void> {
+    return this.workspaceTrustService.whenTrustDecided();
   }
 }
diff --git a/packages/extension/src/browser/extension.service.ts b/packages/extension/src/browser/extension.service.ts
index 9a056124da..8ce34d6b0b 100644
--- a/packages/extension/src/browser/extension.service.ts
+++ b/packages/extension/src/browser/extension.service.ts
@@ -241,12 +241,30 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi
 
   public async activate(): Promise<void> {
     await this.initExtensionMetaData();
-    // Apply trust filter if in restricted mode
-    this.extensionMetaDataArr = await this.allowedExtensionService.filterExtensionsAfterTrustDecided(
-      this.extensionMetaDataArr,
-    );
-    await this.initExtensionInstanceData();
+
+    // Split extensions into allowed (can init before trust decision) and others (wait for trust)
+    const allowedIds = new Set(this.allowedExtensionService.getAllowedExtensionIds());
+    const allowedExtensions = this.extensionMetaDataArr.filter((ext) => allowedIds.has(ext.id));
+    const pendingExtensions = this.extensionMetaDataArr.filter((ext) => !allowedIds.has(ext.id));
+
+    // Initialize allowed extensions immediately
+    await this.initExtensionInstanceData(allowedExtensions);
     await this.runEagerExtensionsContributes();
+
+    if (pendingExtensions.length > 0) {
+      // Wait for trust decision, then initialize the rest
+      await this.allowedExtensionService.waitTrustDecided();
+      const allowedPending = this.allowedExtensionService.filterExtensions(pendingExtensions);
+      if (allowedPending.length > 0) {
+        await this.initExtensionInstanceData(allowedPending);
+      }
+      // Run eager extension contributes once all extensions are initialized
+      await this.runEagerExtensionsContributes();
+    }
+
+    // Final extension list after trust filtering
+    this.extensionMetaDataArr = this.allowedExtensionService.filterExtensions(this.extensionMetaDataArr);
+
     // update nls config by extensions
     await this.setupExtensionNLSConfig();
 
@@ -309,8 +327,9 @@ export class ExtensionServiceImpl extends WithEventBus implements ExtensionServi
   /**
    * 初始化插件实例数据
    */
-  private async initExtensionInstanceData() {
-    for (const extensionMetaData of this.extensionMetaDataArr) {
+  private async initExtensionInstanceData(extensions?: IExtensionMetaData[]) {
+    const metaDataArr = extensions ?? this.extensionMetaDataArr;
+    for (const extensionMetaData of metaDataArr) {
       const isBuiltin = this.extensionInstanceManageService.checkIsBuiltin(extensionMetaData);
       const isDevelopment = this.extensionInstanceManageService.checkIsDevelopment(extensionMetaData);
       const extension = await this.extensionInstanceManageService.createExtensionInstance(