aws-runtime-bridge 1.7.50 → 1.8.1

package/dist/adapter/types.js

@@ -4,8 +4,8 @@
  *
  * 参考自 SpectrAI 项目的 adapter 设计，用于支持多种 AI Provider
  */
-import { EventEmitter } from 'node:events';
-const TEMP_CLIPBOARD_PASTE_PLACEHOLDER = '[temp clipboard paste file]';
+import { EventEmitter } from "node:events";
+const TEMP_CLIPBOARD_PASTE_PLACEHOLDER = "[temp clipboard paste file]";
 const WINDOWS_TEMP_CLIPBOARD_PASTE_PATH = /[A-Z]:(?:\\\\|\\)[^\r\n"'`]*?(?:\\\\|\\)mini-term-clipboard(?:\\\\|\\)paste-\d+\.txt/gi;
 const POSIX_TEMP_CLIPBOARD_PASTE_PATH = /\/[^\r\n"'`]*?\/mini-term-clipboard\/paste-\d+\.txt/gi;
 const BARE_TEMP_CLIPBOARD_PASTE_PATH = /mini-term-clipboard[\\/]paste-\d+\.txt/gi;
@@ -24,8 +24,12 @@ export function redactTransientClipboardPastePaths(text) {
  * 主流程：剥离包裹引号 -> 要求整串匹配，避免误拦截显式读取该文件的正常命令。
  */
 export function isTransientClipboardPasteFilePath(text) {
-    const trimmed = text.trim().replace(/^(["'])(.*)\1$/, '$2');
-    return [WINDOWS_TEMP_CLIPBOARD_PASTE_PATH, POSIX_TEMP_CLIPBOARD_PASTE_PATH, BARE_TEMP_CLIPBOARD_PASTE_PATH].some((pattern) => {
+    const trimmed = text.trim().replace(/^(["'])(.*)\1$/, "$2");
+    return [
+        WINDOWS_TEMP_CLIPBOARD_PASTE_PATH,
+        POSIX_TEMP_CLIPBOARD_PASTE_PATH,
+        BARE_TEMP_CLIPBOARD_PASTE_PATH,
+    ].some((pattern) => {
         pattern.lastIndex = 0;
         const match = pattern.exec(trimmed);
         return Boolean(match && match[0] === trimmed);
@@ -35,13 +39,13 @@ export function isTransientClipboardPasteFilePath(text) {
  * 递归脱敏工具展示参数，保留真实执行输入不变，仅用于日志/状态/时间线展示。
  */
 export function redactTransientClipboardPastePathsInValue(value) {
-    if (typeof value === 'string') {
+    if (typeof value === "string") {
         return redactTransientClipboardPastePaths(value);
     }
     if (Array.isArray(value)) {
         return value.map((item) => redactTransientClipboardPastePathsInValue(item));
     }
-    if (value && typeof value === 'object') {
+    if (value && typeof value === "object") {
         return Object.fromEntries(Object.entries(value).map(([key, item]) => [
             key,
             redactTransientClipboardPastePathsInValue(item),
@@ -57,23 +61,63 @@ export function redactTransientClipboardPastePathsInValue(value) {
  */
 const KNOWN_MCP_TOOLS = {
     // aws-mcp 工具
-    'get_colleague': 'aws-mcp',
-    'get_group_rooms': 'aws-mcp',
-    'get_profile': 'aws-mcp',
-    'get_status': 'aws-mcp',
-    'hire_colleague': 'aws-mcp',
-    'hire_colleagues_batch': 'aws-mcp',
-    'send_group': 'aws-mcp',
-    'send_private': 'aws-mcp',
-    'poll_message': 'aws-mcp',
-    'get_message': 'aws-mcp',
-    'get_dm_history': 'aws-mcp',
-    'get_group_history': 'aws-mcp',
-    'my_task': 'aws-mcp',
-    'submit_task_result': 'aws-mcp',
-    'reject_task': 'aws-mcp',
-    'terminate_task': 'aws-mcp',
+    get_colleague: "aws-mcp",
+    get_group_rooms: "aws-mcp",
+    get_profile: "aws-mcp",
+    get_status: "aws-mcp",
+    hire_colleague: "aws-mcp",
+    hire_colleagues_batch: "aws-mcp",
+    send_group: "aws-mcp",
+    send_private: "aws-mcp",
+    poll_message: "aws-mcp",
+    get_message: "aws-mcp",
+    get_dm_history: "aws-mcp",
+    get_group_history: "aws-mcp",
+    my_task: "aws-mcp",
+    submit_task_result: "aws-mcp",
+    reject_task: "aws-mcp",
+    terminate_task: "aws-mcp",
 };
+const AGENTSWORK_MCP_SERVER_ALIASES = new Set([
+    "aws-mcp",
+    "agents-work-studio",
+]);
+function canonicalizeMcpServer(serverName, toolName) {
+    const knownMcpServer = KNOWN_MCP_TOOLS[toolName.toLowerCase()];
+    if (knownMcpServer && AGENTSWORK_MCP_SERVER_ALIASES.has(serverName.toLowerCase())) {
+        return knownMcpServer;
+    }
+    return serverName;
+}
+export function getCanonicalMcpDetail(rawToolName) {
+    const normalizedRawToolName = rawToolName.trim();
+    if (!normalizedRawToolName)
+        return normalizedRawToolName;
+    if (normalizedRawToolName.includes("__")) {
+        const parts = normalizedRawToolName.split("__").filter(Boolean);
+        if (parts.length >= 3 && parts[0].toLowerCase() === "mcp") {
+            const serverName = parts[1];
+            const toolName = parts.slice(2).join("__");
+            return `${canonicalizeMcpServer(serverName, toolName)}/${toolName}`;
+        }
+        if (parts.length >= 2) {
+            const serverName = parts[0];
+            const toolName = parts.slice(1).join("__");
+            return `${canonicalizeMcpServer(serverName, toolName)}/${toolName}`;
+        }
+    }
+    const knownMcpServer = KNOWN_MCP_TOOLS[normalizedRawToolName.toLowerCase()];
+    return knownMcpServer
+        ? `${knownMcpServer}/${normalizedRawToolName}`
+        : normalizedRawToolName;
+}
+function formatCanonicalMcpDetail(serverName, toolName) {
+    if (!serverName)
+        return toolName;
+    if (!toolName)
+        return serverName;
+    return `${canonicalizeMcpServer(serverName, toolName)}/${toolName}`;
+}
 /**
  * 根据工具名称获取动作类型信息
  * @param toolName 工具名称
@@ -82,32 +126,36 @@ const KNOWN_MCP_TOOLS = {
  */
 export function getToolActionInfo(toolName, toolInput, metadata) {
     if (!toolName) {
-        return { actionType: 'other', actionLabel: '调用工具' };
+        return { actionType: "other", actionLabel: "调用工具" };
     }
     const name = toolName.toLowerCase();
-    const normalizedName = name.replace(/[_-]/g, '');
-    const semanticToolName = name.startsWith('mcp__')
-        ? name.split('__').slice(2).join('__')
-        : name.includes('-mcp__')
-            ? name.slice(name.indexOf('-mcp__') + 6)
-            : name;
-    const normalizedSemanticToolName = semanticToolName.replace(/[_-]/g, '');
+    const normalizedName = name.replace(/[_-]/g, "");
+    const semanticToolName = name.startsWith("mcp__")
+        ? name.split("__").slice(2).join("__")
+        : name.startsWith("builtin__")
+            ? name.split("__").slice(1).join("__")
+            : name.includes("-mcp__")
+                ? name.slice(name.indexOf("-mcp__") + 6)
+                : name.includes("/")
+                    ? name.split("/").filter(Boolean).at(-1) || name
+                    : name;
+    const normalizedSemanticToolName = semanticToolName.replace(/[_-]/g, "");
     const normalizeSkillList = (value) => {
         if (!Array.isArray(value)) {
             return [];
         }
         return value
-            .map((item) => String(item ?? '').trim())
+            .map((item) => String(item ?? "").trim())
             .filter((item) => item.length > 0);
     };
     const firstString = (...values) => {
         for (const value of values) {
-            if (typeof value === 'string' && value.trim()) {
+            if (typeof value === "string" && value.trim()) {
                 return redactTransientClipboardPastePaths(value);
             }
             if (Array.isArray(value) && value.length > 0) {
                 const first = value[0];
-                if (typeof first === 'string' && first.trim()) {
+                if (typeof first === "string" && first.trim()) {
                     return redactTransientClipboardPastePaths(first);
                 }
             }
@@ -115,17 +163,16 @@ export function getToolActionInfo(toolName, toolInput, metadata) {
         return undefined;
     };
     const matchesToolName = (...toolNames) => {
-        const normalizedToolNames = toolNames.map((item) => item.replace(/[_-]/g, ''));
-        return normalizedToolNames.includes(normalizedName) || normalizedToolNames.includes(normalizedSemanticToolName);
+        const normalizedToolNames = toolNames.map((item) => item.replace(/[_-]/g, ""));
+        return (normalizedToolNames.includes(normalizedName) ||
+            normalizedToolNames.includes(normalizedSemanticToolName));
     };
-    // 调试日志：记录工具名
-    console.log(`[getToolActionInfo] toolName="${toolName}", name="${name}"`);
     const loadSkills = normalizeSkillList(toolInput?.load_skills);
-    if ((name === 'task' || name === 'task()') && loadSkills.length > 0) {
+    if ((name === "task" || name === "task()") && loadSkills.length > 0) {
         return {
-            actionType: 'skill',
-            actionLabel: '加载技能',
-            actionDetail: loadSkills.join(', '),
+            actionType: "skill",
+            actionLabel: "加载技能",
+            actionDetail: loadSkills.join(", "),
         };
     }
     // Skill 调用
@@ -136,62 +183,94 @@ export function getToolActionInfo(toolName, toolInput, metadata) {
     //
     // 注意：SDK 发送的 tool_name 可能是 'Skill'（大写）或 'skill'（小写）
     // 使用 toLowerCase() 统一处理
-    const isSkillTool = name === 'skill' ||
-        name === 'load_skill' ||
-        name === 'disclosecontext' ||
-        (name.includes('skill') && !name.startsWith('mcp__') && !name.includes('mcp_'));
-    console.log(`[getToolActionInfo] Skill detection: name="${name}", isSkillTool=${isSkillTool}`);
+    const isSkillTool = name === "skill" ||
+        name === "load_skill" ||
+        name === "disclosecontext" ||
+        (name.includes("skill") &&
+            !name.startsWith("mcp__") &&
+            !name.includes("mcp_"));
     if (isSkillTool) {
         // Skill 参数可能有多种格式：
         // 1. { skill: "skillName" }
         // 2. { name: "skillName" }
         // 3. { args: { name: "skillName", ... } }  // task() 格式
         // 4. { load_skills: ["skill1", "skill2"] } // task() 加载技能格式
-        let skillName = '';
+        let skillName = "";
         // 检查 load_skills 格式（task 工具）
-        if (Array.isArray(toolInput?.load_skills) && toolInput.load_skills.length > 0) {
-            skillName = toolInput.load_skills.join(', ');
+        if (Array.isArray(toolInput?.load_skills) &&
+            toolInput.load_skills.length > 0) {
+            skillName = toolInput.load_skills.join(", ");
         }
         // 检查 skill 参数
-        else if (typeof toolInput?.skill === 'string') {
+        else if (typeof toolInput?.skill === "string") {
             skillName = toolInput.skill;
         }
         // 检查 name 参数
-        else if (typeof toolInput?.name === 'string') {
+        else if (typeof toolInput?.name === "string") {
             skillName = toolInput.name;
         }
         // 检查嵌套的 args.name
-        else if (toolInput?.args && typeof toolInput.args === 'object') {
+        else if (toolInput?.args && typeof toolInput.args === "object") {
             const args = toolInput.args;
-            if (typeof args.name === 'string') {
+            if (typeof args.name === "string") {
                 skillName = args.name;
             }
-            else if (typeof args.skill === 'string') {
+            else if (typeof args.skill === "string") {
                 skillName = args.skill;
             }
         }
-        console.log(`[getToolActionInfo] Detected Skill tool: skillName="${skillName}", toolInput=${JSON.stringify(toolInput)}`);
-        return { actionType: 'skill', actionLabel: '使用技能', actionDetail: skillName || undefined };
+        return {
+            actionType: "skill",
+            actionLabel: "使用技能",
+            actionDetail: skillName || undefined,
+        };
     }
     // 文件/命令工具即使走 MCP 命名，也优先按语义显示为读取/编辑/命令执行。
-    if (matchesToolName('edit', 'editfile', 'strreplace', 'editcode', 'apply_patch', 'multiedit', 'replace')) {
+    if (matchesToolName("edit", "editfile", "strreplace", "editcode", "apply_patch", "multiedit", "replace")) {
         const filePath = firstString(toolInput?.file_path, toolInput?.filePath, toolInput?.path, toolInput?.target_file, toolInput?.targetFile);
-        return { actionType: 'edit_file', actionLabel: '编辑文件', actionDetail: filePath };
+        return {
+            actionType: "edit_file",
+            actionLabel: "编辑文件",
+            actionDetail: filePath,
+        };
     }
-    if (matchesToolName('write', 'writefile', 'fswrite')) {
+    if (matchesToolName("write", "writefile", "fswrite")) {
         const filePath = firstString(toolInput?.file_path, toolInput?.filePath, toolInput?.path, toolInput?.target_file, toolInput?.targetFile);
-        return { actionType: 'write_file', actionLabel: '写入文件', actionDetail: filePath };
+        return {
+            actionType: "write_file",
+            actionLabel: "写入文件",
+            actionDetail: filePath,
+        };
     }
-    if (matchesToolName('read', 'readfile', 'readcode', 'readmultiplefiles', 'read_file')) {
+    if (matchesToolName("read", "readfile", "readcode", "readmultiplefiles", "read_file")) {
         if (Array.isArray(toolInput?.paths)) {
-            return { actionType: 'read_file', actionLabel: '读取文件', actionDetail: `${toolInput.paths.length}个文件` };
+            return {
+                actionType: "read_file",
+                actionLabel: "读取文件",
+                actionDetail: `${toolInput.paths.length}个文件`,
+            };
         }
         const filePath = firstString(toolInput?.file_path, toolInput?.filePath, toolInput?.path, toolInput?.paths, toolInput?.target_file, toolInput?.targetFile);
-        return { actionType: 'read_file', actionLabel: '读取文件', actionDetail: filePath };
+        return {
+            actionType: "read_file",
+            actionLabel: "读取文件",
+            actionDetail: filePath,
+        };
     }
-    if (matchesToolName('bash', 'shell', 'command', 'executepwsh', 'controlpwshprocess', 'execute', 'run_command', 'execute_command')) {
+    if (matchesToolName("bash", "shell", "command", "executepwsh", "controlpwshprocess", "execute", "run_command", "execute_command")) {
         const command = firstString(toolInput?.command, toolInput?.cmd, toolInput?.argv);
-        return { actionType: 'bash', actionLabel: '执行命令', actionDetail: command?.slice(0, 50) };
+        return {
+            actionType: "bash",
+            actionLabel: "执行命令",
+            actionDetail: command?.slice(0, 50),
+        };
+    }
+    if (matchesToolName("poll_message", "get_message")) {
+        return {
+            actionType: "idle",
+            actionLabel: "监听消息",
+            actionDetail: getCanonicalMcpDetail(toolName),
+        };
     }
     // MCP 工具调用
     // 优先使用 metadata 中的 mcpServer 信息（SDK 直接提供）
@@ -202,101 +281,137 @@ export function getToolActionInfo(toolName, toolInput, metadata) {
     // 4. xxx-mcp__tool (自定义格式，如 aws-mcp__get_profile)
     // 5. 包含 'mcp_' 的工具名
     // 6. Kiro 的 kiroPowers
-    // 
+    //
     // actionDetail 格式: server/tool（包含 MCP server 名称，便于用户识别工具来源）
     // 优先检查 metadata 中的 MCP server 信息
     if (metadata?.mcpServer) {
         const mcpServer = metadata.mcpServer;
-        const mcpTool = toolName || '';
-        const detail = mcpTool ? `${mcpServer}/${mcpTool}` : mcpServer;
-        console.log(`[getToolActionInfo] MCP from metadata: server="${mcpServer}", tool="${mcpTool}"`);
-        return { actionType: 'mcp', actionLabel: '调用MCP', actionDetail: detail };
+        const mcpTool = toolName || "";
+        const detail = formatCanonicalMcpDetail(mcpServer, mcpTool);
+        return { actionType: "mcp", actionLabel: "调用MCP", actionDetail: detail };
     }
     // 检查是否在已知 MCP 工具列表中
     const knownMcpServer = KNOWN_MCP_TOOLS[toolName];
     if (knownMcpServer) {
         const detail = `${knownMcpServer}/${toolName}`;
-        console.log(`[getToolActionInfo] MCP from known list: server="${knownMcpServer}", tool="${toolName}"`);
-        return { actionType: 'mcp', actionLabel: '调用MCP', actionDetail: detail };
+        return { actionType: "mcp", actionLabel: "调用MCP", actionDetail: detail };
     }
-    const isMcpTool = name.startsWith('mcp__') ||
-        name.includes('-mcp__') ||
-        (name.includes('mcp_') && !name.includes('skill')) ||
-        name === 'kiropowers';
+    const isMcpTool = name.startsWith("mcp__") ||
+        name.includes("-mcp__") ||
+        (name.includes("mcp_") && !name.includes("skill")) ||
+        name === "kiropowers";
     if (isMcpTool) {
-        let mcpServer = '';
-        let mcpTool = '';
-        if (name.startsWith('mcp__')) {
+        let mcpServer = "";
+        let mcpTool = "";
+        if (name.startsWith("mcp__")) {
             // 标准格式: mcp__server__tool
-            const parts = toolName.split('__');
-            mcpServer = parts[1] || '';
-            mcpTool = parts.slice(2).join('__') || '';
+            const parts = toolName.split("__");
+            mcpServer = parts[1] || "";
+            mcpTool = parts.slice(2).join("__") || "";
         }
-        else if (name.includes('-mcp__')) {
+        else if (name.includes("-mcp__")) {
             // 自定义格式: xxx-mcp__tool (如 aws-mcp__get_profile)
-            const idx = name.indexOf('-mcp__');
+            const idx = name.indexOf("-mcp__");
             mcpServer = name.substring(0, idx + 4); // "xxx-mcp"（保留完整 server 名）
             mcpTool = name.substring(idx + 6); // 去掉 "-mcp__" 前缀，得到工具名
         }
-        else if (name === 'kiropowers') {
-            mcpServer = 'kiro';
-            mcpTool = (toolInput?.powerName || toolInput?.action) || '';
+        else if (name === "kiropowers") {
+            mcpServer = "kiro";
+            mcpTool = (toolInput?.powerName || toolInput?.action) || "";
         }
         else {
             // 其他包含 mcp_ 的格式
-            mcpServer = 'mcp';
+            mcpServer = "mcp";
             mcpTool = toolName;
         }
         // 格式: server/tool（便于用户识别 MCP server 来源）
-        const detail = mcpServer && mcpTool ? `${mcpServer}/${mcpTool}` : (mcpTool || toolName);
-        return { actionType: 'mcp', actionLabel: '调用MCP', actionDetail: detail };
-    }
-    if (matchesToolName('poll_message', 'get_message')) {
-        return { actionType: 'idle', actionLabel: '监听消息', actionDetail: toolName };
+        const detail = formatCanonicalMcpDetail(mcpServer, mcpTool) || toolName;
+        return { actionType: "mcp", actionLabel: "调用MCP", actionDetail: detail };
     }
     // 文件编辑 (Kiro: strReplace, editCode)
-    if (matchesToolName('edit', 'editfile', 'strreplace', 'editcode', 'apply_patch', 'multiedit', 'replace')) {
+    if (matchesToolName("edit", "editfile", "strreplace", "editcode", "apply_patch", "multiedit", "replace")) {
         const filePath = firstString(toolInput?.file_path, toolInput?.filePath, toolInput?.path, toolInput?.target_file, toolInput?.targetFile);
-        return { actionType: 'edit_file', actionLabel: '编辑文件', actionDetail: filePath };
+        return {
+            actionType: "edit_file",
+            actionLabel: "编辑文件",
+            actionDetail: filePath,
+        };
     }
     // 文件写入 (Kiro: fsWrite)
-    if (matchesToolName('write', 'writefile', 'fswrite')) {
+    if (matchesToolName("write", "writefile", "fswrite")) {
         const filePath = firstString(toolInput?.file_path, toolInput?.filePath, toolInput?.path, toolInput?.target_file, toolInput?.targetFile);
-        return { actionType: 'write_file', actionLabel: '写入文件', actionDetail: filePath };
+        return {
+            actionType: "write_file",
+            actionLabel: "写入文件",
+            actionDetail: filePath,
+        };
     }
     // 文件读取 (Kiro: readFile, readCode, readMultipleFiles)
-    if (matchesToolName('read', 'readfile', 'readcode', 'readmultiplefiles', 'read_file')) {
+    if (matchesToolName("read", "readfile", "readcode", "readmultiplefiles", "read_file")) {
         if (Array.isArray(toolInput?.paths)) {
-            return { actionType: 'read_file', actionLabel: '读取文件', actionDetail: `${toolInput.paths.length}个文件` };
+            return {
+                actionType: "read_file",
+                actionLabel: "读取文件",
+                actionDetail: `${toolInput.paths.length}个文件`,
+            };
         }
         const filePath = firstString(toolInput?.file_path, toolInput?.filePath, toolInput?.path, toolInput?.paths, toolInput?.target_file, toolInput?.targetFile);
-        return { actionType: 'read_file', actionLabel: '读取文件', actionDetail: filePath };
+        return {
+            actionType: "read_file",
+            actionLabel: "读取文件",
+            actionDetail: filePath,
+        };
     }
     // Bash 命令 (Kiro: executePwsh, controlPwshProcess)
-    if (matchesToolName('bash', 'shell', 'command', 'executepwsh', 'controlpwshprocess', 'execute', 'run_command', 'execute_command')) {
+    if (matchesToolName("bash", "shell", "command", "executepwsh", "controlpwshprocess", "execute", "run_command", "execute_command")) {
         const command = firstString(toolInput?.command, toolInput?.cmd, toolInput?.argv);
-        return { actionType: 'bash', actionLabel: '执行命令', actionDetail: command?.slice(0, 50) };
+        return {
+            actionType: "bash",
+            actionLabel: "执行命令",
+            actionDetail: command?.slice(0, 50),
+        };
     }
     // 文件搜索 (Kiro: grepSearch, fileSearch)
-    if (name === 'glob' || name === 'grep' || name === 'find' || name === 'search' || name === 'grepsearch' || name === 'filesearch') {
+    if (name === "glob" ||
+        name === "grep" ||
+        name === "find" ||
+        name === "search" ||
+        name === "grepsearch" ||
+        name === "filesearch") {
         const query = (toolInput?.query || toolInput?.pattern);
-        return { actionType: 'search', actionLabel: '搜索文件', actionDetail: query?.slice(0, 30) };
+        return {
+            actionType: "search",
+            actionLabel: "搜索文件",
+            actionDetail: query?.slice(0, 30),
+        };
     }
     // 网络操作 (Kiro: webFetch, remote_web_search)
-    if (name === 'webfetch' || name === 'websearch' || name === 'fetch' || name === 'http' || name === 'remote_web_search') {
+    if (name === "webfetch" ||
+        name === "websearch" ||
+        name === "fetch" ||
+        name === "http" ||
+        name === "remote_web_search") {
         const url = (toolInput?.url || toolInput?.query);
-        return { actionType: 'web', actionLabel: '网络请求', actionDetail: url?.slice(0, 50) };
+        return {
+            actionType: "web",
+            actionLabel: "网络请求",
+            actionDetail: url?.slice(0, 50),
+        };
     }
     // LSP 操作
-    if (name.startsWith('lsp') || name.includes('language_server')) {
-        return { actionType: 'lsp', actionLabel: 'LSP操作' };
+    if (name.startsWith("lsp") || name.includes("language_server")) {
+        return { actionType: "lsp", actionLabel: "LSP操作" };
     }
     // Notebook 编辑
-    if (name === 'notebookedit' || name.includes('notebook')) {
-        return { actionType: 'notebook', actionLabel: '编辑Notebook' };
+    if (name === "notebookedit" || name.includes("notebook")) {
+        return { actionType: "notebook", actionLabel: "编辑Notebook" };
     }
     // 其他工具
-    return { actionType: 'other', actionLabel: '调用工具', actionDetail: toolName };
+    return {
+        actionType: "other",
+        actionLabel: "调用工具",
+        actionDetail: toolName,
+    };
 }
 // ============ Adapter 基类 ============
 /**

package/dist/adapter/types.test.js

@@ -1,10 +1,17 @@
 import { describe, expect, it } from 'vitest';
 import { getToolActionInfo, isTransientClipboardPasteFilePath, redactTransientClipboardPastePaths, redactTransientClipboardPastePathsInValue, } from './types.js';
 describe('getToolActionInfo', () => {
-    it('reports poll_message as a normal MCP tool call', () => {
+    it('reports poll_message as an idle MCP listening tool call', () => {
         expect(getToolActionInfo('poll_message')).toEqual({
-            actionType: 'mcp',
-            actionLabel: '调用MCP',
+            actionType: 'idle',
+            actionLabel: '监听消息',
+            actionDetail: 'aws-mcp/poll_message',
+        });
+    });
+    it('reports prefixed poll_message as a canonical idle MCP listening tool call', () => {
+        expect(getToolActionInfo('aws-mcp__poll_message')).toEqual({
+            actionType: 'idle',
+            actionLabel: '监听消息',
             actionDetail: 'aws-mcp/poll_message',
         });
     });

package/dist/routes/ai-sources.js

@@ -59,7 +59,7 @@ async function fetchRemoteModelList(baseUrl, apiKey) {
     return normalizeListedModels(anthropicResponse.data);
 }
 aiSourcesRouter.post('/cc-switch/apply-ai-sources', validateToken, async (req, res) => {
-    const { agentId, template, ccSwitchEnabledTools, acodeTemplateId, claudecodeTemplateId, codexTemplateId, opencodeTemplateId, acode, claudecode, codex, opencode, } = req.body || {};
+    const { agentId, template, ccSwitchEnabledTools, acodeTemplateId, claudecodeTemplateId, codexTemplateId, opencodeTemplateId, acodeModelEffort, claudecodeModelEffort, codexModelEffort, opencodeModelEffort, acode, claudecode, codex, opencode, } = req.body || {};
     if (!agentId) {
         res.status(400).json({ error: 'agentId is required' });
         return;
@@ -81,6 +81,10 @@ aiSourcesRouter.post('/cc-switch/apply-ai-sources', validateToken, async (req, r
             claudecodeTemplateId: String(claudecodeTemplateId || ''),
             codexTemplateId: String(codexTemplateId || ''),
             opencodeTemplateId: String(opencodeTemplateId || ''),
+            acodeModelEffort: String(acodeModelEffort || ''),
+            claudecodeModelEffort: String(claudecodeModelEffort || ''),
+            codexModelEffort: String(codexModelEffort || ''),
+            opencodeModelEffort: String(opencodeModelEffort || ''),
             generatedFromUnifiedTemplate: appliedSummary.generatedFromUnifiedTemplate,
             applied: appliedSummary.applied,
             skippedTools: appliedSummary.skippedTools,

package/dist/routes/ai-sources.test.js

@@ -76,6 +76,14 @@ function buildModelListCandidates(baseUrl, protocol) {
         : [`${normalizedBaseUrl}/models`, `${normalizedBaseUrl}/v1/models`];
     return [...openAiCandidates, `${normalizedBaseUrl}/v1/models`];
 }
+function buildApplyAiSourcesResponse(body) {
+    return {
+        acodeModelEffort: String(body.acodeModelEffort || ''),
+        claudecodeModelEffort: String(body.claudecodeModelEffort || ''),
+        codexModelEffort: String(body.codexModelEffort || ''),
+        opencodeModelEffort: String(body.opencodeModelEffort || ''),
+    };
+}
 describe('ai source unified config generation', () => {
     it('builds tool-specific configs from unified template fields', () => {
         assert.deepEqual(buildUnifiedToolConfig({
@@ -145,4 +153,17 @@ describe('ai source unified config generation', () => {
             model: 'gpt-test',
         }).opencode.provider.default.options.baseURL).toBe('https://octopus.721579.xyz/v1');
     });
+    it('echoes selected model effort metadata in apply-ai-sources responses', () => {
+        expect(buildApplyAiSourcesResponse({
+            acodeModelEffort: 'xhigh',
+            claudecodeModelEffort: 'high',
+            codexModelEffort: 'max',
+            opencodeModelEffort: 'high',
+        })).toEqual({
+            acodeModelEffort: 'xhigh',
+            claudecodeModelEffort: 'high',
+            codexModelEffort: 'max',
+            opencodeModelEffort: 'high',
+        });
+    });
 });

package/dist/routes/instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../../src/routes/instance.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAoBrD,wBAAgB,qBAAqB,CACnC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/D,IAAI,CAEN;AAED,eAAO,MAAM,cAAc,4CAAW,CAAC;AAsJvC,wBAAgB,4BAA4B,CAAC,gBAAgB,EAAE,MAAM,GAAG;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE;QACJ,EAAE,EAAE,OAAO,CAAC;QACZ,aAAa,CAAC,EAAE,SAAS,CAAC;QAC1B,oBAAoB,EAAE,OAAO,CAAC;QAC9B,qBAAqB,EAAE,OAAO,CAAC;QAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAqCA;AAED,MAAM,WAAW,4BAA4B;IAC3C,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,gBAAgB,CAAC;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,iCAAiC;IACzC,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,8BAA8B,CAAC;IACtC,YAAY,EAAE,gBAAgB,CAAC;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,KAAK,EACZ,0BAA0B,EAAE,MAAM,GACjC,4BAA4B,CAiB9B;AAoDD;;;GAGG;AACH,wBAAgB,sCAAsC,CACpD,UAAU,EAAE,MAAM,EAAE,GACnB,iCAAiC,CAUnC;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAQhF;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,cAAc,EAAE,MAAM,EAAE,EACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC5C,MAAM,CAaR;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC5C,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,WAAW,GAAG,SAAS,GAAG,YAAY,GAAG,OAAO,CAAC,CAAC,CAY3F"}
+{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../../src/routes/instance.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAqBrD,wBAAgB,qBAAqB,CACnC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/D,IAAI,CAEN;AAED,eAAO,MAAM,cAAc,4CAAW,CAAC;AAsJvC,wBAAgB,4BAA4B,CAAC,gBAAgB,EAAE,MAAM,GAAG;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE;QACJ,EAAE,EAAE,OAAO,CAAC;QACZ,aAAa,CAAC,EAAE,SAAS,CAAC;QAC1B,oBAAoB,EAAE,OAAO,CAAC;QAC9B,qBAAqB,EAAE,OAAO,CAAC;QAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAqCA;AAED,MAAM,WAAW,4BAA4B;IAC3C,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,gBAAgB,CAAC;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,iCAAiC;IACzC,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,8BAA8B,CAAC;IACtC,YAAY,EAAE,gBAAgB,CAAC;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,KAAK,EACZ,0BAA0B,EAAE,MAAM,GACjC,4BAA4B,CAiB9B;AAoDD;;;GAGG;AACH,wBAAgB,sCAAsC,CACpD,UAAU,EAAE,MAAM,EAAE,GACnB,iCAAiC,CAUnC;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAQhF;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,cAAc,EAAE,MAAM,EAAE,EACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC5C,MAAM,CAaR;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC5C,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,WAAW,GAAG,SAAS,GAAG,YAAY,GAAG,OAAO,CAAC,CAAC,CAY3F"}

package/dist/routes/instance.js

@@ -2,16 +2,15 @@ import { Router } from "express";
 import axios from "axios";
 import { spawn } from "node:child_process";
 import { createHash, timingSafeEqual } from "node:crypto";
-import { validateToken } from "../middleware/auth.js";
 import { resolveSchedulerBaseUrlFrom } from "../config.js";
-import { getRuntimeAccessToken } from "../services/runtime-binding.js";
-import { loadInstanceState, saveInstanceState, } from "../services/instance-state.js";
-import { initInstance } from "../services/instance-init-service.js";
-import { discoverCcSwitchConfiguredItems, loadCcSwitchSdk } from "../services/cc-switch-sdk.js";
-import { syncLegacyStateFromSdk } from "../services/instance-init-service.js";
-import { detectToolStatuses, ensureToolsInstalled, SUPPORTED_INSTALLABLE_TOOLS, SUPPORTED_UNINSTALLABLE_TOOLS, uninstallTools, } from "../services/tool-installer.js";
+import { validateToken } from "../middleware/auth.js";
 import { getConfiguredConnectionKeys, requestRuntimeAccessTokenRefreshForServer } from "../services/auto-register.js";
+import { discoverCcSwitchConfiguredItems, loadCcSwitchSdk } from "../services/cc-switch-sdk.js";
+import { initInstance, syncLegacyStateFromSdk } from "../services/instance-init-service.js";
 import { createBridgeLifecycleOperation, deliverPendingBridgeLifecycleNotifications, upsertBridgeLifecycleOperation, } from "../services/lifecycle-state.js";
+import { loadInstanceState, saveInstanceState, } from "../services/instance-state.js";
+import { getRuntimeAccessToken } from "../services/runtime-binding.js";
+import { detectToolStatuses, ensureToolsInstalled, SUPPORTED_INSTALLABLE_TOOLS, SUPPORTED_UNINSTALLABLE_TOOLS, uninstallTools, } from "../services/tool-installer.js";
 import { createLogger } from "../utils/logger.js";
 const log = createLogger("instance");
 const PANEL_TOOL_STATUS_KEYS = ["acode", "claude", "opencode", "codex"];

package/dist/routes/runtime-binding.js

@@ -102,7 +102,7 @@ runtimeBindingRouter.post("/binding/claim-agent", (req, res) => {
         res.status(403).json({ ok: false, error: "loopback request required" });
         return;
     }
-    const { workspacePath, serverUrl } = req.body || {};
+    const { agentId, workspacePath, serverUrl } = req.body || {};
     if (!workspacePath || !String(workspacePath).trim()) {
         res.status(400).json({ ok: false, error: "workspacePath is required" });
         return;
@@ -111,7 +111,7 @@ runtimeBindingRouter.post("/binding/claim-agent", (req, res) => {
         res.status(400).json({ ok: false, error: "serverUrl is required" });
         return;
     }
-    const claimed = claimMcpLaunchBinding({ workspacePath, serverUrl });
+    const claimed = claimMcpLaunchBinding({ agentId, workspacePath, serverUrl });
     if (!claimed) {
         res.status(404).json({
             ok: false,