@wendongfly/myhi 1.3.128 → 1.3.130

package/dist/chat.html

@@ -134,6 +134,25 @@
     .tool-body { display: none; background: var(--surface); border: 1px solid var(--surface2); border-radius: 6px; padding: 0.5rem; margin-top: 0.2rem; font-family: 'SF Mono', 'Consolas', monospace; font-size: 0.75rem; line-height: 1.3; overflow-x: auto; white-space: pre-wrap; word-break: break-all; max-height: 300px; overflow-y: auto; }
     .tool-body.open { display: block; }
 
+    /* 子代理（Task）面板：内部活动按 parent_tool_use_id 归拢 + 状态灯，不平铺污染主流 */
+    .msg-subagent { border-left: 3px solid var(--accent); margin: 0.4rem 0 0.4rem 0.3rem; padding-left: 0.6rem; }
+    .sub-header { display: flex; align-items: center; gap: 0.4rem; cursor: pointer; font-size: 0.8rem; color: var(--accent); padding: 0.28rem 0; user-select: none; flex-wrap: wrap; }
+    .sub-header:hover { filter: brightness(1.15); }
+    .sub-header .arrow { transition: transform 0.15s; font-size: 0.65rem; }
+    .sub-header .arrow.open { transform: rotate(90deg); }
+    .sub-dot { width: 8px; height: 8px; border-radius: 50%; flex: none; }
+    .sub-dot.running { background: var(--blue); animation: subpulse 1s ease-in-out infinite; }
+    .sub-dot.done { background: var(--green); }
+    .sub-dot.fail { background: #e5484d; }
+    @keyframes subpulse { 0%,100%{opacity:1;transform:scale(1)} 50%{opacity:.3;transform:scale(.65)} }
+    .sub-meta { color: var(--muted); font-size: 0.72rem; }
+    .sub-body { display: none; margin-top: 0.2rem; padding-left: 0.4rem; border-left: 1px dashed var(--surface2); }
+    .sub-body.open { display: block; }
+    .sub-desc { color: var(--muted); font-size: 0.74rem; padding: 0.2rem 0 0.35rem; white-space: pre-wrap; word-break: break-word; }
+    .sub-act { font-size: 0.75rem; padding: 0.15rem 0; color: var(--text); white-space: pre-wrap; word-break: break-word; }
+    .sub-act .k { color: var(--muted); }
+    .sub-summary { background: var(--surface); border: 1px solid var(--surface2); border-radius: 6px; padding: 0.4rem 0.5rem; margin-top: 0.35rem; font-size: 0.75rem; white-space: pre-wrap; word-break: break-word; max-height: 260px; overflow-y: auto; }
+
 
     /* Diff 视图 */
     .msg-diff { font-family: 'SF Mono', 'Consolas', monospace; font-size: 0.78rem; background: var(--surface); border: 1px solid var(--border); border-radius: 8px; padding: 0.5rem 0.6rem; overflow-x: auto; line-height: 1.35; }
@@ -1117,14 +1136,107 @@
     const TOOL_ICONS = { Read:'📄', Edit:'✏️', Write:'📝', Bash:'💻', Grep:'🔍', Glob:'📂', WebFetch:'🌐', WebSearch:'🔎', LSP:'🔧', Task:'🤖', Agent:'🤖' };
 
     // 子代理（Task 工具）渲染：把 subagent_type / description / prompt 拆开展示，
-    // 而不是甩一坨 input JSON。返回 { label, body } 交给 addToolMessage。
+    // 而不是甩一坨 input JSON。返回 { label, body, desc } 交给面板/工具卡。
     function subagentToolInfo(input) {
       const type = (input && input.subagent_type) || 'general-purpose';
       const desc = (input && input.description) || '';
       const prompt = (input && input.prompt) || '';
       const label = `子代理 · ${type}`;
       const body = (desc ? `📋 ${desc}\n\n` : '') + (prompt || JSON.stringify(input || {}, null, 2));
-      return { label, body };
+      return { label, body, desc };
+    }
+
+    // ── 子代理（Task）面板：子代理内部活动带 parent_tool_use_id 冒泡到主 stream（见 agent.js），
+    //    这里按 taskId(=Task 的 tool_use id) 归拢到一张可折叠面板 + 状态灯，主流不再被平铺污染 ──
+    let _subagents = {}; // taskId → { el, bodyEl, dotEl, metaEl, toolCount, state }
+    function subaResetAll() { _subagents = {}; }
+
+    // 生成一个可折叠的内部工具项（复用工具卡样式），放进子代理面板 body
+    function subaMakeItem(name, payload) {
+      const icon = TOOL_ICONS[name] || '🔧';
+      const item = document.createElement('div'); item.className = 'msg-tool';
+      const h = document.createElement('div'); h.className = 'tool-header';
+      h.innerHTML = `<span class="arrow">▶</span> ${icon} ${escHtml(name || '工具')}`;
+      const b = document.createElement('div'); b.className = 'tool-body';
+      b.innerHTML = renderAnsiHtml(typeof payload === 'string' ? payload : JSON.stringify(payload || {}, null, 2));
+      h.onclick = () => { b.classList.toggle('open'); h.querySelector('.arrow').classList.toggle('open'); };
+      item.appendChild(h); item.appendChild(b);
+      return item;
+    }
+
+    function subaCreatePanel(taskId, info, opts) {
+      if (!taskId) return null;
+      if (_subagents[taskId]) return _subagents[taskId];
+      endStream(); removeThinking(); endToolGroup();
+      const el = document.createElement('div'); el.className = 'msg msg-subagent';
+      const header = document.createElement('div'); header.className = 'sub-header';
+      const arrow = document.createElement('span'); arrow.className = 'arrow'; arrow.textContent = '▶';
+      const dot = document.createElement('span'); dot.className = 'sub-dot running';
+      const title = document.createElement('span'); title.innerHTML = `🤖 ${escHtml((info && info.label) || '子代理')}`;
+      const meta = document.createElement('span'); meta.className = 'sub-meta'; meta.textContent = '运行中…';
+      header.appendChild(arrow); header.appendChild(dot); header.appendChild(title); header.appendChild(meta);
+      const bodyEl = document.createElement('div'); bodyEl.className = 'sub-body';
+      if (info && info.desc) { const d = document.createElement('div'); d.className = 'sub-desc'; d.textContent = '📋 ' + info.desc; bodyEl.appendChild(d); }
+      header.onclick = () => { bodyEl.classList.toggle('open'); arrow.classList.toggle('open'); };
+      el.appendChild(header); el.appendChild(bodyEl);
+      chatArea.appendChild(el); trimMessages();
+      const rec = { el, bodyEl, dotEl: dot, metaEl: meta, toolCount: 0, state: 'running' };
+      _subagents[taskId] = rec;
+      if (opts && opts.done) subaMarkDone(taskId, null);
+      scrollToBottom();
+      return rec;
+    }
+
+    // 把一条带 parent_tool_use_id 的消息拆成活动，追加进对应面板。命中返回 true。
+    function subaRoute(msg) {
+      const pid = msg && msg.parent_tool_use_id;
+      const rec = pid && _subagents[pid];
+      if (!rec) return false;
+      const blocks = msg.message && msg.message.content;
+      if (Array.isArray(blocks)) {
+        for (const bl of blocks) {
+          if (bl.type === 'tool_use') {
+            rec.bodyEl.appendChild(subaMakeItem(bl.name === 'Task' ? '子代理' : bl.name, bl.input));
+            rec.toolCount++;
+          } else if (bl.type === 'text' && bl.text && bl.text.trim()) {
+            const t = document.createElement('div'); t.className = 'sub-act';
+            t.innerHTML = `<span class="k">💬</span> ${escHtml(bl.text.trim())}`;
+            rec.bodyEl.appendChild(t);
+          } else if (bl.type === 'tool_result') {
+            const c = typeof bl.content === 'string' ? bl.content
+              : Array.isArray(bl.content) ? bl.content.map(x => x.text || '').join('\n') : JSON.stringify(bl.content);
+            if (c && c.trim()) rec.bodyEl.appendChild(subaMakeItem('↳ 结果', c));
+          }
+        }
+      } else if (typeof msg.content === 'string' && msg.content.trim()) {
+        const t = document.createElement('div'); t.className = 'sub-act';
+        t.innerHTML = `<span class="k">↳</span> ${escHtml(msg.content.trim())}`;
+        rec.bodyEl.appendChild(t);
+      }
+      if (rec.state === 'running') rec.metaEl.textContent = `运行中… ${rec.toolCount} 步`;
+      scrollToBottom();
+      return true;
+    }
+
+    function subaMarkDone(taskId, summary) {
+      const rec = _subagents[taskId];
+      if (!rec || rec.state === 'done') return;
+      rec.state = 'done';
+      rec.dotEl.className = 'sub-dot done';
+      rec.metaEl.textContent = `✅ 完成 · ${rec.toolCount} 步`;
+      if (summary && String(summary).trim()) {
+        const s = document.createElement('div'); s.className = 'sub-summary';
+        s.textContent = String(summary).trim();
+        rec.bodyEl.appendChild(s);
+      }
+    }
+    function subaMarkAllDone() { for (const id in _subagents) subaMarkDone(id, null); }
+
+    // 主线里 Task 的 tool_result（tool_use_id == taskId）→ 面板转完成 + 摘要。命中返回 true。
+    function subaTryComplete(toolUseId, content) {
+      if (!toolUseId || !_subagents[toolUseId]) return false;
+      subaMarkDone(toolUseId, content);
+      return true;
     }
 
     // ── 消息渲染 ──────────────────────────────────
@@ -1798,6 +1910,8 @@
     // ── Agent 模式事件 ──────────────────────────────
     socket.on('agent:message', (msg) => {
       if (!msg) return;
+      // 子代理内部活动（带 parent_tool_use_id）归入对应面板，不平铺进主流
+      if (subaRoute(msg)) { setWorkState('working'); return; }
       switch (msg.type) {
         case 'system':
           if (msg.subtype === 'init') {
@@ -1836,15 +1950,14 @@
                 if (block.name === 'AskUserQuestion' && block.input) {
                   openAskSheet(block.input);
                 }
-                if (block.name === 'Task' && block.input) {
-                  const info = subagentToolInfo(block.input);
-                  addToolMessage(info.body, info.label);
+                if (block.name === 'Task') {
+                  subaCreatePanel(block.id, subagentToolInfo(block.input || {}));
                 } else {
                   addToolMessage(JSON.stringify(block.input || {}, null, 2), block.name || '工具');
                 }
               } else if (block.type === 'tool_result') {
                 const content = typeof block.content === 'string' ? block.content : JSON.stringify(block.content);
-                addRawOutput(content);
+                if (!subaTryComplete(block.tool_use_id, content)) addRawOutput(content);
               }
             }
           }
@@ -1860,6 +1973,7 @@
           // 轮次结束时确保闹钟 chip 被扫描（防止最后一条消息未经过 endStream）
           endStream();
           const cost = msg.total_cost_usd ? ` ($${msg.total_cost_usd.toFixed(4)})` : '';
+          subaMarkAllDone(); // 轮结束：仍在"运行中"的子代理面板一律收尾为完成（兜底）
           addStatusMessage(`完成${cost}`);
           // 关键：idle 放最后——渲染最终答复的 addAssistantMessage 会把状态置回 'working'，
           // 若在其之前置 idle 会被顶回「执行中」+ 取消按钮不复位。渲染全部完成后再回 idle。
@@ -1903,9 +2017,8 @@
           if (msg.name === 'AskUserQuestion' && msg.input) {
             openAskSheet(msg.input);
           }
-          if (msg.name === 'Task' && msg.input) {
-            const info = subagentToolInfo(msg.input);
-            addToolMessage(info.body, info.label);
+          if (msg.name === 'Task') {
+            subaCreatePanel(msg.id, subagentToolInfo(msg.input || {}));
           } else {
             addToolMessage(JSON.stringify(msg.input || {}, null, 2), msg.name || '工具');
           }
@@ -1919,7 +2032,7 @@
             const text = typeof msg.content === 'string' ? msg.content
               : Array.isArray(msg.content) ? msg.content.map(b => b.text || '').join('\n')
               : JSON.stringify(msg.content);
-            if (text.trim()) addRawOutput(text);
+            if (text.trim() && !subaTryComplete(msg.tool_use_id, text)) addRawOutput(text);
           }
           setWorkState('working');
           break;
@@ -1950,8 +2063,10 @@
       _historyHasMore = true;
       _userScrolledUp = false;
 
+      subaResetAll();
       for (const msg of history) {
         endStream(); // 每条历史消息都是独立的，不要流式合并
+        if (subaRoute(msg)) continue; // 子代理内部历史消息归入对应面板
         if (msg.type === 'user' && msg.content) {
           addInputMessage(msg.content);
         } else if (msg.type === 'assistant' && msg.message?.content) {
@@ -1960,7 +2075,10 @@
           for (const block of msg.message.content) {
             if (block.type === 'thinking' && block.thinking) { showThinking(block.thinking); removeThinking(); }
             else if (block.type === 'text' && block.text) texts.push(block.text);
-            else if (block.type === 'tool_use') addToolMessage(JSON.stringify(block.input || {}, null, 2), block.name || '工具');
+            else if (block.type === 'tool_use') {
+              if (block.name === 'Task') subaCreatePanel(block.id, subagentToolInfo(block.input || {}), { done: false });
+              else addToolMessage(JSON.stringify(block.input || {}, null, 2), block.name || '工具');
+            }
           }
           if (texts.length) {
             const combined = texts.join('\n\n');
@@ -1977,6 +2095,7 @@
           addStatusMessage(`完成${cost}`);
         }
       }
+      subaMarkAllDone(); // 历史都是过去式：剩余"运行中"的子代理面板收尾为完成
 
       // 还原断点处的流式气泡，让后续 live delta 接着拼
       if (inflightText) {

package/installer/install-myhi.ps1

@@ -72,15 +72,39 @@ try {
 
   # ---------- 2b) Claude Code CLI（myhi 的 AI 引擎，@anthropic-ai/claude-code）----------
   if (-not $SkipClaude) {
-    Info "安装/更新 Claude CLI（npm i -g @anthropic-ai/claude-code@latest，稍候）..."
     $eaC = $ErrorActionPreference; $ErrorActionPreference = 'Continue'
+    # 停掉可能在跑的 claude.exe（升级时它锁着 ~250MB 原生二进制会 EBUSY），并清 .claude-code-<hash>
+    # 残留（防 npm 原子替换 ENOTEMPTY）——与前面停 myhi/清 .myhi-* 同款。
+    taskkill /IM claude.exe /F /T 2>$null | Out-Null
+    $npmRc = (npm.cmd root -g | Select-Object -Last 1).ToString().Trim()
+    Get-ChildItem (Join-Path $npmRc '@anthropic-ai') -Filter '.claude-code-*' -Directory -ErrorAction SilentlyContinue | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue
+    Info "安装/更新 Claude CLI（npm i -g @anthropic-ai/claude-code@latest，稍候）..."
     npm.cmd i -g '@anthropic-ai/claude-code@latest' --allow-scripts=@anthropic-ai/claude-code
     if ($LASTEXITCODE -ne 0) { npm.cmd i -g '@anthropic-ai/claude-code@latest' }
-    $claudeExit = $LASTEXITCODE
+
+    # 校验 claude 真能跑：claude-code 2.x 是平台原生二进制，其平台包(optionalDependencies，
+    # 如 @anthropic-ai/claude-code-win32-x64)可能在安装时【静默失败】没装上 → bin/claude 只剩
+    # 500B 报错占位 → 用时才发现坏。故装完立即验证，坏了【自动补装对应平台包】自愈。
+    function Test-ClaudeVer {
+      try { $v = (& claude --version 2>&1 | Select-Object -First 1); if ("$v" -match '\d+\.\d+\.\d+') { return "$v" } } catch {}
+      return $null
+    }
+    $cv = Test-ClaudeVer
+    if (-not $cv) {
+      Warn "Claude 原生二进制缺失（平台包静默失败），补装平台包..."
+      $npmRootC = (npm.cmd root -g | Select-Object -Last 1).ToString().Trim()
+      $ccPkg = Join-Path $npmRootC '@anthropic-ai\claude-code\package.json'
+      $ccVer = if (Test-Path $ccPkg) { (Get-Content $ccPkg -Raw | ConvertFrom-Json).version } else { 'latest' }
+      $arch = if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { 'arm64' } else { 'x64' }
+      # 清 .claude-code-<hash> 残留，防补装时 ENOTEMPTY
+      Get-ChildItem (Join-Path $npmRootC '@anthropic-ai') -Filter '.claude-code-*' -Directory -ErrorAction SilentlyContinue | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue
+      npm.cmd i -g "@anthropic-ai/claude-code-win32-$arch@$ccVer"
+      $cv = Test-ClaudeVer
+    }
     $ErrorActionPreference = $eaC
     # 不因 claude 装失败而中断整体部署（可事后手动补）
-    if ($claudeExit -eq 0) { Ok "Claude CLI 已安装" }
-    else { Warn "Claude CLI 安装失败(exit $claudeExit)，可稍后手动：npm i -g @anthropic-ai/claude-code" }
+    if ($cv) { Ok "Claude CLI 可用：$cv" }
+    else { Warn "Claude CLI 仍不可用，请手动排查：claude --version（或补装 @anthropic-ai/claude-code-win32-x64）" }
   }
   $pkgDir  = Join-Path $npmRoot '@wendongfly\myhi'
   $daemon  = Join-Path $pkgDir 'bin\daemon.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wendongfly/myhi",
-  "version": "1.3.128",
+  "version": "1.3.130",
   "description": "Web-based terminal sharing with chat UI — control your terminal from phone via LAN/Tailscale",
   "type": "module",
   "main": "dist/index.js",