@auto-ai/agent 2.1.103 → 2.1.104

package/dist/ws-test.html

@@ -2832,6 +2832,26 @@
     </div>
   </div>
 
+  <div id="mcpItemConfigModal" class="agent-md-modal" aria-hidden="true">
+    <div class="agent-md-modal-backdrop" id="mcpItemConfigModalBackdrop"></div>
+    <div class="agent-md-modal-card" role="dialog" aria-modal="true" aria-labelledby="mcpItemConfigModalTitle">
+      <div class="agent-md-modal-head">
+        <h2 id="mcpItemConfigModalTitle">编辑 MCP 配置</h2>
+        <button type="button" class="agent-md-modal-close" id="btnMcpItemConfigModalClose" aria-label="关闭">
+          &times;
+        </button>
+      </div>
+      <p id="mcpItemConfigHint" class="tool-files-sub" style="margin: 0 1rem 0.5rem; line-height: 1.4">
+        标准 mcp.json 单条 server 配置（与 Cursor mcp.json 相同）：<code>{ "command": "...", "args": [...], "env": {...} }</code>。保存后写入 agent .mcp.json 的 <code>mcpServers.&lt;serverName&gt;</code>。
+      </p>
+      <textarea id="mcpItemConfigEditor" class="agent-md-editor" spellcheck="false" placeholder="加载中…"></textarea>
+      <div class="agent-md-modal-foot">
+        <button type="button" class="btn-agent-md-cancel" id="btnMcpItemConfigCancel">取消</button>
+        <button type="button" class="btn-primary" id="btnMcpItemConfigSave">保存</button>
+      </div>
+    </div>
+  </div>
+
   <div id="agentMdModal" class="agent-md-modal" aria-hidden="true">
     <div class="agent-md-modal-backdrop" id="agentMdModalBackdrop"></div>
     <div class="agent-md-modal-card" role="dialog" aria-modal="true" aria-labelledby="agentMdModalTitle">
@@ -3452,6 +3472,14 @@
       const btnMcpJsonInputModalClose = $('btnMcpJsonInputModalClose')
       const btnMcpJsonInputCancel = $('btnMcpJsonInputCancel')
       const btnMcpJsonInputConfirm = $('btnMcpJsonInputConfirm')
+      const mcpItemConfigModal = $('mcpItemConfigModal')
+      const mcpItemConfigModalBackdrop = $('mcpItemConfigModalBackdrop')
+      const mcpItemConfigModalTitle = $('mcpItemConfigModalTitle')
+      const mcpItemConfigEditor = $('mcpItemConfigEditor')
+      const btnMcpItemConfigModalClose = $('btnMcpItemConfigModalClose')
+      const btnMcpItemConfigCancel = $('btnMcpItemConfigCancel')
+      const btnMcpItemConfigSave = $('btnMcpItemConfigSave')
+      let mcpItemEditState = null
 
       ;(function initAgentIdFromPageUrl() {
         try {
@@ -3889,13 +3917,29 @@
         }
       }
 
-      function resolveEnvelopeSourceAgent(runId, payload) {
+      /**
+       * 业务语义：解析消息所属 agent 展示名。
+       * 优先 payload.sourceAgent，其次 v3 信封 agent_name，main run 再回退页面当前 agent。
+       */
+      function resolveEnvelopeSourceAgent(runId, payload, envelopeAgentName) {
         const payloadSource =
           payload && typeof payload.sourceAgent === 'string'
-            ? payload.sourceAgent
+            ? payload.sourceAgent.trim()
             : ''
         if (payloadSource) return payloadSource
-        return runId === 'main' ? 'main' : 'unknown-agent'
+        const envelopeSource =
+          typeof envelopeAgentName === 'string' ? envelopeAgentName.trim() : ''
+        if (envelopeSource) return envelopeSource
+        if (runId === 'main') return currentAgentParam()
+        return 'unknown-agent'
+      }
+
+      function resolveRunDisplayAgent(runId, sourceAgent) {
+        const named =
+          typeof sourceAgent === 'string' ? sourceAgent.trim() : ''
+        if (named) return named
+        if (runId === 'main') return currentAgentParam()
+        return 'unknown-agent'
       }
 
       function ensureRunBuffer(runId) {
@@ -4249,7 +4293,7 @@
                 Number.isInteger(item.arrivalSeq) ? item.arrivalSeq : Number.MAX_SAFE_INTEGER,
               fallbackOrder: timelineFallbackOrder++,
               runId: runId,
-              sourceAgent: item.sourceAgent || (runId === 'main' ? 'main' : 'unknown-agent'),
+              sourceAgent: resolveRunDisplayAgent(runId, item.sourceAgent),
               scheduledTrigger: item.scheduledTrigger === true,
               kind: 'conversation',
               payload: item,
@@ -4269,7 +4313,7 @@
               Number.isInteger(item.arrivalSeq) ? item.arrivalSeq : Number.MAX_SAFE_INTEGER,
             fallbackOrder: timelineFallbackOrder++,
             runId: rid,
-            sourceAgent: item.source || (rid === 'main' ? 'main' : 'unknown-agent'),
+            sourceAgent: resolveRunDisplayAgent(rid, item.source),
             scheduledTrigger: item.scheduledTrigger === true,
             kind: 'source',
             payload: item,
@@ -4333,7 +4377,7 @@
           const runId = block.runId
           const blockItems = block.items
           if (!blockItems.length) continue
-          const defaultSourceAgent = block.sourceAgent || (runId === 'main' ? 'main' : 'unknown-agent')
+          const defaultSourceAgent = resolveRunDisplayAgent(runId, block.sourceAgent)
           const mainSegmentSuffix =
             block.isMainSegment && block.segmentSeq > 1 ? ' · segment=' + block.segmentSeq : ''
           const lastBlockItem = blockItems[blockItems.length - 1]
@@ -4527,7 +4571,7 @@
           const action = typeof payload.action === 'string' ? payload.action : ''
           const index = Number.isInteger(payload.index) ? payload.index : -1
           const msg = payload.message
-          const sourceAgent = resolveEnvelopeSourceAgent(runId, payload)
+          const sourceAgent = resolveEnvelopeSourceAgent(runId, payload, data.agent_name)
           const runBuffer = ensureRunBuffer(runId)
           const runMessage = {
             message: msg,
@@ -5463,6 +5507,54 @@
         return u.toString()
       }
 
+      function buildRuntimeMcpItemConfigUrl(itemId, source) {
+        const u = new URL('/api/runtime/mcps/item-config', httpOriginForApi() + '/')
+        u.searchParams.set('agent', currentAgentParam())
+        u.searchParams.set('item', itemId)
+        u.searchParams.set('source', source)
+        return u.toString()
+      }
+
+      function closeMcpItemConfigModal() {
+        if (!mcpItemConfigModal) return
+        mcpItemConfigModal.classList.remove('is-open')
+        mcpItemConfigModal.setAttribute('aria-hidden', 'true')
+        mcpItemEditState = null
+      }
+
+      function openMcpItemConfigEditor(itemId, source, onSaved) {
+        if (!mcpItemConfigModal || !mcpItemConfigEditor) return
+        mcpItemEditState = { itemId: itemId, source: source, packageId: null, onSaved: onSaved || null }
+        if (mcpItemConfigModalTitle) {
+          mcpItemConfigModalTitle.textContent = '编辑 MCP 配置 · ' + itemId
+        }
+        mcpItemConfigEditor.value = '加载中…'
+        mcpItemConfigModal.classList.add('is-open')
+        mcpItemConfigModal.setAttribute('aria-hidden', 'false')
+        fetch(buildRuntimeMcpItemConfigUrl(itemId, source))
+          .then(function (r) {
+            return r.json().then(function (body) {
+              return { r: r, body: body }
+            })
+          })
+          .then(function (x) {
+            if (!x.r.ok) throw new Error(x.body.message || x.body.error || x.r.statusText)
+            if (mcpItemEditState) {
+              mcpItemEditState.packageId = x.body.packageId || null
+            }
+            const overlay = x.body.overlay
+            if (overlay && typeof overlay === 'object' && !Array.isArray(overlay)) {
+              mcpItemConfigEditor.value = JSON.stringify(overlay, null, 2)
+            } else {
+              mcpItemConfigEditor.value = '{}'
+            }
+          })
+          .catch(function (e) {
+            window.alert('加载 MCP 配置失败: ' + e)
+            closeMcpItemConfigModal()
+          })
+      }
+
       function buildRuntimeSkillFilesUrl() {
         const u = new URL('/api/runtime/skills/files', httpOriginForApi() + '/')
         u.searchParams.set('agent', currentAgentParam())
@@ -5723,7 +5815,17 @@
             (hasJson ? ' · 含 .mcp.json' : ' · 缺少 .mcp.json') +
             ' · 可导出文件 ' +
             (Number.isFinite(fc) && fc > 0 ? fc : 0) +
-            ' · zip 仅含编译产物（mcp.json / index.js）'
+            ' · zip 为单包目录整包解压'
+          const editBtn = document.createElement('button')
+          editBtn.type = 'button'
+          editBtn.className = 'tool-files-download'
+          editBtn.textContent = '编辑'
+          editBtn.style.marginRight = '0.45rem'
+          editBtn.addEventListener('click', function () {
+            openMcpItemConfigEditor(file, 'runtime', function () {
+              void loadMcpPackageList()
+            })
+          })
           const exportBtn = document.createElement('button')
           exportBtn.type = 'button'
           exportBtn.className = 'tool-files-download'
@@ -7781,10 +7883,26 @@
                     }
                     exportBtn.addEventListener('click', function () {
                       if (exportBtn.disabled) return
-                      window.open(buildRuntimeMcpExportUrl(id), '_blank', 'noopener')
+                      const pkgId = row.s && row.s.packageId ? String(row.s.packageId) : id
+                      window.open(buildRuntimeMcpExportUrl(pkgId), '_blank', 'noopener')
                     })
                     actions.appendChild(exportBtn)
                   }
+                  const editBtn = document.createElement('button')
+                  editBtn.type = 'button'
+                  editBtn.className = 'btn-picker-action'
+                  editBtn.textContent = '编辑'
+                  editBtn.addEventListener('click', function () {
+                    const src = source === 'remote' ? 'remote' : 'runtime'
+                    openMcpItemConfigEditor(id, src, function () {
+                      if (typeof refreshMcpPickerRows === 'function') {
+                        void refreshMcpPickerRows().then(function () {
+                          renderMcpRows()
+                        })
+                      }
+                    })
+                  })
+                  actions.appendChild(editBtn)
                   const toggleBtn = document.createElement('button')
                   toggleBtn.type = 'button'
                   toggleBtn.className = 'btn-picker-action'
@@ -7881,7 +7999,8 @@
                           })
                         return
                       }
-                      fetch(buildRuntimeMcpDeleteUrl(id), { method: 'DELETE' })
+                      const pkgId = row.s && row.s.packageId ? String(row.s.packageId) : id
+                      fetch(buildRuntimeMcpDeleteUrl(pkgId), { method: 'DELETE' })
                         .then(function (r) {
                           return r.json().catch(function () {
                             return {}
@@ -8542,6 +8661,69 @@
       if (mcpJsonInputModalBackdrop) {
         mcpJsonInputModalBackdrop.addEventListener('click', closeMcpJsonInputModal)
       }
+      if (btnMcpItemConfigModalClose) {
+        btnMcpItemConfigModalClose.addEventListener('click', closeMcpItemConfigModal)
+      }
+      if (btnMcpItemConfigCancel) {
+        btnMcpItemConfigCancel.addEventListener('click', closeMcpItemConfigModal)
+      }
+      if (mcpItemConfigModalBackdrop) {
+        mcpItemConfigModalBackdrop.addEventListener('click', closeMcpItemConfigModal)
+      }
+      if (btnMcpItemConfigSave && mcpItemConfigEditor) {
+        btnMcpItemConfigSave.addEventListener('click', function () {
+          if (!mcpItemEditState) return
+          const raw = String(mcpItemConfigEditor.value || '').trim()
+          let server
+          try {
+            server = raw ? JSON.parse(raw) : {}
+          } catch (e) {
+            window.alert('JSON 解析失败: ' + e)
+            return
+          }
+          if (!server || typeof server !== 'object' || Array.isArray(server)) {
+            window.alert('配置必须是 JSON 对象')
+            return
+          }
+          if (server.mcpServers) {
+            window.alert('请填写标准 server 配置（command/args/env），不要嵌套 mcpServers')
+            return
+          }
+          const clearOverlay = Object.keys(server).length === 0
+          btnMcpItemConfigSave.disabled = true
+          const saveUrl = buildRuntimeMcpItemConfigUrl(mcpItemEditState.itemId, mcpItemEditState.source)
+          const saveOpts = clearOverlay
+            ? { method: 'DELETE' }
+            : {
+                method: 'PUT',
+                headers: { 'Content-Type': 'application/json; charset=utf-8' },
+                body: JSON.stringify({ server: server }),
+              }
+          fetch(saveUrl, saveOpts)
+            .then(function (r) {
+              return r.json().then(function (body) {
+                return { r: r, body: body }
+              })
+            })
+            .then(function (x) {
+              if (!x.r.ok) throw new Error(x.body.message || x.body.error || x.r.statusText)
+              closeMcpItemConfigModal()
+              setStatus('MCP 配置已保存', serverReady ? 'ready' : '')
+              return persistAgentConfigAndRestartSession({ silent: true })
+            })
+            .then(function () {
+              if (mcpItemEditState && typeof mcpItemEditState.onSaved === 'function') {
+                mcpItemEditState.onSaved()
+              }
+            })
+            .catch(function (e) {
+              window.alert('保存失败: ' + e)
+            })
+            .finally(function () {
+              btnMcpItemConfigSave.disabled = false
+            })
+        })
+      }
       if (btnMcpJsonInputConfirm && mcpJsonInputEditor) {
         btnMcpJsonInputConfirm.addEventListener('click', function () {
           const raw = String(mcpJsonInputEditor.value || '').trim()

package/lib/launcher-env.js

@@ -1,23 +1,15 @@
 /**
- * agent 启动环境：默认路径 + .env + 内置 runtime 同步到 .ws-agents。
+ * agent 启动环境：默认路径 + .env 加载。
  * 发布时由 sync-launcher-env 复制为 packages/agent/lib/launcher-env.js（单文件，无子模块依赖）。
  */
 
-import { cpSync, existsSync, mkdirSync, readFileSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { createRequire } from 'node:module'
 
 const require = createRequire(import.meta.url)
 
-/** 与 prepack、wsSkillRuntime 等保持一致的内置 runtime 目录名 */
-const BUILTIN_RUNTIME_DIR_NAMES = [
-  'skills-runtime',
-  'tools-runtime',
-  'mcps-runtime',
-]
-
 export function resolveMainPackageRoot() {
   try {
     return dirname(require.resolve('@auto-ai/agent/package.json'))
@@ -26,18 +18,6 @@ export function resolveMainPackageRoot() {
   }
 }
 
-/**
- * 内置 runtime 来源根：已安装的 @auto-ai/agent 包根，或源码仓库根。
- */
-export function resolveBundledRuntimeSourceRoot() {
-  try {
-    const pkgJson = require.resolve('@auto-ai/agent/package.json')
-    return dirname(pkgJson)
-  } catch {
-    return join(dirname(fileURLToPath(import.meta.url)), '..')
-  }
-}
-
 /**
  * 解析 WS_AGENTS_ROOT：显式环境变量优先，否则 <WS_PROJECT_ROOT|cwd>/.ws-agents。
  */
@@ -50,34 +30,6 @@ export function resolveWsAgentsRoot(env) {
   return join(projectRoot, '.ws-agents')
 }
 
-/**
- * 若 .ws-agents 下尚无对应 runtime 目录，则从包内/仓库根复制一份。
- * 已存在则跳过，避免覆盖用户通过 API 安装或手工改动的内容。
- */
-export function ensureWsAgentsBuiltinRuntime(env) {
-  const agentsRoot = resolveWsAgentsRoot(env)
-  if (!env.WS_AGENTS_ROOT?.trim()) {
-    env.WS_AGENTS_ROOT = agentsRoot
-  }
-
-  const sourceRoot = resolveBundledRuntimeSourceRoot()
-  mkdirSync(agentsRoot, { recursive: true })
-
-  for (const dirName of BUILTIN_RUNTIME_DIR_NAMES) {
-    const src = join(sourceRoot, dirName)
-    const dest = join(agentsRoot, dirName)
-    if (!existsSync(src) || existsSync(dest)) {
-      continue
-    }
-    cpSync(src, dest, {
-      recursive: true,
-      filter: path => !path.split(/[/\\]+/).includes('.ws-agent'),
-    })
-  }
-
-  return env
-}
-
 function applyDotenvLines(env, text) {
   for (const line of text.split('\n')) {
     const trimmed = line.trim()
@@ -128,7 +80,11 @@ export function buildLauncherEnv(baseEnv = process.env) {
   loadDotenvFile(env, join(homedir(), '.config', 'agent', 'env'))
   loadDotenvFile(env, join(homedir(), '.agent.env'))
 
-  return ensureWsAgentsBuiltinRuntime(env)
+  if (!env.WS_AGENTS_ROOT?.trim()) {
+    env.WS_AGENTS_ROOT = resolveWsAgentsRoot(env)
+  }
+
+  return env
 }
 
 /** 写入当前进程环境（源码直接启动 wsServer 时使用） */

package/mcps-runtime/claude-tuitui/server/boot.mjs

@@ -14,6 +14,17 @@ log(`[BOOT] tuitui-channel boot.mjs start pid=${process.pid}`);
 log(`[BOOT] marker=2026-03-23-v2-runtime-probe`);
 log(`[BOOT] env TUITUI_DM_POLICY=${process.env.TUITUI_DM_POLICY || ''} TUITUI_STATE_DIR=${process.env.TUITUI_STATE_DIR || ''}`);
 
+// 父进程（WS 会话子进程 / bun -e 调试）退出后，stdio MCP 不应继续存活成为孤儿。
+const parentPidAtBoot = process.ppid;
+const parentExitWatch = setInterval(() => {
+  if (process.ppid !== parentPidAtBoot) {
+    clearInterval(parentExitWatch);
+    log(`[BOOT] parent pid changed ${parentPidAtBoot} -> ${process.ppid}, exiting`);
+    process.exit(0);
+  }
+}, 1000);
+parentExitWatch.unref?.();
+
 process.on('uncaughtException', (err) => {
   log(`[BOOT] uncaughtException ${err?.stack || err}`);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auto-ai/agent",
-  "version": "2.1.103",
+  "version": "2.1.104",
   "description": "Auto AI Agent 网关 CLI（WebSocket，独立二进制，无需 Bun）",
   "type": "module",
   "maintainers": [
@@ -27,11 +27,11 @@
     "node": ">=18"
   },
   "optionalDependencies": {
-    "@auto-ai/agent-linux-x64": "2.1.103",
-    "@auto-ai/agent-linux-arm64": "2.1.103",
-    "@auto-ai/agent-darwin-x64": "2.1.103",
-    "@auto-ai/agent-darwin-arm64": "2.1.103",
-    "@auto-ai/agent-win-x64": "2.1.103"
+    "@auto-ai/agent-linux-x64": "2.1.104",
+    "@auto-ai/agent-linux-arm64": "2.1.104",
+    "@auto-ai/agent-darwin-x64": "2.1.104",
+    "@auto-ai/agent-darwin-arm64": "2.1.104",
+    "@auto-ai/agent-win-x64": "2.1.104"
   },
   "scripts": {
     "prepare": "node ../../scripts/sync-launcher-env.js",