mocode-ai 1.3.9 → 1.4.0

package/dist/config/profiles.js

@@ -0,0 +1,125 @@
+/**
+ * 工具能力分组的叶子模块。生产主路径使用 COMMON_TOOL_NAMES + TOOL_ROUTE_GROUPS 进行
+ * 每 turn LLM 自动路由；文件尾的静态 profile 仅保留给未迁移嵌入调用，不再有用户命令。
+ * 本模块零业务依赖，供 config/llm/policy 安全共享。
+ */
+/**
+ * 工具簇 → 工具名。新增工具时归到对应簇;一个工具只属一个簇。
+ * view_image 放 core-read,保证所有模式都能读取已有本地图片;工具产生的即时视觉结果通过
+ * modelAttachments 直接回灌,不依赖 view_image。screenshot 留 frontend(抓整个桌面,隐私敏感,
+ * 主要服务前端联调)。
+ */
+export const TOOL_GROUPS = {
+    'core-read': ['read_file', 'view_image', 'glob', 'grep'],
+    'core-write': ['write_file', 'edit_file', 'run_command'],
+    'agent-meta': ['plan_update', 'note_append', 'ask_human', 'use_skill', 'run_skill'],
+    web: ['web_search', 'web_fetch'],
+    frontend: ['browser', 'dev_server', 'screenshot'],
+    computer: ['computer'],
+    memory: ['memory_save', 'memory_search', 'memory_list', 'memory_update', 'memory_forget', 'memory_graph'],
+    subagent: ['sub-agent'],
+};
+// ── LLM 自动工具路由 ──────────────────────────────────────────────────────
+/** 主 Agent 每一步都可见的低风险、高复用工具。 */
+export const COMMON_TOOL_NAMES = [
+    'read_file',
+    'view_image',
+    'glob',
+    'grep',
+    'web_search',
+    'web_fetch',
+    'plan_update',
+    'note_append',
+    'ask_human',
+    'use_skill',
+];
+/** 主模型用于在执行中单向扩容工具面的虚拟控制工具；不进入 registry。 */
+export const ADD_TOOL_GROUPS_TOOL_NAME = 'add_tool_groups';
+/**
+ * 可组合工具簇目录。路由器选择的是簇而不是单个工具；一个 turn 内只允许追加、不允许缩减。
+ * doing/debug/computer 场景刻意拆开文件写入、命令执行、浏览器调试和桌面控制，避免为完成
+ * 一个窄任务直接暴露 full 工具集。
+ */
+export const TOOL_ROUTE_GROUPS = {
+    'workspace-write': {
+        tools: ['write_file', 'edit_file'],
+        description: 'Create or edit workspace files for implementation, fixes, refactors, or generated code.',
+    },
+    'shell-debug': {
+        tools: ['run_command'],
+        description: 'Run tests, builds, linters, Git, package managers, logs, diagnostics, and foreground commands.',
+    },
+    'browser-debug': {
+        tools: ['browser', 'dev_server'],
+        description: 'Start local development servers and debug web UIs through DOM, console, network, and page sessions.',
+        gateEnv: 'MOCODE_FRONTEND_TOOLS_ENABLED',
+    },
+    'desktop-observe': {
+        tools: ['screenshot'],
+        description: 'Capture the whole desktop or system dialogs without controlling mouse or keyboard.',
+        gateEnv: 'MOCODE_FRONTEND_TOOLS_ENABLED',
+    },
+    'computer-control': {
+        tools: ['computer'],
+        description: 'Control real desktop applications with mouse, keyboard, scrolling, and visual feedback.',
+        gateEnv: 'MOCODE_COMPUTER_USE_ENABLED',
+    },
+    'memory-read': {
+        tools: ['memory_search', 'memory_list'],
+        description: 'Recall cross-session project facts, decisions, conventions, and prior context.',
+        gateEnv: 'MEMORY_ENABLED',
+    },
+    'memory-write': {
+        tools: ['memory_save', 'memory_update', 'memory_forget', 'memory_graph'],
+        description: 'Persist, revise, forget, or link cross-session knowledge when the user explicitly requests it.',
+        gateEnv: 'MEMORY_ENABLED',
+    },
+    orchestration: {
+        tools: ['sub-agent', 'run_skill'],
+        description: 'Delegate genuinely independent work or execute a packaged fork skill in an isolated worker.',
+        gateEnv: 'MOCODE_SUBAGENT_ENABLED',
+    },
+    mcp: {
+        tools: [],
+        description: 'Use connected MCP extension tools when their server capabilities directly match the task.',
+        gateEnv: 'MOCODE_MCP_ENABLED',
+    },
+};
+export const TOOL_ROUTE_GROUP_NAMES = Object.keys(TOOL_ROUTE_GROUPS);
+export function isToolRouteGroupName(value) {
+    return typeof value === 'string' && TOOL_ROUTE_GROUP_NAMES.includes(value);
+}
+/** 返回簇内实际工具名；MCP 工具由运行时注册表动态发现。 */
+export function getToolRouteGroupNames(group, registeredNames = []) {
+    return group === 'mcp' ? registeredNames.filter((name) => name.startsWith('mcp__')) : TOOL_ROUTE_GROUPS[group].tools;
+}
+/** 模式 → 包含的工具簇。保留旧 profile 数据仅供迁移期兼容；主 Agent 已改用 ToolPolicy。 */
+export const PROFILE_GROUPS = {
+    // 默认:写码 + 联网检索,无浏览器自动化/桌面/记忆,兼顾日常效率与 token 成本。
+    coding: ['core-read', 'core-write', 'agent-meta', 'web'],
+    // 前端联调:coding 能力 + 结构化 browser/dev_server/独立 screenshot。
+    frontend: ['core-read', 'core-write', 'agent-meta', 'web', 'frontend'],
+    // 通用桌面 GUI 操控:coding 能力 + 自带视觉闭环的 computer;不等价包含 frontend。
+    'computer-use': ['core-read', 'core-write', 'agent-meta', 'web', 'computer'],
+    // 项目源码只读调研:不直接暴露 core-write;仍可写 session note/memory,skill 有独立执行语义。
+    research: ['core-read', 'agent-meta', 'web', 'memory'],
+    // 全量:所有簇。
+    full: ['core-read', 'core-write', 'agent-meta', 'web', 'frontend', 'computer', 'memory', 'subagent'],
+};
+export const PROFILE_NAMES = Object.keys(PROFILE_GROUPS);
+export function isProfileName(v) {
+    return typeof v === 'string' && PROFILE_NAMES.includes(v);
+}
+/** 模式包含的工具名集合。 */
+export function getProfileToolNames(profile) {
+    const out = new Set();
+    for (const g of PROFILE_GROUPS[profile]) {
+        for (const name of TOOL_GROUPS[g])
+            out.add(name);
+    }
+    return out;
+}
+/** 某模式是否含某簇(派生查询的单一事实源)。 */
+export function profileHasGroup(profile, group) {
+    return PROFILE_GROUPS[profile].includes(group);
+}

package/dist/context/age-aware.js

@@ -1,7 +1,7 @@
 // Pressure-only tool-result encoding coordinator.
 // Normal pushes are raw apart from the per-result hard safety cap.
 import { optimizeToolResult } from './pipeline.js';
-import { canonicalizePath, extractPath, isToolResultSuccess, toText, } from './utils.js';
+import { canonicalizePath, extractPath, isToolResultSuccess, toText } from './utils.js';
 /** Rebuilds records from current history for each pressure pass. */
 export class AgeAwareEncodingState {
     pushOrdinal = 0;
@@ -79,9 +79,7 @@ export class AgeAwareEncodingState {
                     continue;
                 const content = toText(toolMessage.content);
                 const succeeded = isToolResultSuccess(content);
-                const path = call.name === 'read_file'
-                    ? canonicalizePath(extractPath(call.argsRaw))
-                    : null;
+                const path = call.name === 'read_file' ? canonicalizePath(extractPath(call.argsRaw)) : null;
                 const isFirstRead = path ? !this.seenReadPaths.has(path) : undefined;
                 this.records.set(id, {
                     toolCallId: id,

package/dist/context/artifacts.js

@@ -13,15 +13,6 @@ function stateFor(state) {
     }
     return current;
 }
-function parseArgs(raw) {
-    try {
-        const value = JSON.parse(raw || '{}');
-        return value && typeof value === 'object' ? value : null;
-    }
-    catch {
-        return null;
-    }
-}
 function callArgs(history, idx) {
     const id = history[idx].tool_call_id;
     if (!id)
@@ -30,7 +21,8 @@ function callArgs(history, idx) {
         const message = history[cursor];
         if (message.role !== 'assistant')
             continue;
-        const calls = message.tool_calls;
+        const calls = message
+            .tool_calls;
         const hit = calls?.find((call) => call.id === id);
         if (hit?.function?.name)
             return { tool: hit.function.name, argsRaw: hit.function.arguments ?? '{}' };
@@ -54,7 +46,7 @@ function pathsFromOutput(tool, output) {
             paths.add(normalized);
     };
     if (tool === 'grep' || tool === 'run_command') {
-        const expression = /^(.+?\.[A-Za-z0-9]+):(?:\d+|\s*\d+\s*(?:处匹配|matches?))/gmi;
+        const expression = /^(.+?\.[A-Za-z0-9]+):(?:\d+|\s*\d+\s*(?:处匹配|matches?))/gim;
         let match;
         while ((match = expression.exec(output)))
             add(match[1]);
@@ -99,7 +91,6 @@ export function recordArtifact(state, history, idx, output, succeeded) {
     const type = sourceType(call.tool);
     if (!type)
         return;
-    const args = parseArgs(call.argsRaw);
     const id = history[idx].tool_call_id ?? `${idx}`;
     const directPath = canonicalizePath(extractPath(call.argsRaw));
     let dependencies = directPath
@@ -197,7 +188,9 @@ export function rehydrateArtifacts(state, history) {
             retained.tokenCount = estimateTokens(content);
             retained.freshness = content.startsWith(STALE_PREFIX)
                 ? 'stale'
-                : content.startsWith('⌦[') ? 'stubbed' : retained.freshness;
+                : content.startsWith('⌦[')
+                    ? 'stubbed'
+                    : retained.freshness;
             artifactState.artifacts.set(id, retained);
         }
         else {

package/dist/context/budget.js

@@ -3,7 +3,7 @@
 // This module only estimates and reports. session/scheduler.ts owns the sole
 // automatic rewrite sequence and starts all pressure cleanup plus compact_history
 // when corrected or raw request occupancy reaches 80%.
-import { chatTools, estimateMessagesTokens, estimateToolSchemaTokens, messageTokens, } from '../llm/index.js';
+import { chatTools, estimateMessagesTokens, estimateToolSchemaTokens, messageTokens } from '../llm/index.js';
 import { toText } from './utils.js';
 /** 五区分账(占比对齐 CONTEXT_WINDOW)。顺序固定,便于遍历。 */
 export const BUDGET_LAYERS = [
@@ -17,10 +17,10 @@ export const BUDGET_LAYERS = [
 export const DEFAULT_BUDGET_POLICY = {
     ratios: {
         system: 0.15,
-        history: 0.20,
+        history: 0.2,
         toolRecent: 0.25,
         toolOld: 0.25,
-        summary: 0.10,
+        summary: 0.1,
         reserve: 0.05,
     },
     hotTurnWindow: 4,
@@ -29,8 +29,8 @@ export const DEFAULT_BUDGET_POLICY = {
     compactKeepRatio: 0.15,
     compactForceKeepRatio: 0.05,
     compactKeepMaxTokens: 48000,
-    pressureTriggerRatio: 0.80,
-    schedulerTargetRatio: 0.80,
+    pressureTriggerRatio: 0.8,
+    schedulerTargetRatio: 0.8,
     estimateSafetyFactor: 1.05,
     compactHeadroomTokens: 1500,
 };
@@ -72,9 +72,7 @@ export function evaluateBudget(history, window, step = 0, correction = 1, active
     // 裸总量(不乘 correction):硬闸用它判断,防止 correction 折扣否决真实溢出。
     let rawTotal = 0;
     const sysMsg = history[0];
-    const safeEphemeral = Number.isFinite(ephemeralTokens)
-        ? Math.max(0, Math.round(ephemeralTokens))
-        : 0;
+    const safeEphemeral = Number.isFinite(ephemeralTokens) ? Math.max(0, Math.round(ephemeralTokens)) : 0;
     const systemCosts = {
         prompt: sysMsg ? msgTokens(sysMsg) : 0,
         toolSchemas: estimateToolSchemaTokens(activeTools),

package/dist/context/classifier.js

@@ -49,8 +49,7 @@ function classifyByShape(output) {
         return 'log';
     // 路径列表:多行都是含分隔符的相对路径(glob 风格)
     const lines = output.split('\n').filter((l) => l.trim().length > 0);
-    if (lines.length >= 3 &&
-        lines.every((l) => /^[\w.\-\\/ ]+$/.test(l.trim()) && /[\\/]/.test(l))) {
+    if (lines.length >= 3 && lines.every((l) => /^[\w.\-\\/ ]+$/.test(l.trim()) && /[\\/]/.test(l))) {
         return 'tree';
     }
     // JSON 结构化(web_fetch 的 JSON 响应等)→ doc 渲染

package/dist/context/encoders/code.js

@@ -72,9 +72,7 @@ function collapseImportBlocks(text) {
         i = j;
     }
     const result = out.join('\n');
-    return result.length < text.length
-        ? { text: result, collapsed }
-        : { text, collapsed: 0 };
+    return result.length < text.length ? { text: result, collapsed } : { text, collapsed: 0 };
 }
 function braceDelta(line, state) {
     let delta = 0;
@@ -164,9 +162,7 @@ function collapseFunctionBodies(text) {
         }
     }
     const result = out.join('\n');
-    return result.length < text.length
-        ? { text: result, collapsed }
-        : { text, collapsed: 0 };
+    return result.length < text.length ? { text: result, collapsed } : { text, collapsed: 0 };
 }
 export const codeEncoder = {
     kind: 'code',

package/dist/context/encoders/command.js

@@ -25,9 +25,7 @@ function parseDiagnostic(line) {
 }
 function splitStatus(text) {
     const lines = text.split('\n');
-    const status = /^\[(?:退出码 [^\]]+|已中断|超时,已终止)\]$/.test(lines[0] ?? '')
-        ? lines.shift()
-        : null;
+    const status = /^\[(?:退出码 [^\]]+|已中断|超时,已终止)\]$/.test(lines[0] ?? '') ? lines.shift() : null;
     return { status, lines };
 }
 function formatDiagnostics(lines) {

package/dist/context/encoders/search.js

@@ -119,9 +119,7 @@ export const searchEncoder = {
                 },
             };
         }
-        const text = isAgedCold(input)
-            ? collapseLegacyBodies(legacy.text)
-            : legacy.text;
+        const text = isAgedCold(input) ? collapseLegacyBodies(legacy.text) : legacy.text;
         return {
             text,
             meta: {

package/dist/context/index.js

@@ -4,6 +4,6 @@
 export { optimizeToolResult } from './pipeline.js';
 export { classify, knownToolKinds } from './classifier.js';
 export { recordArtifact, invalidateArtifacts, rehydrateArtifacts, refreshArtifactFreshness, pruneStaleArtifacts, collectArtifactRefs, formatArtifactTokenSources, knownEditTargets, } from './artifacts.js';
-export { registerEncoder, registerAll, getEncoder, registeredKinds, } from './registry.js';
+export { registerEncoder, registerAll, getEncoder, registeredKinds } from './registry.js';
 // ── Context Budget Scheduler ───────────────────────────────────────────────
 export { evaluateBudget, scheduleActions, formatReport, quickEstimate, userTurnBoundary, BUDGET_LAYERS, DEFAULT_BUDGET_POLICY, BUDGET_RATIO, HOT_TURN_WINDOW, } from './budget.js';

package/dist/context/lifecycle.js

@@ -3,7 +3,7 @@
 // Tool-call count is not context pressure, so this module never ages, digests,
 // stubs, or otherwise rewrites history. It only records producer/consumer
 // relationships for diagnostics and future pressure-aware decisions.
-import { canonicalizePath, extractPath, isToolResultSuccess, toText, toolNameOf, } from './utils.js';
+import { canonicalizePath, extractPath, isToolResultSuccess, toText, toolNameOf } from './utils.js';
 const OBSERVER_TOOLS = new Set(['grep', 'glob', 'web_search', 'web_fetch']);
 const CONSUMER_TOOLS = new Set(['read_file', 'edit_file', 'write_file']);
 const DIGEST_PREFIX = '⌦[摘要:';
@@ -17,7 +17,7 @@ function extractProducerPaths(toolName, content) {
     try {
         if (toolName === 'grep') {
             const rawLine = /^(.+?\.[A-Za-z0-9]+):\d+:/gm;
-            const summary = /^(.+?\.[A-Za-z0-9]+):\s*\d+\s*(?:处匹配|matches?)[,，]/gmi;
+            const summary = /^(.+?\.[A-Za-z0-9]+):\s*\d+\s*(?:处匹配|matches?)[,，]/gim;
             let match;
             while ((match = rawLine.exec(content)))
                 add(match[1]);
@@ -27,7 +27,9 @@ function extractProducerPaths(toolName, content) {
         else if (toolName === 'glob') {
             for (const line of content.split(/\r?\n/)) {
                 const value = line.trim();
-                if (value && !value.includes(' ') && (/\.[A-Za-z0-9]+$/.test(value) || value.includes('/') || value.includes('\\')))
+                if (value &&
+                    !value.includes(' ') &&
+                    (/\.[A-Za-z0-9]+$/.test(value) || value.includes('/') || value.includes('\\')))
                     add(value);
             }
         }

package/dist/context/pipeline.js

@@ -13,7 +13,7 @@ import { builtinEncoders } from './encoders/index.js';
 import { passthroughEncoder } from './encoders/passthrough.js';
 import { capToolResultForHistory } from '../session/compact.js';
 import { config } from '../config/index.js';
-import { MAX_HISTORY_RESULT, MAX_SKILL_RESULT, MAX_MEMORY_RESULT, } from '../tools/constants.js';
+import { MAX_HISTORY_RESULT, MAX_SKILL_RESULT, MAX_MEMORY_RESULT } from '../tools/constants.js';
 let booted = false;
 /** 懒注册内置 encoder(首次调用 optimizeToolResult 时触发,避免模块加载期循环 import)。 */
 function boot() {

package/dist/context/relevance.js

@@ -1,15 +1,13 @@
 // Relevance Pruner: statically removes tool results that a newer observation supersedes.
 // It never deletes messages or changes tool_call_id pairing; only tool content is stubbed.
-import { canonicalizePath, extractPath, isToolResultSuccess, toText, } from './utils.js';
+import { canonicalizePath, extractPath, isToolResultSuccess, toText } from './utils.js';
 /** Shared prefix lets /context count read and observation supersession together. */
 const STUB_PREFIX = '⌦[已过时:';
 const READ_STUB_REASON = '同 path 已有新 read / 已被 mutation 覆写';
 function parseArgs(raw) {
     try {
         const parsed = raw.trim() ? JSON.parse(raw) : {};
-        return parsed && typeof parsed === 'object'
-            ? parsed
-            : null;
+        return parsed && typeof parsed === 'object' ? parsed : null;
     }
     catch {
         return null;

package/dist/context/token-calibration.js

@@ -10,8 +10,7 @@ const MAX_ENTRIES = 64;
 let cache;
 const toolFingerprints = new WeakMap();
 function cachePath() {
-    return process.env.MOCODE_TOKEN_CALIBRATION_CACHE
-        || path.join(os.homedir(), '.mocode', 'token-calibration.json');
+    return process.env.MOCODE_TOKEN_CALIBRATION_CACHE || path.join(os.homedir(), '.mocode', 'token-calibration.json');
 }
 function hash(value) {
     return createHash('sha256').update(value).digest('hex');
@@ -64,35 +63,31 @@ function writeCache() {
     }
 }
 function validEntry(entry) {
-    return !!entry
-        && Number.isFinite(entry.correction)
-        && entry.correction >= MIN_CORRECTION
-        && entry.correction <= MAX_CORRECTION
-        && Number.isInteger(entry.samples)
-        && entry.samples > 0;
+    return (!!entry &&
+        Number.isFinite(entry.correction) &&
+        entry.correction >= MIN_CORRECTION &&
+        entry.correction <= MAX_CORRECTION &&
+        Number.isInteger(entry.samples) &&
+        entry.samples > 0);
 }
 /** 读取指定 provider/model/工具集合的历史校准；未命中时退回 1。 */
 export function getTokenCalibration(baseURL, model, tools) {
     const entry = readCache().entries[calibrationKey(baseURL, model, tools)];
-    return validEntry(entry)
-        ? { correction: entry.correction, samples: entry.samples }
-        : { correction: 1, samples: 0 };
+    return validEntry(entry) ? { correction: entry.correction, samples: entry.samples } : { correction: 1, samples: 0 };
 }
 /** 用一次真实 prompt usage 更新 EWMA；只落比例和样本数，不保存任何消息内容。 */
 export function updateTokenCalibration(baseURL, model, tools, estimatedTokens, actualTokens) {
-    if (estimatedTokens <= 100
-        || actualTokens <= 100
-        || !Number.isFinite(estimatedTokens)
-        || !Number.isFinite(actualTokens)) {
+    if (estimatedTokens <= 100 ||
+        actualTokens <= 100 ||
+        !Number.isFinite(estimatedTokens) ||
+        !Number.isFinite(actualTokens)) {
         return getTokenCalibration(baseURL, model, tools);
     }
     const key = calibrationKey(baseURL, model, tools);
     const store = readCache();
     const previous = store.entries[key];
     const raw = Math.max(MIN_CORRECTION, Math.min(MAX_CORRECTION, actualTokens / estimatedTokens));
-    const correction = validEntry(previous)
-        ? previous.correction * (1 - EWMA_ALPHA) + raw * EWMA_ALPHA
-        : raw;
+    const correction = validEntry(previous) ? previous.correction * (1 - EWMA_ALPHA) + raw * EWMA_ALPHA : raw;
     const next = {
         correction,
         samples: validEntry(previous) ? previous.samples + 1 : 1,

package/dist/host/stdio.js

@@ -6,24 +6,34 @@ import { buildBasePrompt, config } from '../config/index.js';
 import { refreshChatTools, estimateMessagesTokens } from '../llm/index.js';
 import { initializeAllMcp, getMcpTools, getMcpWarnings, closeAllMcp } from '../mcp/index.js';
 import { setSandboxRoot } from '../sandbox/index.js';
-import { createContextState, loadSession, newSessionId, saveSession } from '../session/index.js';
+import { appendCurrentSessionTraceEvent, createContextState, loadSession, newSessionId, saveSession, } from '../session/index.js';
 import { setCurrentSessionId } from '../session/state.js';
 import { manualCompact } from '../session/scheduler.js';
 import { effectiveSystemPrompt } from '../skills/index.js';
+import { clearSkillActivation } from '../skills/activation.js';
 import { registerToolsExtension } from '../tools/registry.js';
+import { ToolPolicyController } from '../tools/policy.js';
+import { routeToolGroups } from '../tools/router.js';
+// 装配官方默认工具包:registry 不再顶层 import builtins(破模块循环),host 入口须显式装配。
+import '../tools/builtins/index.js';
 import { parseCommand } from './protocol.js';
 let initialized = null;
 let activeRun = null;
 let sessionId = '';
 let history = [];
 let queryHistory = [];
+let lastToolGroups = [];
 let contextState = createContextState();
 const approvals = new Map();
-function write(envelope) { process.stdout.write(`${JSON.stringify(envelope)}\n`); }
+function write(envelope) {
+    process.stdout.write(`${JSON.stringify(envelope)}\n`);
+}
 function emit(event, payload = {}, requestId) {
     write({ type: 'event', event, payload, requestId });
 }
-function error(message, requestId) { write({ type: 'error', error: message, requestId }); }
+function error(message, requestId) {
+    write({ type: 'error', error: message, requestId });
+}
 async function initializeRuntime() {
     if (initialized)
         return initialized;
@@ -42,13 +52,16 @@ async function initializeRuntime() {
     })();
     return initialized;
 }
-function systemMessage() { return effectiveSystemPrompt(buildBasePrompt(sessionId)); }
+function systemMessage() {
+    return effectiveSystemPrompt(buildBasePrompt(sessionId));
+}
 function createSession() {
     sessionId = newSessionId();
     setCurrentSessionId(sessionId, process.cwd());
     setAgentMode('auto');
     history = [{ role: 'system', content: systemMessage() }];
     queryHistory = [];
+    lastToolGroups = [];
     contextState = createContextState();
 }
 function restoreSession(id) {
@@ -64,6 +77,7 @@ function restoreSession(id) {
     else
         history.unshift({ role: 'system', content: systemMessage() });
     queryHistory = [...(loaded.queryHistory ?? [])];
+    lastToolGroups = [...(loaded.lastToolGroups ?? [])];
     contextState = createContextState();
     return true;
 }
@@ -83,7 +97,7 @@ function waitForApproval(runId, request) {
         approvalId,
         title: request.title,
         detail: request.detail ?? '',
-        options: (request.options ?? []).map((option) => typeof option === 'string' ? option : option.label),
+        options: (request.options ?? []).map((option) => (typeof option === 'string' ? option : option.label)),
     }, runId);
     return new Promise((resolve) => approvals.set(approvalId, { resolve, runId }));
 }
@@ -104,19 +118,25 @@ async function run(command) {
         return error('An agent run is already active for this project.', command.id);
     if (!command.prompt.trim())
         return;
+    let toolPolicy;
     try {
         await initializeRuntime();
         const resumed = prepareSession(command.sessionId);
         if (resumed === null)
             return error(`Session ${command.sessionId} could not be restored.`, command.id);
+        // 每个被接受的 stdio run 都是真实用户 turn；在路由与 Agent 执行前清除上一轮 skill deny。
+        clearSkillActivation();
         const controller = new AbortController();
         activeRun = { id: command.id, controller };
         queryHistory.push(command.prompt);
         const userInput = command.attachments?.length
-            ? [{ type: 'text', text: command.prompt }, ...command.attachments.map((attachment) => ({
+            ? [
+                { type: 'text', text: command.prompt },
+                ...command.attachments.map((attachment) => ({
                     type: 'image_url',
                     image_url: { url: attachment.dataUrl },
-                }))]
+                })),
+            ]
             : command.prompt;
         emit('run_started', {
             sessionId,
@@ -126,15 +146,47 @@ async function run(command) {
             promptCache: config.provider === 'anthropic' && config.anthropicPromptCache,
             attachments: command.attachments?.map((attachment) => attachment.name) ?? [],
         }, command.id);
+        const previousGroups = [...lastToolGroups];
+        const decision = await routeToolGroups({
+            input: command.prompt,
+            previousGroups,
+            planMode: false,
+            attachmentNames: command.attachments?.map((attachment) => attachment.name),
+            signal: controller.signal,
+        });
+        toolPolicy = new ToolPolicyController({
+            groups: decision.groups,
+            reason: decision.reason,
+            confidence: decision.confidence,
+        });
+        lastToolGroups = toolPolicy.groupNames;
+        const initialToolRoute = {
+            policyId: toolPolicy.id,
+            groups: toolPolicy.groupNames,
+            previousGroups,
+            inheritPrevious: decision.inheritPrevious,
+            confidence: decision.confidence,
+            reason: decision.reason,
+            latencyMs: decision.latencyMs,
+            fallback: decision.fallback,
+            planMode: false,
+        };
+        emit('tool_route', initialToolRoute, command.id);
+        const turnId = queryHistory.length;
         const result = await runAgentCore({
             history,
             userInput,
             signal: controller.signal,
             hooks: hooksFor(command.id),
             contextState,
+            toolPolicy,
+            initialToolRoute,
+            traceContext: { sessionId, turnId },
+            onTraceEvent: appendCurrentSessionTraceEvent,
             permissionPrompt: (request) => waitForApproval(command.id, request),
         });
-        saveSession(history, sessionId, queryHistory);
+        lastToolGroups = toolPolicy.groupNames;
+        saveSession(history, sessionId, queryHistory, lastToolGroups);
         emit('run_completed', {
             sessionId,
             completed: result.completed,
@@ -149,12 +201,21 @@ async function run(command) {
     }
     catch (cause) {
         const message = cause instanceof Error ? cause.message : String(cause);
+        if (toolPolicy)
+            lastToolGroups = toolPolicy.groupNames;
         try {
             if (sessionId)
-                saveSession(history, sessionId, queryHistory);
+                saveSession(history, sessionId, queryHistory, lastToolGroups);
+        }
+        catch {
+            /* Preserve the runtime error. */
+        }
+        if (activeRun?.id === command.id && activeRun.controller.signal.aborted) {
+            emit('run_aborted', {}, command.id);
+        }
+        else {
+            emit('run_failed', { message }, command.id);
         }
-        catch { /* Preserve the runtime error. */ }
-        emit('run_failed', { message }, command.id);
     }
     finally {
         for (const [approvalId, waiter] of approvals) {
@@ -193,7 +254,7 @@ async function compact(command) {
             createSession();
         emit('status', { value: 'compacting' }, command.id);
         const log = await manualCompact(history, command.focus, { force: true });
-        saveSession(history, sessionId, queryHistory);
+        saveSession(history, sessionId, queryHistory, lastToolGroups);
         const pct = contextUsagePercent();
         emit('compact_done', {
             compacted: log.compactHistoryCalled,