sema-core 2.0.14 → 2.0.16

package/dist/services/agents/genSystemReminder.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSkillsReminder = generateSkillsReminder;
 exports.generateRulesReminders = generateRulesReminders;
+exports.generatePostCompactReminders = generatePostCompactReminders;
 exports.generatePlanReminders = generatePlanReminders;
 const path = __importStar(require("path"));
 const ConfManager_1 = require("../../manager/ConfManager");
@@ -45,8 +46,11 @@ const genSystemPrompt_1 = require("./genSystemPrompt");
 const cwd_1 = require("../../util/cwd");
 const plan_1 = require("../../prompt/plan");
 const define_1 = require("../../prompt/define");
-function generateSkillsReminder() {
-    const skillsDesc = (0, skillsManager_1.getSkillTypesDescription)();
+const compact_1 = require("../../prompt/compact");
+const skillsManager_2 = require("../skills/skillsManager");
+const log_1 = require("../../util/log");
+async function generateSkillsReminder() {
+    const skillsDesc = await (0, skillsManager_1.getSkillTypesDescription)();
     if (!skillsDesc)
         return [];
     const reminder = `${define_1.REMINDER_SYS_OPEN}\nAvailable skills (invoke via the skill tool):\n\n${skillsDesc}\n${define_1.REMINDER_SYS_CLOSE}`;
@@ -79,6 +83,48 @@ ${define_1.REMINDER_SYS_CLOSE}`;
             text: rulesReminder
         }];
 }
+/**
+ * 压缩后注入的 reminder 块，顺序：被压掉的 skill 原文（仅作上下文，不受 hasSkillTool 门控）、
+ * skill 列表（仅当会话有 skill 工具，与 handleControlSignalRebuild 同口径）、rules（始终）。
+ * 压缩成功后历史已被摘要替换、不可逆，任何一段生成失败只降级不抛出。
+ */
+async function generatePostCompactReminders(hasSkillTool, compactedSkills = []) {
+    const reminders = [];
+    if (compactedSkills.length > 0) {
+        // 当前已禁用/已删除的 skill 不再注入（尊重用户当前配置）；状态查询失败则不过滤——
+        // 内容仅作上下文且带禁止重执行提示，多注入无害，漏注入才是问题
+        let activeSkills = compactedSkills;
+        try {
+            const skillsManager = (0, skillsManager_2.getSkillsManager)();
+            activeSkills = compactedSkills.filter(s => !!skillsManager.getSkillConfig(s.name) && !skillsManager.isSkillDisabled(s.name));
+        }
+        catch (error) {
+            (0, log_1.logError)(`[Compact] Failed to check skill status, injecting compacted skills unfiltered: ${error}`);
+        }
+        if (activeSkills.length > 0) {
+            const sections = activeSkills.map(s => `### Skill: ${s.name}\n\n${s.text}`).join('\n\n');
+            reminders.push({
+                type: 'text',
+                text: `${define_1.REMINDER_SYS_OPEN}\n${compact_1.SKILL_CONTEXT_NOTICE}\n\n${sections}\n${define_1.REMINDER_SYS_CLOSE}`,
+            });
+        }
+    }
+    if (hasSkillTool) {
+        try {
+            reminders.push(...await generateSkillsReminder());
+        }
+        catch (error) {
+            (0, log_1.logError)(`[Compact] Failed to generate skills reminder after compact: ${error}`);
+        }
+    }
+    try {
+        reminders.push(...generateRulesReminders());
+    }
+    catch (error) {
+        (0, log_1.logError)(`[Compact] Failed to generate rules reminder after compact: ${error}`);
+    }
+    return reminders;
+}
 function generatePlanReminders() {
     const currentDir = (0, cwd_1.readInitialCwd)();
     const plansDir = path.join(currentDir, '.sema/', 'plans/');

package/dist/services/agents/genSystemReminder.js.map

@@ -1 +1 @@
-{"version":3,"file":"genSystemReminder.js","sourceRoot":"","sources":["../../../src/services/agents/genSystemReminder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,wDAUC;AAED,wDA2BC;AAED,sDAOC;AA1DD,2CAA4B;AAC5B,2DAA0D;AAC1D,2DAAkE;AAClE,qDAA2D;AAC3D,wDAA0D;AAC1D,uDAAqD;AACrD,wCAA+C;AAC/C,4CAAoE;AACpE,gDAA2E;AAE3E,SAAgB,sBAAsB;IACpC,MAAM,UAAU,GAAG,IAAA,wCAAwB,GAAE,CAAA;IAC7C,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAA;IAE1B,MAAM,QAAQ,GAAG,GAAG,0BAAiB,sDAAsD,UAAU,KAAK,2BAAkB,EAAE,CAAA;IAE9H,OAAO,CAAC;YACN,IAAI,EAAE,MAAe;YACrB,IAAI,EAAE,QAAQ;SACf,CAAC,CAAA;AACJ,CAAC;AAED,SAAgB,sBAAsB;IACpC,MAAM,aAAa,GAAG,IAAA,4BAAc,GAAE,CAAA;IACtC,MAAM,WAAW,GAAG,aAAa,CAAC,aAAa,EAAE,EAAE,WAAW,IAAI,EAAE,CAAA;IACpE,MAAM,kBAAkB,GAAG,WAAW,CAAC,CAAC,CAAC,gDAAgD,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAC3G,MAAM,WAAW,GAAG,IAAA,iCAAkB,GAAE,CAAA;IACxC,8DAA8D;IAC9D,MAAM,aAAa,GAAG,IAAA,mCAAiB,GAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAA,iCAAoB,GAAE,CAAA;IAEvE,IAAI,CAAC,kBAAkB,IAAI,CAAC,WAAW,IAAI,CAAC,aAAa,EAAE,CAAC;QAC1D,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACrD,MAAM,QAAQ,GAAG,CAAC,kBAAkB,EAAE,WAAW,EAAE,aAAa,EAAE,yBAAyB,OAAO,EAAE,CAAC;SAClG,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,MAAM,CAAC,CAAA;IAEf,MAAM,aAAa,GAAG,GAAG,0BAAiB;;;EAG1C,QAAQ;EACR,2BAAkB,EAAE,CAAA;IAEpB,OAAO,CAAC;YACN,IAAI,EAAE,MAAe;YACrB,IAAI,EAAE,aAAa;SACpB,CAAC,CAAA;AACJ,CAAC;AAED,SAAgB,qBAAqB;IACnC,MAAM,UAAU,GAAG,IAAA,oBAAc,GAAE,CAAA;IACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAE1D,MAAM,aAAa,GAAG,IAAA,uCAAgC,EAAC,QAAQ,CAAC,CAAA;IAEhE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAA;AACzD,CAAC"}
+{"version":3,"file":"genSystemReminder.js","sourceRoot":"","sources":["../../../src/services/agents/genSystemReminder.ts"],"names":[],"mappings":"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"}

package/dist/services/commands/runCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runCommand.d.ts","sourceRoot":"","sources":["../../../src/services/commands/runCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,mBAAmB,CAAC;AAY/C,UAAU,mBAAmB;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,SAAS,CAAC,iBAAiB,EAAE,CAAC;CACvC;AAOD,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAKzG"}
+{"version":3,"file":"runCommand.d.ts","sourceRoot":"","sources":["../../../src/services/commands/runCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,mBAAmB,CAAC;AAgB/C,UAAU,mBAAmB;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,SAAS,CAAC,iBAAiB,EAAE,CAAC;CACvC;AAOD,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAKzG"}

package/dist/services/commands/runCommand.js

@@ -10,6 +10,10 @@ const commandsManager_1 = require("./commandsManager");
 const message_1 = require("../../util/message");
 const tokens_1 = require("../../util/tokens");
 const TaskManager_1 = require("../../manager/TaskManager");
+const tools_1 = require("../../tools/base/tools");
+const tool_1 = require("../../prompt/tool");
+const genSystemReminder_1 = require("../agents/genSystemReminder");
+const compact_2 = require("../../prompt/compact");
 // ─── 主入口 ──────────────────────────────────────────────────────────────────
 async function handleCommand(input, sessionId) {
     const systemResult = await handleSystemCommand(input, sessionId);
@@ -96,11 +100,17 @@ async function handleCompactCommand(sessionId, customInstructions) {
             }, sessionId);
             return;
         }
-        // 压缩后清空 todos 和 readFileTimestamps（历史上下文已丢失，它们不再有意义）
-        mainAgentState.updateTodosIntelligently([]);
+        // 压缩后清空 readFileTimestamps（促使模型重新读取文件）；todos 不清空：
+        // 模型侧 todo 工具读 todoTasksMap（从未被清），清 UI 投影只造成面板闪空的不一致
         mainAgentState.setReadFileTimestamps({});
+        // 与自动压缩路径同口径：重新注入被压掉的 skill 原文与 skills/rules reminder。
+        // 手动压缩替换全部历史，被压区间即完整消息列表，无需幸存过滤
+        const hasSkillTool = (0, tools_1.getAvailableTools)(undefined, { sessionId })
+            .some(tool => tool.name === tool_1.TOOL_NAME_SKILL);
+        const reminders = await (0, genSystemReminder_1.generatePostCompactReminders)(hasSkillTool, (0, compact_1.collectSkillActivations)(messages));
+        // reminder 前置，摘要带续接包装（来源说明 + 直接续做指示）
         mainAgentState.setMessageHistory([
-            (0, message_1.buildUserMsg)(result.summary),
+            (0, message_1.buildUserMsg)([...reminders, { type: 'text', text: (0, compact_2.wrapCompactSummary)(result.summary) }]),
         ]);
         (0, log_1.logDebug)('压缩完成，已替换为 local-command 格式消息历史');
     }

package/dist/services/commands/runCommand.js.map

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

package/dist/services/mcp/MCPManager.d.ts

@@ -5,8 +5,8 @@
  * 实现优先级：插件 < 用户级 < 项目级
  *
  * 状态管理：
- * - 服务启用/禁用：.sema/settings.json -> disabledMcpServers
- * - 可用工具列表：.sema/settings.json -> enabledMcpServerUseTools
+ * - 服务启用/禁用：settings.json -> disabledMcpServers（用户级 ~/.sema + 项目级 .sema 取并集生效）
+ * - 可用工具列表：settings.json -> enabledMcpServerUseTools（用户级打底、项目级同名覆盖）
  */
 import { Tool } from '../../tools/base/Tool';
 import { MCPServerConfig, MCPServerInfo } from '../../types/mcp';
@@ -41,6 +41,14 @@ declare class MCPManager {
      * 写入 Sema 项目级 settings.json（合并写入，保留其他字段）
      */
     private writeSemaSettings;
+    /**
+     * 禁用的 MCP Server 集合：用户级 + 项目级并集（任一层禁用即禁用）
+     */
+    private readDisabledUnion;
+    /**
+     * MCP Server 可用工具映射：用户级打底、项目级同名覆盖（与 disabled 同样的分层思路）
+     */
+    private readUseToolsMerged;
     /**
      * 解析 Sema 来源的 MCP Server 配置条目
      */
@@ -123,19 +131,25 @@ declare class MCPManager {
      * 重新连接指定 MCP Server
      */
     reconnectMCPServer(name: string): Promise<MCPServerInfo[]>;
+    /**
+     * 启停写入哪层 settings：跟随 server 所在层
+     * （项目级/local 写项目级，用户级/插件写用户级，即全局生效）
+     */
+    private toggleScope;
     /**
      * 禁用指定 MCP Server
-     * 修改 .sema/settings.json 的 disabledMcpServers 字段
+     * 修改 settings.json 的 disabledMcpServers 字段（写入层见 toggleScope）
      */
     disableMCPServer(name: string): Promise<MCPServerInfo[]>;
     /**
      * 启用指定 MCP Server
-     * 修改 .sema/settings.json 的 disabledMcpServers 字段
+     * 只从目标层（见 toggleScope）的 disabledMcpServers 移除；若另一层仍禁用，最终仍为禁用
      */
     enableMCPServer(name: string): Promise<MCPServerInfo[]>;
     /**
      * 更新指定 MCP Server 的工具使用列表
-     * 修改 .sema/settings.json 的 enabledMcpServerUseTools 字段
+     * 修改 settings.json 的 enabledMcpServerUseTools 字段（写入层跟随 server 所在层，见 toggleScope；
+     * 生效值为用户级打底、项目级同名覆盖，toolNames 为 null 时删除该层记录=全部可用）
      */
     updateMCPUseTools(name: string, toolNames: string[] | null): Promise<MCPServerInfo[]>;
     /**

package/dist/services/mcp/MCPManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MCPManager.d.ts","sourceRoot":"","sources":["../../../src/services/mcp/MCPManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAU9E;;GAEG;AACH,cAAM,UAAU;IACd,OAAO,CAAC,kBAAkB,CAAQ;IAClC,OAAO,CAAC,qBAAqB,CAAQ;IAGrC,OAAO,CAAC,eAAe,CAA+B;IAEtD,OAAO,CAAC,cAAc,CAAwC;IAG9D,OAAO,CAAC,OAAO,CAAoC;;IAkBnD;;OAEG;IACH,OAAO,CAAC,eAAe;IAMvB;;OAEG;IACH,OAAO,CAAC,YAAY;IAUpB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAStB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAIxB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAMzB;;OAEG;IACH,OAAO,CAAC,cAAc;IAetB;;OAEG;IACH,OAAO,CAAC,aAAa;IAsBrB;;;OAGG;YACW,mBAAmB;IAkDjC;;;;OAIG;YACW,WAAW;IAgDzB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA2B5B;;OAEG;IACH,OAAO,CAAC,aAAa;IAWrB;;OAEG;YACW,aAAa;IAwB3B;;OAEG;YACW,gBAAgB;IAa9B;;OAEG;YACW,aAAa;IAM3B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAa7B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAY9B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAM5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAMrD;;;OAGG;IACG,uBAAuB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IA0DzD;;OAEG;IACH,WAAW,IAAI,IAAI,EAAE;IAsBrB;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAWrE;;OAEG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAe7D;;OAEG;IACG,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAUhE;;;OAGG;IACG,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAoB9D;;;OAGG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAiB7D;;;OAGG;IACG,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAoB3F;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B;AAMD;;GAEG;AACH,wBAAgB,aAAa,IAAI,UAAU,CAK1C;AAED;;;GAGG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAGpD;AAED,OAAO,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"MCPManager.d.ts","sourceRoot":"","sources":["../../../src/services/mcp/MCPManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAgB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAU9E;;GAEG;AACH,cAAM,UAAU;IACd,OAAO,CAAC,kBAAkB,CAAQ;IAClC,OAAO,CAAC,qBAAqB,CAAQ;IAGrC,OAAO,CAAC,eAAe,CAA+B;IAEtD,OAAO,CAAC,cAAc,CAAwC;IAG9D,OAAO,CAAC,OAAO,CAAoC;;IAkBnD;;OAEG;IACH,OAAO,CAAC,eAAe;IAMvB;;OAEG;IACH,OAAO,CAAC,YAAY;IAUpB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAStB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAIxB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAMzB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;OAEG;IACH,OAAO,CAAC,cAAc;IAetB;;OAEG;IACH,OAAO,CAAC,aAAa;IAsBrB;;;OAGG;YACW,mBAAmB;IAkDjC;;;;OAIG;YACW,WAAW;IA+CzB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA2B5B;;OAEG;IACH,OAAO,CAAC,aAAa;IAWrB;;OAEG;YACW,aAAa;IAwB3B;;OAEG;YACW,gBAAgB;IAa9B;;OAEG;YACW,aAAa;IAM3B;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAa7B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAY9B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAM5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAMrD;;;OAGG;IACG,uBAAuB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IA0DzD;;OAEG;IACH,WAAW,IAAI,IAAI,EAAE;IAsBrB;;OAEG;IACG,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAWrE;;OAEG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA4B7D;;OAEG;IACG,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAUhE;;;OAGG;IACH,OAAO,CAAC,WAAW;IAKnB;;;OAGG;IACG,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAqB9D;;;OAGG;IACG,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAuB7D;;;;OAIG;IACG,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAsB3F;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B;AAMD;;GAEG;AACH,wBAAgB,aAAa,IAAI,UAAU,CAK1C;AAED;;;GAGG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAGpD;AAED,OAAO,EAAE,UAAU,EAAE,CAAA"}

package/dist/services/mcp/MCPManager.js

@@ -6,8 +6,8 @@
  * 实现优先级：插件 < 用户级 < 项目级
  *
  * 状态管理：
- * - 服务启用/禁用：.sema/settings.json -> disabledMcpServers
- * - 可用工具列表：.sema/settings.json -> enabledMcpServerUseTools
+ * - 服务启用/禁用：settings.json -> disabledMcpServers（用户级 ~/.sema + 项目级 .sema 取并集生效）
+ * - 可用工具列表：settings.json -> enabledMcpServerUseTools（用户级打底、项目级同名覆盖）
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -126,6 +126,23 @@ class MCPManager {
     writeSemaSettings(data) {
         (0, settingsLoader_1.writeSettings)('project', data);
     }
+    /**
+     * 禁用的 MCP Server 集合：用户级 + 项目级并集（任一层禁用即禁用）
+     */
+    readDisabledUnion() {
+        const user = (0, settingsLoader_1.readSettings)('user').disabledMcpServers ?? [];
+        const project = (0, settingsLoader_1.readSettings)('project').disabledMcpServers ?? [];
+        return new Set([...user, ...project]);
+    }
+    /**
+     * MCP Server 可用工具映射：用户级打底、项目级同名覆盖（与 disabled 同样的分层思路）
+     */
+    readUseToolsMerged() {
+        return {
+            ...((0, settingsLoader_1.readSettings)('user').enabledMcpServerUseTools ?? {}),
+            ...((0, settingsLoader_1.readSettings)('project').enabledMcpServerUseTools ?? {}),
+        };
+    }
     // ==================== 配置解析 ====================
     /**
      * 解析 Sema 来源的 MCP Server 配置条目
@@ -223,9 +240,8 @@ class MCPManager {
      */
     async loadServers() {
         const serverMap = new Map();
-        const semaSettings = this.readSemaSettings();
-        const semaDisabled = new Set(semaSettings.disabledMcpServers ?? []);
-        const semaUseToolsMap = semaSettings.enabledMcpServerUseTools ?? {};
+        const semaDisabled = this.readDisabledUnion();
+        const semaUseToolsMap = this.readUseToolsMerged();
         // 1. 插件 MCP：从已安装且启用的插件中加载 - 最低优先级
         await this.loadMCPsFromPlugins(serverMap, semaDisabled, semaUseToolsMap);
         // 2. Sema 用户级：~/.sema/.mcp.json
@@ -521,6 +537,20 @@ class MCPManager {
         const { servers, hasMcpServersField } = this.readSemaMcpConfigFile(configPath);
         delete servers[name];
         this.writeSemaMcpConfigFile(configPath, servers, hasMcpServersField);
+        // 清理同层 settings 中的禁用/工具列表记录（写入层与 disable/enable 对称，见 toggleScope）
+        const settingsScope = this.toggleScope(info);
+        const settings = (0, settingsLoader_1.readSettings)(settingsScope);
+        let settingsChanged = false;
+        if (settings.disabledMcpServers?.includes(name)) {
+            settings.disabledMcpServers = settings.disabledMcpServers.filter(n => n !== name);
+            settingsChanged = true;
+        }
+        if (settings.enabledMcpServerUseTools && name in settings.enabledMcpServerUseTools) {
+            delete settings.enabledMcpServerUseTools[name];
+            settingsChanged = true;
+        }
+        if (settingsChanged)
+            (0, settingsLoader_1.writeSettings)(settingsScope, settings);
         await this.disconnectClient(name);
         (0, log_1.logInfo)(`移除 MCP Server [${name}]`);
         return this.refreshMCPServerConfigs();
@@ -537,9 +567,17 @@ class MCPManager {
         await this.connectServer(info);
         return this.getMCPServerConfigs();
     }
+    /**
+     * 启停写入哪层 settings：跟随 server 所在层
+     * （项目级/local 写项目级，用户级/插件写用户级，即全局生效）
+     */
+    toggleScope(info) {
+        const s = info.config.scope;
+        return s === 'project' || s === 'local' ? 'project' : 'user';
+    }
     /**
      * 禁用指定 MCP Server
-     * 修改 .sema/settings.json 的 disabledMcpServers 字段
+     * 修改 settings.json 的 disabledMcpServers 字段（写入层见 toggleScope）
      */
     async disableMCPServer(name) {
         const info = this.serverInfoCache?.find(s => s.config.name === name);
@@ -547,23 +585,24 @@ class MCPManager {
             (0, log_1.logWarn)(`禁用 MCP Server 失败: 未找到 [${name}]`);
             return this.getMCPServerConfigs();
         }
-        const settings = this.readSemaSettings();
+        const scope = this.toggleScope(info);
+        const settings = (0, settingsLoader_1.readSettings)(scope);
         if (!settings.disabledMcpServers)
             settings.disabledMcpServers = [];
         if (!settings.disabledMcpServers.includes(name)) {
             settings.disabledMcpServers.push(name);
         }
-        this.writeSemaSettings(settings);
+        (0, settingsLoader_1.writeSettings)(scope, settings);
         info.status = false;
         await this.disconnectClient(name);
         info.connectStatus = 'disconnected';
         info.capabilities = undefined;
-        (0, log_1.logInfo)(`禁用 MCP Server [${name}]`);
+        (0, log_1.logInfo)(`禁用 MCP Server [${name}]（${scope} 级）`);
         return this.getMCPServerConfigs();
     }
     /**
      * 启用指定 MCP Server
-     * 修改 .sema/settings.json 的 disabledMcpServers 字段
+     * 只从目标层（见 toggleScope）的 disabledMcpServers 移除；若另一层仍禁用，最终仍为禁用
      */
     async enableMCPServer(name) {
         const info = this.serverInfoCache?.find(s => s.config.name === name);
@@ -571,19 +610,27 @@ class MCPManager {
             (0, log_1.logWarn)(`启用 MCP Server 失败: 未找到 [${name}]`);
             return this.getMCPServerConfigs();
         }
-        const settings = this.readSemaSettings();
+        const scope = this.toggleScope(info);
+        const settings = (0, settingsLoader_1.readSettings)(scope);
         if (settings.disabledMcpServers) {
             settings.disabledMcpServers = settings.disabledMcpServers.filter(n => n !== name);
         }
-        this.writeSemaSettings(settings);
-        info.status = true;
-        await this.connectServer(info);
-        (0, log_1.logInfo)(`启用 MCP Server [${name}]`);
+        (0, settingsLoader_1.writeSettings)(scope, settings);
+        const stillDisabled = this.readDisabledUnion().has(name);
+        info.status = !stillDisabled;
+        if (stillDisabled) {
+            (0, log_1.logWarn)(`MCP Server [${name}] 在另一层 settings 中仍被禁用，未连接`);
+        }
+        else {
+            await this.connectServer(info);
+        }
+        (0, log_1.logInfo)(`启用 MCP Server [${name}]（${scope} 级）`);
         return this.getMCPServerConfigs();
     }
     /**
      * 更新指定 MCP Server 的工具使用列表
-     * 修改 .sema/settings.json 的 enabledMcpServerUseTools 字段
+     * 修改 settings.json 的 enabledMcpServerUseTools 字段（写入层跟随 server 所在层，见 toggleScope；
+     * 生效值为用户级打底、项目级同名覆盖，toolNames 为 null 时删除该层记录=全部可用）
      */
     async updateMCPUseTools(name, toolNames) {
         const info = this.serverInfoCache?.find(s => s.config.name === name);
@@ -591,19 +638,21 @@ class MCPManager {
             (0, log_1.logWarn)(`更新工具列表失败: 未找到 MCP Server [${name}]`);
             return this.getMCPServerConfigs();
         }
-        const settings = this.readSemaSettings();
+        const scope = this.toggleScope(info);
+        const settings = (0, settingsLoader_1.readSettings)(scope);
         if (!settings.enabledMcpServerUseTools)
             settings.enabledMcpServerUseTools = {};
-        if (toolNames === null) {
+        // == null 同时兜住 null 与 undefined（SDK 桥的 payload 助手会把 null 键整个略去）
+        if (toolNames == null) {
             delete settings.enabledMcpServerUseTools[name];
         }
         else {
             settings.enabledMcpServerUseTools[name] = toolNames;
         }
-        this.writeSemaSettings(settings);
-        // 同步更新缓存中的配置
-        info.config.useTools = toolNames;
-        (0, log_1.logInfo)(`更新 MCP Server [${name}] 工具列表: ${toolNames ? toolNames.join(', ') : 'null (使用所有工具)'}`);
+        (0, settingsLoader_1.writeSettings)(scope, settings);
+        // 同步更新缓存中的配置（取分层合并后的生效值）
+        info.config.useTools = this.readUseToolsMerged()[name] ?? null;
+        (0, log_1.logInfo)(`更新 MCP Server [${name}] 工具列表（${scope} 级）: ${toolNames ? toolNames.join(', ') : 'null (使用所有工具)'}`);
         return this.getMCPServerConfigs();
     }
     /**

package/dist/services/mcp/MCPManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"MCPManager.js","sourceRoot":"","sources":["../../../src/services/mcp/MCPManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MCPManager.js","sourceRoot":"","sources":["../../../src/services/mcp/MCPManager.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkqBH,sCAKC;AAMD,wCAGC;AA9qBD,uCAAwB;AACxB,2CAA4B;AAC5B,2CAAuC;AACvC,qDAAuD;AAGvD,wCAAqE;AACrE,0DAAmD;AACnD,kDAAoD;AACpD,wCAA+C;AAC/C,0CAAyD;AACzD,2BAA6C;AAC7C,+DAAwE;AAGxE;;GAEG;AACH,MAAM,UAAU;IAYd;QARA,cAAc;QACN,oBAAe,GAA2B,IAAI,CAAA;QACtD,eAAe;QACP,mBAAc,GAAoC,IAAI,CAAA;QAE9D,kBAAkB;QACV,YAAO,GAA2B,IAAI,GAAG,EAAE,CAAA;QAGjD,MAAM,WAAW,GAAG,IAAA,yBAAc,GAAE,CAAA;QACpC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;QAE7D,MAAM,GAAG,GAAG,IAAA,oBAAc,GAAE,CAAA;QAC5B,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;QAEjE,gBAAgB;QAChB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,uBAAuB,EAAE;aACjD,KAAK,CAAC,GAAG,CAAC,EAAE;YACX,IAAA,cAAQ,EAAC,kBAAkB,GAAG,EAAE,CAAC,CAAA;YACjC,OAAO,EAAqB,CAAA;QAC9B,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA,CAAC,CAAC,CAAC,CAAA;IAClD,CAAC;IAED;;OAEG;IACK,eAAe;QACrB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA;IAC7B,CAAC;IAED,mDAAmD;IAEnD;;OAEG;IACK,YAAY,CAAC,QAAgB;QACnC,IAAI,CAAC;YACH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAAE,OAAO,IAAI,CAAA;YACzC,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;QACtD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,cAAQ,EAAC,WAAW,QAAQ,MAAM,GAAG,EAAE,CAAC,CAAA;YACxC,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,cAAc,CAAC,QAAgB;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QACxC,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAA;QAClD,IAAI,IAAI,CAAC,UAAU,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC,UAAU,CAAA;QACxB,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;OAEG;IACK,gBAAgB;QACtB,OAAO,IAAA,6BAAY,EAAC,SAAS,CAAC,CAAA;IAChC,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,IAAkB;QAC1C,IAAA,8BAAa,EAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAChC,CAAC;IAED;;OAEG;IACK,iBAAiB;QACvB,MAAM,IAAI,GAAG,IAAA,6BAAY,EAAC,MAAM,CAAC,CAAC,kBAAkB,IAAI,EAAE,CAAA;QAC1D,MAAM,OAAO,GAAG,IAAA,6BAAY,EAAC,SAAS,CAAC,CAAC,kBAAkB,IAAI,EAAE,CAAA;QAChE,OAAO,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,CAAC,CAAA;IACvC,CAAC;IAED;;OAEG;IACK,kBAAkB;QACxB,OAAO;YACL,GAAG,CAAC,IAAA,6BAAY,EAAC,MAAM,CAAC,CAAC,wBAAwB,IAAI,EAAE,CAAC;YACxD,GAAG,CAAC,IAAA,6BAAY,EAAC,SAAS,CAAC,CAAC,wBAAwB,IAAI,EAAE,CAAC;SAC5D,CAAA;IACH,CAAC;IAED,iDAAiD;IAEjD;;OAEG;IACK,cAAc,CAAC,IAAY,EAAE,GAAQ,EAAE,KAAmB;QAChE,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,IAAI,IAAI,OAAO,CAAA;QACtD,OAAO;YACL,IAAI;YACJ,SAAS;YACT,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,KAAK;SACN,CAAA;IACH,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,MAAuB,EAAE,MAAe,EAAE,QAA0B,EAAE,QAAiB;QAC3G,IAAI,SAA6B,CAAA;QACjC,IAAI,QAAQ,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,IAAA,iBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;gBAC3C,MAAM,KAAK,GAAG,IAAA,8BAAuB,EAAC,GAAG,EAAE,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,CAAA;gBAC9D,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;YACtE,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS,GAAG,QAAQ,CAAA;YACtB,CAAC;QACH,CAAC;QACD,OAAO;YACL,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE;YAC/B,aAAa,EAAE,cAAc;YAC7B,MAAM;YACN,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,QAAQ,EAAE,SAAS;SACpB,CAAA;IACH,CAAC;IAED,iDAAiD;IAEjD;;;OAGG;IACK,KAAK,CAAC,mBAAmB,CAC/B,SAAqC,EACrC,YAAyB,EACzB,eAAyC;QAEzC,IAAI,CAAC;YACH,MAAM,EAAE,iBAAiB,EAAE,GAAG,wDAAa,2BAA2B,GAAC,CAAA;YACvE,MAAM,WAAW,GAAG,MAAM,iBAAiB,EAAE,CAAC,yBAAyB,EAAE,CAAA;YACzE,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;YAEhE,IAAI,WAAW,GAAG,CAAC,CAAA;YACnB,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;gBACpC,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAA;gBAC3C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;oBAAE,SAAQ;gBAEzE,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;oBACrC,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;oBACtD,IAAA,cAAQ,EAAC,OAAO,MAAM,CAAC,IAAI,aAAa,QAAQ,CAAC,QAAQ,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;oBAC5F,IAAI,CAAC,OAAO;wBAAE,SAAQ;oBAEtB,KAAK,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAM,OAAO,CAAC,EAAE,CAAC;wBAC7D,MAAM,gBAAgB,GAAG,UAAU,MAAM,CAAC,IAAI,IAAI,UAAU,EAAE,CAAA;wBAC9D,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,SAAS,IAAI,OAAO,CAAA;wBACtD,MAAM,MAAM,GAAoB;4BAC9B,IAAI,EAAE,gBAAgB;4BACtB,SAAS;4BACT,WAAW,EAAE,GAAG,CAAC,WAAW;4BAC5B,OAAO,EAAE,GAAG,CAAC,OAAO;4BACpB,IAAI,EAAE,GAAG,CAAC,IAAI;4BACd,GAAG,EAAE,GAAG,CAAC,GAAG;4BACZ,GAAG,EAAE,GAAG,CAAC,GAAG;4BACZ,OAAO,EAAE,GAAG,CAAC,OAAO;4BACpB,KAAK,EAAE,QAAQ;yBAChB,CAAA;wBACD,MAAM,MAAM,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;wBAClD,MAAM,QAAQ,GAAG,gBAAgB,IAAI,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;wBACpG,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;wBAChG,WAAW,EAAE,CAAA;oBACf,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;gBACpB,IAAA,cAAQ,EAAC,aAAa,WAAW,IAAI,CAAC,CAAA;YACxC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAA,cAAQ,EAAC,gBAAgB,KAAK,EAAE,CAAC,CAAA;QACnC,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,WAAW;QACvB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAyB,CAAA;QAClD,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAC7C,MAAM,eAAe,GAA6B,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAE3E,kCAAkC;QAClC,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,YAAY,EAAE,eAAe,CAAC,CAAA;QAExE,gCAAgC;QAChC,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;QACpE,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,KAAK,GAAG,CAAC,CAAA;YACb,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAM,eAAe,CAAC,EAAE,CAAC;gBAC/D,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA;gBACrD,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,QAAQ,GAAG,IAAI,IAAI,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;oBAC5E,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAA;oBAC3G,KAAK,EAAE,CAAA;gBACT,CAAC;YACH,CAAC;YACD,IAAI,KAAK,GAAG,CAAC;gBAAE,IAAA,cAAQ,EAAC,oBAAoB,KAAK,IAAI,CAAC,CAAA;QACxD,CAAC;QAED,+CAA+C;QAC/C,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;QAC1E,IAAI,kBAAkB,EAAE,CAAC;YACvB,IAAI,KAAK,GAAG,CAAC,CAAA;YACb,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAM,kBAAkB,CAAC,EAAE,CAAC;gBAClE,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC,CAAA;gBACxD,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,QAAQ,GAAG,IAAI,IAAI,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;oBAC5E,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAA;oBAC9G,KAAK,EAAE,CAAA;gBACT,CAAC;YACH,CAAC;YACD,IAAI,KAAK,GAAG,CAAC;gBAAE,IAAA,cAAQ,EAAC,oBAAoB,KAAK,IAAI,CAAC,CAAA;QACxD,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC3D,IAAA,aAAO,EAAC,cAAc,SAAS,CAAC,IAAI,SAAS,WAAW,GAAG,CAAC,CAAA;QAE5D,oCAAoC;QACpC,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAA;QAEpC,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;IACvD,CAAC;IAED;;OAEG;IACK,oBAAoB,CAAC,SAAqC;QAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACxC,IAAI,OAAO,GAAG,KAAK,CAAA;QAEnB,IAAI,QAAQ,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;YAChF,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC;gBAC3D,QAAQ,CAAC,kBAAkB,GAAG,QAAQ,CAAA;gBACtC,OAAO,GAAG,IAAI,CAAA;YAChB,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,CAAC,wBAAwB,EAAE,CAAC;YACtC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC;gBAClE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;oBACzB,OAAO,QAAQ,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAA;oBAC9C,OAAO,GAAG,IAAI,CAAA;gBAChB,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;YAChC,IAAA,cAAQ,EAAC,sCAAsC,CAAC,CAAA;QAClD,CAAC;IACH,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,CAAkB,EAAE,CAAkB;QAC1D,OAAO,CACL,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS;YAC3B,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO;YACvB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;YACjD,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC;YAC/C,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG;YACf,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CACxD,CAAA;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,aAAa,CAAC,IAAmB;QAC7C,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAC5B,MAAM,QAAQ,GAAG,sBAAQ,CAAC,WAAW,EAAE,CAAA;QACvC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAA;QACjC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAA;QACtB,QAAQ,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAA;QACxC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACjC,MAAM,MAAM,GAAG,IAAI,qBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACzC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;YACtB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YAC9B,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,CAAA;YAClC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,SAAS,CAAA;YACpD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC7B,IAAA,cAAQ,EAAC,eAAe,IAAI,QAAQ,CAAC,CAAA;YACrC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAA;QAC1C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,aAAa,GAAG,OAAO,CAAA;YAC5B,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;YACxB,IAAA,cAAQ,EAAC,kBAAkB,IAAI,SAAS,GAAG,EAAE,CAAC,CAAA;YAC9C,QAAQ,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,gBAAgB,CAAC,IAAY;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrC,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,UAAU,EAAE,CAAA;YAC3B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAA,cAAQ,EAAC,kBAAkB,IAAI,YAAY,GAAG,EAAE,CAAC,CAAA;YACnD,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,aAAa;QACzB,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC7F,CAAC;IAED,sDAAsD;IAEtD;;;OAGG;IACK,qBAAqB,CAAC,UAAkB;QAC9C,IAAI,CAAC;YACH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;gBAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAA;YAChF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAA;YAC5D,IAAI,IAAI,CAAC,UAAU,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;gBAC3D,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAA;YAC/D,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAA;QACrF,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAA;QAClD,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,sBAAsB,CAAC,UAAkB,EAAE,OAA4B,EAAE,kBAAkB,GAAG,IAAI;QACxG,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;YACpC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAC/D,MAAM,OAAO,GAAG,kBAAkB,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAA;YACtE,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;QACxE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAA,cAAQ,EAAC,kBAAkB,UAAU,MAAM,GAAG,EAAE,CAAC,CAAA;YACjD,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;IAED;;OAEG;IACK,oBAAoB,CAAC,KAAmB;QAC9C,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAA;IACnF,CAAC;IAED,iDAAiD;IAEjD;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,cAAc,CAAA;QAC3B,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAA;QACtC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,mBAAmB;QACvB,IAAI,IAAI,CAAC,eAAe;YAAE,OAAO,IAAI,CAAC,eAAe,CAAA;QACrD,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC,cAAc,CAAA;QACnD,OAAO,IAAI,CAAC,uBAAuB,EAAE,CAAA;IACvC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,uBAAuB;QAC3B,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC,cAAc,CAAA;QACnD,IAAA,cAAQ,EAAC,qBAAqB,CAAC,CAAA;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAExE,gBAAgB;QAChB,IAAI,CAAC,eAAe,EAAE,CAAA;QACtB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QAExB,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAgB,CAAA;QACtC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;QAE1D,YAAY;QACZ,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;QACxF,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAExE,kBAAkB;QAClB,MAAM,SAAS,GAAoB,EAAE,CAAA;QACrC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAA;YAChC,MAAM,OAAO,GAAG,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;YAC3D,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YAE7C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACpB,aAAa;gBACb,IAAI,cAAc,EAAE,CAAC;oBACnB,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;oBACjC,OAAO,CAAC,aAAa,GAAG,cAAc,CAAA;oBACtC,OAAO,CAAC,YAAY,GAAG,SAAS,CAAA;gBAClC,CAAC;gBACD,SAAQ;YACV,CAAC;YAED,IAAI,OAAO,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAClE,+BAA+B;gBAC/B,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;gBAC7C,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAA;gBAC3C,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;gBACzC,IAAA,cAAQ,EAAC,eAAe,IAAI,gBAAgB,CAAC,CAAA;YAC/C,CAAC;iBAAM,CAAC;gBACN,iBAAiB;gBACjB,IAAI,cAAc;oBAAE,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;gBACrD,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACzB,CAAC;QACH,CAAC;QAED,gBAAgB;QAChB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,IAAA,aAAO,EAAC,oBAAoB,IAAI,CAAC,MAAM,CAAC,IAAI,SAAS,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;YAC/H,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACnC,IAAA,cAAQ,EAAC,oBAAoB,IAAI,CAAC,MAAM,CAAC,IAAI,SAAS,GAAG,EAAE,CAAC,CAAA;YAC9D,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,IAAA,aAAO,EAAC,sBAAsB,QAAQ,CAAC,MAAM,QAAQ,SAAS,CAAC,MAAM,QAAQ,YAAY,CAAC,MAAM,MAAM,CAAC,CAAA;QACvG,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;OAEG;IACH,WAAW;QACT,MAAM,KAAK,GAAW,EAAE,CAAA;QACxB,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChD,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK;gBAAE,SAAQ;YAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;YAC1E,MAAM,QAAQ,GAAG,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAA;YACtC,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAC/C,OAAO,CAAC,EAAE,CAAC,IAAA,qCAAoB,EAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAC7D,CAAA;YACD,IAAI,QAAQ,EAAE,CAAC;gBACb,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;oBACtC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;oBACnC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;oBAC1E,OAAO,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;gBACpC,CAAC,CAAC,CAAC,CAAA;YACL,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAA;YAC5B,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAAC,MAAuB;QACxC,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC1D,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAA;QAC9E,IAAA,cAAQ,EAAC,eAAe,UAAU,cAAc,OAAO,yBAAyB,kBAAkB,EAAE,CAAC,CAAA;QACrG,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAA;QACjD,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;QACpB,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAA;QACpE,IAAA,aAAO,EAAC,qBAAqB,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,KAAK,MAAM,CAAC,CAAA;QAClE,OAAO,IAAI,CAAC,uBAAuB,EAAE,CAAA;IACvC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,IAAY;QAChC,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;QACpE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAA,aAAO,EAAC,0BAA0B,IAAI,GAAG,CAAC,CAAA;YAC1C,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAA;QACnC,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,KAAM,CAAC,CAAA;QACzD,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAA;QAC9E,OAAO,OAAO,CAAC,IAAI,CAAC,CAAA;QACpB,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAA;QACpE,kEAAkE;QAClE,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC5C,MAAM,QAAQ,GAAG,IAAA,6BAAY,EAAC,aAAa,CAAC,CAAA;QAC5C,IAAI,eAAe,GAAG,KAAK,CAAA;QAC3B,IAAI,QAAQ,CAAC,kBAAkB,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,QAAQ,CAAC,kBAAkB,GAAG,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAA;YACjF,eAAe,GAAG,IAAI,CAAA;QACxB,CAAC;QACD,IAAI,QAAQ,CAAC,wBAAwB,IAAI,IAAI,IAAI,QAAQ,CAAC,wBAAwB,EAAE,CAAC;YACnF,OAAO,QAAQ,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAA;YAC9C,eAAe,GAAG,IAAI,CAAA;QACxB,CAAC;QACD,IAAI,eAAe;YAAE,IAAA,8BAAa,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAA;QAC3D,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;QACjC,IAAA,aAAO,EAAC,kBAAkB,IAAI,GAAG,CAAC,CAAA;QAClC,OAAO,IAAI,CAAC,uBAAuB,EAAE,CAAA;IACvC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB,CAAC,IAAY;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;QACpE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAA,aAAO,EAAC,0BAA0B,IAAI,GAAG,CAAC,CAAA;YAC1C,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAA;QACnC,CAAC;QACD,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAC9B,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAA;IACnC,CAAC;IAED;;;OAGG;IACK,WAAW,CAAC,IAAmB;QACrC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAA;QAC3B,OAAO,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAA;IAC9D,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,gBAAgB,CAAC,IAAY;QACjC,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;QACpE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAA,aAAO,EAAC,0BAA0B,IAAI,GAAG,CAAC,CAAA;YAC1C,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAA;QACnC,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACpC,MAAM,QAAQ,GAAG,IAAA,6BAAY,EAAC,KAAK,CAAC,CAAA;QACpC,IAAI,CAAC,QAAQ,CAAC,kBAAkB;YAAE,QAAQ,CAAC,kBAAkB,GAAG,EAAE,CAAA;QAClE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACxC,CAAC;QACD,IAAA,8BAAa,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC9B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;QACjC,IAAI,CAAC,aAAa,GAAG,cAAc,CAAA;QACnC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAA;QAC7B,IAAA,aAAO,EAAC,kBAAkB,IAAI,KAAK,KAAK,KAAK,CAAC,CAAA;QAC9C,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAA;IACnC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,eAAe,CAAC,IAAY;QAChC,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;QACpE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAA,aAAO,EAAC,0BAA0B,IAAI,GAAG,CAAC,CAAA;YAC1C,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAA;QACnC,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACpC,MAAM,QAAQ,GAAG,IAAA,6BAAY,EAAC,KAAK,CAAC,CAAA;QACpC,IAAI,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YAChC,QAAQ,CAAC,kBAAkB,GAAG,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAA;QACnF,CAAC;QACD,IAAA,8BAAa,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC9B,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACxD,IAAI,CAAC,MAAM,GAAG,CAAC,aAAa,CAAA;QAC5B,IAAI,aAAa,EAAE,CAAC;YAClB,IAAA,aAAO,EAAC,eAAe,IAAI,2BAA2B,CAAC,CAAA;QACzD,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC;QACD,IAAA,aAAO,EAAC,kBAAkB,IAAI,KAAK,KAAK,KAAK,CAAC,CAAA;QAC9C,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAA;IACnC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,iBAAiB,CAAC,IAAY,EAAE,SAA0B;QAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;QACpE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAA,aAAO,EAAC,6BAA6B,IAAI,GAAG,CAAC,CAAA;YAC7C,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAA;QACnC,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACpC,MAAM,QAAQ,GAAG,IAAA,6BAAY,EAAC,KAAK,CAAC,CAAA;QACpC,IAAI,CAAC,QAAQ,CAAC,wBAAwB;YAAE,QAAQ,CAAC,wBAAwB,GAAG,EAAE,CAAA;QAC9E,gEAAgE;QAChE,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;YACtB,OAAO,QAAQ,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAA;QAChD,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,wBAAwB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAA;QACrD,CAAC;QACD,IAAA,8BAAa,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC9B,yBAAyB;QACzB,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,CAAA;QAC9D,IAAA,aAAO,EAAC,kBAAkB,IAAI,UAAU,KAAK,QAAQ,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAA;QAC1G,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAA;IACnC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAC1B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA;IAC7B,CAAC;CACF;AAyBQ,gCAAU;AAvBnB,yDAAyD;AAEzD,IAAI,kBAAkB,GAAsB,IAAI,CAAA;AAEhD;;GAEG;AACH,SAAgB,aAAa;IAC3B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,kBAAkB,GAAG,IAAI,UAAU,EAAE,CAAA;IACvC,CAAC;IACD,OAAO,kBAAkB,CAAA;AAC3B,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,cAAc;IAClC,MAAM,OAAO,GAAG,aAAa,EAAE,CAAA;IAC/B,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;AACtB,CAAC"}

package/dist/services/plugins/pluginsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pluginsManager.d.ts","sourceRoot":"","sources":["../../../src/services/plugins/pluginsManager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAWH,OAAO,KAAK,EACV,eAAe,EAcf,sBAAsB,EACvB,MAAM,oBAAoB,CAAA;AAK3B,cAAM,cAAc;IAClB,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,qBAAqB,CAAQ;IACrC,OAAO,CAAC,oBAAoB,CAAQ;IAEpC,OAAO,CAAC,2BAA2B,CAAsC;IACzE,OAAO,CAAC,cAAc,CAA+C;;IAqBrE,OAAO,CAAC,eAAe;YAIT,qBAAqB;YAWrB,sBAAsB;YAKtB,oBAAoB;YAWpB,qBAAqB;IAKnC,OAAO,CAAC,mBAAmB;YAIb,YAAY;YAIZ,aAAa;YAIb,mBAAmB;IAkBjC;;OAEG;YACW,oBAAoB;IAwClC;;OAEG;YACW,qBAAqB;IAgBnC;;OAEG;YACW,mBAAmB;IASjC;;OAEG;YACW,kBAAkB;IAShC;;OAEG;YACW,eAAe;IAO7B;;OAEG;YACW,cAAc;IAe5B;;;;;OAKG;YACW,gBAAgB;IAS9B;;OAEG;YACW,OAAO;IAcrB;;OAEG;YACW,SAAS;IAQvB;;OAEG;IACG,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAoC1E;;OAEG;IACG,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA0BnF;;OAEG;IACG,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAoBjF;;;OAGG;IACG,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAkCjF;;;;OAIG;IACG,aAAa,CACjB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,CAAC;IA6FlC;;;OAGG;IACG,eAAe,CACnB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,CAAC;IAiClC;;OAEG;IACG,YAAY,CAChB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,CAAC;IAIlC;;OAEG;IACG,aAAa,CACjB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,CAAC;YAIpB,gBAAgB;IAqB9B;;OAEG;IACG,YAAY,CAChB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,CAAC;IAKlC;;OAEG;YACW,sBAAsB;IAyEpC;;;OAGG;IACG,6BAA6B,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAuCtE;;OAEG;IACG,yBAAyB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAUlE,OAAO,IAAI,IAAI;CAGhB;AAMD,wBAAgB,iBAAiB,IAAI,cAAc,CAKlD;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}
+{"version":3,"file":"pluginsManager.d.ts","sourceRoot":"","sources":["../../../src/services/plugins/pluginsManager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAWH,OAAO,KAAK,EACV,eAAe,EAcf,sBAAsB,EACvB,MAAM,oBAAoB,CAAA;AAK3B,cAAM,cAAc;IAClB,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,qBAAqB,CAAQ;IACrC,OAAO,CAAC,oBAAoB,CAAQ;IAEpC,OAAO,CAAC,2BAA2B,CAAsC;IACzE,OAAO,CAAC,cAAc,CAA+C;;IAqBrE,OAAO,CAAC,eAAe;YAIT,qBAAqB;YAWrB,sBAAsB;YAKtB,oBAAoB;YAWpB,qBAAqB;IAKnC,OAAO,CAAC,mBAAmB;YAIb,YAAY;YAIZ,aAAa;YAIb,mBAAmB;IAkBjC;;OAEG;YACW,oBAAoB;IAwClC;;OAEG;YACW,qBAAqB;IAgBnC;;OAEG;YACW,mBAAmB;IASjC;;OAEG;YACW,kBAAkB;IAShC;;OAEG;YACW,eAAe;IAO7B;;OAEG;YACW,cAAc;IAe5B;;;;;OAKG;YACW,gBAAgB;IAS9B;;OAEG;YACW,OAAO;IAcrB;;OAEG;YACW,SAAS;IAQvB;;OAEG;IACG,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAoC1E;;OAEG;IACG,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA0BnF;;OAEG;IACG,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAoBjF;;;OAGG;IACG,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA8CjF;;;;OAIG;IACG,aAAa,CACjB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,CAAC;IA6FlC;;;OAGG;IACG,eAAe,CACnB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,CAAC;IAiClC;;OAEG;IACG,YAAY,CAChB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,CAAC;IAIlC;;OAEG;IACG,aAAa,CACjB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,CAAC;YAIpB,gBAAgB;IAqB9B;;OAEG;IACG,YAAY,CAChB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,eAAe,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,CAAC;IAKlC;;OAEG;YACW,sBAAsB;IAyEpC;;;OAGG;IACG,6BAA6B,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAuCtE;;OAEG;IACG,yBAAyB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAUlE,OAAO,IAAI,IAAI;CAGhB;AAMD,wBAAgB,iBAAiB,IAAI,cAAc,CAKlD;AAED,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/dist/services/plugins/pluginsManager.js

@@ -369,6 +369,18 @@ class PluginsManager {
             }
         }
         await this.writeInstalledPlugins(installed);
+        // 4. 从各层 settings 中移除该市场插件的 enabledPlugins 记录
+        const cwd = (0, cwd_1.readInitialCwd)();
+        for (const scope of ['local', 'project', 'user']) {
+            const settingsPath = this.getSettingsFilePath(scope, cwd);
+            const settings = await this.readSettings(settingsPath);
+            const staleKeys = Object.keys(settings.enabledPlugins ?? {}).filter(k => k.endsWith(`@${marketplaceName}`));
+            if (staleKeys.length > 0) {
+                for (const key of staleKeys)
+                    delete settings.enabledPlugins[key];
+                await this.writeSettings(settingsPath, settings);
+            }
+        }
         (0, log_1.logInfo)(`市场 [${marketplaceName}] 已移除`);
         return this.refreshMarketplacePluginsInfo();
     }