@seamnet/client 0.18.2 → 0.19.0

package/lib/init.js

@@ -225,8 +225,9 @@ function registerSeamHome() {
   }
 }
 
-export function patchClaudeMd() {
-  const claudeMdPath = join(process.cwd(), 'CLAUDE.md');
+export function patchClaudeMd(projectDir = process.cwd()) {
+  // 默认值 process.cwd() 仅对当前 home 有效；跨 home 调用必须显式传 projectDir
+  const claudeMdPath = join(projectDir, 'CLAUDE.md');
   const rulesRef = '@.seam/CHANNEL_RULES.md';
   const identityRef = '@.seam/IDENTITY.md';
   const contactsRef = '@.seam/contacts.json';
@@ -260,10 +261,11 @@ export function patchClaudeMd() {
  * 从 npm package 的 templates/ 拷贝 CHANNEL_RULES.md 到 .seam/。
  * 每次 init 和 guardian 启动都覆盖——确保老 AI 升级后获得最新规则。
  */
-export function syncChannelRules() {
+export function syncChannelRules(seamHome = SEAM_DIR) {
+  // 默认值 SEAM_DIR 仅对当前 home 有效；跨 home 调用必须显式传 seamHome
   const src = join(TEMPLATES_DIR, 'CHANNEL_RULES.md');
-  const dest = join(SEAM_DIR, 'CHANNEL_RULES.md');
-  if (!existsSync(SEAM_DIR)) mkdirSync(SEAM_DIR, { recursive: true });
+  const dest = join(seamHome, 'CHANNEL_RULES.md');
+  if (!existsSync(seamHome)) mkdirSync(seamHome, { recursive: true });
   const content = readFileSync(src, 'utf8');
   writeFileSync(dest, content);
   return dest;

package/lib/upgrade-all.js

@@ -1,31 +1,43 @@
 /**
- * Host-tool 模式：对所有已注册的 SEAM_HOME 滚动升级 + 重启 guardian。
+ * Host-tool 模式：对所有已注册的 SEAM_HOME 跑完整 applyHomeUpgrade。
  *
  * 流程：
  * 1. 全局升 npm 包（仅一次）
  * 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。）
+ * 3. 逐个 entry 跑完整 applyHomeUpgrade（version.json / patch settings /
+ *    syncChannelRules / patchClaudeMd / 剥 .mcp.json / 重启 guardian）。
+ *    顺序执行，每个 entry try/catch——一个 home 失败不中断其余。
+ * 4. 末尾报告 ok/fail 计数 + 每个 home 结果。
  *
  * 仅升级"当前在跑的 guardian"——目录还在但 guardian 没开的，跳过。
- * 想拉那些上来，下次自己 `seam-client guardian start` 即可，
- * 那时已是新版 npm 包。
- *
+ * 想拉那些上来，下次自己 `seam-client guardian start` 即可（已是新版包）。
  * 路人 CC（没装 seam-client / 没 register）天然不在 registry，不会被碰。
  */
 
+import { existsSync } from 'node:fs';
 import { join, dirname } from 'node:path';
-import { execSync, spawnSync } from 'node:child_process';
-import { fileURLToPath } from 'node:url';
+import { execSync } from 'node:child_process';
 import { readAll } from './registry.js';
+import { applyHomeUpgrade } from './upgrade.js';
 
-const __filename = fileURLToPath(import.meta.url);
-const CLI_PATH = join(dirname(__filename), '..', 'bin', 'cli.js');
+/**
+ * 检测某 home 是否还残留本地 node_modules/@seamnet/client。
+ * 只警告，不删——删本地包是单独的迁移决定，由人手动做。
+ */
+function checkLocalInstallResidue(seamHome) {
+  const localPkg = join(dirname(seamHome), 'node_modules', '@seamnet', 'client');
+  if (existsSync(localPkg)) {
+    console.log(
+      `    ⚠️  ${dirname(seamHome)} 仍有本地包 node_modules/@seamnet/client——`
+      + '全局迁移未完成，建议手动删除本地 node_modules/@seamnet/client'
+    );
+  }
+}
 
 export async function upgradeAll() {
   console.log('Seam — host-tool upgrade-all\n');
 
+  // 1. 全局升包（一次）
   console.log('1. npm install -g @seamnet/client@latest');
   try {
     execSync('npm install -g @seamnet/client@latest', { stdio: 'inherit' });
@@ -34,35 +46,37 @@ export async function upgradeAll() {
     process.exit(1);
   }
 
+  // 2. 读 registry
   const entries = readAll();
   if (entries.length === 0) {
     console.log('\n2. registry 为空——没有正在运行的 guardian，结束。');
     return;
   }
-  console.log(`\n2. registry 里 ${entries.length} 个活 guardian，逐个重启`);
+  console.log(`\n2. registry 里 ${entries.length} 个活 guardian，逐个跑完整升级`);
 
-  let okCount = 0;
+  // 3. 逐个 applyHomeUpgrade（一个失败不中断其余）
+  const results = [];
   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 非零退出（继续）');
-    }
-    const startRes = spawnSync('node', [CLI_PATH, 'guardian', 'start'], { env, stdio: 'inherit' });
-    if (startRes.status !== 0) {
-      console.error(`    start 失败 (exit ${startRes.status})`);
-    } else {
-      okCount += 1;
+    console.log(`\n  → ${userId}  (home=${seam_home})`);
+    checkLocalInstallResidue(seam_home);
+    try {
+      await applyHomeUpgrade({
+        seamHome: seam_home,
+        ccSession: tmux_session,
+        ccSocket: tmux_socket,
+      });
+      results.push({ userId, ok: true });
+    } catch (e) {
+      console.error(`    FAILED: ${e.message}`);
+      results.push({ userId, ok: false, error: e.message });
     }
   }
 
-  console.log(`\nDone. ${okCount}/${entries.length} 个 guardian 已重启。`);
+  // 4. 报告
+  const okCount = results.filter((r) => r.ok).length;
+  console.log(`\nDone. ${okCount}/${results.length} 个 home 升级成功。`);
+  for (const r of results) {
+    console.log(`  ${r.ok ? 'ok  ' : 'FAIL'} ${r.userId}${r.ok ? '' : '  — ' + r.error}`);
+  }
 }

package/lib/upgrade.js

@@ -1,121 +1,182 @@
 /**
  * 升级已入网 AI 的 seam-client 配置。
  *
- * 做：
- * 1. npm install @seamnet/client@latest
- * 2. patch .claude/settings.json：SessionStart hook 命令（老包名 → bin 名）
- *    + 预授权 seam CLI（permissions.allow 加 Bash(seam *)）
- * 3. 重新 patchClaudeMd（确保引用 @.seam/contacts.json 等新增的）
- * 3b. 清理 .mcp.json 里的 seam-im 条目（MCP server 已废弃）
- * 4. 重启 guardian（新 detached 后台进程生效）
+ * applyHomeUpgrade({ seamHome, ccSession, ccSocket })
+ *   —— 对指定 home 做 per-home 升级：写 version.json、patch settings.json、
+ *      syncChannelRules、patchClaudeMd、剥 .mcp.json 的 seam-im、
+ *      置 pending_upgrade_restart、spawn 重启该 home 的 guardian。
+ *      不含 npm install——caller 先装好包。所有路径基于 seamHome 参数，
+ *      不碰 process.cwd()、不碰 paths.js 的 SEAM_DIR 常量。
  *
- * 不做：
- * - 不动 credentials.json / IDENTITY.md（那些是 AI 自己的）
- * - 不重新 register（用原有 userId）
+ * upgrade()  —— per-project 命令：本地 npm install + applyHomeUpgrade(当前 home)。
+ *
+ * 不做：不动 credentials.json / IDENTITY.md（AI 自己的），不重新 register。
  */
 
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
-import { execSync } from 'node:child_process';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { execSync, spawnSync } from 'node:child_process';
 import { SEAM_DIR } from './paths.js';
+import { resolveTmuxSocketPath } from './guardian.js';
 
-export async function upgrade() {
-  console.log('Seam — upgrading...\n');
+const CLI_PATH = join(dirname(fileURLToPath(import.meta.url)), '..', 'bin', 'cli.js');
 
-  // 1. 升包
-  console.log('1. npm install @seamnet/client@latest');
-  try {
-    execSync('npm install @seamnet/client@latest', { stdio: 'inherit' });
-  } catch (e) {
-    console.error(`  npm install failed: ${e.message}`);
-    process.exit(1);
-  }
+function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
 
-  // 1b. 更新 version.json
+/**
+ * 读 upgrade.js 模块自身相邻的 package.json 版本号。
+ * caller 跑完 npm install（local 或 global）后该文件已被覆盖成新版，
+ * 此处运行时读取即拿到新版本号——不依赖 cwd/node_modules（host-tool
+ * 模式下非当前 home 没有本地 node_modules）。
+ */
+function readOwnVersion() {
   try {
-    const newPkg = JSON.parse(readFileSync(join(process.cwd(), 'node_modules', '@seamnet', 'client', 'package.json'), 'utf8'));
-    const versionPath = join(SEAM_DIR, 'version.json');
-    writeFileSync(versionPath, JSON.stringify({ version: newPkg.version, upgradedAt: new Date().toISOString() }, null, 2));
-    console.log(`  version.json updated to ${newPkg.version}`);
-  } catch (e) {
-    console.error(`  version.json update failed (non-fatal): ${e.message}`);
+    const pkgPath = join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json');
+    return JSON.parse(readFileSync(pkgPath, 'utf8')).version;
+  } catch {
+    return null;
   }
+}
 
-  // 2. patch settings.json hook
-  console.log('2. patching .claude/settings.json SessionStart hook');
-  const settingsPath = join(process.cwd(), '.claude', 'settings.json');
-  if (existsSync(settingsPath)) {
+/**
+ * 检测当前 tmux session/socket。SEAM_CC_SESSION env 优先，否则回退
+ * `tmux display-message`。回退只对"当前 home"成立——AI 在自己的终端里
+ * 跑 upgrade，display-message 解析到的就是它自己。跨 home 的 caller
+ * （upgrade-all）不用这个，改从 registry entry 取 session/socket。
+ */
+function detectCurrentSession() {
+  const ccSocket = resolveTmuxSocketPath() || '';
+  const tmux = ccSocket ? `tmux -S "${ccSocket}"` : 'tmux';
+  let ccSession = process.env.SEAM_CC_SESSION || '';
+  if (!ccSession) {
     try {
-      const s = JSON.parse(readFileSync(settingsPath, 'utf8'));
-      let changed = false;
-      const oldCmd = 'npx @seamnet/client autostart';
-      const newCmd = 'npx seam-client autostart';
-      for (const group of s.hooks?.SessionStart || []) {
-        for (const h of group.hooks || []) {
-          if (h.command === oldCmd) {
-            h.command = newCmd;
-            changed = true;
-          }
+      ccSession = execSync(`${tmux} display-message -p '#S'`, { encoding: 'utf8' }).trim();
+    } catch {}
+  }
+  return { ccSession, ccSocket };
+}
+
+function patchSettings(settingsPath) {
+  if (!existsSync(settingsPath)) {
+    console.log('    no .claude/settings.json, skip');
+    return;
+  }
+  try {
+    const s = JSON.parse(readFileSync(settingsPath, 'utf8'));
+    let changed = false;
+    const oldCmd = 'npx @seamnet/client autostart';
+    const newCmd = 'npx seam-client autostart';
+    for (const group of s.hooks?.SessionStart || []) {
+      for (const h of group.hooks || []) {
+        if (h.command === oldCmd) {
+          h.command = newCmd;
+          changed = true;
         }
       }
-      // 预授权 seam CLI：老 AI 升级后用 `seam` 发消息的路径立刻可用
-      if (!s.permissions) s.permissions = {};
-      if (!Array.isArray(s.permissions.allow)) s.permissions.allow = [];
-      if (!s.permissions.allow.includes('Bash(seam *)')) {
-        s.permissions.allow.push('Bash(seam *)');
-        changed = true;
-      }
-      if (changed) {
-        writeFileSync(settingsPath, JSON.stringify(s, null, 2));
-        console.log('  settings.json patched (hook command + seam CLI 预授权 Bash(seam *))');
-      } else {
-        console.log('  settings.json already up-to-date, skip');
-      }
-    } catch (e) {
-      console.error(`  failed to patch settings.json: ${e.message}`);
     }
+    // 预授权 seam CLI：老 AI 升级后用 `seam` 发消息的路径立刻可用
+    if (!s.permissions) s.permissions = {};
+    if (!Array.isArray(s.permissions.allow)) s.permissions.allow = [];
+    if (!s.permissions.allow.includes('Bash(seam *)')) {
+      s.permissions.allow.push('Bash(seam *)');
+      changed = true;
+    }
+    if (changed) {
+      writeFileSync(settingsPath, JSON.stringify(s, null, 2));
+      console.log('    settings.json patched (hook command + seam CLI 预授权 Bash(seam *))');
+    } else {
+      console.log('    settings.json already up-to-date, skip');
+    }
+  } catch (e) {
+    console.error(`    failed to patch settings.json: ${e.message}`);
   }
+}
 
-  // 3. 刷新 CLAUDE.md 引用（contacts.json 等新增的）
-  console.log('3. refreshing CLAUDE.md references + CHANNEL_RULES.md');
+function cleanMcpJson(mcpPath) {
   try {
-    const { patchClaudeMd, syncChannelRules } = await import('./init.js');
-    syncChannelRules();
-    patchClaudeMd();
+    if (!existsSync(mcpPath)) {
+      console.log('    no .mcp.json, skip');
+      return;
+    }
+    const mcp = JSON.parse(readFileSync(mcpPath, 'utf8'));
+    if (mcp.mcpServers && Object.prototype.hasOwnProperty.call(mcp.mcpServers, 'seam-im')) {
+      delete mcp.mcpServers['seam-im'];
+      writeFileSync(mcpPath, JSON.stringify(mcp, null, 2));
+      console.log('    removed seam-im entry from .mcp.json');
+    } else {
+      console.log('    no seam-im entry, skip');
+    }
   } catch (e) {
-    console.error(`  refresh failed (non-fatal): ${e.message}`);
+    console.error(`    .mcp.json cleanup failed (non-fatal): ${e.message}`);
   }
+}
+
+/**
+ * 对指定 home 做 per-home 升级。不含 npm install。
+ *
+ * guardian 重启一律 spawn 子进程（带 SEAM_HOME/SEAM_CC_SESSION/SEAM_CC_SOCKET
+ * env）——不在进程内调 guardianStop/Start，那俩认死的 SEAM_DIR/PID_PATH，
+ * 对非当前 home 会操作错对象。
+ *
+ * @param {object}  o
+ * @param {string}  o.seamHome   绝对路径，<project>/.seam
+ * @param {string} [o.ccSession] 该 home 的 tmux session（此处不回退 display-message）
+ * @param {string} [o.ccSocket]  该 home 的 tmux socket
+ */
+export async function applyHomeUpgrade({ seamHome, ccSession, ccSocket }) {
+  if (!seamHome) throw new Error('applyHomeUpgrade: seamHome required');
+  const projectDir = dirname(seamHome);
 
-  // 3b. 清理 .mcp.json 里的 seam-im 条目（MCP server 0.18.0 已废弃，删它指向的
-  //     mcp-serve 已不存在——必须在 CC restart 之前剥掉，否则重启会加载到死引用）
-  console.log('3b. cleaning seam-im from .mcp.json');
+  // version.json
   try {
-    const mcpPath = join(process.cwd(), '.mcp.json');
-    if (existsSync(mcpPath)) {
-      const mcp = JSON.parse(readFileSync(mcpPath, 'utf8'));
-      if (mcp.mcpServers && Object.prototype.hasOwnProperty.call(mcp.mcpServers, 'seam-im')) {
-        delete mcp.mcpServers['seam-im'];
-        writeFileSync(mcpPath, JSON.stringify(mcp, null, 2));
-        console.log('  removed seam-im entry from .mcp.json');
-      } else {
-        console.log('  no seam-im entry, skip');
-      }
-    } else {
-      console.log('  no .mcp.json, skip');
+    const version = readOwnVersion();
+    if (version) {
+      writeFileSync(
+        join(seamHome, 'version.json'),
+        JSON.stringify({ version, upgradedAt: new Date().toISOString() }, null, 2)
+      );
+      console.log(`    version.json → ${version}`);
     }
   } catch (e) {
-    console.error(`  .mcp.json cleanup failed (non-fatal): ${e.message}`);
+    console.error(`    version.json update failed (non-fatal): ${e.message}`);
   }
 
-  // 4. 重启 guardian（让新代码生效）+ 标记需要自动重启 CC
-  console.log('4. restarting guardian + scheduling CC auto-restart');
+  // patch .claude/settings.json
+  patchSettings(join(projectDir, '.claude', 'settings.json'));
+
+  // 刷新 CHANNEL_RULES.md + CLAUDE.md 引用（显式传 home/projectDir）
   try {
-    const { guardianStop, guardianStart } = await import('./guardian.js');
-    await guardianStop();
-    await new Promise((r) => setTimeout(r, 1000));
+    const { syncChannelRules, patchClaudeMd } = await import('./init.js');
+    syncChannelRules(seamHome);
+    patchClaudeMd(projectDir);
+    console.log('    CHANNEL_RULES + CLAUDE.md refreshed');
+  } catch (e) {
+    console.error(`    CHANNEL_RULES/CLAUDE.md refresh failed (non-fatal): ${e.message}`);
+  }
+
+  // 剥 .mcp.json 的 seam-im（CC restart 前剥掉指向已删 mcp-serve 的死引用）
+  cleanMcpJson(join(projectDir, '.mcp.json'));
 
-    // 打 pending_upgrade_restart 标记——新 guardian 启动时会读到并自动重启 CC
-    const statePath = join(SEAM_DIR, 'state.json');
+  // 重启 guardian：spawn 子进程 stop → 置 flag → start
+  const env = {
+    ...process.env,
+    SEAM_HOME: seamHome,
+    SEAM_CC_SESSION: ccSession || '',
+    SEAM_CC_SOCKET: ccSocket || '',
+  };
+  const stopRes = spawnSync(process.execPath, [CLI_PATH, 'stop'], { env, stdio: 'inherit' });
+  if (stopRes.status !== 0) {
+    // stop 非 0 不致命——guardian 可能本来就没在跑
+    console.log(`    guardian stop exited ${stopRes.status}（可能本来没跑，继续）`);
+  }
+  await sleep(1000);
+
+  // 置 pending_upgrade_restart——新 guardian 启动时读到会自动重启 CC
+  try {
+    const statePath = join(seamHome, 'state.json');
     let stateJson = {};
     if (existsSync(statePath)) {
       try { stateJson = JSON.parse(readFileSync(statePath, 'utf8')); } catch {}
@@ -123,10 +184,36 @@ export async function upgrade() {
     if (!stateJson.guardian) stateJson.guardian = {};
     stateJson.guardian.pending_upgrade_restart = true;
     writeFileSync(statePath, JSON.stringify(stateJson, null, 2));
+  } catch (e) {
+    console.error(`    state.json flag failed (non-fatal): ${e.message}`);
+  }
+
+  const startRes = spawnSync(process.execPath, [CLI_PATH, 'guardian', 'start'], { env, stdio: 'inherit' });
+  if (startRes.status !== 0) {
+    throw new Error(`guardian start failed (exit ${startRes.status})`);
+  }
+  console.log('    guardian restarted');
+}
+
+export async function upgrade() {
+  console.log('Seam — upgrading...\n');
+
+  // 1. 本地升包
+  console.log('1. npm install @seamnet/client@latest');
+  try {
+    execSync('npm install @seamnet/client@latest', { stdio: 'inherit' });
+  } catch (e) {
+    console.error(`  npm install failed: ${e.message}`);
+    process.exit(1);
+  }
 
-    await guardianStart();
+  // 2. 对当前 home 跑 applyHomeUpgrade（session 走 display-message 检测）
+  console.log('2. applying per-home upgrade');
+  const { ccSession, ccSocket } = detectCurrentSession();
+  try {
+    await applyHomeUpgrade({ seamHome: SEAM_DIR, ccSession, ccSocket });
   } catch (e) {
-    console.error(`  guardian restart failed: ${e.message}`);
+    console.error(`  upgrade failed: ${e.message}`);
     console.log('\n  请手动 /exit 并重新启动 Claude Code。');
     return;
   }

package/package.json

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