@mobius-os/mobius 0.2.9 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mobius-os/mobius",
-  "version": "0.2.9",
+  "version": "0.3.1",
   "type": "module",
   "description": "Mobius terminal client. Reuses Mobius frontend TypeScript types and jsonl entry shapes.",
   "bin": {
@@ -18,6 +18,7 @@
   "dependencies": {
     "chalk": "^5.3.0",
     "cli-highlight": "2.1.11",
+    "extract-zip": "^2.0.1",
     "ink": "5.2.0",
     "marked": "12.0.2",
     "react": "18.3.1",

package/src/aimux.ts

@@ -6,9 +6,11 @@
  * currently authenticated Mobius server.  Nothing is started before login.
  */
 import { spawn, spawnSync, type ChildProcess } from 'node:child_process'
-import { promises as fs, existsSync } from 'node:fs'
+import { promises as fs, existsSync, createWriteStream } from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
+import { Readable } from 'node:stream'
+import extract from 'extract-zip'
 import { mobiusHome } from './config.js'
 
 export type AimuxState = 'starting' | 'connected' | 'failed' | 'stopped' | 'disabled'
@@ -22,6 +24,11 @@ export interface AimuxStatus {
 }
 export interface InstallProgress { phase: 'python' | 'venv' | 'install' | 'ready'; detail?: string }
 
+/** aimux 的调用方式：venv 直接执行，或用内置 python 跑 `-m aimux`（Plan B 兜底）。 */
+export type AimuxLauncher =
+  | { kind: 'exe'; path: string }
+  | { kind: 'module'; python: string }
+
 const AIMUX_PACKAGE = 'aimux'
 const WIN = process.platform === 'win32'
 const venvDir = () => path.join(mobiusHome(), 'aimux-venv')
@@ -76,21 +83,125 @@ async function pythonForAimux(onProgress?: (p: InstallProgress) => void): Promis
   return findPython() ?? installPython(onProgress)
 }
 
-export async function ensureAimux(onProgress?: (p: InstallProgress) => void): Promise<{ ok: boolean; error?: string }> {
-  if (existsSync(aimuxExe()) && existsSync(venvPython())) { onProgress?.({ phase: 'ready' }); return { ok: true } }
+// ── Plan B: 内置 python+aimux 运行时（本地 venv/pip 失败时的离线兜底）─────────
+// 一个 zip 内含完整的 python-build-standalone（自带 ensurepip+pip）+ 预装 aimux；
+// 解压到 ~/.mobius/python-bundle/ 后用 `<python> -m aimux` 运行，彻底绕开宿主机
+// 系统 python（如被精简掉 ensurepip 的容器镜像）。aimux 全部依赖为纯 Python，
+// 故三平台可共用同一套打包产物，分别按 arch 发布到 CDN。
+const BUNDLE_VER = '1'
+const bundleDir = () => path.join(mobiusHome(), 'python-bundle')
+const bundlePython = () => WIN
+  ? path.join(bundleDir(), 'python', 'python.exe')
+  : path.join(bundleDir(), 'python', 'bin', 'python3')
+
+/** 当前平台对应的内置运行时包名；mac-arm64 走 mac-x64（Rosetta 2）。 */
+export function bundleArch(): string | null {
+  const { platform, arch } = process
+  if (platform === 'linux' && arch === 'x64') return 'linux-x64'
+  if (platform === 'win32' && arch === 'x64') return 'win-x64'
+  if (platform === 'darwin' && (arch === 'x64' || arch === 'arm64')) return 'mac-x64'
+  return null
+}
+
+/** CDN 基址可用 MOBIUS_TUI_PYTHON_BUNDLE_URL 覆盖；文件名固定为 mobius-python-<arch>-v<N>.zip。 */
+export const bundleBaseUrl = () => (process.env.MOBIUS_TUI_PYTHON_BUNDLE_URL || 'https://serve.nutshellai.cn/publish/auto/mobius-tui').replace(/\/$/, '')
+export const bundleUrl = (arch: string) => `${bundleBaseUrl()}/mobius-python-${arch}-v${BUNDLE_VER}.zip`
+
+function bundleReady(): boolean {
+  return existsSync(bundlePython()) && spawnSync(bundlePython(), ['-c', 'import aimux'], { stdio: 'ignore', windowsHide: true }).status === 0
+}
+
+async function downloadBundle(arch: string, onProgress?: (p: InstallProgress) => void): Promise<{ ok: boolean; error?: string; zipPath?: string }> {
+  const url = bundleUrl(arch)
+  const zipPath = path.join(mobiusHome(), `python-bundle-v${BUNDLE_VER}.zip.tmp`)
+  await fs.mkdir(path.dirname(zipPath), { recursive: true })   // 首次安装 ~/.mobius 可能尚未创建
+  let res: Response
+  try { res = await fetch(url) } catch (e: any) { return { ok: false, error: `下载失败: ${e?.message ?? e}` } }
+  if (!res.ok) return { ok: false, error: `下载失败: HTTP ${res.status} (${url})` }
+  const total = Number(res.headers.get('content-length') || 0)
+  const ws = createWriteStream(zipPath)
+  let got = 0, last = 0
+  try {
+    const stream = Readable.fromWeb(res.body as any)
+    for await (const chunk of stream) {
+      ws.write(chunk as Buffer)
+      got += (chunk as Buffer).length
+      if (total && got - last > total * 0.03) { last = got; onProgress?.({ phase: 'install', detail: `下载内置运行时 ${Math.round((got / total) * 100)}%` }) }
+    }
+    if (!total && got) onProgress?.({ phase: 'install', detail: `下载内置运行时 ${(got / 1048576).toFixed(0)}MB` })
+    await new Promise<void>((resolve, reject) => { ws.end(() => resolve()); ws.on('error', reject) })
+  } catch (e: any) {
+    try { ws.destroy() } catch {}
+    try { await fs.unlink(zipPath) } catch {}
+    return { ok: false, error: `下载失败: ${e?.message ?? e}` }
+  }
+  return { ok: true, zipPath }
+}
+
+async function extractBundle(zipPath: string): Promise<{ ok: boolean; error?: string }> {
+  const staging = path.join(mobiusHome(), 'python-bundle.new')
+  const finalDir = bundleDir()
+  const stagingPython = WIN ? path.join(staging, 'python', 'python.exe') : path.join(staging, 'python', 'bin', 'python3')
+  await fs.rm(staging, { recursive: true, force: true }).catch(() => {})
+  await fs.mkdir(staging, { recursive: true })
+  try { await extract(zipPath, { dir: staging, defaultDirMode: 0o755, defaultFileMode: 0o644 }) }
+  catch (e: any) { await fs.rm(staging, { recursive: true, force: true }).catch(() => {}); return { ok: false, error: `解压失败: ${e?.message ?? e}` } }
+  if (!WIN) try { await fs.chmod(stagingPython, 0o755) } catch {}   // 保险：确保可执行位（extract-zip 通常已还原）
+  await fs.rm(finalDir, { recursive: true, force: true }).catch(() => {})
+  await fs.rename(staging, finalDir)
+  return { ok: true }
+}
+
+export async function ensureFromBundle(onProgress?: (p: InstallProgress) => void): Promise<{ ok: boolean; error?: string; launcher?: AimuxLauncher }> {
+  if (bundleReady()) return { ok: true, launcher: { kind: 'module', python: bundlePython() } }
+  const arch = bundleArch()
+  if (!arch) return { ok: false, error: `当前平台无内置运行时 (platform=${process.platform} arch=${process.arch})` }
+  onProgress?.({ phase: 'install', detail: `下载内置运行时 (${arch})…` })
+  const dl = await downloadBundle(arch, onProgress)
+  if (!dl.ok || !dl.zipPath) return { ok: false, error: dl.error }
+  onProgress?.({ phase: 'install', detail: '解压内置运行时…' })
+  const ex = await extractBundle(dl.zipPath)
+  try { await fs.unlink(dl.zipPath) } catch {}
+  if (!ex.ok) return { ok: false, error: ex.error }
+  if (!bundleReady()) return { ok: false, error: '内置运行时解压后仍无法 import aimux' }
+  return { ok: true, launcher: { kind: 'module', python: bundlePython() } }
+}
+
+/** 按 launcher 把 aimux 参数变成实际 spawn。 */
+export function spawnLauncher(launcher: AimuxLauncher, args: string[]): ChildProcess {
+  return launcher.kind === 'exe'
+    ? spawn(launcher.path, args, { windowsHide: true })
+    : spawn(launcher.python, ['-m', 'aimux', ...args], { windowsHide: true })
+}
+
+/** test-only 导出: 暴露内部 downloadBundle 以便单测 mock fetch 验证流式下载+进度。 */
+export const downloadBundleForTest = downloadBundle
+
+export async function ensureAimux(onProgress?: (p: InstallProgress) => void): Promise<{ ok: boolean; error?: string; launcher?: AimuxLauncher }> {
+  // Fast-path：venv 里已有 aimux 可执行 → 直接用。
+  if (existsSync(aimuxExe()) && existsSync(venvPython())) { onProgress?.({ phase: 'ready' }); return { ok: true, launcher: { kind: 'exe', path: aimuxExe() } } }
   const py = await pythonForAimux(onProgress)
-  if (!py) return { ok: false, error: '未找到 Python。请先安装 Python 3.10+（或安装 uv 后重试）。' }
-  onProgress?.({ phase: 'venv', detail: `创建 Python 虚拟环境（${py}）…` })
-  let r = await run(py, ['-m', 'venv', venvDir()])
-  if (r.code !== 0 && py === 'py') r = await run(py, ['-3', '-m', 'venv', venvDir()])
-  if (r.code !== 0) return { ok: false, error: `venv 创建失败: ${r.stderr || r.stdout}` }
-  onProgress?.({ phase: 'install', detail: `下载并安装 ${AIMUX_PACKAGE}…` })
-  r = await run(venvPython(), ['-m', 'pip', 'install', '--no-input', '--disable-pip-version-check', AIMUX_PACKAGE], line => {
-    if (/downloading|collecting|installing|using cached|%\s*\d|━|─/i.test(line)) onProgress?.({ phase: 'install', detail: line.slice(0, 120) })
-  })
-  if (r.code !== 0) return { ok: false, error: `pip install 失败: ${r.stderr || r.stdout}` }
-  if (!existsSync(aimuxExe())) return { ok: false, error: `aimux 可执行未生成: ${aimuxExe()}` }
-  onProgress?.({ phase: 'ready' }); return { ok: true }
+  let venvError = '未找到 Python。请先安装 Python 3.10+（或安装 uv 后重试）。'
+  if (py) {
+    onProgress?.({ phase: 'venv', detail: `创建 Python 虚拟环境（${py}）…` })
+    let r = await run(py, ['-m', 'venv', venvDir()])
+    if (r.code !== 0 && py === 'py') r = await run(py, ['-3', '-m', 'venv', venvDir()])
+    if (r.code === 0) {
+      onProgress?.({ phase: 'install', detail: `下载并安装 ${AIMUX_PACKAGE}…` })
+      r = await run(venvPython(), ['-m', 'pip', 'install', '--no-input', '--disable-pip-version-check', AIMUX_PACKAGE], line => {
+        if (/downloading|collecting|installing|using cached|%\s*\d|━|─/i.test(line)) onProgress?.({ phase: 'install', detail: line.slice(0, 120) })
+      })
+      if (r.code === 0 && existsSync(aimuxExe())) { onProgress?.({ phase: 'ready' }); return { ok: true, launcher: { kind: 'exe', path: aimuxExe() } } }
+      venvError = r.code === 0 ? `aimux 可执行未生成: ${aimuxExe()}` : `pip install 失败: ${r.stderr || r.stdout}`
+    } else {
+      venvError = `venv 创建失败: ${r.stderr || r.stdout}`
+    }
+  }
+  // ── Plan B 兜底：本地 python/venv 不可用 → 下载内置 python+aimux 运行时 ──
+  onProgress?.({ phase: 'install', detail: '本地 Python 不可用，改用内置运行时…' })
+  const bundle = await ensureFromBundle(onProgress)
+  if (bundle.ok && bundle.launcher) { onProgress?.({ phase: 'ready' }); return { ok: true, launcher: bundle.launcher } }
+  return { ok: false, error: `${venvError}；内置运行时也失败: ${bundle.error}` }
 }
 
 export function tuiAimuxIdentifier(): string {
@@ -155,8 +266,10 @@ export class AimuxSupervisor {
     )
     this.child = child
     this.startHeartbeat()
+    let tail = ''   // 缓存 aimux 最近输出, 进程异常退出时带进状态行, 便于诊断(code=1 不再是黑盒)
     const classify = (buf: Buffer) => {
       const text = buf.toString('utf8')
+      tail = (tail + text).slice(-4000)
       if (!this.bridgeConnected && /connected|registered|event stream|heartbeat|sse/i.test(text)) {
         onStatus({ state: 'starting', phase: 'heartbeat', detail: 'AIMUX 已启动，等待 bridge 心跳确认…', identifier })
       } else if (/connection (refused|reset|closed|error)|failed to connect|unauthorized|forbidden|token.*invalid/i.test(text)) {
@@ -170,7 +283,10 @@ export class AimuxSupervisor {
       this.child = null
       this.stopHeartbeat()
       if (this.stopping) { onStatus({ state: 'stopped', phase: 'idle', detail: 'AIMUX 已停止', identifier }); return }
-      this.scheduleReconnect(`AIMUX 进程退出（code=${code}）`)
+      const reason = code !== 0 && tail.trim()
+        ? `AIMUX 进程退出（code=${code}）: ${tail.trim().split(/[\r\n]+/).filter(Boolean).slice(-3).join(' ⏎ ').slice(-200)}`
+        : `AIMUX 进程退出（code=${code}）`
+      this.scheduleReconnect(reason)
     })
   }
 
@@ -281,8 +397,13 @@ export async function startAimuxConnection(opts: { server: string; token: string
       phase: p.phase === 'ready' ? 'connecting' : p.phase,
       detail: p.detail || (p.phase === 'ready' ? 'AIMUX 已就绪，准备连接…' : p.phase),
     }))
-    if (!ready.ok) { onStatus({ state: 'failed', phase: 'idle', detail: ready.error }); return }
-    supervisor = new AimuxSupervisor({ server: opts.server, token: opts.token, identifier: tuiAimuxIdentifier(), onStatus })
+    if (!ready.ok || !ready.launcher) { onStatus({ state: 'failed', phase: 'idle', detail: ready.error }); return }
+    const identifier = tuiAimuxIdentifier()
+    const launcher = ready.launcher
+    supervisor = new AimuxSupervisor({
+      server: opts.server, token: opts.token, identifier, onStatus,
+      spawnProcess: () => spawnLauncher(launcher, ['reverse', 'connect', `${opts.server.replace(/\/$/, '')}/aimux_bridge`, '--identifier', identifier, '--token', opts.token, '--replace']),
+    })
     supervisor.start()
   })().finally(() => { installing = null })
   await installing

package/src/components/AimuxStatus.tsx

@@ -10,15 +10,21 @@ const STYLE: Record<AimuxStatus['state'], { icon: string; color: 'green' | 'yell
   disabled: { icon: '○', color: 'gray' },
 }
 
-export function AimuxStatusLine({ status, compact = false }: { status: AimuxStatus; compact?: boolean }) {
-  const style = STYLE[status.state]
+// Plain status text (without the leading icon/space), so callers can measure its
+// visible width and lay it out beside other status fragments on one row.
+export function aimuxStatusText(status: AimuxStatus, compact = false): string {
   const phase = status.phase && !['idle', 'connected'].includes(status.phase) ? ` · ${phaseLabel(status.phase)}` : ''
   const detail = status.detail || stateLabel(status.state)
+  return `AIMUX${phase} · ${compact ? compactDetail(detail) : detail}`
+}
+
+export function AimuxStatusLine({ status, compact = false }: { status: AimuxStatus; compact?: boolean }) {
+  const style = STYLE[status.state]
   return (
     <Box>
       <Text color={style.color}>{style.icon}</Text>
       <Text dimColor={status.state === 'disabled' || status.state === 'stopped'}>
-        {' '}AIMUX{phase} · {compact ? compactDetail(detail) : detail}
+        {' ' + aimuxStatusText(status, compact)}
       </Text>
     </Box>
   )

package/src/components/Chat.tsx

@@ -16,7 +16,7 @@ import { viewsForEntry, dedupeUserEntries, toolLabel, type EntryView } from '../
 import type { ReadyState } from './PrepScreen.js'
 import type { AnyEntry } from '../types.js'
 import type { AimuxStatus } from '../aimux.js'
-import { AimuxStatusLine } from './AimuxStatus.js'
+import { AimuxStatusLine, aimuxStatusText } from './AimuxStatus.js'
 
 interface ChatProps {
   client: MobiusClient
@@ -549,15 +549,44 @@ function StatusArea({ ready, sessionId, columns, webUrl, aimuxStatus, modelDispl
         <Text dimColor>{left}</Text>
         {right ? <Text dimColor>{right}</Text> : null}
       </Box>
-      <Text>
-        <Text dimColor>web · </Text>
-        <Text color="cyan" underline>{clickableUrl(webUrl)}</Text>
-      </Text>
-      {aimuxStatus ? <AimuxStatusLine status={aimuxStatus} compact /> : null}
+      {/* Merged connectivity row: AIMUX status sits left, the clickable web URL
+          sits right and truncates to the remaining width (its OSC 8 link target
+          stays full so it stays clickable). This collapses the former separate
+          "web · url" and AIMUX rows into one, dropping the status area from
+          three rows to two. */}
+      <ConnectivityRow aimuxStatus={aimuxStatus} webUrl={webUrl} columns={columns} />
     </Box>
   )
 }
 
+// AIMUX status (left) ⟷ clickable web URL (right) on a single row.
+function ConnectivityRow({ aimuxStatus, webUrl, columns }: { aimuxStatus?: AimuxStatus; webUrl: string; columns: number }) {
+  const aimuxText = aimuxStatus ? aimuxStatusText(aimuxStatus, true) : ''
+  // icon (1) + leading space (1) + status text width
+  const aimuxWidth = aimuxText ? 2 + displayWidth(aimuxText) : 0
+  // No AIMUX status → web URL keeps the whole row (unchanged from before).
+  // Otherwise leave room for the AIMUX block + 'web · ' prefix + a safety gap
+  // (the gap also absorbs ambiguous-width chars like box-drawing in the detail).
+  const urlBudget = aimuxWidth
+    ? Math.max(8, columns - 2 - aimuxWidth - WEB_PREFIX.length - 6)
+    : undefined
+  const web = (
+    <Text>
+      <Text dimColor>{WEB_PREFIX}</Text>
+      <Text color="cyan" underline>{clickableUrl(webUrl, urlBudget)}</Text>
+    </Text>
+  )
+  if (!aimuxStatus) return <Box>{web}</Box>
+  return (
+    <Box justifyContent="space-between">
+      <AimuxStatusLine status={aimuxStatus} compact />
+      {web}
+    </Box>
+  )
+}
+
+const WEB_PREFIX = 'web · '
+
 function compactPath(path: string): string {
   const home = process.env.HOME
   if (!home) return path
@@ -577,10 +606,43 @@ function buildWebUrl(server: string, webUserId: string, ready: ReadyState, sessi
   return sessionId ? `${base}?session=${encodeURIComponent(sessionId)}` : base
 }
 
-/** OSC 8 hyperlinks remain readable as plain URLs in terminals without support. */
-function clickableUrl(url: string): string {
-  if (process.env.MOBIUS_TUI_DISABLE_LINKS === '1') return url
-  return `\u001B]8;;${url}\u0007${url}\u001B]8;;\u0007`
+/** OSC 8 hyperlinks remain readable as plain URLs in terminals without support.
+ *  When maxLen is given, only the *visible* text is truncated (the OSC 8 link
+ *  target keeps the full URL, so it stays clickable on narrow terminals). */
+function clickableUrl(url: string, maxLen?: number): string {
+  const display = maxLen != null ? truncateDisplay(url, maxLen) : url
+  if (process.env.MOBIUS_TUI_DISABLE_LINKS === '1') return display
+  return `\u001B]8;;${url}\u0007${display}\u001B]8;;\u0007`
+}
+
+// Visible-column width (CJK / emoji / fullwidth count as 2; combining marks as
+// 0), used to size the AIMUX status block so the web URL truncates to exactly
+// the remaining width without overflowing the row.
+function displayWidth(str: string): number {
+  let w = 0
+  for (const ch of str) {
+    const code = ch.codePointAt(0) ?? 0
+    if (code >= 0x0300 && code <= 0x036F) continue // combining diacriticals: 0 cols
+    w += isWideCodepoint(code) ? 2 : 1
+  }
+  return w
+}
+
+function isWideCodepoint(code: number): boolean {
+  return (
+    (code >= 0x1100 && code <= 0x115F) || // Hangul Jamo
+    (code >= 0x2E80 && code <= 0x303E) || // CJK radicals / punctuation
+    (code >= 0x3041 && code <= 0x33FF) || // Hiragana / Katakana / CJK compat
+    (code >= 0x3400 && code <= 0x4DBF) || // CJK Unified Extension A
+    (code >= 0x4E00 && code <= 0x9FFF) || // CJK Unified Ideographs (心跳正常 …)
+    (code >= 0xA000 && code <= 0xA4CF) || // Yi
+    (code >= 0xAC00 && code <= 0xD7A3) || // Hangul syllables
+    (code >= 0xF900 && code <= 0xFAFF) || // CJK compatibility ideographs
+    (code >= 0xFE30 && code <= 0xFE4F) || // CJK compatibility forms
+    (code >= 0xFF00 && code <= 0xFF60) || // Fullwidth ASCII
+    (code >= 0xFFE0 && code <= 0xFFE6) || // Fullwidth signs
+    (code >= 0x1F300 && code <= 0x1FAFF)  // Emoji / symbols
+  )
 }
 
 // (fitTranscript / blockRows / wrappedRows 视窗裁剪 + in-app 翻页逻辑已移除:

package/src/lib/entry-view.ts

@@ -291,6 +291,7 @@ function truncate(s: string, n: number): string {
 /** Build a one-line summary of a tool call from its name + input. */
 export function summarizeToolInput(name: string, input: any): string {
   if (!input || typeof input !== 'object') return ''
+  name = normalizeToolName(name)   // mcp__aimux__remote_exec_command → remote_exec_command
   const cmd = (s?: string) => truncate(s ?? '', 120)
   switch (name) {
     case 'Bash':
@@ -298,6 +299,7 @@ export function summarizeToolInput(name: string, input: any): string {
     case 'bash':
     case 'exec':
     case 'exec_command':
+    case 'remote_exec_command':
     case 'shell_command':
     case 'run_terminal_cmd':
       return cmd(input.cmd ?? input.command ?? input.script)
@@ -345,23 +347,61 @@ export function summarizeToolInput(name: string, input: any): string {
 function extractToolResult(content: any): { text: string; isError: boolean } {
   const isError = !!content?.is_error
   let body = content?.content
-  if (typeof body === 'string') return { text: body, isError }
-  if (Array.isArray(body)) {
-    const t = body
+  let text = ''
+  if (typeof body === 'string') text = body
+  else if (Array.isArray(body)) {
+    text = body
       .map((b: any) => (typeof b === 'string' ? b : (b?.text ?? '')))
       .filter(Boolean)
       .join('\n')
-    return { text: t, isError }
+  } else if (typeof body === 'object' && body) {
+    text = body.text ?? body.output ?? JSON.stringify(body)
   }
-  if (typeof body === 'object' && body) {
-    return { text: body.text ?? body.output ?? JSON.stringify(body), isError }
-  }
-  return { text: '', isError }
+  // claude MCP 工具(如 aimux remote_exec_command)的结果是 JSON 串 {"output":"...","exit_code":0}
+  // 解包出 output, 与 codex exec 的纯文本输出对齐; 再清掉终端标题/退出码探针等 shell 噪声.
+  return { text: cleanShellNoise(unwrapExecOutput(text)), isError }
+}
+
+/**
+ * aimux remote_exec_command 等 MCP 工具把命令输出包成 {"output":"...","exit_code":0,...}
+ * JSON 串。解包出 output 字段，使 claude-code 的命令结果与 codex 的纯文本输出一致。
+ * 仅当整体是 JSON 对象且含字符串 output 字段时才解包（避免误吞本身就是 JSON 的文件内容）。
+ */
+function unwrapExecOutput(text: string): string {
+  const trimmed = text.trim()
+  if (!(trimmed.startsWith('{') && trimmed.endsWith('}'))) return text
+  try {
+    const obj = JSON.parse(trimmed)
+    if (obj && typeof obj === 'object' && typeof obj.output === 'string') return obj.output
+  } catch { /* 不是 JSON, 原样返回 */ }
+  return text
+}
+
+/**
+ * 清掉 aimux 交互式 shell 捕获里的纯噪声 (claude-code 与 codex 经 aimux 执行命令时都会产生):
+ *   - OSC 终端标题序列  \x1b]0;root@host: cwd\x07   (最刺眼的乱码)
+ *   - CSI 控制序列      \x1b[...m 等
+ *   - aimux 退出码探针  __AIMUX_EXIT_<hex>__:<code>  及其 echo 回显
+ */
+function cleanShellNoise(text: string): string {
+  if (!text) return text
+  return text
+    .replace(/\x1b\][^\x1b]*?(?:\x07|\x1b\\)/g, '')   // OSC 终端标题
+    .replace(/\x1b\[[0-9;?]*[A-Za-z]/g, '')            // CSI 控制序列
+    .replace(/__AIMUX_EXIT_[0-9a-fA-F]+__(:\d+)?/g, '') // aimux 退出码标记
+    .replace(/[ \t]*\r?\n[ \t]*\r?\n[ \t]*\r?\n+/g, '\n\n') // 压连续空行
+    .trim()
+}
+
+/** 还原 claude MCP 工具长名: mcp__<server>__<tool> → <tool>, 与 codex 短名对齐。 */
+function normalizeToolName(name: string): string {
+  const m = /^mcp__[a-zA-Z0-9_-]+__(.+)$/.exec(name)
+  return m ? m[1] : name
 }
 
 const TOOL_LABEL: Record<string, string> = {
   Bash: '运行命令', bash: '运行命令', shell: '运行命令', exec: '运行命令',
-  exec_command: '运行命令', shell_command: '运行命令', run_terminal_cmd: '运行命令',
+  exec_command: '运行命令', remote_exec_command: '运行命令', shell_command: '运行命令', run_terminal_cmd: '运行命令',
   result: '结果',
   write_stdin: '输入命令',
   Read: '读取文件', read_file: '读取文件',
@@ -588,7 +628,8 @@ export function viewsForEntry(entry: AnyEntry): EntryView[] {
 }
 
 export function toolLabel(name: string): string {
-  return TOOL_LABEL[name] ?? name
+  const n = normalizeToolName(name)   // mcp__aimux__remote_exec_command → remote_exec_command → 运行命令
+  return TOOL_LABEL[n] ?? n
 }
 
 // ── 用户输入去重 (对齐 web viewer/rounds.ts buildRounds) ──────────────────────