@seamnet/client 0.14.5 → 0.15.0

package/bin/seam.js

@@ -377,43 +377,11 @@ async function cmdInvite(subAction, restArgs) {
 
 // === cc (Claude Code 管理) ===
 
-import { execSync, spawn } from 'node:child_process';
-
-function ccGetSessions() {
-  let lines;
-  try {
-    lines = execSync('tmux list-sessions -F "#{session_name}"', {
-      encoding: 'utf8', timeout: 5000,
-    }).trim().split('\n').filter(Boolean);
-  } catch {
-    return [];
-  }
-  return lines.map(name => {
-    let ccRunning = false;
-    try {
-      const panePid = execSync(`tmux display-message -t "${name}" -p '#{pane_pid}'`, {
-        encoding: 'utf8', timeout: 3000,
-      }).trim();
-      // pane 进程本身可能就是 claude（tmux 直接启动时），也可能是 bash 的子进程
-      const self = execSync(`ps -o comm= -p ${panePid} 2>/dev/null`, {
-        encoding: 'utf8', timeout: 3000,
-      }).trim();
-      let child = '';
-      try {
-        child = execSync(`ps -o comm= --ppid ${panePid} 2>/dev/null`, {
-          encoding: 'utf8', timeout: 3000,
-        }).trim().split('\n').pop() || '';
-      } catch {}
-      ccRunning = ['claude', 'claude-code'].includes(self) ||
-                  ['claude', 'claude-code'].includes(child);
-    } catch {}
-    return { session: name, cc: ccRunning };
-  });
-}
+const tmuxUtils = require('../lib/tmux-utils.cjs');
 
 async function cmdCc(subAction, restArgs) {
   if (!subAction || subAction === 'list') {
-    const sessions = ccGetSessions();
+    const sessions = tmuxUtils.listSessions();
     if (sessions.length === 0) output(true, { sessions: [], message: 'no tmux sessions' });
     output(true, { sessions });
     return;
@@ -430,10 +398,7 @@ async function cmdCc(subAction, restArgs) {
     });
     if (!values.session) output(false, '--session required');
     try {
-      const text = execSync(
-        `tmux capture-pane -t "${values.session}" -p | tail -${parseInt(values.lines) || 20}`,
-        { encoding: 'utf8', timeout: 5000 }
-      );
+      const text = tmuxUtils.readOutput(values.session, parseInt(values.lines) || 20);
       output(true, { session: values.session, lines: text.trimEnd().split('\n') });
     } catch (e) {
       output(false, `read failed: ${e.message}`);
@@ -452,24 +417,11 @@ async function cmdCc(subAction, restArgs) {
     });
     if (!values.session) output(false, '--session required');
     if (!values.text) output(false, '--text required');
-    const sessions = ccGetSessions();
-    const target = sessions.find(s => s.session === values.session);
-    if (!target) output(false, `session "${values.session}" not found`);
-    if (!target.cc) output(false, `session "${values.session}": CC not running`);
     try {
-      // 分两步：先发文本（literal），再单独发 Enter
-      // CC 用 raw terminal mode，合在一起发会丢回车
-      execSync(
-        `tmux send-keys -t "${values.session}" -l ${JSON.stringify(values.text)}`,
-        { timeout: 5000 }
-      );
-      execSync(
-        `tmux send-keys -t "${values.session}" Enter`,
-        { timeout: 5000 }
-      );
+      tmuxUtils.sendToCC(values.session, values.text);
       output(true, { session: values.session, sent: values.text });
     } catch (e) {
-      output(false, `send failed: ${e.message}`);
+      output(false, e.message);
     }
     return;
   }
@@ -484,21 +436,12 @@ async function cmdCc(subAction, restArgs) {
       strict: false,
     });
     if (!values.dir) output(false, '--dir required');
-    if (!existsSync(values.dir)) output(false, `dir not found: ${values.dir}`);
-    const sessionName = values.session || join(values.dir).split('/').pop();
-    // 检查 session 是否已存在
-    const existing = ccGetSessions();
-    if (existing.find(s => s.session === sessionName)) {
-      output(false, `session "${sessionName}" already exists`);
-    }
+    const sessionName = values.session || values.dir.split('/').pop();
     try {
-      execSync(
-        `tmux new-session -d -s "${sessionName}" -c "${values.dir}" 'claude --dangerously-skip-permissions'`,
-        { timeout: 10000 }
-      );
+      tmuxUtils.startCC(values.dir, sessionName);
       output(true, { session: sessionName, dir: values.dir, started: true });
     } catch (e) {
-      output(false, `start failed: ${e.message}`);
+      output(false, e.message);
     }
     return;
   }

package/lib/guardian.js

@@ -219,29 +219,21 @@ export async function guardianRun() {
       ? '🔄 [Seam] 升级完成。Guardian 将在 10 秒后重启 CC 以加载新的 MCP 工具。你会在新对话里看到单个 seam 工具取代原来的多个工具。'
       : '🔄 [Seam] 入网完成。Guardian 将在 10 秒后重启 CC 以加载 MCP 工具。重启后你会在新的对话里读到 IDENTITY.md。';
     hub.inject(notice);
-    setTimeout(() => {
+    setTimeout(async () => {
       try {
-        execSync(`${tmux} send-keys -t ${safeSession} '/exit' Enter`, {
-          stdio: 'ignore',
-          timeout: 5000,
-        });
-        setTimeout(() => {
-          try {
-            execSync(
-              `${tmux} send-keys -t ${safeSession} 'claude --dangerously-skip-permissions --continue' Enter`,
-              { stdio: 'ignore', timeout: 5000 }
-            );
-            guardianState.set('cc_restarted', new Date().toISOString());
-            if (isUpgradeRestart) guardianState.delete('pending_upgrade_restart');
-            hub.logger('guardian').info('cc_restart_injected');
-          } catch (e) {
-            hub.logger('guardian').error('cc_restart_failed', e);
-          }
-        }, 3000);
+        const { restartCC } = require('./tmux-utils.cjs');
+        const ok = await restartCC(safeSession, { socketPath: ccSocket, continueSession: true });
+        if (ok) {
+          guardianState.set('cc_restarted', new Date().toISOString());
+          if (isUpgradeRestart) guardianState.delete('pending_upgrade_restart');
+          hub.logger('guardian').info('cc_restart_injected');
+        } else {
+          hub.logger('guardian').error('cc_restart_failed', new Error('restartCC returned false'));
+        }
       } catch (e) {
-        hub.logger('guardian').error('cc_exit_failed', e);
+        hub.logger('guardian').error('cc_restart_failed', e);
       }
-    }, 10000); // 3s → 10s 给 AI 读到通知的时间
+    }, 10000);
   }
 
   // Keep alive + graceful shutdown (pid 文件清理)

package/lib/tmux-utils.cjs

@@ -0,0 +1,122 @@
+/**
+ * tmux-utils — 可靠的 tmux 交互。
+ *
+ * CC 用 raw terminal mode，tmux send-keys 需要特殊处理：
+ * 1. 文本用 -l (literal) 发，不解释特殊键
+ * 2. Enter 单独发
+ * 3. 发完验证是否被接收
+ */
+
+const { execSync } = require('node:child_process');
+const { existsSync, readFileSync } = require('node:fs');
+const { join } = require('node:path');
+
+const EXEC_OPTS = { encoding: 'utf8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'] };
+
+function tmuxCmd(socketPath) {
+  return socketPath ? `tmux -S "${socketPath}"` : 'tmux';
+}
+
+function listSessions(socketPath) {
+  const tmux = tmuxCmd(socketPath);
+  let lines;
+  try {
+    lines = execSync(`${tmux} list-sessions -F "#{session_name}"`, EXEC_OPTS)
+      .trim().split('\n').filter(Boolean);
+  } catch {
+    return [];
+  }
+  return lines.map(name => {
+    const cc = isCCRunning(name, socketPath);
+    return { session: name, cc };
+  });
+}
+
+function isCCRunning(session, socketPath) {
+  const tmux = tmuxCmd(socketPath);
+  try {
+    const panePid = execSync(
+      `${tmux} display-message -t "${session}" -p '#{pane_pid}'`, EXEC_OPTS
+    ).trim();
+    const self = execSync(`ps -o comm= -p ${panePid} 2>/dev/null`, EXEC_OPTS).trim();
+    if (['claude', 'claude-code'].includes(self)) return true;
+    try {
+      const child = execSync(`ps -o comm= --ppid ${panePid} 2>/dev/null`, EXEC_OPTS)
+        .trim().split('\n').pop() || '';
+      if (['claude', 'claude-code'].includes(child)) return true;
+    } catch {}
+  } catch {}
+  return false;
+}
+
+/**
+ * 给 tmux session 里的 CC 发用户消息。
+ * 用 -l (literal) 发文本 + 单独 Enter，保证 raw terminal mode 下不丢回车。
+ */
+function sendToCC(session, text, { socketPath, skipCheck = false } = {}) {
+  const tmux = tmuxCmd(socketPath);
+  if (!skipCheck && !isCCRunning(session, socketPath)) {
+    throw new Error(`session "${session}": CC not running`);
+  }
+  // 用 -l 发纯文本（不解释特殊键）
+  execSync(`${tmux} send-keys -t "${session}" -l ${JSON.stringify(text)}`, EXEC_OPTS);
+  // 单独发 Enter 提交
+  execSync(`${tmux} send-keys -t "${session}" Enter`, EXEC_OPTS);
+}
+
+/**
+ * 读 tmux session 的最后 N 行输出。
+ */
+function readOutput(session, lines = 20, socketPath) {
+  const tmux = tmuxCmd(socketPath);
+  return execSync(
+    `${tmux} capture-pane -t "${session}" -p | tail -${parseInt(lines) || 20}`,
+    EXEC_OPTS
+  );
+}
+
+/**
+ * 在新 tmux session 里启动 CC。
+ */
+function startCC(dir, session, socketPath) {
+  const tmux = tmuxCmd(socketPath);
+  if (!existsSync(dir)) throw new Error(`dir not found: ${dir}`);
+  try {
+    execSync(`${tmux} has-session -t "${session}" 2>/dev/null`, EXEC_OPTS);
+    throw new Error(`session "${session}" already exists`);
+  } catch (e) {
+    if (e.message.includes('already exists')) throw e;
+  }
+  execSync(
+    `${tmux} new-session -d -s "${session}" -c "${dir}" 'claude --dangerously-skip-permissions'`,
+    { ...EXEC_OPTS, timeout: 10000 }
+  );
+}
+
+/**
+ * 给 CC 发 /exit 然后重启（带 --continue）。
+ * guardian 升级后自动重启 CC 用这个。
+ */
+function restartCC(session, { socketPath, continueSession = true } = {}) {
+  const tmux = tmuxCmd(socketPath);
+  // 发 /exit
+  execSync(`${tmux} send-keys -t "${session}" -l '/exit'`, EXEC_OPTS);
+  execSync(`${tmux} send-keys -t "${session}" Enter`, EXEC_OPTS);
+  // 等 CC 退出
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      try {
+        const cmd = continueSession
+          ? 'claude --dangerously-skip-permissions --continue'
+          : 'claude --dangerously-skip-permissions';
+        execSync(`${tmux} send-keys -t "${session}" -l ${JSON.stringify(cmd)}`, EXEC_OPTS);
+        execSync(`${tmux} send-keys -t "${session}" Enter`, EXEC_OPTS);
+        resolve(true);
+      } catch (e) {
+        resolve(false);
+      }
+    }, 3000);
+  });
+}
+
+module.exports = { listSessions, isCCRunning, sendToCC, readOutput, startCC, restartCC, tmuxCmd };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seamnet/client",
-  "version": "0.14.5",
+  "version": "0.15.0",
   "description": "One command to join Seam — the network where people and AI stay in sync.",
   "bin": {
     "seam-client": "bin/cli.js",