revert(browser): 移除「导入本机浏览器登录态」功能（保留代理设置）

apps/desktop/src/main/browser/browser-controller.ts

@@ -2,9 +2,10 @@ import { getLogger } from '../logger'
 const log = getLogger('browser')
 
 import { app, BrowserWindow, session as electronSession, WebContentsView, type Rectangle, type Session } from 'electron'
-import { existsSync, readFileSync, writeFileSync } from 'node:fs'
+import { existsSync, readFileSync, readdirSync, writeFileSync } from 'node:fs'
+import { rm as rmAsync } from 'node:fs/promises'
 import { join } from 'node:path'
-import type { BrowserImportInfo, BrowserTabInfo, BrowserUiState } from '@shared/types'
+import type { BrowserProxySettings, BrowserTabInfo, BrowserUiState } from '@shared/types'
 import {
   BrowserCdpTimeoutError,
   BROWSER_OBSERVE_TIMEOUT_MS,
@@ -30,8 +31,10 @@ import {
  *   渲染层 BrowserSlot 量出占位矩形，经 IPC 同步边界（原生视图天然盖在 DOM 之上）。
  * - 页面观察/操作全部走 CDP（webContents.debugger）：AX tree 快照 + ref 代际机制
  *   + Input.dispatch* 真实输入事件；不在页面里执行模拟点击。
- * - 登录态隔离在 persist:aso-browser 分区；本地浏览器配置导入由 browser-profile.ts
- *   直接迁移分区目录数据（Cookies/Local Storage + 密钥移植）。
+ * - 登录态隔离在 persist:aso-browser 分区，随分区持久保存。
+ * - 代理设置作用于同一分区会话（session.setProxy）：跟随系统 / 直连 / 手动规则
+ *   （Chromium proxyRules 语法 + 绕过列表），持久化进 aso-browser.json，
+ *   启动即应用、修改后断开在途连接立即生效（对 Agent 的 browser_* 工具同样生效）。
  */
 
 const PARTITION = 'persist:aso-browser'
@@ -70,7 +73,7 @@ interface TabRecord {
 
 interface BrowserSettings {
   riskAcknowledged: boolean
-  imported?: BrowserImportInfo | null
+  proxy?: BrowserProxySettings
 }
 
 export interface BrowserObservation {
@@ -111,6 +114,36 @@ function textValue(v: unknown): string {
   return ''
 }
 
+/** 校验/规范化代理输入（fixed 模式必须有可解析的 host:port 规则；其余模式丢弃规则字段） */
+function normalizeProxy(input: BrowserProxySettings): BrowserProxySettings {
+  if (input.mode !== 'fixed') return { mode: input.mode }
+  const entries = (input.rules ?? '')
+    .split(';')
+    .map((s) => s.trim())
+    .filter(Boolean)
+  if (entries.length === 0) {
+    throw new Error('手动代理需要填写规则，如 127.0.0.1:7890（多协议用分号分隔，如 http=127.0.0.1:7890;https=127.0.0.1:7890）。')
+  }
+  for (const entry of entries) {
+    const hostPort = entry.includes('://')
+      ? entry.slice(entry.indexOf('://') + 3)
+      : entry.includes('=')
+        ? entry.slice(entry.indexOf('=') + 1)
+        : entry
+    const colon = hostPort.lastIndexOf(':')
+    const port = colon >= 0 ? hostPort.slice(colon + 1) : ''
+    if (!hostPort || colon < 0 || !/^\d{1,5}$/.test(port) || Number(port) < 1 || Number(port) > 65535) {
+      throw new Error(`代理规则「${entry}」无效：应为 host:port（如 127.0.0.1:7890）。`)
+    }
+  }
+  const bypass = (input.bypass ?? '')
+    .split(',')
+    .map((s) => s.trim())
+    .filter(Boolean)
+    .join(',')
+  return { mode: 'fixed', rules: entries.join(';'), bypass: bypass || undefined }
+}
+
 function isEditableAxNode(node: Record<string, unknown>): boolean {
   const role = textValue(node.role).toLowerCase()
   if (role === 'textfield' || role === 'textbox' || role === 'searchbox') return true
@@ -289,19 +322,24 @@ export class BrowserController {
   private closedTabs: Array<{ title: string; url: string; closedAt: number }> = []
 
   constructor() {
-    this.browserSession = electronSession.fromPartition(PARTITION)
+    this.settings = this.loadSettings()
+    this.browserSession = this.createBrowserSession()
+    this.cleanupLegacyImportArtifacts()
+  }
+
+  /** 创建受管分区会话并挂上固定策略（UA、权限、下载、代理） */
+  private createBrowserSession(): Session {
+    const session = electronSession.fromPartition(PARTITION)
     // 诚实的 UA：保留 Chromium token 保证站点兼容，去掉 Electron 标识
-    this.browserSession.setUserAgent(
-      this.browserSession.getUserAgent().replace(/Electron\/[\d.]+/, `InkreachAgent/${app.getVersion()}`)
-    )
+    session.setUserAgent(session.getUserAgent().replace(/Electron\/[\d.]+/, `InkreachAgent/${app.getVersion()}`))
     // 网页权限请求（摄像头/定位等）默认拒绝
-    this.browserSession.setPermissionRequestHandler((_wc, _permission, callback) => callback(false))
+    session.setPermissionRequestHandler((_wc, _permission, callback) => callback(false))
     // 下载留在受管浏览器内，落到系统下载目录（重名自动加序号）
-    this.browserSession.on('will-download', (_event, item) => {
+    session.on('will-download', (_event, item) => {
       const dir = app.getPath('downloads')
       const base = item.getFilename() || 'download'
       const dot = base.lastIndexOf('.')
-      const stem = dot > 0 ? base.slice(0, dot) : base
+      const stem = dot > 0 ? base.slice(0, dot) : ''
       const ext = dot > 0 ? base.slice(dot) : ''
       let target = join(dir, base)
       for (let i = 1; existsSync(target) && i < 100; i++) {
@@ -309,7 +347,11 @@ export class BrowserController {
       }
       item.setSavePath(target)
     })
-    this.settings = this.loadSettings()
+    // 启动即应用持久化的代理设置（setProxy 异步；失败不阻塞浏览器初始化，日志可查）
+    this.applyProxyTo(session, this.proxySettings()).catch((err: unknown) => {
+      log.error('启动时代理设置应用失败:', { err })
+    })
+    return session
   }
 
   // ---- 设置持久化 ----
@@ -321,12 +363,16 @@ export class BrowserController {
   private loadSettings(): BrowserSettings {
     try {
       const raw = JSON.parse(readFileSync(this.settingsFile, 'utf8')) as Partial<BrowserSettings>
+      const proxy = raw.proxy
       return {
         riskAcknowledged: raw.riskAcknowledged === true,
-        imported: raw.imported ?? null
+        proxy:
+          proxy && (proxy.mode === 'direct' || proxy.mode === 'fixed' || proxy.mode === 'system')
+            ? proxy
+            : { mode: 'system' }
       }
     } catch {
-      return { riskAcknowledged: false }
+      return { riskAcknowledged: false, proxy: { mode: 'system' } }
     }
   }
 
@@ -338,20 +384,66 @@ export class BrowserController {
     }
   }
 
-  /** 配置导入完成后由 browser-profile.ts 回写摘要 */
-  setImportedInfo(info: BrowserImportInfo | null): void {
-    this.settings.imported = info
+  /** 历史遗留清理：删除已下线的「登录态导入」功能留下的轮换分区目录与暂存
+   *  （aso-browser-g* / .import-staging-* / aso-browser.pending-import）。
+   *  控制器创建时无人持有这些目录的句柄；失败只记日志，下次启动再试。 */
+  private cleanupLegacyImportArtifacts(): void {
+    const root = join(app.getPath('userData'), 'Partitions')
+    if (!existsSync(root)) return
+    const stale: string[] = []
+    for (const entry of readdirSync(root, { withFileTypes: true })) {
+      if (!entry.isDirectory()) continue
+      if (
+        entry.name.startsWith('.import-staging-') ||
+        entry.name === 'aso-browser.pending-import' ||
+        /^aso-browser-g\d+$/.test(entry.name)
+      ) {
+        stale.push(entry.name)
+      }
+    }
+    if (stale.length === 0) return
+    void (async () => {
+      for (const name of stale) {
+        try {
+          await rmAsync(join(root, name), { recursive: true, force: true, maxRetries: 1 })
+        } catch (err) {
+          log.warn('清理遗留导入目录失败，下次启动重试', { name, err: err instanceof Error ? err.message : String(err) })
+        }
+      }
+      log.info('cleaned legacy import artifacts', { stale })
+    })()
+  }
+
+  // ---- 代理设置 ----
+
+  private proxySettings(): BrowserProxySettings {
+    return this.settings.proxy ?? { mode: 'system' }
+  }
+
+  getProxySettings(): BrowserProxySettings {
+    return this.proxySettings()
+  }
+
+  /** 应用到指定分区会话；切换后断开在途连接，让新规则对已打开的标签立即生效 */
+  private async applyProxyTo(session: Session, proxy: BrowserProxySettings): Promise<void> {
+    await session.setProxy(
+      proxy.mode === 'fixed'
+        ? { mode: 'fixed_servers', proxyRules: proxy.rules ?? '', proxyBypassRules: proxy.bypass }
+        : proxy.mode === 'direct'
+          ? { mode: 'direct' }
+          : { mode: 'system' }
+    )
+    await session.closeAllConnections()
+  }
+
+  /** 更新并持久化代理设置：先应用成功才落盘（失败抛错给 UI，原设置保持不变） */
+  async setProxySettings(input: BrowserProxySettings): Promise<BrowserProxySettings> {
+    const next = normalizeProxy(input)
+    await this.applyProxyTo(this.browserSession, next)
+    this.settings.proxy = next
     this.saveSettings()
     this.emitState()
-  }
-
-  get importedInfo(): BrowserImportInfo | null {
-    return this.settings.imported ?? null
-  }
-
-  /** 当前是否有活跃标签页（导入配置前必须没有） */
-  get hasTabs(): boolean {
-    return this.tabs.size > 0
+    return next
   }
 
   // ---- 窗口与状态广播 ----
@@ -395,7 +487,7 @@ export class BrowserController {
       activeTabId: this.activeTabId,
       recentClosed: this.closedTabs.map(({ title, url }) => ({ title, url })),
       trace: this.traceText,
-      imported: this.settings.imported ?? null
+      proxy: this.proxySettings()
     }
   }
 
@@ -456,8 +548,11 @@ export class BrowserController {
     if (!this.owner || this.owner.isDestroyed()) throw new Error('主窗口尚未就绪，无法创建浏览器标签。')
     if (this.tabs.size >= MAX_TABS) throw new Error(`浏览器标签页已达上限（${MAX_TABS}），请先关闭不需要的标签。`)
     const tabId = `tab-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`
+    // popup 的 viewOptions 不一定带 partition（会导致弹窗落入默认会话），统一强制受管分区
     const view = new WebContentsView(
-      viewOptions ?? {
+      viewOptions
+        ? { ...viewOptions, webPreferences: { ...(viewOptions.webPreferences ?? {}), partition: PARTITION } }
+        : {
             webPreferences: {
               partition: PARTITION,
               nodeIntegration: false,
@@ -611,7 +706,7 @@ export class BrowserController {
     return this.buildState()
   }
 
-  /** 关闭整个受管浏览器（销毁全部标签；导入配置前也会走这里） */
+  /** 关闭整个受管浏览器（销毁全部标签；分区会话与登录态保留） */
   close(): BrowserUiState {
     for (const tabId of [...this.tabs.keys()]) this.closeTab(tabId)
     this.agentTabId = null

apps/desktop/src/main/browser/browser-profile.ts

@@ -1,256 +0,0 @@
-import { app } from 'electron'
-import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from 'node:fs'
-import { homedir } from 'node:os'
-import { join } from 'node:path'
-import type { BrowserImportResult, BrowserProfileMeta, BrowserSource } from '@shared/types'
-import { getBrowserController } from './browser-controller'
-
-/**
- * 本地浏览器配置导入（复用各网站登录态）。
- *
- * 实现思路（零解密依赖，纯文件迁移）：
- * - Local Storage / IndexedDB 在 Chromium 里是明文 leveldb，直接拷入受管分区即可生效。
- * - Cookies 用 AES-GCM 加密，密钥经 OS 加密后存于浏览器根目录 Local State
- *   （os_crypt.encrypted_key）。Windows 上该密钥由 DPAPI（用户级）包裹——同一
- *   Windows 用户的任意进程都能解开，因此把这份密钥「移植」进本应用的 Local State，
- *   本应用内的 Chromium 即可解密拷贝过来的 Cookies（Chrome 127+ 的 app-bound
- *   加密 V20 除外，会明确提示不支持）。macOS/Linux 的密钥绑定钥匙串/KWallet，
- *   Cookies 无法直接迁移，仅迁移 Local Storage。
- */
-
-/** Chromium 系浏览器的用户数据根目录（按平台） */
-const SOURCE_ROOTS: Array<{ id: string; name: string; win: string; mac: string; linux: string }> = [
-  {
-    id: 'chrome',
-    name: 'Google Chrome',
-    win: join(process.env.LOCALAPPDATA ?? '', 'Google', 'Chrome', 'User Data'),
-    mac: join(homedir(), 'Library', 'Application Support', 'Google', 'Chrome'),
-    linux: join(homedir(), '.config', 'google-chrome')
-  },
-  {
-    id: 'edge',
-    name: 'Microsoft Edge',
-    win: join(process.env.LOCALAPPDATA ?? '', 'Microsoft', 'Edge', 'User Data'),
-    mac: join(homedir(), 'Library', 'Application Support', 'Microsoft Edge'),
-    linux: join(homedir(), '.config', 'microsoft-edge')
-  },
-  {
-    id: 'brave',
-    name: 'Brave',
-    win: join(process.env.LOCALAPPDATA ?? '', 'BraveSoftware', 'Brave-Browser', 'User Data'),
-    mac: join(homedir(), 'Library', 'Application Support', 'BraveSoftware', 'Brave-Browser'),
-    linux: join(homedir(), '.config', 'BraveSoftware', 'Brave-Browser')
-  },
-  {
-    id: 'chromium',
-    name: 'Chromium',
-    win: join(process.env.LOCALAPPDATA ?? '', 'Chromium', 'User Data'),
-    mac: join(homedir(), 'Library', 'Application Support', 'Chromium'),
-    linux: join(homedir(), '.config', 'chromium')
-  }
-]
-
-/** 受管浏览器分区目录（persist:aso-browser 的落盘位置） */
-function partitionDir(): string {
-  return join(app.getPath('userData'), 'Partitions', 'aso-browser')
-}
-
-function sourceRoot(id: string): string {
-  const source = SOURCE_ROOTS.find((s) => s.id === id)
-  if (!source) return ''
-  return process.platform === 'win32' ? source.win : process.platform === 'darwin' ? source.mac : source.linux
-}
-
-/** 读取 profile 的展示名（Preferences 的 profile.name，失败时用目录名） */
-function readProfileName(profileDir: string): string {
-  try {
-    const file = join(profileDir, 'Preferences')
-    if (statSync(file).size > 8 * 1024 * 1024) return profileDir.split(/[\\/]/).pop() || profileDir
-    const raw = JSON.parse(readFileSync(file, 'utf8')) as { profile?: { name?: string } }
-    return raw.profile?.name?.trim() || profileDir.split(/[\\/]/).pop() || profileDir
-  } catch {
-    return profileDir.split(/[\\/]/).pop() || profileDir
-  }
-}
-
-/** 检测本机可导入的浏览器与 profile 列表 */
-export function detectBrowserSources(): BrowserSource[] {
-  const sources: BrowserSource[] = []
-  for (const source of SOURCE_ROOTS) {
-    const root = sourceRoot(source.id)
-    if (!root || !existsSync(root)) continue
-    const profiles: BrowserProfileMeta[] = []
-    try {
-      for (const entry of readdirSync(root, { withFileTypes: true })) {
-        if (!entry.isDirectory()) continue
-        if (entry.name.startsWith('.') || entry.name === 'System Profile' || entry.name === 'Guest Profile') continue
-        const profileDir = join(root, entry.name)
-        if (!existsSync(join(profileDir, 'Preferences'))) continue
-        profiles.push({ dir: entry.name, name: readProfileName(profileDir) })
-      }
-    } catch {
-      // 目录不可读则跳过该浏览器
-      continue
-    }
-    if (profiles.length > 0) {
-      sources.push({ id: source.id, name: source.name, userDataDir: root, profiles })
-    }
-  }
-  return sources
-}
-
-function copyFileSafe(from: string, to: string): void {
-  try {
-    copyFileSync(from, to)
-  } catch (err) {
-    const code = (err as NodeJS.ErrnoException).code
-    if (code === 'EBUSY' || code === 'EPERM' || code === 'EACCES') {
-      throw new Error('源浏览器文件被占用：请完全退出对应的浏览器（含后台进程）后重试。')
-    }
-    throw err
-  }
-}
-
-/** 拷贝 leveldb 目录（跳过 LOCK/LOG 运行时文件），目标已存在时先清空 */
-function copyLevelDbDir(from: string, to: string): boolean {
-  if (!existsSync(from)) return false
-  const entries = readdirSync(from, { withFileTypes: true })
-  const files = entries.filter((e) => e.isFile() && e.name !== 'LOCK' && !e.name.startsWith('LOG'))
-  if (files.length === 0) return false
-  rmSync(to, { recursive: true, force: true })
-  mkdirSync(to, { recursive: true })
-  for (const file of files) {
-    copyFileSafe(join(from, file.name), join(to, file.name))
-  }
-  return true
-}
-
-interface SourceKeyInfo {
-  key: string | null
-  /** app-bound（V20）等不可移植场景的说明 */
-  note?: string
-}
-
-/**
- * 读取源浏览器 Local State 里的 os_crypt.encrypted_key 并判断可移植性。
- * Windows：前缀 DPAPI 可移植；V20 为 app-bound 加密（Chrome/Edge 127+），
- * 其他进程无法解开，明确降级。macOS/Linux：密钥在系统钥匙串/KWallet，跳过。
- */
-function readSourceKey(userDataDir: string): SourceKeyInfo {
-  if (process.platform !== 'win32') {
-    return { key: null, note: '当前平台的浏览器 Cookie 密钥绑定系统钥匙串，暂不支持迁移 Cookie（LocalStorage 登录态仍会导入）。' }
-  }
-  try {
-    const raw = JSON.parse(readFileSync(join(userDataDir, 'Local State'), 'utf8')) as {
-      os_crypt?: { encrypted_key?: string }
-    }
-    const encoded = raw.os_crypt?.encrypted_key
-    if (!encoded) return { key: null, note: '未找到源浏览器 Cookie 密钥，跳过 Cookie 迁移。' }
-    const bytes = Buffer.from(encoded, 'base64')
-    if (bytes.subarray(0, 3).toString('utf8') === 'V20') {
-      return { key: null, note: '该浏览器使用了应用绑定加密（app-bound encryption），无法第三方迁移 Cookie；已导入 Local Storage，首次访问各站点仍需登录一次。' }
-    }
-    if (bytes.subarray(0, 5).toString('utf8') !== 'DPAPI') {
-      return { key: null, note: '源浏览器 Cookie 密钥格式不受支持，跳过 Cookie 迁移。' }
-    }
-    return { key: encoded }
-  } catch {
-    return { key: null, note: '读取源浏览器 Local State 失败，跳过 Cookie 迁移。' }
-  }
-}
-
-/** 把源密钥移植进本应用根 Local State（首次会备份原文件） */
-function transplantKey(sourceKey: string): void {
-  const appLocalState = join(app.getPath('userData'), 'Local State')
-  const backup = `${appLocalState}.aso-backup`
-  let doc: Record<string, unknown> = {}
-  if (existsSync(appLocalState)) {
-    try {
-      doc = JSON.parse(readFileSync(appLocalState, 'utf8')) as Record<string, unknown>
-      if (!existsSync(backup)) copyFileSync(appLocalState, backup)
-    } catch {
-      doc = {}
-    }
-  }
-  const osCrypt = (doc.os_crypt ?? {}) as Record<string, unknown>
-  osCrypt.encrypted_key = sourceKey
-  doc.os_crypt = osCrypt
-  writeFileSync(appLocalState, JSON.stringify(doc, null, 2), 'utf8')
-}
-
-/** 导入指定浏览器的 profile 配置到受管浏览器分区 */
-export function importBrowserProfile(sourceId: string, profileDir: string): BrowserImportResult {
-  const browser = getBrowserController()
-  if (browser.hasTabs) {
-    throw new Error('请先关闭内置浏览器的所有标签页，再导入浏览器配置。')
-  }
-  const root = sourceRoot(sourceId)
-  if (!root || !existsSync(root)) throw new Error('未找到该浏览器的用户数据目录。')
-  // 只接受该根目录下的直接子目录名，拒绝任意路径注入
-  const dirName = profileDir.split(/[\\/]/).pop() ?? ''
-  const sourceProfile = join(root, dirName)
-  if (dirName !== profileDir || !existsSync(join(sourceProfile, 'Preferences'))) {
-    throw new Error('profile 目录不存在。')
-  }
-  const sourceName = SOURCE_ROOTS.find((s) => s.id === sourceId)?.name ?? sourceId
-  const target = partitionDir()
-
-  // 1) Local Storage（明文 leveldb，直接迁移）
-  let localStorage = false
-  try {
-    localStorage = copyLevelDbDir(join(sourceProfile, 'Local Storage', 'leveldb'), join(target, 'Local Storage', 'leveldb'))
-  } catch (err) {
-    throw new Error(err instanceof Error ? err.message : `Local Storage 迁移失败: ${String(err)}`)
-  }
-
-  // 2) Cookies + 密钥移植
-  let cookies = false
-  let cookieNote: string | undefined
-  const keyInfo = readSourceKey(root)
-  const cookieDb = existsSync(join(sourceProfile, 'Network', 'Cookies'))
-    ? join(sourceProfile, 'Network', 'Cookies')
-    : existsSync(join(sourceProfile, 'Cookies'))
-      ? join(sourceProfile, 'Cookies')
-      : null
-  if (keyInfo.key && cookieDb) {
-    try {
-      transplantKey(keyInfo.key)
-      mkdirSync(join(target, 'Network'), { recursive: true })
-      copyFileSafe(cookieDb, join(target, 'Network', 'Cookies'))
-      for (const suffix of ['-wal', '-shm']) {
-        if (existsSync(`${cookieDb}${suffix}`)) copyFileSafe(`${cookieDb}${suffix}`, join(target, 'Network', `Cookies${suffix}`))
-      }
-      cookies = true
-    } catch (err) {
-      cookieNote = err instanceof Error ? err.message : 'Cookie 迁移失败。'
-    }
-  } else {
-    cookieNote = keyInfo.note ?? '源浏览器没有可迁移的 Cookie 数据库。'
-  }
-
-  const parts: string[] = []
-  if (cookies) parts.push('Cookie（站点登录态）')
-  if (localStorage) parts.push('LocalStorage')
-  if (!cookies && !localStorage) {
-    return { ok: false, cookies, localStorage, cookieNote, message: `未在 ${sourceName}（${dirName}）中找到可迁移的登录数据。` }
-  }
-
-  browser.setImportedInfo({
-    browser: sourceName,
-    profile: readProfileName(sourceProfile),
-    at: new Date().toISOString(),
-    cookies,
-    localStorage,
-    note: cookieNote
-  })
-
-  return {
-    ok: true,
-    cookies,
-    localStorage,
-    cookieNote,
-    message: `已从 ${sourceName} 导入 ${parts.join(' + ')}。${cookieNote ?? ''}${
-      cookies ? '若登录态未生效，重启应用后重试。' : ''
-    }`
-  }
-}

apps/desktop/src/main/ipc.ts

@@ -4,7 +4,6 @@ import { userInfo } from 'node:os'
 import { AgentService } from './pi/agent-service'
 import { getPluginHost } from './plugins/plugin-host'
 import { getBrowserController } from './browser/browser-controller'
-import { detectBrowserSources, importBrowserProfile } from './browser/browser-profile'
 import { getLogger } from './logger'
 
 const log = getLogger('ipc')
@@ -402,11 +401,15 @@ export function registerIpc(): AgentService {
     return browserPass(() => getBrowserController().applyLayout({ tabId, visible, revision, bounds: { x, y, width, height } }))
   })
 
-  // ---- 本地浏览器配置导入 ----
-  handle('browser:detectSources', () => browserPass(() => detectBrowserSources()))
-  handle('browser:importProfile', (_e, sourceId: unknown, profileDir: unknown) => {
-    if (typeof sourceId !== 'string' || typeof profileDir !== 'string') throw new Error('invalid import source')
-    return browserPass(() => importBrowserProfile(sourceId, profileDir))
+  // ---- 受管浏览器代理设置（persist:aso-browser 分区，保存即生效） ----
+  handle('browser:getProxy', () => getBrowserController().getProxySettings())
+  handle('browser:setProxy', (_e, input: unknown) => {
+    if (!input || typeof input !== 'object') throw new Error('invalid proxy settings')
+    const { mode, rules, bypass } = input as Record<string, unknown>
+    if (mode !== 'system' && mode !== 'direct' && mode !== 'fixed') throw new Error('invalid proxy mode')
+    if (rules !== undefined && typeof rules !== 'string') throw new Error('invalid proxy rules')
+    if (bypass !== undefined && typeof bypass !== 'string') throw new Error('invalid proxy bypass')
+    return getBrowserController().setProxySettings({ mode, rules, bypass })
   })
 
   // ---- 插件系统 ----

apps/desktop/src/main/plugins/builtin/browser.ts

@@ -15,8 +15,11 @@ export const browserPlugin: BuiltinPlugin = {
     minContract: '0.1.0',
     panel: true,
     order: 10,
-    description: '受管浏览器'
+    description: '受管浏览器',
+    icon: 'Globe'
   },
+  /** 宿主专属二级设置页（代理设置；见 SettingsModal 插件页特判） */
+  settingsPage: true,
   main: (api) => {
     for (const tool of browserTools) {
       api.pi.registerTool(tool)

apps/desktop/src/main/plugins/builtin/index.ts

@@ -14,6 +14,9 @@ export interface BuiltinPlugin {
   main?: HarnessPluginFactory
   /** 渲染层宿主树组件 key（renderer/src/plugins/builtin-components.ts） */
   component?: string
+  /** 带宿主专属二级设置页（设置页插件行可点击进入、可固定一级入口；
+   * 不走声明式设置表单，页面内容由设置页特判渲染） */
+  settingsPage?: true
 }
 
 export const BUILTIN_PLUGINS: BuiltinPlugin[] = [browserPlugin]

apps/desktop/src/main/plugins/plugin-host.ts

@@ -362,7 +362,8 @@ class PluginHost {
   /** 设置入口是否固定到设置页一级导航（仅声明了设置表单的插件可开） */
   async setSettingsNav(id: string, on: boolean): Promise<void> {
     const plugin = this.resolved.get(id)
-    if (!plugin || !this.settingsSchemas.has(id)) return
+    // 可固定入口 = 声明了设置表单，或内置插件带宿主专属设置页（如浏览器）
+    if (!plugin || (!this.settingsSchemas.has(id) && !this.builtinSettingsPage(id))) return
     log.info('set settings nav', { pluginId: id, on })
     if (on) this.settingsNavSet.add(id)
     else this.settingsNavSet.delete(id)
@@ -467,6 +468,11 @@ class PluginHost {
     return !this.disabled.has(id)
   }
 
+  /** 内置插件是否带宿主专属二级设置页（不走声明式表单，设置页特判渲染） */
+  private builtinSettingsPage(id: string): boolean {
+    return BUILTIN_PLUGINS.some((b) => b.manifest.id === id && b.settingsPage === true)
+  }
+
   list(): PluginInfo[] {
     return [...this.resolved.values()]
       .map((p) => ({
@@ -478,8 +484,13 @@ class PluginHost {
         hasPage: Boolean(p.source === 'external' && p.manifest.entry?.page),
         hasComponent: Boolean(p.componentKey),
         hasRenderer: Boolean(p.source === 'external' && p.manifest.entry?.renderer),
-        hasSettings: (this.settingsSchemas.get(p.manifest.id)?.items.length ?? 0) > 0,
-        settingsNav: this.settingsNavSet.has(p.manifest.id) && (this.settingsSchemas.get(p.manifest.id)?.items.length ?? 0) > 0,
+        hasSettings:
+          (this.settingsSchemas.get(p.manifest.id)?.items.length ?? 0) > 0 ||
+          this.builtinSettingsPage(p.manifest.id),
+        settingsNav:
+          this.settingsNavSet.has(p.manifest.id) &&
+          ((this.settingsSchemas.get(p.manifest.id)?.items.length ?? 0) > 0 ||
+            this.builtinSettingsPage(p.manifest.id)),
         dependencies: this.depStatus(p),
         storageSchema: this.storageSchemas.get(p.manifest.id),
         error: p.error

apps/desktop/src/preload/index.ts

@@ -3,8 +3,7 @@ import type {
   AgentUiEvent,
   AppSettings,
   AttachmentInfo,
-  BrowserImportResult,
-  BrowserSource,
+  BrowserProxySettings,
   BrowserUiEvent,
   BrowserUiState,
   ChatResources,
@@ -126,9 +125,9 @@ const api = {
     revision: number
     bounds: { x: number; y: number; width: number; height: number }
   }): Promise<void> => ipcRenderer.invoke('browser:layout', layout),
-  browserDetectSources: (): Promise<BrowserSource[]> => ipcRenderer.invoke('browser:detectSources'),
-  browserImportProfile: (sourceId: string, profileDir: string): Promise<BrowserImportResult> =>
-    ipcRenderer.invoke('browser:importProfile', sourceId, profileDir),
+  browserGetProxy: (): Promise<BrowserProxySettings> => ipcRenderer.invoke('browser:getProxy'),
+  browserSetProxy: (input: BrowserProxySettings): Promise<BrowserProxySettings> =>
+    ipcRenderer.invoke('browser:setProxy', input),
   onBrowserEvent: (callback: (event: BrowserUiEvent) => void): (() => void) => {
     const listener = (_e: Electron.IpcRendererEvent, event: BrowserUiEvent): void => callback(event)
     ipcRenderer.on('browser:event', listener)

apps/desktop/src/renderer/src/App.tsx

@@ -377,8 +377,6 @@ export default function App(): JSX.Element {
               onCloseTab={browser.closeTab}
               onCloseAllTabs={browser.closeBrowser}
               onAcknowledgeRisk={browser.acknowledgeRisk}
-              onDetectSources={browser.detectSources}
-              onImportProfile={browser.importProfile}
             />
           )
         }

apps/desktop/src/renderer/src/components/SettingsModal.tsx

@@ -37,6 +37,7 @@ import type { PluginSettingsSchema, PluginSettingsSchemas, PluginSettingValues,
 import { THEME_MODES, THEME_PRESETS, applyThemeColor } from '../lib/theme'
 import { usePluginList } from '../plugins/store'
 import { PluginIconValue } from '../plugins/plugin-icons'
+import { BrowserProxyForm } from './browser/BrowserProxyForm'
 
 type PluginSettingsTab = `plugin:${string}`
 type Tab = 'general' | 'model' | 'prompt' | 'plugins' | 'skills' | 'commands' | PluginSettingsTab
@@ -774,7 +775,7 @@ function PluginsPanel({
   onNavToggle: (pluginId: string, on: boolean) => void
 }): ReactNode {
   const plugins = usePluginList()
-  const [scope, setScope] = useState<'user' | 'project' | 'builtin'>('user')
+  const [scope, setScope] = useState<'all' | 'user' | 'project' | 'builtin'>('all')
   /** 全局插件重载进行中（重扫目录 + 重建运行时；期间刷新按钮禁用旋转） */
   const [reloading, setReloading] = useState(false)
   const [dirs, setDirs] = useState<{ user: string[]; project: string[]; global: string[] }>({
@@ -796,17 +797,23 @@ function PluginsPanel({
   }, [])
 
   const scoped =
-    scope === 'builtin'
+    scope === 'all'
+      ? plugins
+      : scope === 'builtin'
         ? plugins.filter((p) => p.source === 'builtin')
-      : plugins.filter((p) => p.source === 'external' && (scope === 'project' ? p.origin === 'project' : p.origin !== 'project'))
+        : plugins.filter((p) =>
+            p.source === 'external' ? (scope === 'project' ? p.origin === 'project' : p.origin !== 'project') : false
+          )
   const scopedDirs = scope === 'user' ? dirs.global : scope === 'project' ? dirs.project : []
   const scopedHints = scope === 'user' ? ['全局'] : ['项目']
+  const originLabel = (p: PluginInfo): string =>
+    p.source === 'builtin' ? '内置' : p.origin === 'project' ? '项目' : '全局'
 
   return (
     <div className="flex min-h-0 flex-col">
       <div className="flex items-center gap-2 pb-3">
         <div className="flex items-center rounded-control bg-zinc-100 p-0.5">
-          {(['user', 'project', 'builtin'] as const).map((s) => (
+          {(['all', 'user', 'project', 'builtin'] as const).map((s) => (
             <button
               key={s}
               type="button"
@@ -815,7 +822,7 @@ function PluginsPanel({
                 scope === s ? 'bg-white font-medium text-zinc-900 shadow-sm' : 'text-zinc-500 hover:text-zinc-700'
               }`}
             >
-              {s === 'user' ? '全局' : s === 'project' ? '项目' : '内置'}
+              {s === 'all' ? '全部' : s === 'user' ? '全局' : s === 'project' ? '项目' : '内置'}
             </button>
           ))}
         </div>
@@ -837,9 +844,15 @@ function PluginsPanel({
       {scoped.length === 0 ? (
         <div className="flex flex-col items-center justify-center gap-1 rounded-card border border-dashed border-line py-12 text-center">
           <div className="text-[13px] font-medium text-ink-2">
-            {scope === 'builtin' ? '暂无内置插件' : devBuild ? '暂无第三方插件' : '第三方插件装载已关闭（用户版构建）'}
+            {scope === 'all'
+              ? '暂无插件'
+              : scope === 'builtin'
+                ? '暂无内置插件'
+                : devBuild
+                  ? '暂无第三方插件'
+                  : '第三方插件装载已关闭（用户版构建）'}
           </div>
-          {scope !== 'builtin' && devBuild && (
+          {(scope === 'user' || scope === 'project') && devBuild && (
             <div className="text-[11.5px] text-ink-3">
               把含 manifest.json 的插件目录放入
               {scope === 'user' ? '全局（~/.pi/agent/extensions）' : '项目 .pi/extensions/'}即可自动识别
@@ -855,7 +868,8 @@ function PluginsPanel({
                 (a.manifest.order ?? 100) - (b.manifest.order ?? 100) || a.manifest.id.localeCompare(b.manifest.id)
             )
             .map((p) => {
-              const openSettings = p.enabled && (p.hasSettings || Boolean(p.storageSchema))
+              const openSettings =
+                p.enabled && (p.hasSettings || Boolean(p.storageSchema) || p.manifest.id === 'browser')
               return (
                 <div
                   key={p.manifest.id}
@@ -880,7 +894,7 @@ function PluginsPanel({
                   <div className="flex items-center gap-2">
                     <span className="text-[12.5px] font-medium text-ink">{p.manifest.name}</span>
                     <span className="rounded-control bg-hover px-1.5 py-0.5 text-[10px] text-ink-3">
-                      {scope === 'builtin' ? '内置' : scope === 'user' ? '全局' : '项目'} v{p.manifest.version}
+                      {originLabel(p)} v{p.manifest.version}
                     </span>
                     {p.dependencies.length > 0 && <PluginDepsTip deps={p.dependencies} />}
                   </div>
@@ -1659,6 +1673,19 @@ export function SettingsModal({
             {tab.startsWith('plugin:') &&
               (() => {
                 const pid = tab.slice(7)
+                // 内置浏览器：专属二级页（代理设置），不走向声明式设置表单
+                if (pid === 'browser') {
+                  return (
+                    <div className="flex h-full min-h-0 flex-col gap-4 overflow-y-auto pb-2 pr-1">
+                      <section className="shrink-0 rounded-card border border-line">
+                        <div className="border-b border-line px-3 py-2 text-[12px] font-medium text-ink">代理设置</div>
+                        <div className="p-3">
+                          <BrowserProxyForm />
+                        </div>
+                      </section>
+                    </div>
+                  )
+                }
                 const schema = settingSchemas[pid]
                 const info = plugins.find((p) => p.manifest.id === pid)
                 const hasForm = Boolean(schema && schema.items.length > 0)

apps/desktop/src/renderer/src/components/browser/BrowserPanel.tsx

@@ -4,20 +4,21 @@ import {
   LuArrowRight,
   LuChevronDown,
   LuCircleAlert,
-  LuDownload,
   LuGlobe,
+  LuNetwork,
   LuPlus,
   LuRotateCw,
   LuX
 } from 'react-icons/lu'
-import type { BrowserImportResult, BrowserSource, BrowserUiState } from '@shared/types'
+import type { BrowserUiState } from '@shared/types'
 import { BrowserSlot } from './BrowserSlot'
+import { BrowserProxyForm } from './BrowserProxyForm'
 
 /**
- * 内置受管浏览器的「chrome」部分（页签栏/地址栏/工具条/导入浮层）。
+ * 内置受管浏览器的「chrome」部分（页签栏/地址栏/工具条/代理浮层）。
  * 作为侧边面板的一个标签内容渲染；页面本体是主进程的原生 WebContentsView
  * （盖在 DOM 之上），BrowserSlot 量出页面区域矩形后由主进程对齐原生视图。
- * 任何全屏浮层（设置/搜索/导入）出现时必须卸载 Slot 隐藏原生视图。
+ * 任何全屏浮层（设置/搜索/代理）出现时必须卸载 Slot 隐藏原生视图。
  */
 
 interface BrowserPanelProps {
@@ -35,14 +36,12 @@ interface BrowserPanelProps {
   /** 关闭全部页面（销毁各标签的 WebContentsView；分区会话/登录态保留） */
   onCloseAllTabs: () => void
   onAcknowledgeRisk: () => void
-  onDetectSources: () => Promise<BrowserSource[]>
-  onImportProfile: (sourceId: string, profileDir: string) => Promise<BrowserImportResult>
 }
 
 export function BrowserPanel(props: BrowserPanelProps): JSX.Element {
   const { state, suspended } = props
   const [address, setAddress] = useState('')
-  const [importOpen, setImportOpen] = useState(false)
+  const [proxyOpen, setProxyOpen] = useState(false)
   const [tabListOpen, setTabListOpen] = useState(false)
   const [tabMenu, setTabMenu] = useState<{ x: number; y: number; tabId: string } | null>(null)
 
@@ -80,7 +79,7 @@ export function BrowserPanel(props: BrowserPanelProps): JSX.Element {
 
   const riskBanner = state && !state.riskAcknowledged
   // 下拉/右键菜单会伸到页面区域上方，原生视图必须暂时让位（原生层级永远在 DOM 之上）
-  const overlayOpen = importOpen || tabListOpen || tabMenu !== null
+  const overlayOpen = proxyOpen || tabListOpen || tabMenu !== null
   // 需要暂时隐藏原生视图的原因（宿主全屏浮层 + 本面板菜单）
   const hideCause = suspended || overlayOpen
 
@@ -356,11 +355,12 @@ export function BrowserPanel(props: BrowserPanelProps): JSX.Element {
         </div>
         <button
           type="button"
-          onClick={() => setImportOpen(true)}
-          title="导入本机浏览器登录态"
+          onClick={() => setProxyOpen(true)}
+          title="代理设置"
+          aria-expanded={proxyOpen}
           className="flex size-7 items-center justify-center rounded text-ink-3 transition-colors hover:bg-hover hover:text-ink-2"
         >
-          <LuDownload size={13} />
+          <LuNetwork size={13} />
         </button>
       </div>
 
@@ -404,69 +404,25 @@ export function BrowserPanel(props: BrowserPanelProps): JSX.Element {
       </div>
 
       {/* Agent 操作轨迹 */}
-      {state?.trace && !importOpen && (
+      {state?.trace && (
         <div className="shrink-0 truncate border-t border-line bg-surface px-3 py-1.5 text-[10.5px] text-ink-3">
           {state.trace}
         </div>
       )}
 
-      {/* 配置导入浮层（覆盖面板，出现时原生视图已隐藏） */}
-      {importOpen && (
-        <ImportOverlay
-          state={state}
-          onClose={() => setImportOpen(false)}
-          onDetectSources={props.onDetectSources}
-          onImportProfile={props.onImportProfile}
-        />
-      )}
+      {/* 代理设置浮层（覆盖面板，出现时原生视图已隐藏） */}
+      {proxyOpen && <ProxyOverlay onClose={() => setProxyOpen(false)} />}
     </div>
   )
 }
 
-// ---- 配置导入浮层 ----
-
-function ImportOverlay({
-  state,
-  onClose,
-  onDetectSources,
-  onImportProfile
-}: {
-  state: BrowserUiState | null
-  onClose: () => void
-  onDetectSources: () => Promise<BrowserSource[]>
-  onImportProfile: (sourceId: string, profileDir: string) => Promise<BrowserImportResult>
-}): JSX.Element {
-  const [sources, setSources] = useState<BrowserSource[] | null>(null)
-  const [selected, setSelected] = useState<{ sourceId: string; profileDir: string } | null>(null)
-  const [busy, setBusy] = useState(false)
-  const [result, setResult] = useState<BrowserImportResult | null>(null)
-  const [error, setError] = useState<string | null>(null)
-
-  useEffect(() => {
-    onDetectSources()
-      .then((list) => {
-        setSources(list)
-        const first = list[0]
-        if (first?.profiles[0]) setSelected({ sourceId: first.id, profileDir: first.profiles[0].dir })
-      })
-      .catch((err) => setError(err instanceof Error ? err.message : String(err)))
-  }, [onDetectSources])
-
-  const runImport = (): void => {
-    if (!selected) return
-    setBusy(true)
-    setError(null)
-    setResult(null)
-    onImportProfile(selected.sourceId, selected.profileDir)
-      .then(setResult)
-      .catch((err) => setError(err instanceof Error ? err.message : String(err)))
-      .finally(() => setBusy(false))
-  }
+// ---- 浮层薄壳：标题栏 + 关闭；表单本体在共用组件（设置页二级页同样复用） ----
 
+function ProxyOverlay({ onClose }: { onClose: () => void }): JSX.Element {
   return (
     <div className="absolute inset-0 z-20 flex flex-col bg-surface/95 backdrop-blur-[2px]">
       <div className="flex h-10 shrink-0 items-center justify-between border-b border-line px-3">
-        <div className="text-[12.5px] font-medium text-ink-2">导入本机浏览器登录态</div>
+        <div className="text-[12.5px] font-medium text-ink-2">代理设置</div>
         <button
           type="button"
           aria-label="关闭"
@@ -476,86 +432,8 @@ function ImportOverlay({
           <LuX size={13} />
         </button>
       </div>
-
-      <div className="min-h-0 flex-1 overflow-y-auto p-3 text-[12px] text-ink-2">
-        <p className="mb-3 leading-relaxed text-ink-3">
-          选择本机浏览器的一个配置（Profile），把其中各网站的登录态（Cookie / Local Storage）导入到内置受管浏览器。
-          导入前请<span className="font-medium text-ink-2">完全退出</span>该浏览器，并关闭本面板的所有标签页。
-        </p>
-
-        {state?.imported && (
-          <div className="mb-3 rounded border border-line bg-inset px-2.5 py-2 text-[11.5px] text-ink-3">
-            当前导入来源：{state.imported.browser} · {state.imported.profile}
-            {state.imported.cookies ? '（含 Cookie）' : ''}
-          </div>
-        )}
-
-        {sources === null && !error && <p className="py-6 text-center text-ink-3">正在检测本机浏览器…</p>}
-        {sources?.length === 0 && <p className="py-6 text-center text-ink-3">未检测到可导入的本机浏览器（支持 Chrome / Edge / Brave / Chromium）</p>}
-
-        <div className="flex flex-col gap-2">
-          {sources?.map((source) => (
-            <div key={source.id} className="rounded border border-line">
-              <div className="flex items-center gap-1.5 px-2.5 py-2 text-[12px] font-medium text-ink-2">
-                <LuChevronDown size={12} className="text-ink-3" />
-                {source.name}
-                <span className="text-[10.5px] font-normal text-ink-3">（{source.profiles.length} 个配置）</span>
-              </div>
-              <div className="flex flex-col gap-1 px-2 pb-2">
-                {source.profiles.map((profile) => {
-                  const active = selected?.sourceId === source.id && selected.profileDir === profile.dir
-                  return (
-                    <button
-                      key={profile.dir}
-                      type="button"
-                      onClick={() => setSelected({ sourceId: source.id, profileDir: profile.dir })}
-                      className={`flex items-center justify-between rounded px-2.5 py-1.5 text-left text-[11.5px] transition-colors ${
-                        active ? 'bg-accent-tint text-accent-ink' : 'text-ink-2 hover:bg-hover'
-                      }`}
-                    >
-                      <span className="min-w-0 truncate">
-                        {profile.name}
-                        <span className="ml-1.5 text-[10.5px] text-ink-3">{profile.dir}</span>
-                      </span>
-                      {active && <span className="shrink-0 text-[10px]">已选择</span>}
-                    </button>
-                  )
-                })}
-              </div>
-            </div>
-          ))}
-        </div>
-
-        {error && (
-          <div className="mt-3 rounded border border-red/40 bg-red-tint px-2.5 py-2 text-[11.5px] text-red">{error}</div>
-        )}
-        {result && (
-          <div
-            className={`mt-3 rounded border px-2.5 py-2 text-[11.5px] leading-relaxed ${
-              result.ok ? 'border-green-200 bg-green-tint text-green' : 'border-red/40 bg-red-tint text-red'
-            }`}
-          >
-            {result.message}
-          </div>
-        )}
-      </div>
-
-      <div className="flex shrink-0 items-center justify-end gap-2 border-t border-line px-3 py-2.5">
-        <button
-          type="button"
-          onClick={onClose}
-          className="rounded px-3 py-1.5 text-[12px] text-ink-3 transition-colors hover:bg-hover hover:text-ink-2"
-        >
-          关闭
-        </button>
-        <button
-          type="button"
-          disabled={!selected || busy}
-          onClick={runImport}
-          className="rounded bg-accent px-3.5 py-1.5 text-[12px] font-medium text-page transition-opacity hover:opacity-90 disabled:opacity-40"
-        >
-          {busy ? '导入中…' : '导入登录态'}
-        </button>
+      <div className="min-h-0 flex-1 overflow-y-auto p-3">
+        <BrowserProxyForm />
       </div>
     </div>
   )

apps/desktop/src/renderer/src/components/browser/BrowserProxyForm.tsx

@@ -0,0 +1,135 @@
+/**
+ * 受管浏览器代理设置表单（面板浮层与设置页二级页共用）。
+ * 只作用于 persist:aso-browser 分区；保存即生效（主进程 setProxy + 断开在途连接）。
+ * 自含数据源：自行订阅 browser 事件流获取当前生效设置。
+ */
+import { useEffect, useState, type JSX } from 'react'
+import type { BrowserProxySettings, BrowserUiState } from '@shared/types'
+
+const PROXY_MODES: Array<{ id: BrowserProxySettings['mode']; label: string }> = [
+  { id: 'system', label: '跟随系统' },
+  { id: 'direct', label: '直连' },
+  { id: 'fixed', label: '手动代理' }
+]
+
+export function BrowserProxyForm(): JSX.Element {
+  const [state, setState] = useState<BrowserUiState | null>(null)
+  const [mode, setMode] = useState<BrowserProxySettings['mode']>('system')
+  const [rules, setRules] = useState('')
+  const [bypass, setBypass] = useState('')
+  const [busy, setBusy] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+  const [saved, setSaved] = useState(false)
+
+  // 当前生效设置：首查 + 事件跟随（主进程广播，保存成功后表单同步）
+  useEffect(() => {
+    let alive = true
+    window.api
+      .browserGetState()
+      .then((s) => {
+        if (alive) setState(s)
+      })
+      .catch(() => undefined)
+    const off = window.api.onBrowserEvent((event) => {
+      if (event.type === 'state' && alive) setState(event.state)
+    })
+    return () => {
+      alive = false
+      off()
+    }
+  }, [])
+
+  const current = state?.proxy
+  useEffect(() => {
+    if (!current) return
+    setMode(current.mode)
+    setRules(current.mode === 'fixed' ? (current.rules ?? '') : '')
+    setBypass(current.bypass ?? '')
+  }, [current?.mode, current?.rules, current?.bypass])
+
+  const save = (): void => {
+    setBusy(true)
+    setError(null)
+    setSaved(false)
+    window.api
+      .browserSetProxy({ mode, rules: rules.trim(), bypass: bypass.trim() })
+      .then((p) => {
+        setMode(p.mode)
+        setRules(p.rules ?? '')
+        setBypass(p.bypass ?? '')
+        setSaved(true)
+      })
+      .catch((err) => setError(err instanceof Error ? err.message : String(err)))
+      .finally(() => setBusy(false))
+  }
+
+  const inputCls =
+    'w-full rounded border border-line bg-inset px-2.5 py-1.5 text-[12px] text-ink outline-none placeholder:text-ink-3 focus:border-accent focus:bg-surface'
+
+  return (
+    <div className="text-[12px] text-ink-2">
+      <div className="flex w-fit items-center rounded-control border border-line bg-hover p-0.5">
+        {PROXY_MODES.map((m) => (
+          <button
+            key={m.id}
+            type="button"
+            onClick={() => setMode(m.id)}
+            className={`h-7 rounded-[6px] px-3 text-[12px] transition-colors ${
+              mode === m.id ? 'bg-surface font-medium text-ink shadow-card' : 'text-ink-3 hover:text-ink-2'
+            }`}
+          >
+            {m.label}
+          </button>
+        ))}
+      </div>
+
+      {mode === 'fixed' && (
+        <div className="mt-3 flex flex-col gap-2.5">
+          <label className="flex flex-col gap-1">
+            <span className="text-[11px] text-ink-3">代理规则（多协议用分号分隔）</span>
+            <input
+              value={rules}
+              onChange={(e) => setRules(e.target.value)}
+              placeholder="127.0.0.1:7890 或 http=127.0.0.1:7890;https=127.0.0.1:7890"
+              spellCheck={false}
+              className={inputCls}
+            />
+          </label>
+          <label className="flex flex-col gap-1">
+            <span className="text-[11px] text-ink-3">绕过列表（逗号分隔，可留空）</span>
+            <input
+              value={bypass}
+              onChange={(e) => setBypass(e.target.value)}
+              placeholder="<local>,*.example.com,127.0.0.1"
+              spellCheck={false}
+              className={inputCls}
+            />
+          </label>
+          <p className="text-[10.5px] leading-4 text-ink-3">
+            规则语法与 Chromium 一致：host:port 应用于全部协议；也可按协议指定（http=…;https=…;socks=…）。
+          </p>
+        </div>
+      )}
+
+      {error && (
+        <div className="mt-3 rounded border border-red/40 bg-red-tint px-2.5 py-2 text-[11.5px] text-red">{error}</div>
+      )}
+      {saved && !error && (
+        <div className="mt-3 rounded border border-green-200 bg-green-tint px-2.5 py-2 text-[11.5px] text-green">
+          已保存并立即生效（在途连接已重置）。
+        </div>
+      )}
+
+      <div className="mt-3 flex items-center justify-end gap-2">
+        <button
+          type="button"
+          disabled={busy || (mode === 'fixed' && !rules.trim())}
+          onClick={save}
+          className="rounded bg-accent px-3.5 py-1.5 text-[12px] font-medium text-page transition-opacity hover:opacity-90 disabled:opacity-40"
+        >
+          {busy ? '应用中…' : '保存并应用'}
+        </button>
+      </div>
+    </div>
+  )
+}

apps/desktop/src/renderer/src/hooks/useBrowser.ts

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react'
-import type { BrowserImportResult, BrowserSource, BrowserUiState } from '@shared/types'
+import type { BrowserUiState } from '@shared/types'
 
 /**
  * 内置受管浏览器面板状态与操作。
@@ -16,8 +16,6 @@ export function useBrowser(): {
   closeTab: (tabId: string) => void
   closeBrowser: () => void
   acknowledgeRisk: () => void
-  detectSources: () => Promise<BrowserSource[]>
-  importProfile: (sourceId: string, profileDir: string) => Promise<BrowserImportResult>
 } {
   const [state, setState] = useState<BrowserUiState | null>(null)
 
@@ -50,8 +48,6 @@ export function useBrowser(): {
     selectTab: wrap((tabId: string) => window.api.browserSelectTab(tabId)),
     closeTab: wrap((tabId: string) => window.api.browserCloseTab(tabId)),
     closeBrowser: wrap(() => window.api.browserClose()),
-    acknowledgeRisk: wrap(() => window.api.browserAcknowledgeRisk()),
-    detectSources: () => window.api.browserDetectSources(),
-    importProfile: (sourceId: string, profileDir: string) => window.api.browserImportProfile(sourceId, profileDir)
+    acknowledgeRisk: wrap(() => window.api.browserAcknowledgeRisk())
   }
 }

apps/desktop/src/renderer/src/lib/api.ts

@@ -2,8 +2,7 @@ import type {
   AgentUiEvent,
   AppSettings,
   AttachmentInfo,
-  BrowserImportResult,
-  BrowserSource,
+  BrowserProxySettings,
   BrowserUiEvent,
   BrowserUiState,
   ChatResources,
@@ -36,8 +35,6 @@ export type {
   SessionMeta,
   SessionState,
   SessionStatsInfo,
-  BrowserImportResult,
-  BrowserSource,
   BrowserUiEvent,
   BrowserUiState
 }
@@ -113,8 +110,8 @@ declare global {
         revision: number
         bounds: { x: number; y: number; width: number; height: number }
       }) => Promise<void>
-      browserDetectSources: () => Promise<BrowserSource[]>
-      browserImportProfile: (sourceId: string, profileDir: string) => Promise<BrowserImportResult>
+      browserGetProxy: () => Promise<BrowserProxySettings>
+      browserSetProxy: (input: BrowserProxySettings) => Promise<BrowserProxySettings>
       onBrowserEvent: (callback: (event: BrowserUiEvent) => void) => () => void
       // ---- 插件系统 ----
       pluginsList: () => Promise<PluginInfo[]>

apps/desktop/src/shared/types.ts

@@ -271,16 +271,6 @@ export interface BrowserClosedTab {
   url: string
 }
 
-/** 已导入的本地浏览器配置摘要（面板展示用） */
-export interface BrowserImportInfo {
-  browser: string
-  profile: string
-  at: string
-  cookies: boolean
-  localStorage: boolean
-  note?: string
-}
-
 /** 浏览器面板完整状态（事件与查询共用同一结构） */
 export interface BrowserUiState {
   /** 是否存在受管浏览器会话（有标签页即视为打开） */
@@ -293,36 +283,22 @@ export interface BrowserUiState {
   recentClosed: BrowserClosedTab[]
   /** 最近一次 Agent 浏览器操作描述（面板底部轨迹） */
   trace: string | null
-  imported?: BrowserImportInfo | null
+  /** 当前代理设置（面板展示与编辑；变更即广播） */
+  proxy: BrowserProxySettings
+}
+
+/** 受管浏览器代理设置（作用于 persist:aso-browser 分区；保存后立即生效） */
+export interface BrowserProxySettings {
+  /** system=跟随系统（Electron 默认）| direct=直连 | fixed=手动规则 */
+  mode: 'system' | 'direct' | 'fixed'
+  /** fixed 模式：Chromium proxyRules 语法——host:port，多协议用分号分隔，可选 scheme= 前缀（如 http=127.0.0.1:7890;https=127.0.0.1:7890） */
+  rules?: string
+  /** 绕过列表（逗号分隔：<local>、*.example.com 等；Chromium bypass 语法） */
+  bypass?: string
 }
 
 export type BrowserUiEvent = { type: 'state'; state: BrowserUiState }
 
-/** 本地浏览器（Chromium 系）下的一个 profile */
-export interface BrowserProfileMeta {
-  /** profile 目录名（Default / Profile 1 …） */
-  dir: string
-  /** 展示名（Preferences 里的名称或目录名） */
-  name: string
-}
-
-/** 检测到的可导入浏览器来源 */
-export interface BrowserSource {
-  id: string
-  name: string
-  userDataDir: string
-  profiles: BrowserProfileMeta[]
-}
-
-/** 导入结果（主进程返回；cookieNote 说明跳过原因） */
-export interface BrowserImportResult {
-  ok: boolean
-  cookies: boolean
-  localStorage: boolean
-  cookieNote?: string
-  message: string
-}
-
 export type AgentUiEvent =
   | { type: 'session_ready'; state: SessionState }
   | { type: 'session_error'; message: string }
@@ -389,7 +365,7 @@ export interface PluginInfo {
   hasComponent: boolean
   /** 有渲染层模块（entry.renderer，宿主动态 import 后注册宿主内 React 组件） */
   hasRenderer: boolean
-  /** 已声明设置表单（api.ui.registerSettings；空 schema 视为无） */
+  /** 有设置页可进：已声明设置表单（api.ui.registerSettings），或内置插件带宿主专属设置页（如浏览器） */
   hasSettings: boolean
   /** 设置入口已固定到设置页一级导航（用户开关；仅 hasSettings 时可开） */
   settingsNav: boolean

docs/roadmap.md

@@ -12,7 +12,7 @@
 | v0.4.0 | 工具与审批 | 工具调用卡片（参数/结果折叠展示）、tool_call 拦截 → Approval Card、defineTool 业务工具骨架（本地可跑的演示工具） |
 | v0.5.0 | 打磨 | 深浅主题、GSAP 动效细节、快捷键、错误态/空态、队列可视化、自动滚动策略 |
 | v0.8.0 | 动态插件系统（M0–M3） | 两层能力模型（内置组件级/外置 iframe）、pi 原生契约聚合 extension、@aso/plugin-sdk、plugin://peer:// 协议、视图切换+聊天保活+徽标、侧栏/面板/胶囊/深链槽位、浏览器面板插件化、插件重载 |
-| v0.9.0 | 插件一等公民 + 可观测 | entry.renderer 宿主内 React 组件（Blob 装载+单实例 React）、.pi/extensions 一等插件源（build 开关门控）、声明式设置体系（13 控件+一级导航入口）、统一日志系统（滚动文件/api.log/IPC 追踪/渲染层错误归档）、插件依赖与服务互调（dependencies/optionalDependencies + api.service/requirePlugin + 拓扑波次激活 + 环检测）、插件 SQLite 存储（每插件一库 userData/plugin-data/<id>/data.db + 共享 worker 线程 + 机器可读 declareSchema + 设置页存储区卡片）、渐进式教程 docs/plugins/ + DESIGN.md + plugin-template、性能/样式标准与检验器（激活 10s/装载 8s 护栏、@aso/plugin-sdk/ui 组件库+三态、withTimeout/withRetry、plugin:check）、悬浮状态胶囊（ZCode 复刻：最小化药丸展示最新消息 ⇄ 展开面板每插件一区域、区域可收起、固定高度滚动、行尾彩色数值）、图标统一 lucide 白名单、面板平铺标签条 |
+| v0.9.0 | 插件一等公民 + 可观测 | entry.renderer 宿主内 React 组件（Blob 装载+单实例 React）、.pi/extensions 一等插件源（build 开关门控）、声明式设置体系（13 控件+一级导航入口）、统一日志系统（滚动文件/api.log/IPC 追踪/渲染层错误归档）、插件依赖与服务互调（dependencies/optionalDependencies + api.service/requirePlugin + 拓扑波次激活 + 环检测）、插件 SQLite 存储（每插件一库 userData/plugin-data/<id>/data.db + 共享 worker 线程 + 机器可读 declareSchema + 设置页存储区卡片）、渐进式教程 docs/plugins/ + DESIGN.md + plugin-template、性能/样式标准与检验器（激活 10s/装载 8s 护栏、@aso/plugin-sdk/ui 组件库+三态、withTimeout/withRetry、plugin:check）、悬浮状态胶囊（ZCode 复刻：最小化药丸展示最新消息 ⇄ 展开面板每插件一区域、区域可收起、固定高度滚动、行尾彩色数值）、受管浏览器代理设置（persist 分区 session.setProxy：跟随系统/直连/手动 Chromium proxyRules + 绕过列表，保存即生效并对 browser_* 工具同样生效）、图标统一 lucide 白名单、面板平铺标签条 |
 | 未来 | | 插件管理与 zip 导入（M4）、ed25519 签名在线更新（M5）、外置插件模板与开发工作流（M6）、pi 原生扩展目录管控（M7）、B4/B5 槽位、electron-builder 打包与自动更新、i18n（中/英）、sqlite 持久化与迁移、本地备份恢复、热点词/生成/模板业务插件、手动模式编排 UI、RPC 子进程隔离模式 |
 
 ---

packages/plugin-template/manifest.json

@@ -6,7 +6,7 @@
   "description": "TODO：一句话描述插件做什么",
   "order": 50,
   "panel": true,
-  "icon": "Puzzle",
+  "icon": "Blocks",
   "entry": {
     "main": "main.mjs",
     "renderer": "renderer.mjs"