dsh-agentone 0.5.38 → 0.5.40

package/lib/index.js

@@ -33,14 +33,17 @@ import {
 import { applyPlatformModel, removePlatformModel } from './model.js';
 import { installPlatformSkill, listPlatformSkills, removePlatformSkill } from './skill.js';
 import { applyPlatformSkillhub, removePlatformSkillhub } from './skillhub.js';
+import { createProfilePlugins, validatePackage, PROTECTED_PACKAGES } from './profile-plugins.js';
+import { createDefaultsSync } from './defaults-sync.js';
+import { canonicalSkillSlug, localSkillState } from './skill-state.js';
 import { ensureLanguageDefault } from './language.js';
 import { bootstrapInstanceCredentials, INSTANCE_SOURCE, isInstanceManaged, resolvePlatformUrl } from './instance.js';
 import { beginCliAuth, cliAuthQrcode, completeCliAuth, parseCliAuthBeginOutput } from './cliauth.mjs';
 import { platformFetch } from './http.js';
 import { donePageHtml, statusPageHtml } from './page.js';
-import { compareSemver, dshPluginCli, firstErrorLines, hasChineseText, installCliTool, isTerminalCliAuthFailure, isUnexpectedStoreError, larkCliInitActiveUrl, larkCliInitStatus, probeCliDetail, probePythonEnv, pnpmViewLatest, runCliTool, startLarkCliInit, stopLarkCliInit, unexpectedStoreGuidance, upgradeCliTool } from './proc.js';
+import { compareSemver, firstErrorLines, hasChineseText, installCliTool, isTerminalCliAuthFailure, isUnexpectedStoreError, larkCliInitActiveUrl, larkCliInitStatus, probeCliDetail, probePythonEnv, pnpmViewLatest, runCliTool, startLarkCliInit, stopLarkCliInit, unexpectedStoreGuidance, upgradeCliTool } from './proc.js';
 
-import { clearCredentials, loadCredentials, resolveDshHome, saveCredentials, updateCredentials } from './store.js';
+import { clearCredentials, loadCredentials, saveCredentials, updateCredentials } from './store.js';
 
 const require = createRequire(import.meta.url);
 
@@ -58,6 +61,7 @@ export const Config = z.object({
     .default('https://ccpg.one.agentone.work')
     .description('AgentOne 平台地址（本地开发在 profile cordis.patch.yml 覆盖为 http://127.0.0.1:8558）'),
   storeDir: z.string().default('').description('凭据存储目录，空则用 $DSH_HOME/agentone'),
+  profileName: z.string().default('').description('当前 Web profile 名称；Desktop 自动读取当前 profile，旧版 Web 宿主请明确填写'),
 });
 
 /** 本次进程内的登录 CSRF state（/callback 比对后即失效）。 */
@@ -214,13 +218,6 @@ async function ensureFreshToken(config, log) {
   return tokenRefreshInFlight;
 }
 
-/**
- * 插件管理目标 profile：普通 dsh 固定 web（控制台只跑 web profile）；
- * DSH Desktop 用 desktopProfiles.current（apply 时探测填充）。
- */
-let PLUGIN_PROFILE = 'web';
-/** desktop 受管插件操作通道（desktopPnpm.runPlugin 包装），非 desktop 为 null。 */
-let desktopPluginCli = null;
 /**
  * dsh ≥ 0.1.7 的官方 settings 服务（apply 时可选获取）：用来把平台模型写进
  * profile patch 活配置层，同步即时生效。旧宿主没有该服务，取到 null 即回退
@@ -228,10 +225,6 @@ let desktopPluginCli = null;
  */
 let settingsService = null;
 
-function pluginProfileDir(config) {
-  return join(resolveDshHome(config), 'profiles', PLUGIN_PROFILE);
-}
-
 /** 模型同步失败自愈重试调度（模块级单例：apply 重入先清旧定时器）。
  * 平台侧瞬时故障（如 AirRouter 短暂不可达）会让启动同步失败，错误一直
  * 挂在状态页直到下次 dsh 重启——这里由 5s 状态轮询驱动：发现 model_error
@@ -267,14 +260,6 @@ function scheduleModelRetry(config, log) {
   modelRetryTimer.unref?.();
 }
 
-/** 转发 dsh plugin 子命令：desktop 走受管 pnpm，普通 dsh 走官方 CLI。 */
-async function runPluginCli(args) {
-  if (desktopPluginCli) {
-    return desktopPluginCli(args);
-  }
-  return dshPluginCli(args, PLUGIN_PROFILE);
-}
-
 /** 宿主 DesktopPnpmService 的并发锁占用报错（同一时刻只允许一个 pnpm
  * 操作——设计如此，不是故障）。识别后应排队等待而非把错误抛给用户。 */
 const DESKTOP_PNPM_BUSY_RE = /another desktop pnpm operation is already running/i;
@@ -300,13 +285,14 @@ const sleep = (ms) => new Promise((resolve) => { setTimeout(resolve, ms); });
  */
 export function desktopRunPlugin(service, invokingDir) {
   let queue = Promise.resolve();
-  const run = async (args) => {
+  const run = async (args, options = {}) => {
     // 宿主 lock 是同步抛错（runPlugin 调用即抛），先探再跑 + 失败退避都做
     let attempt = 0;
     for (;;) {
+      options.signal?.throwIfAborted();
       let handle;
       try {
-        handle = service.runPlugin([...args], invokingDir);
+        handle = service.runPlugin([...args], invokingDir, options.signal);
       } catch (error) {
         const message = error?.message || String(error);
         if (DESKTOP_PNPM_BUSY_RE.test(message) && attempt < 5) {
@@ -316,6 +302,9 @@ export function desktopRunPlugin(service, invokingDir) {
         }
         throw error;
       }
+      const cancel = () => handle.cancel();
+      options.signal?.addEventListener('abort', cancel, { once: true });
+      if (options.signal?.aborted) cancel();
       let stdout = '';
       let stderr = '';
       const append = (acc, chunk) => (acc + String(chunk)).slice(-64 * 1024);
@@ -329,6 +318,7 @@ export function desktopRunPlugin(service, invokingDir) {
       }, 300_000);
       try {
         const outcome = await handle.done;
+        options.signal?.throwIfAborted();
         if (timedOut) throw new Error('命令执行超时，请稍后重试');
         if (outcome.exitCode !== 0 || outcome.signal != null) {
           const message = firstErrorLines(`${stderr}\n${stdout}`);
@@ -350,35 +340,18 @@ export function desktopRunPlugin(service, invokingDir) {
         return { stdout, stderr };
       } finally {
         clearTimeout(timer);
+        options.signal?.removeEventListener('abort', cancel);
       }
     }
   };
-  return (args) => {
-    const next = queue.then(() => run(args));
+  return (args, options = {}) => {
+    const next = queue.then(() => run(args, options));
     // 队列尾吞错，避免一次失败卡死后续排队操作
     queue = next.catch(() => undefined);
     return next;
   };
 }
 
-/**
- * npm 包名白名单（scoped 与非 scoped）。用户输入会进入 CLI 参数，必须先
- * 收敛到 npm 官方命名规则，杜绝以 `-` 开头的值被 dsh/pnpm 当成 flag。
- */
-const NPM_NAME_RE = /^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/;
-/** 版本白名单：语义化版本、^ ~ 前缀与 latest 标签。 */
-const VERSION_RE = /^(?:\^|~)?\d+(?:\.\d+){0,3}(?:[-+][a-z0-9._-]+)?$|^latest$/;
-
-/** 校验用户输入的包名/版本；非法值直接拒绝（中文报错）。 */
-function assertValidPackage(name, version) {
-  if (!NPM_NAME_RE.test(name)) {
-    throw new Error('插件名不合法：仅允许小写字母、数字和 . _ -（scoped 名如 @scope/pkg）');
-  }
-  if (version !== undefined && version !== '' && !VERSION_RE.test(version)) {
-    throw new Error('版本号不合法：仅允许语义化版本（如 1.2.3、^1.2.0）或 latest');
-  }
-}
-
 async function readJsonFile(path) {
   try {
     return JSON.parse(await readFile(path, 'utf8'));
@@ -393,19 +366,6 @@ async function installedVersion(profile, name) {
   return typeof manifest?.version === 'string' ? manifest.version : null;
 }
 
-/** 包是否带 dsh.bundle 声明（决定它在层列表里是否被激活）。 */
-async function isBundlePackage(profile, name) {
-  const manifest = await readJsonFile(join(profile, 'node_modules', name, 'package.json'));
-  return Boolean(manifest?.dsh?.bundle);
-}
-
-/** link:/file: 等本地路径依赖展示短标签（没有版本号可读）。 */
-function specLabel(spec) {
-  if (typeof spec !== 'string') return '';
-  if (spec.startsWith('link:') || spec.startsWith('file:')) return '本地链接';
-  return '';
-}
-
 /** dsh 插件与 CLI 操作白名单：用户输入不得进入 execFile 的 tool 位。 */
 const CLI_TOOLS = new Set(['lark-cli', 'ccpg-cli']);
 /** 除 CLI 外可通过 /agentone/api/cli/install 自助安装的工具（python 无
@@ -448,7 +408,7 @@ const INBOX_BUNDLES = new Set([
  * 装入 /opt/prebuilt/dsh-home，init.sh 首启物化到持久卷）。用户可以卸载，
  * 但它们承载控制台核心体验（侧栏宿主/Workflow One/插件市场/IM 桥），所以
  * 每次 dsh 启动时检测：缺失则静默重装（常驻保证），已装则不碰（尊重用户
- * 的版本选择）。
+ * 的版本选择）。安装走 profile-plugins 受管通道，与平台默认能力同一队列。
  */
 const BUILTIN_PLUGINS = [
   'dsh-better-sidebar',
@@ -479,203 +439,15 @@ const BUILTIN_PLUGIN_DESCRIPTIONS = {
     'AgentOne 平台集成：IDOne 登录、平台模型、SkillHub 技能与 CLI 授权（本插件）',
 };
 
-/** 汇总 profile 插件状态：dependencies（去掉 in-box）+ 已装版本 + 激活态。 */
-async function listProfilePlugins(config) {
-  const dir = pluginProfileDir(config);
-  const manifest = await readJsonFile(join(dir, 'package.json'));
-  const dependencies = manifest?.dependencies ?? {};
-  const bundles = Array.isArray(manifest?.dsh?.profile?.bundles)
-    ? manifest.dsh.profile.bundles
-    : [];
-  const plugins = [];
-  const seen = new Set();
-  for (const [name, spec] of Object.entries(dependencies)) {
-    if (INBOX_BUNDLES.has(name)) continue;
-    seen.add(name);
-    const version = await installedVersion(dir, name);
-    const bundle = version !== null && (await isBundlePackage(dir, name));
-    plugins.push({
-      name,
-      spec,
-      version,
-      source: specLabel(spec) || 'npm',
-      bundled: bundle,
-      // 激活 = 已装 + 带 bundle 声明 + 出现在 dsh.profile.bundles
-      active: bundle && bundles.includes(name),
-      builtin: BUILTIN_PLUGINS.includes(name),
-      // 自身随平台镜像升级：前端据此隐藏卸载/升级按钮（与后端拒绝逻辑同源）
-      self_managed: name === PLUGIN_PACKAGE_NAME && isSelfManaged(),
-      description: BUILTIN_PLUGIN_DESCRIPTIONS[name] || null,
-    });
-  }
-  // 内置插件被卸载后不在 dependencies 里，但仍要出现在列表中
-  // （状态「未安装」+「安装」按钮），否则用户无从感知与恢复。
-  for (const name of BUILTIN_PLUGINS) {
-    if (seen.has(name)) continue;
-    plugins.push({
-      name,
-      spec: null,
-      version: null,
-      source: 'npm',
-      bundled: false,
-      active: false,
-      builtin: true,
-      self_managed: false,
-      description: BUILTIN_PLUGIN_DESCRIPTIONS[name] || null,
-    });
-  }
-  return {
-    profile: PLUGIN_PROFILE,
-    bundles: bundles.filter((name) => !INBOX_BUNDLES.has(name)),
-    plugins,
-  };
-}
-
-/** dsh plugin add 的构建脚本放行参数（与镜像 Dockerfile 预装命令同源）。
- * pnpm 11 默认拦截依赖构建脚本，node-pty（sidebar/harness-one 的终端依赖）
- * 被拦会导致 add 非零退出、bundles reconcile 不执行——包装上了却永远
- * 「未激活」。用 = 连接形式，避免空格分隔被 pnpm 拆成两个参数。
- */
+/** 内置插件安装期构建授权（与镜像 Dockerfile 预装命令同源）：pnpm 默认
+ * 拦截依赖构建脚本，node-pty（侧栏/工作台的终端依赖）被拦会导致插件
+ * 装上却无法激活。平台默认能力清单未声明时按此兜底合并。 */
 const BUILTIN_PLUGIN_ALLOW_BUILD = {
-  'dsh-better-sidebar': ['--allow-build=node-pty'],
-  'dsh-harness-one': ['--allow-build=node-pty'],
-  dshmarket: ['--allow-build=node-pty'],
-  'dsh-im': [],
-  [PLUGIN_PACKAGE_NAME]: [],
+  'dsh-better-sidebar': ['node-pty'],
+  'dsh-harness-one': ['node-pty'],
+  dshmarket: ['node-pty'],
 };
 
-/** 安装：白名单校验后转发（desktop 受管 pnpm / 官方 CLI；参数数组，无 shell）。
- * pnpm 11 在 profile 存在被忽略的构建脚本时 add 以 ERR_PNPM_IGNORED_BUILDS
- * 非零退出，但包本身已装上（先装后报）——以落盘为准，装上即成功。 */
-async function installProfilePlugin(config, name, version) {
-  assertValidPackage(name, version);
-  const target = version ? `${name}@${version}` : name;
-  try {
-    await runPluginCli(['add', target, ...(BUILTIN_PLUGIN_ALLOW_BUILD[name] || [])]);
-  } catch (error) {
-    if ((await installedVersion(pluginProfileDir(config), name)) === null) throw error;
-  }
-  return listProfilePlugins(config);
-}
-
-/** 卸载：自身与内置插件拒绝（无卸载按钮 + 后端兜底）；白名单校验后转发官方 CLI。 */
-async function removeProfilePlugin(config, name) {
-  assertValidPackage(name);
-  if (INBOX_BUNDLES.has(name)) {
-    throw new Error('dsh 内置组件不可卸载');
-  }
-  if (BUILTIN_PLUGINS.includes(name)) {
-    throw new Error('内置插件承载 dsh 核心体验，不可卸载');
-  }
-  if (name === PLUGIN_PACKAGE_NAME) {
-    throw new Error('AgentOne 插件是登录与模型配置的载体，不能卸载自己');
-  }
-  await runPluginCli(['remove', name]);
-  return listProfilePlugins(config);
-}
-
-/** 升级到 registry 最新版：view 查实时 latest → 显式版本号 add（会重写
- * package.json spec）→ 校验落盘版本。不能用 `dsh plugin update`（即
- * `pnpm update`）：它只在 spec range 内升级，`dsh plugin add` 写入的精确
- * pin（如 "0.19.1"）下永远是 no-op，却返回成功——历史上「点升级提示已
- * 升级、版本永不变」的根因。 */
-async function upgradeProfilePlugin(config, name) {
-  assertValidPackage(name);
-  if (INBOX_BUNDLES.has(name)) {
-    throw new Error('dsh 内置组件随 dsh 一同升级，请等待平台更新 dsh');
-  }
-  if (name === PLUGIN_PACKAGE_NAME && isSelfManaged()) {
-    throw new Error('AgentOne 插件随平台镜像一同升级，无需手动操作');
-  }
-  const dir = pluginProfileDir(config);
-  const [latest, current] = await Promise.all([
-    pnpmViewLatest(name, dir).catch(() => null),
-    installedVersion(dir, name),
-  ]);
-  if (!latest) {
-    throw new Error('查询插件最新版本失败，请稍后重试');
-  }
-  // latest dist-tag 可能指向旧版（作者误指/回退），不比已装高就没必要升
-  if (latest === current || (current && compareSemver(latest, current) <= 0)) {
-    throw new Error(`已是最新版本（v${current ?? latest}）`);
-  }
-  try {
-    await runPluginCli(['add', `${name}@${latest}`, ...(BUILTIN_PLUGIN_ALLOW_BUILD[name] || [])]);
-  } catch (error) {
-    // 同 install：ERR_PNPM_IGNORED_BUILDS 非零退出但包已装上，不阻断升级
-    if ((await installedVersion(dir, name)) !== latest) throw error;
-  }
-  const after = await installedVersion(dir, name);
-  if (after !== latest) {
-    // 兑现「插件已升级」提示的前置校验：没升上去就明说，不再假报成功
-    throw new Error(`升级未生效（当前 v${after ?? '未安装'}，目标 v${latest}），请稍后重试`);
-  }
-  return listProfilePlugins(config);
-}
-
-/**
- * 内置插件常驻检测：镜像预装插件缺失时逐个静默重装。单个失败不阻断
- * （网络抖动等），下一个启动周期再试；全部已装时零开销。
- */
-async function ensureBuiltinPlugins(config, log) {
-  const state = await listProfilePlugins(config);
-  const installed = new Set(state.plugins.map((plugin) => plugin.name));
-  const missing = BUILTIN_PLUGINS.filter((name) => !installed.has(name));
-  if (!missing.length) return [];
-  const reinstalled = [];
-  for (const name of missing) {
-    try {
-      await installProfilePlugin(config, name);
-      reinstalled.push(name);
-      log.info(`[dsh-agentone] builtin plugin reinstalled: ${name}`);
-    } catch (error) {
-      log.warn(`[dsh-agentone] builtin plugin reinstall failed (${name}): ${error?.message || error}`);
-    }
-  }
-  return reinstalled;
-}
-
-/**
- * 套餐技能自动同步：平台上 source=plan 且未安装的技能静默装齐（与平台托管
- * 实例的套餐技能预装语义对齐）；单个失败不阻断其余，结果记 credentials。
- */
-async function syncPlanSkills(config, log, credentials) {
-  const token = credentials?.access_token;
-  if (!token) return null;
-  let listing;
-  try {
-    listing = await listPlatformSkills(config.platformUrl, token);
-  } catch (error) {
-    log.warn(`[dsh-agentone] skills list failed: ${error?.message || error}`);
-    await updateCredentials(config, { skills_error: String(error?.message || error) }).catch(
-      () => {},
-    );
-    return null;
-  }
-  const pending = (listing.skills || []).filter((skill) => skill.source === 'plan' && !skill.installed);
-  let installed = 0;
-  const failures = [];
-  for (const skill of pending) {
-    try {
-      await installPlatformSkill(config.platformUrl, token, skill.canonical_slug, {
-        config,
-        source: 'plan',
-      });
-      installed += 1;
-      log.info(`[dsh-agentone] plan skill installed: ${skill.canonical_slug}`);
-    } catch (error) {
-      failures.push(`${skill.canonical_slug}: ${error?.message || error}`);
-    }
-  }
-  await updateCredentials(config, {
-    skills_synced_at: new Date().toISOString(),
-    skills_error: failures.length ? failures.join('；') : null,
-  }).catch(() => {});
-  if (failures.length) log.warn(`[dsh-agentone] plan skill failures: ${failures.join('；')}`);
-  return { installed, failed: failures.length };
-}
-
-
 /**
  * status 内缓存：skills/catalog 内容几乎不变，却被 5s 轮询每次全量重拉。
  * 缓存 45s；模型同步结果本就落盘在 credentials，不受缓存影响。
@@ -727,7 +499,7 @@ async function cachedPlatformStatus(config, credentials) {
  * token + state 比对），收完第一个请求即关停；5 分钟无回调自动超时关闭。
  * 返回外部浏览器可达的回调地址。
  */
-function openCallbackServer(config, log) {
+function openCallbackServer(config, log, onLogin = () => {}, isCurrent = () => true) {
   return new Promise((resolve, reject) => {
     const server = createServer(async (req, res) => {
       const close = () => server.close();
@@ -758,6 +530,7 @@ button{font:inherit;padding:9px 22px;border-radius:10px;border:none;cursor:point
           finish(false);
           return;
         }
+        if (!isCurrent()) { finish(false); return; }
         const expiresIn = Number(result.expires_in) || 0;
         await saveCredentials(config, {
           schema_version: 2,
@@ -774,10 +547,8 @@ button{font:inherit;padding:9px 22px;border-radius:10px;border:none;cursor:point
           ...(await loadCredentials(config)),
           access_token: result.access_token,
         }).catch(() => {});
-        await syncPlanSkills(config, log, {
-          ...(await loadCredentials(config)),
-          access_token: result.access_token,
-        }).catch(() => {});
+        if (!isCurrent()) { finish(false); return; }
+        onLogin();
         finish(true);
       } catch (error) {
         log.warn(`[dsh-agentone] desktop exchange failed: ${error?.message || error}`);
@@ -795,12 +566,13 @@ button{font:inherit;padding:9px 22px;border-radius:10px;border:none;cursor:point
 }
 
 /**
- * 是否运行在 DSH Desktop 内：宿主进程是 Electron（execPath 指向 DSH Desktop
- * 可执行文件）。与页面侧标记（page.js 传 desktop:true）互为兜底——iframe 内
+ * 是否运行在桌面壳内：宿主进程是 Electron（execPath 指向桌面壳可执行文件）。
+ * 壳品牌：DSH Desktop / DSH NEXT / DeepSeek HARNESS（NEXT 的公开发布名）。
+ * 与页面侧标记（page.js 传 desktop:true）互为兜底——iframe 内
  * location.search 不含宿主 query，页面自检在设置 iframe 场景会漏。
  */
 function isDesktopHost() {
-  return /DSH Desktop\.(?:app|exe)/i.test(process.execPath);
+  return /(?:DSH Desktop|DSH NEXT|DeepSeek HARNESS)\.(?:app|exe)/i.test(process.execPath);
 }
 
 export function apply(ctx, config) {
@@ -821,14 +593,96 @@ export function apply(ctx, config) {
   // patch 活配置层；取不到（旧宿主）就回退「只写 settings.yaml + 下次启动导入」。
   // 不能写进 inject：那会让插件在旧宿主上一直 PENDING。
   settingsService = ctx.get?.('settings') ?? null;
-  if (desktopProfiles?.current?.name) {
-    PLUGIN_PROFILE = desktopProfiles.current.name;
-    ctx.inject(['desktopPnpm'], (desktopCtx) => {
-      desktopPluginCli = desktopRunPlugin(desktopCtx.desktopPnpm, pluginProfileDir(config));
-      log.info(`[dsh-agentone] desktop profile: ${PLUGIN_PROFILE}`);
-    });
-  }
   ctx.effect(() => {
+    let disposed = false;
+    const profiles = createProfilePlugins({ ctx, config, desktopRun: desktopRunPlugin });
+    const defaults = createDefaultsSync({ config, profiles,
+      credentials: () => ensureFreshToken(config, log), log });
+    const listProfilePlugins = async () => {
+      const state = await profiles.list();
+      const seen = new Set();
+      state.plugins.forEach((plugin) => {
+        seen.add(plugin.name);
+        plugin.self_managed = plugin.name === PLUGIN_PACKAGE_NAME && isSelfManaged();
+        plugin.builtin = plugin.builtin || BUILTIN_PLUGINS.includes(plugin.name);
+        plugin.description = plugin.description || BUILTIN_PLUGIN_DESCRIPTIONS[plugin.name] || null;
+      });
+      // 内置插件被卸载后不在 dependencies 里，仍以「未安装」占位出现在列表，
+      // 否则用户无从感知与恢复（常驻检测会在下次启动时自动重装）。
+      for (const name of BUILTIN_PLUGINS) {
+        if (seen.has(name)) continue;
+        state.plugins.push({ name, spec: null, version: null, bundled: false, registered: false,
+          active: false, source: 'npm', builtin: true,
+          self_managed: name === PLUGIN_PACKAGE_NAME && isSelfManaged(),
+          description: BUILTIN_PLUGIN_DESCRIPTIONS[name] || null, target_version: null,
+          state: 'missing', loaded: null });
+      }
+      return state;
+    };
+    const installProfilePlugin = async (_config, name, version = 'latest') => {
+      validatePackage(name, version);
+      // 内置插件（镜像控制台四件套/自身）是本机概念，不依赖平台登录：
+      // 直接走受管安装队列，构建授权用镜像预装命令同源的 node-pty 兜底。
+      if (BUILTIN_PLUGINS.includes(name)) {
+        await profiles.install(name, 'latest', { allowBuild: BUILTIN_PLUGIN_ALLOW_BUILD[name] || [] });
+        return listProfilePlugins();
+      }
+      await defaults.manualOperation(async (_owner, options) => {
+        const policy = options.document.plugins.find((item) => item.name === name);
+        // 平台清单声明的构建授权与内置插件已知的 node-pty 兜底合并
+        const allowBuild = [...new Set([...(policy?.allow_build || []), ...(BUILTIN_PLUGIN_ALLOW_BUILD[name] || [])])];
+        return profiles.install(name, 'latest', { ...options, allowBuild });
+      });
+      return listProfilePlugins();
+    };
+    const removeProfilePlugin = async (_config, name) => {
+      validatePackage(name);
+      if (PROTECTED_PACKAGES.has(name)) throw new Error('AgentOne 自身和 DSH 基础组件不可卸载');
+      if (BUILTIN_PLUGINS.includes(name)) throw new Error('内置插件承载 dsh 控制台核心体验，不可卸载');
+      return defaults.manualOperation((_owner, options) => profiles.remove(name, options));
+    };
+    const upgradeProfilePlugin = async (_config, name) => {
+      if (INBOX_BUNDLES.has(name) || (name === PLUGIN_PACKAGE_NAME && isSelfManaged())) {
+        throw new Error('此组件随宿主或平台更新，请等待平台更新');
+      }
+      await defaults.manualOperation(async (_owner, options) => {
+        const managed = options.document.plugins.find((item) => item.name === name);
+        if (managed) return profiles.install(name, managed.version, { ...options, allowBuild: managed.allow_build });
+        const latest = await pnpmViewLatest(name, profiles.target().dir).catch(() => null);
+        if (!latest) throw new Error('查询插件最新版本失败，请检查 npm 连接后重试');
+        const installed = (await profiles.list()).plugins.find((item) => item.name === name);
+        if (installed?.version && compareSemver(latest, installed.version) <= 0) {
+          throw new Error(`已是最新版本（v${installed.version}）`);
+        }
+        return profiles.install(name, latest, options);
+      });
+      return listProfilePlugins();
+    };
+    const syncPlanSkills = async () => {
+      const result = await defaults.sync({ manual: true });
+      if (result?.error) throw new Error(result.error);
+      invalidateStatusCache();
+      return { installed: result?.skills.filter((item) => item.state === 'current').length || 0,
+        failed: result?.skills.filter((item) => ['failed', 'conflict', 'report_pending'].includes(item.state)).length || 0 };
+    };
+    const onLogin = () => {
+      defaults.reset();
+      void defaults.sync().then(invalidateStatusCache).catch(() => {});
+    };
+    // 内置插件常驻检测：缺失时静默重装（不依赖登录态）；单个失败不阻断，
+    // 下个启动周期再试。已装不碰——版本升级交给平台默认能力同步。
+    const ensureBuiltinPlugins = async () => {
+      const state = await profiles.list();
+      const installed = new Set(state.plugins.filter((plugin) => plugin.version).map((plugin) => plugin.name));
+      for (const name of BUILTIN_PLUGINS.filter((entry) => !installed.has(entry))) {
+        try {
+          await profiles.install(name, 'latest', { allowBuild: BUILTIN_PLUGIN_ALLOW_BUILD[name] || [] });
+          log.info(`[dsh-agentone] builtin plugin reinstalled: ${name}`);
+        } catch (error) {
+          log.warn(`[dsh-agentone] builtin plugin reinstall failed (${name}): ${error?.message || error}`);
+        }
+      }
+    };
     // 模块级重试定时器跨 apply 存活：重入先清，避免旧定时器引用旧 config
     clearModelRetry();
     modelRetryAttempts = 0;
@@ -905,6 +759,18 @@ export function apply(ctx, config) {
             modelRetryAttempts = 0;
           }
         }
+        if (skills?.skills && defaults.snapshot().user_id) {
+          const identity = defaults.snapshot();
+          skills = { ...skills, skills: await Promise.all(skills.skills.map(async (item) => {
+            const local = await localSkillState(config.platformUrl, item.canonical_slug, {
+              config: { ...config, dshHome: identity.home }, userId: identity.user_id, registry: identity.registry,
+            });
+            return { ...item, installed: ['current', 'report_pending'].includes(local.state),
+              local_state: local.state, installed_version: local.record?.version || '',
+              upgrade_available: local.state === 'current' && Boolean(item.latest_version && item.latest_fingerprint)
+                && (local.record.version !== item.latest_version || local.record.fingerprint !== item.latest_fingerprint) };
+          })) };
+        }
         // 登录入口判定：UI 登录卡文案需要；托管实例不显示登录入口，跳过查询
         const loginProvider = isInstanceManaged() ? 'feishu' : await resolveLoginProvider(config.platformUrl, log);
         sendJson(response, 200, {
@@ -918,6 +784,7 @@ export function apply(ctx, config) {
           instance_id: credentials?.instance_id ?? null,
           token_expires_at: credentials?.expires_at ?? null,
           plugin_version: PLUGIN_VERSION,
+          defaults: defaults.snapshot(),
           capabilities,
           skills,
           skill_display_names: displayNames,
@@ -960,7 +827,7 @@ export function apply(ctx, config) {
         // /agentone/callback 会 403。desktop 环境（服务端自检 execPath 或页面
         // 传 desktop 标记）改由插件在本进程起一次性本地服务收回调。
         const callbackUrl = body.desktop || isDesktopRuntime
-          ? await openCallbackServer(config, log)
+          ? await openCallbackServer(config, log, onLogin, () => !disposed)
           : String(body.callback_url || '');
         if (!/^https?:\/\/|^\/portal\//.test(callbackUrl)) {
           sendJson(response, 400, { error: '回调地址不合法' });
@@ -1008,6 +875,7 @@ export function apply(ctx, config) {
           redirect(false);
           return;
         }
+        if (disposed) { redirect(false); return; }
         const expiresIn = Number(result.expires_in) || 0;
         await saveCredentials(config, {
           schema_version: 2,
@@ -1024,10 +892,8 @@ export function apply(ctx, config) {
           ...(await loadCredentials(config)),
           access_token: result.access_token,
         }).catch(() => {});
-        await syncPlanSkills(config, log, {
-          ...(await loadCredentials(config)),
-          access_token: result.access_token,
-        }).catch(() => {});
+        if (disposed) { redirect(false); return; }
+        onLogin();
         redirect(true);
       } catch (error) {
         log.warn(`[dsh-agentone] exchange failed: ${error?.message || error}`);
@@ -1035,6 +901,33 @@ export function apply(ctx, config) {
       }
     });
 
+    register('/agentone/api/defaults/status', (request, response) => {
+      if (request.method !== 'GET') { sendJson(response, 405, { error: '请求方法不正确' }); return; }
+      sendJson(response, 200, defaults.snapshot());
+    });
+    for (const action of ['sync', 'retry', 'apply']) {
+      register(`/agentone/api/defaults/${action}`, async (request, response) => {
+        if (request.method !== 'POST') { sendJson(response, 405, { error: '请求方法不正确' }); return; }
+        try {
+          const body = await readJsonBody(request);
+          const credentials = await ensureFreshToken(config, log);
+          if (!credentials) { sendJson(response, 401, { error: '请先登录 AgentOne 平台' }); return; }
+          let item = null;
+          if (action !== 'sync') {
+            if (!['skill', 'plugin'].includes(body.kind) || typeof body.name !== 'string') {
+              sendJson(response, 400, { error: '请选择有效的技能或插件' }); return;
+            }
+            if (action === 'apply' && body.confirm !== true) {
+              sendJson(response, 400, { error: '应用差异将替换当前版本，请确认后继续' }); return;
+            }
+            item = { kind: body.kind, name: body.name, apply: action === 'apply' };
+          }
+          void defaults.sync({ manual: true, item }).then(invalidateStatusCache).catch(() => {});
+          sendJson(response, 202, { ok: true, running: true });
+        } catch (error) { sendJson(response, 400, { error: error?.message || '默认能力同步失败，请重试' }); }
+      });
+    }
+
     register('/agentone/api/model/sync', async (request, response) => {
       if (request.method !== 'POST') {
         response.writeHead(405, { allow: 'POST' });
@@ -1086,17 +979,12 @@ export function apply(ctx, config) {
           return;
         }
         const body = await readJsonBody(request);
-        const slug = String(body.slug || '');
-        if (!/^[a-z0-9][a-z0-9-]*(--[a-z0-9][a-z0-9-]*)?$/i.test(slug)) {
-          sendJson(response, 400, { error: '技能标识格式不正确' });
-          return;
-        }
-        const result = await installPlatformSkill(
-          config.platformUrl,
-          credentials.access_token,
-          slug,
-          { config },
-        );
+        let slug;
+        try { slug = canonicalSkillSlug(body.slug); }
+        catch (error) { sendJson(response, 400, { error: error.message }); return; }
+        const result = await defaults.manualOperation((owner, options) => installPlatformSkill(
+          owner.platform, owner.token, slug, options,
+        ));
         invalidateStatusCache();
         sendJson(response, 200, { ok: true, ...result });
       } catch (error) {
@@ -1153,7 +1041,15 @@ export function apply(ctx, config) {
           config.platformUrl,
           credentials.access_token,
         ).catch(() => null);
-        const installed = (listing?.skills || []).filter((skill) => skill.installed);
+        const identity = defaults.snapshot();
+        const installed = [];
+        if (identity.user_id) {
+          for (const skill of listing?.skills || []) {
+            const local = await localSkillState(config.platformUrl, skill.canonical_slug, {
+              config: { ...config, dshHome: identity.home }, userId: identity.user_id, registry: identity.registry });
+            if (['current', 'report_pending'].includes(local.state)) installed.push({ ...skill, installed: true, installed_version: local.record.version });
+          }
+        }
         sendJson(response, 200, { ...data, installed });
       } catch (error) {
         sendJson(response, 502, { error: '技能市场暂时不可用，请稍后再试' });
@@ -1173,12 +1069,10 @@ export function apply(ctx, config) {
           return;
         }
         const body = await readJsonBody(request);
-        const slug = String(body.slug || '');
-        if (!/^[a-z0-9][a-z0-9-]*(--[a-z0-9][a-z0-9-]*)?$/i.test(slug)) {
-          sendJson(response, 400, { error: '技能标识格式不正确' });
-          return;
-        }
-        await removePlatformSkill(config.platformUrl, credentials.access_token, slug, { config });
+        let slug;
+        try { slug = canonicalSkillSlug(body.slug); }
+        catch (error) { sendJson(response, 400, { error: error.message }); return; }
+        await defaults.manualOperation((owner, options) => removePlatformSkill(owner.platform, owner.token, slug, options));
         invalidateStatusCache();
         sendJson(response, 200, { ok: true, canonical_slug: slug });
       } catch (error) {
@@ -1198,7 +1092,7 @@ export function apply(ctx, config) {
         // 不用 pnpm outdated——它受元数据缓存与 minimumReleaseAge 冷却期
         // 影响，新发布的版本一段时间内查不到，升级按钮追着发版延迟出现。
         // 只查已装且来自 npm 的包；未安装/本地链接没有版本可查。
-        const dir = pluginProfileDir(config);
+        const dir = profiles.target().dir;
         await Promise.all(
           state.plugins
             .filter((item) => item.version !== null && item.source === 'npm')
@@ -1273,7 +1167,7 @@ export function apply(ctx, config) {
       // 中版本。升级成功后落盘先变、运行代码要重启宿主才换——两者差值即
       // 前端「已安装待重启」提示的依据。
       try {
-        const dir = pluginProfileDir(config);
+        const dir = profiles.target().dir;
         const [version, latest] = await Promise.all([
           installedVersion(dir, PLUGIN_PACKAGE_NAME),
           pnpmViewLatest(PLUGIN_PACKAGE_NAME, dir).catch(() => null),
@@ -1674,6 +1568,7 @@ export function apply(ctx, config) {
       try {
         // 先吊销平台侧 refresh token（尽力而为），再清本地；凭据读取失败
         // （文件损坏等）也要走到清凭据，不能把用户卡在登录态。
+        defaults.reset();
         const credentials = await loadCredentials(config);
         if (credentials?.refresh_token) {
           await revokePlatformToken(config.platformUrl, credentials.refresh_token);
@@ -1693,9 +1588,9 @@ export function apply(ctx, config) {
       }
     });
 
-    // 启动时若已有登录态：先保鲜令牌（临期轮换），再后台刷新模型配置、
-    // SkillHub 配置与套餐技能。内置插件常驻检测与登录无关，独立先行。
-    ensureBuiltinPlugins(config, log).catch((error) => {
+    // 默认能力属于已登录平台；无凭据不安装兼容默认。协调器独立于页面存活。
+    // 内置插件常驻检测与登录无关，独立先行。
+    ensureBuiltinPlugins().catch((error) => {
       log.warn(`[dsh-agentone] builtin plugin check failed: ${error?.message || error}`);
     });
     ensureLanguageDefault(config, log).catch((error) => {
@@ -1707,17 +1602,20 @@ export function apply(ctx, config) {
         log.warn(`[dsh-agentone] instance credential bootstrap failed: ${error?.message || error}`);
       });
       const credentials = await ensureFreshToken(config, log);
-      if (!credentials) return;
+      if (!credentials || disposed) return;
+      void defaults.sync().then(invalidateStatusCache).catch(() => {});
       await syncPlatformModel(config, log).catch(() => {});
       // SkillHub 连接在托管容器里由 Hub 直接注入 env（CLAWHUB_* / SKILLHUB_*），
       // 插件不再重复写 skillhub.env / clawhub login，避免两个写入方互相盖。
       if (!isInstanceManaged()) {
         await syncPlatformSkillhub(config, log, credentials).catch(() => {});
       }
-      await syncPlanSkills(config, log, credentials).catch(() => {});
     })();
 
-    return () => {
+    return async () => {
+      disposed = true;
+      await defaults.dispose();
+      await profiles.dispose();
       pendingStates.clear();
       pendingCliAuth.clear();
       clearModelRetry();