@wendongfly/myhi 1.0.76 → 1.0.78

package/dist/attach.js

@@ -28,40 +28,122 @@ function attach(socket, sessionId) {
   socket.emit('join', sessionId);
 
   socket.on('joined', (session) => {
-    process.stderr.write(`\r\n[myhi] 已附加到 "${session.title}" (${sessionId})\r\n`);
+    const isAgent = session.mode === 'agent';
+    process.stderr.write(`\r\n[myhi] 已附加到 "${session.title}" (${sessionId}) 模式=${isAgent ? 'agent' : 'pty'}\r\n`);
     process.stderr.write('[myhi] 按 Ctrl+] 分离\r\n\r\n');
 
     // 本地终端自动获取控制权
     socket.emit('take-control', { sessionId });
 
-    try { process.stdin.setRawMode(true); } catch {}
-    process.stdin.resume();
-    process.stdin.setEncoding('binary');
+    if (isAgent) {
+      // ── Agent 模式：显示格式化输出 ──
+      let _streamText = '';
 
-    // 标准输入 → PTY
-    process.stdin.on('data', (data) => {
-      // Ctrl+] (0x1d) = 分离
-      if (data === '\x1d') {
-        process.stderr.write('\r\n[myhi] 已分离\r\n');
-        cleanup(socket);
-        process.exit(0);
-      }
-      socket.emit('input', data);
-    });
+      socket.on('agent:message', (msg) => {
+        if (!msg) return;
+        switch (msg.type) {
+          case 'system':
+            if (msg.subtype === 'init') process.stderr.write('\x1b[90m[会话已连接]\x1b[0m\r\n');
+            else if (msg.subtype === 'interrupted') process.stderr.write('\r\n\x1b[33m[已中断]\x1b[0m\r\n');
+            break;
+          case 'assistant':
+            if (msg.message?.content) {
+              for (const block of msg.message.content) {
+                if (block.type === 'text') process.stdout.write(block.text + '\r\n');
+                else if (block.type === 'tool_use') {
+                  process.stdout.write(`\r\n\x1b[36m[工具] ${block.name}\x1b[0m\r\n`);
+                  if (block.input) {
+                    const s = typeof block.input === 'string' ? block.input : JSON.stringify(block.input, null, 2);
+                    process.stdout.write('\x1b[90m' + s.slice(0, 500) + '\x1b[0m\r\n');
+                  }
+                }
+              }
+            }
+            break;
+          case 'content_block_delta':
+            if (msg.delta?.text) { process.stdout.write(msg.delta.text); _streamText += msg.delta.text; }
+            break;
+          case 'content_block_stop':
+            if (_streamText) { process.stdout.write('\r\n'); _streamText = ''; }
+            break;
+          case 'tool_use':
+            process.stdout.write(`\r\n\x1b[36m[工具] ${msg.tool_name || msg.name || '?'}\x1b[0m\r\n`);
+            break;
+          case 'tool_result':
+            if (msg.content) {
+              const text = typeof msg.content === 'string' ? msg.content
+                : Array.isArray(msg.content) ? msg.content.map(b => b.text || '').join('') : '';
+              if (text) process.stdout.write('\x1b[90m' + text.slice(0, 1000) + '\x1b[0m\r\n');
+            }
+            break;
+          case 'result':
+            process.stdout.write(`\r\n\x1b[32m[完成]\x1b[0m ${msg.duration_ms ? (msg.duration_ms/1000).toFixed(1)+'s' : ''} ${msg.total_cost_usd ? '$'+msg.total_cost_usd.toFixed(4) : ''}\r\n\r\n`);
+            break;
+          case 'control_request':
+            process.stdout.write(`\r\n\x1b[33m[权限请求] ${msg.request?.tool_name || '?'}\x1b[0m\r\n`);
+            break;
+        }
+      });
 
-    // PTY → 标准输出
-    socket.on('output', (data) => {
-      process.stdout.write(data, 'binary');
-    });
+      socket.on('agent:history', (history) => {
+        for (const msg of history) {
+          if (msg.type === 'user') process.stdout.write(`\x1b[34m> ${msg.content}\x1b[0m\r\n`);
+          else if (msg.type === 'result') process.stdout.write(`\x1b[32m[完成]\x1b[0m\r\n`);
+        }
+        process.stdout.write('\r\n');
+      });
 
-    // 仅在本地窗口实际调整大小时同步尺寸，
-    // 避免触发 PTY 重绘导致输出重复
-    process.stdout.on('resize', () => {
-      socket.emit('resize', {
-        cols: process.stdout.columns || 80,
-        rows: process.stdout.rows    || 24,
+      socket.on('agent:busy', (busy) => {
+        if (busy) process.stderr.write('\x1b[90m[思考中...]\x1b[0m\r\n');
       });
-    });
+
+      socket.on('agent:error', (err) => {
+        process.stderr.write(`\x1b[31m[错误] ${err.message}\x1b[0m\r\n`);
+      });
+
+      // Agent 模式用行编辑输入
+      const rl = createInterface({ input: process.stdin, output: process.stdout, prompt: '\x1b[34m> \x1b[0m' });
+      rl.prompt();
+      rl.on('line', (line) => {
+        const text = line.trim();
+        if (!text) { rl.prompt(); return; }
+        if (text === '/quit' || text === '/exit') {
+          process.stderr.write('[myhi] 已分离\r\n');
+          cleanup(socket);
+          process.exit(0);
+        }
+        socket.emit('agent:query', { prompt: text });
+        // result 消息到达后再显示 prompt
+        socket.once('agent:busy', (busy) => { if (!busy) rl.prompt(); });
+      });
+      rl.on('close', () => { cleanup(socket); process.exit(0); });
+
+    } else {
+      // ── PTY 模式：原始终端 ──
+      try { process.stdin.setRawMode(true); } catch {}
+      process.stdin.resume();
+      process.stdin.setEncoding('binary');
+
+      process.stdin.on('data', (data) => {
+        if (data === '\x1d') {
+          process.stderr.write('\r\n[myhi] 已分离\r\n');
+          cleanup(socket);
+          process.exit(0);
+        }
+        socket.emit('input', data);
+      });
+
+      socket.on('output', (data) => {
+        process.stdout.write(data, 'binary');
+      });
+
+      process.stdout.on('resize', () => {
+        socket.emit('resize', {
+          cols: process.stdout.columns || 80,
+          rows: process.stdout.rows    || 24,
+        });
+      });
+    }
   });
 
   // 控制权被拒绝
@@ -111,7 +193,8 @@ async function pickSession(socket) {
       process.stdout.write('\n活跃会话:\n');
       alive.forEach((s, i) => {
         const viewers = s.viewers > 0 ? ` (${s.viewers} 人在线)` : '';
-        process.stdout.write(`  [${i + 1}] ${s.title}${viewers}  — ${s.id}\n`);
+        const mode = s.mode === 'agent' ? ' [Agent]' : ' [PTY]';
+        process.stdout.write(`  [${i + 1}] ${s.title}${mode}${viewers}  — ${s.id}\n`);
       });
       process.stdout.write('\n');
 

package/dist/chat.html

@@ -976,8 +976,9 @@
       }
     }
 
-    socket.on('connect', () => { showOverlay('正在加入会话...'); socket.emit('join', SESSION_ID); });
-    socket.on('connect_error', (err) => { showOverlay('连接失败: ' + err.message, true); });
+    let _reconnectFails = 0;
+    socket.on('connect', () => { _reconnectFails = 0; showOverlay('正在加入会话...'); socket.emit('join', SESSION_ID); });
+    socket.on('connect_error', () => { _reconnectFails++; showOverlay(_reconnectFails >= 5 ? '连接失败，请检查网络' : `正在重连... (${_reconnectFails})`, _reconnectFails >= 10); });
     socket.on('disconnect', () => { showOverlay('已断开连接，正在重连...'); });
 
     socket.on('joined', (session) => {

package/package.json

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