@seamnet/client 0.16.0 → 0.16.2

package/lib/guardian.js

@@ -12,7 +12,8 @@
  */
 
 import { existsSync, readFileSync, writeFileSync, unlinkSync, mkdirSync, openSync, readlinkSync } from 'node:fs';
-import { join, isAbsolute } from 'node:path';
+import { join, isAbsolute, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { execSync, spawn } from 'node:child_process';
 import { SEAM_DIR, CREDENTIALS_PATH, SOCKET_PATH, LOGS_DIR, PID_PATH } from './paths.js';
 import { writeEntry as registryWrite, removeEntry as registryRemove } from './registry.js';
@@ -89,17 +90,26 @@ export async function guardianStart() {
   const socketPath = resolveTmuxSocketPath();
   const tmux = tmuxCmd(socketPath);
 
-  let ccSession = '';
-  try {
-    ccSession = execSync(`${tmux} display-message -p '#S'`, { encoding: 'utf8' }).trim();
-  } catch {}
+  // SEAM_CC_SESSION env 优先：upgrade-all / 跨 shell 启动时，调用方知道目标 AI
+  // 的 tmux session，直接传过来；不传才回退到 `tmux display-message`（取 attached
+  // client 的 session）。回退在跨 shell 场景下会拿错 session——比如缝在自己的 tmux
+  // 里跑 `cd /home/claude_code/du && seam-client upgrade`，会把"缝"写进渡的 registry。
+  let ccSession = process.env.SEAM_CC_SESSION || '';
+  if (!ccSession) {
+    try {
+      ccSession = execSync(`${tmux} display-message -p '#S'`, { encoding: 'utf8' }).trim();
+    } catch {}
+  }
 
   const cwd = process.cwd();
-  const localCli = join(cwd, 'node_modules', '@seamnet', 'client', 'bin', 'cli.js');
+  // guardian-run 进程从 guardian.js 自己所属的包启动（lib/guardian.js → ../bin/cli.js）。
+  // 不再相对 cwd 找 node_modules——那样既不支持全局安装（host-tool 模式），
+  // cwd 不是项目根时还会崩。模块自解析保证 spawn 出的 guardian 跟当前代码同版本。
+  const selfCli = join(dirname(fileURLToPath(import.meta.url)), '..', 'bin', 'cli.js');
   const logPath = join(LOGS_DIR, 'guardian.log');
   const logFd = openSync(logPath, 'a');
 
-  const child = spawn(process.execPath, [localCli, 'guardian', 'run'], {
+  const child = spawn(process.execPath, [selfCli, 'guardian', 'run'], {
     cwd,
     detached: true,
     stdio: ['ignore', logFd, logFd],

package/lib/upgrade-all.js

@@ -3,18 +3,22 @@
  *
  * 流程：
  * 1. 全局升 npm 包（仅一次）
- * 2. 读 ~/.seam-homes，遍历每个 SEAM_HOME
- * 3. 每个 SEAM_HOME spawn 子进程 stop → start guardian（隔离 paths.js 缓存）
- * 4. 清掉目录已不存在的 entry
+ * 2. 读 ~/.shared/seam-registry/*.json（当前在跑的 guardian 列表）
+ * 3. 每个 entry spawn 子进程 stop → start guardian
+ *    （SEAM_HOME / SEAM_CC_SESSION / SEAM_CC_SOCKET 从 entry 取，
+ *     避免 guardianStart 回退到 `tmux display-message` 抓错 attached client。）
  *
- * 注：本文件是 stage 1 的 registry 实现；stage 2 会替换为 ~/.shared/seam-registry/<userId>.json。
+ * 仅升级"当前在跑的 guardian"——目录还在但 guardian 没开的，跳过。
+ * 想拉那些上来，下次自己 `seam-client guardian start` 即可，
+ * 那时已是新版 npm 包。
+ *
+ * 路人 CC（没装 seam-client / 没 register）天然不在 registry，不会被碰。
  */
 
-import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { join, dirname } from 'node:path';
-import { homedir } from 'node:os';
 import { execSync, spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
+import { readAll } from './registry.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const CLI_PATH = join(dirname(__filename), '..', 'bin', 'cli.js');
@@ -30,38 +34,35 @@ export async function upgradeAll() {
     process.exit(1);
   }
 
-  const homesPath = join(homedir(), '.seam-homes');
-  if (!existsSync(homesPath)) {
-    console.log('\n2. ~/.seam-homes 不存在——无已注册 AI，结束。');
+  const entries = readAll();
+  if (entries.length === 0) {
+    console.log('\n2. registry 为空——没有正在运行的 guardian，结束。');
     return;
   }
-  const lines = readFileSync(homesPath, 'utf8').split('\n').filter(Boolean);
-  console.log(`\n2. ${lines.length} 个已注册 SEAM_HOME，逐个重启 guardian`);
+  console.log(`\n2. registry 里 ${entries.length} 个活 guardian，逐个重启`);
 
-  const alive = [];
-  for (const home of lines) {
-    console.log(`\n  → ${home}`);
-    if (!existsSync(home)) {
-      console.log('    跳过（目录已不存在，从 registry 移除）');
-      continue;
-    }
-    const env = { ...process.env, SEAM_HOME: home };
+  let okCount = 0;
+  for (const entry of entries) {
+    const { userId, seam_home, tmux_session, tmux_socket } = entry;
+    console.log(`\n  → ${userId}  (home=${seam_home}, session=${tmux_session || '?'})`);
+
+    const env = {
+      ...process.env,
+      SEAM_HOME: seam_home,
+      SEAM_CC_SESSION: tmux_session || '',
+      SEAM_CC_SOCKET: tmux_socket || '',
+    };
     const stopRes = spawnSync('node', [CLI_PATH, 'stop'], { env, stdio: 'inherit' });
     if (stopRes.status !== 0) {
-      console.log('    stop 非零退出（guardian 可能未运行，继续）');
+      console.log('    stop 非零退出（继续）');
     }
     const startRes = spawnSync('node', [CLI_PATH, 'guardian', 'start'], { env, stdio: 'inherit' });
     if (startRes.status !== 0) {
       console.error(`    start 失败 (exit ${startRes.status})`);
     } else {
-      alive.push(home);
+      okCount += 1;
     }
   }
 
-  if (alive.length !== lines.length) {
-    writeFileSync(homesPath, alive.length ? alive.join('\n') + '\n' : '');
-    console.log(`\n  registry 清理：${lines.length} → ${alive.length}`);
-  }
-
-  console.log(`\nDone. ${alive.length} 个 AI guardian 已重启。`);
+  console.log(`\nDone. ${okCount}/${entries.length} 个 guardian 已重启。`);
 }

package/package.json

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