@wendongfly/myhi 1.0.82 → 1.0.84

package/dist/attach.js

@@ -1,277 +1,2 @@
 #!/usr/bin/env node
-/**
- * myhi attach — 将本地终端连接到运行中的 PTY 会话
- *
- * 用法：
- *   node src/attach.js          # 列出会话，然后选择
- *   node src/attach.js <id>     # 直接附加到指定会话
- */
-import { createRequire } from 'module';
-import { readFileSync } from 'fs';
-import { join } from 'path';
-import { homedir } from 'os';
-import { createInterface } from 'readline';
-
-const require = createRequire(import.meta.url);
-const { io } = require('socket.io-client');
-
-const SERVER  = process.env.MYHI_SERVER || 'http://localhost:12300';
-const TOKEN   = readFileSync(join(homedir(), '.myhi', 'token'), 'utf8').trim();
-
-function cleanup(socket) {
-  try { process.stdin.setRawMode(false); } catch {}
-  process.stdin.pause();
-  socket.disconnect();
-}
-
-function attach(socket, sessionId) {
-  socket.emit('join', sessionId);
-
-  socket.on('joined', (session) => {
-    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 });
-
-    if (isAgent) {
-      // ── Agent 模式：显示格式化输出 ──
-      let _streamText = '';
-
-      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;
-        }
-      });
-
-      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');
-      });
-
-      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,
-        });
-      });
-    }
-  });
-
-  // 控制权被拒绝
-  socket.on('control-denied', ({ reason }) => {
-    process.stderr.write(`\r\n[myhi] 获取控制权失败: ${reason}\r\n`);
-  });
-
-  // 控制权被其他用户获取
-  socket.on('control-changed', ({ holder, holderName }) => {
-    if (holder && holder !== socket.id) {
-      process.stderr.write(`\r\n[myhi] ${holderName || '其他用户'} 已获取控制权，当前为只读\r\n`);
-    } else if (!holder) {
-      process.stderr.write('\r\n[myhi] 控制权已释放\r\n');
-    }
-  });
-
-  socket.on('kicked', ({ reason }) => {
-    process.stderr.write(`\r\n[myhi] ${reason || '你已被管理员踢出'}\r\n`);
-    cleanup(socket);
-    process.exit(1);
-  });
-
-  socket.on('session-exit', ({ code }) => {
-    process.stderr.write(`\r\n[myhi] 会话已退出 (code ${code})\r\n`);
-    cleanup(socket);
-    process.exit(0);
-  });
-
-  socket.on('error', ({ message }) => {
-    process.stderr.write(`\r\n[myhi] 错误: ${message}\r\n`);
-    cleanup(socket);
-    process.exit(1);
-  });
-}
-
-async function pickSession(socket) {
-  return new Promise((resolve, reject) => {
-    socket.emit('list');
-    socket.once('sessions', (sessions) => {
-      const alive = sessions.filter(s => s.alive);
-      if (!alive.length) {
-        process.stderr.write('[myhi] 没有活跃的会话。\n');
-        cleanup(socket);
-        process.exit(0);
-      }
-
-      process.stdout.write('\n活跃会话:\n');
-      alive.forEach((s, i) => {
-        const viewers = s.viewers > 0 ? ` (${s.viewers} 人在线)` : '';
-        const mode = s.mode === 'agent' ? ' [Agent]' : ' [PTY]';
-        process.stdout.write(`  [${i + 1}] ${s.title}${mode}${viewers}  — ${s.id}\n`);
-      });
-      process.stdout.write('\n');
-
-      const rl = createInterface({ input: process.stdin, output: process.stdout });
-      rl.question('选择会话编号: ', (answer) => {
-        rl.close();
-        const idx = parseInt(answer, 10) - 1;
-        if (idx < 0 || idx >= alive.length) {
-          process.stderr.write('[myhi] 无效的选择。\n');
-          cleanup(socket);
-          process.exit(1);
-        }
-        resolve(alive[idx].id);
-      });
-    });
-  });
-}
-
-async function createAndAttach(socket, opts) {
-  return new Promise((resolve, reject) => {
-    socket.emit('create', opts, (res) => {
-      if (!res?.ok) {
-        process.stderr.write(`[myhi] 创建失败: ${res?.error || '未知错误'}\n`);
-        cleanup(socket);
-        process.exit(1);
-      }
-      process.stdout.write(`[myhi] 已创建会话 "${res.session.title}" — ${res.session.id}\n`);
-      resolve(res.session.id);
-    });
-  });
-}
-
-async function promptNew(socket) {
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const ask = (q) => new Promise((r) => rl.question(q, r));
-  const title   = (await ask('会话名称 [shell]: ')).trim() || 'shell';
-  const initCmd = (await ask('启动命令（可选）: ')).trim() || undefined;
-  rl.close();
-  return createAndAttach(socket, { title, initCmd });
-}
-
-// ── 主入口 ──────────────────────────────────────────────
-
-const socket = io(SERVER, {
-  transports: ['websocket'],
-  auth: { token: TOKEN },
-});
-
-socket.on('connect_error', (err) => {
-  process.stderr.write(`[myhi] 连接失败: ${err.message}\n`);
-  process.exit(1);
-});
-
-socket.on('connect', async () => {
-  const arg = process.argv[2];
-
-  if (arg === '--new') {
-    // --new [标题] [命令]  →  创建后附加
-    const title   = process.argv[3];
-    const initCmd = process.argv[4] || undefined;
-    const sessionId = title
-      ? await createAndAttach(socket, { title, initCmd })
-      : await promptNew(socket);
-    attach(socket, sessionId);
-  } else {
-    const sessionId = arg || await pickSession(socket);
-    attach(socket, sessionId);
-  }
-});
-
-// 退出时恢复终端状态
-for (const sig of ['SIGINT', 'SIGTERM']) {
-  process.on(sig, () => {
-    cleanup(socket);
-    process.exit(0);
-  });
-}
-process.on('exit', () => {
-  try { process.stdin.setRawMode(false); } catch {}
-});
+import{createRequire as e}from"module";if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=new URL(".",import.meta.url).pathname.slice(import.meta.url.match(/^file:\/\/\/\w:/)?1:0,-1)+"/";var t={};const s=e(import.meta.url)("module");const r=e(import.meta.url)("fs");const o=e(import.meta.url)("path");const n=e(import.meta.url)("os");const i=e(import.meta.url)("readline");const c=(0,s.createRequire)(import.meta.url);const{io:a}=c("socket.io-client");const p=process.env.MYHI_SERVER||"http://localhost:12300";const m=(0,r.readFileSync)((0,o.join)((0,n.homedir)(),".myhi","token"),"utf8").trim();function cleanup(e){try{process.stdin.setRawMode(false)}catch{}process.stdin.pause();e.disconnect()}function attach(e,t){e.emit("join",t);e.on("joined",(s=>{const r=s.mode==="agent";process.stderr.write(`\r\n[myhi] 已附加到 "${s.title}" (${t}) 模式=${r?"agent":"pty"}\r\n`);process.stderr.write("[myhi] 按 Ctrl+] 分离\r\n\r\n");e.emit("take-control",{sessionId:t});if(r){let t="";e.on("agent:message",(e=>{if(!e)return;switch(e.type){case"system":if(e.subtype==="init")process.stderr.write("[会话已连接]\r\n");else if(e.subtype==="interrupted")process.stderr.write("\r\n[已中断]\r\n");break;case"assistant":if(e.message?.content){for(const t of e.message.content){if(t.type==="text")process.stdout.write(t.text+"\r\n");else if(t.type==="tool_use"){process.stdout.write(`\r\n[工具] ${t.name}\r\n`);if(t.input){const e=typeof t.input==="string"?t.input:JSON.stringify(t.input,null,2);process.stdout.write(""+e.slice(0,500)+"\r\n")}}}}break;case"content_block_delta":if(e.delta?.text){process.stdout.write(e.delta.text);t+=e.delta.text}break;case"content_block_stop":if(t){process.stdout.write("\r\n");t=""}break;case"tool_use":process.stdout.write(`\r\n[工具] ${e.tool_name||e.name||"?"}\r\n`);break;case"tool_result":if(e.content){const t=typeof e.content==="string"?e.content:Array.isArray(e.content)?e.content.map((e=>e.text||"")).join(""):"";if(t)process.stdout.write(""+t.slice(0,1e3)+"\r\n")}break;case"result":process.stdout.write(`\r\n[完成] ${e.duration_ms?(e.duration_ms/1e3).toFixed(1)+"s":""} ${e.total_cost_usd?"$"+e.total_cost_usd.toFixed(4):""}\r\n\r\n`);break;case"control_request":process.stdout.write(`\r\n[权限请求] ${e.request?.tool_name||"?"}\r\n`);break}}));e.on("agent:history",(e=>{for(const t of e){if(t.type==="user")process.stdout.write(`> ${t.content}\r\n`);else if(t.type==="result")process.stdout.write(`[完成]\r\n`)}process.stdout.write("\r\n")}));e.on("agent:busy",(e=>{if(e)process.stderr.write("[思考中...]\r\n")}));e.on("agent:error",(e=>{process.stderr.write(`[错误] ${e.message}\r\n`)}));const s=(0,i.createInterface)({input:process.stdin,output:process.stdout,prompt:"> "});let r=false;e.on("agent:busy",(e=>{r=e;if(!e)s.prompt()}));s.prompt();s.on("line",(t=>{const o=t.trim();if(!o){if(!r)s.prompt();return}if(o==="/quit"||o==="/exit"||o==="/q"){process.stderr.write("[myhi] 已分离\r\n");cleanup(e);process.exit(0)}if(r){process.stderr.write("[正在处理中，请等待]\r\n");return}e.emit("agent:query",{prompt:o})}));s.on("close",(()=>{cleanup(e);process.exit(0)}))}else{try{process.stdin.setRawMode(true)}catch{}process.stdin.resume();process.stdin.setEncoding("binary");process.stdin.on("data",(t=>{if(t===""){process.stderr.write("\r\n[myhi] 已分离\r\n");cleanup(e);process.exit(0)}e.emit("input",t)}));e.on("output",(e=>{process.stdout.write(e,"binary")}));process.stdout.on("resize",(()=>{e.emit("resize",{cols:process.stdout.columns||80,rows:process.stdout.rows||24})}))}}));e.on("control-denied",(({reason:e})=>{process.stderr.write(`\r\n[myhi] 获取控制权失败: ${e}\r\n`)}));e.on("control-changed",(({holder:t,holderName:s})=>{if(t&&t!==e.id){process.stderr.write(`\r\n[myhi] ${s||"其他用户"} 已获取控制权，当前为只读\r\n`)}else if(!t){process.stderr.write("\r\n[myhi] 控制权已释放\r\n")}}));e.on("kicked",(({reason:t})=>{process.stderr.write(`\r\n[myhi] ${t||"你已被管理员踢出"}\r\n`);cleanup(e);process.exit(1)}));e.on("session-exit",(({code:t})=>{process.stderr.write(`\r\n[myhi] 会话已退出 (code ${t})\r\n`);cleanup(e);process.exit(0)}));e.on("error",(({message:t})=>{process.stderr.write(`\r\n[myhi] 错误: ${t}\r\n`);cleanup(e);process.exit(1)}))}async function pickSession(e){return new Promise(((t,s)=>{e.emit("list");e.once("sessions",(s=>{const r=s.filter((e=>e.alive));if(!r.length){process.stderr.write("[myhi] 没有活跃的会话。\n");cleanup(e);process.exit(0)}process.stdout.write("\n活跃会话:\n");r.forEach(((e,t)=>{const s=e.viewers>0?` (${e.viewers} 人在线)`:"";const r=e.mode==="agent"?" [Agent]":" [PTY]";process.stdout.write(`  [${t+1}] ${e.title}${r}${s}  — ${e.id}\n`)}));process.stdout.write("\n");const o=(0,i.createInterface)({input:process.stdin,output:process.stdout});o.question("选择会话编号: ",(s=>{o.close();const n=parseInt(s,10)-1;if(n<0||n>=r.length){process.stderr.write("[myhi] 无效的选择。\n");cleanup(e);process.exit(1)}t(r[n].id)}))}))}))}async function createAndAttach(e,t){return new Promise(((s,r)=>{e.emit("create",t,(t=>{if(!t?.ok){process.stderr.write(`[myhi] 创建失败: ${t?.error||"未知错误"}\n`);cleanup(e);process.exit(1)}process.stdout.write(`[myhi] 已创建会话 "${t.session.title}" — ${t.session.id}\n`);s(t.session.id)}))}))}async function promptNew(e){const t=(0,i.createInterface)({input:process.stdin,output:process.stdout});const ask=e=>new Promise((s=>t.question(e,s)));const s=(await ask("会话名称 [shell]: ")).trim()||"shell";const r=(await ask("启动命令（可选）: ")).trim()||undefined;t.close();return createAndAttach(e,{title:s,initCmd:r})}const u=a(p,{transports:["websocket"],auth:{token:m}});u.on("connect_error",(e=>{process.stderr.write(`[myhi] 连接失败: ${e.message}\n`);process.exit(1)}));u.on("connect",(async()=>{const e=process.argv[2];if(e==="--new"){const e=process.argv[3];const t=process.argv[4]||undefined;const s=e?await createAndAttach(u,{title:e,initCmd:t}):await promptNew(u);attach(u,s)}else{const t=e||await pickSession(u);attach(u,t)}}));for(const e of["SIGINT","SIGTERM"]){process.on(e,(()=>{cleanup(u);process.exit(0)}))}process.on("exit",(()=>{try{process.stdin.setRawMode(false)}catch{}}));

package/package.json

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