@seamnet/client 0.17.1 → 0.18.0

package/bin/cli.js

@@ -18,7 +18,6 @@ Commands:
   stop                                             Stop guardian
   upgrade                                          Upgrade this AI's seam-client (per-AI mode)
   upgrade-all                                      Host-tool: bump global package + restart all registered guardians
-  mcp-serve                                        Start MCP server (used by Claude Code)
 
 Environment:
   SEAM_HOME    Absolute path to a .seam data directory. Resolution priority:
@@ -82,12 +81,6 @@ try {
       await guardianStop();
       break;
     }
-    case 'mcp-serve': {
-      const { createRequire } = await import('node:module');
-      const require = createRequire(import.meta.url);
-      require('../lib/mcp-server.cjs');
-      break;
-    }
     case 'autostart': {
       const { autostart } = await import('../lib/autostart.js');
       const result = await autostart({ silent: false });

package/bin/seam.js

@@ -61,6 +61,7 @@ function printHelp() {
     '  seam cc read --session <name> [--lines N]',
     '  seam cc send --session <name> --text <msg>',
     '  seam cc start --dir <path> [--session <name>]',
+    '  seam cc restart --session <name> [--no-continue]  重启某个 CC 实例',
     '',
     '输出：JSON { ok: true, data } 或 { ok: false, error }。',
   ].join('\n');
@@ -471,7 +472,32 @@ async function cmdCc(subAction, restArgs) {
     return;
   }
 
-  output(false, `Unknown cc action: ${subAction}. Try: list, read, send, start`);
+  if (subAction === 'restart') {
+    const { values } = parseArgs({
+      args: restArgs,
+      options: {
+        session: { type: 'string' },
+        continue: { type: 'boolean' },
+        'no-continue': { type: 'boolean' },
+      },
+      strict: false,
+    });
+    if (!values.session) output(false, '--session required');
+    const continueSession = values['no-continue'] ? false : true;
+    try {
+      const ok = await tmuxUtils.restartCC(values.session, { continueSession });
+      if (ok) {
+        output(true, { session: values.session, restarted: true });
+      } else {
+        output(false, 'restart failed: CC 未在超时内退出或重启');
+      }
+    } catch (e) {
+      output(false, e.message);
+    }
+    return;
+  }
+
+  output(false, `Unknown cc action: ${subAction}. Try: list, read, send, start, restart`);
 }
 
 function parseDuration(str) {

package/lib/upgrade.js

@@ -6,7 +6,8 @@
  * 2. patch .claude/settings.json：SessionStart hook 命令（老包名 → bin 名）
  *    + 预授权 seam CLI（permissions.allow 加 Bash(seam *)）
  * 3. 重新 patchClaudeMd（确保引用 @.seam/contacts.json 等新增的）
- * 4. 重启 guardian（新 detached 后台进程 + 单 seam MCP tool 生效）
+ * 3b. 清理 .mcp.json 里的 seam-im 条目（MCP server 已废弃）
+ * 4. 重启 guardian（新 detached 后台进程生效）
  *
  * 不做：
  * - 不动 credentials.json / IDENTITY.md（那些是 AI 自己的）
@@ -85,6 +86,27 @@ export async function upgrade() {
     console.error(`  refresh failed (non-fatal): ${e.message}`);
   }
 
+  // 3b. 清理 .mcp.json 里的 seam-im 条目（MCP server 0.18.0 已废弃，删它指向的
+  //     mcp-serve 已不存在——必须在 CC restart 之前剥掉，否则重启会加载到死引用）
+  console.log('3b. cleaning seam-im from .mcp.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');
+    }
+  } catch (e) {
+    console.error(`  .mcp.json cleanup failed (non-fatal): ${e.message}`);
+  }
+
   // 4. 重启 guardian（让新代码生效）+ 标记需要自动重启 CC
   console.log('4. restarting guardian + scheduling CC auto-restart');
   try {
@@ -109,5 +131,5 @@ export async function upgrade() {
     return;
   }
 
-  console.log('\nDone. Guardian 会在 10 秒后通知你并自动重启 Claude Code，加载新的 MCP 工具。');
+  console.log('\nDone. Guardian 会在 10 秒后通知你并自动重启 Claude Code。');
 }

package/package.json

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

package/lib/mcp-server.cjs

@@ -1,250 +0,0 @@
-#!/usr/bin/env node
-/**
- * Seam MCP Server — 轻量转发器
- * 不登录 SDK，通过 unix socket 连接 guardian，把 MCP 工具调用转发为 action。
- *
- * 每个请求都生成 req_id，透传 guardian 的结构化错误（含 code/hint/docs）给 AI。
- */
-
-const net = require('node:net');
-const path = require('node:path');
-const readline = require('node:readline');
-const { execFile } = require('node:child_process');
-const { randomUUID } = require('node:crypto');
-
-const SEAM_DIR = path.join(process.cwd(), '.seam');
-const SOCKET_PATH = path.join(SEAM_DIR, 'guardian.sock');
-const LOG_PATH = path.join(SEAM_DIR, 'logs', 'guardian.jsonl');
-// seam CLI 入口（同一个 npm 包里），MCP 把调用转发给 CLI 执行
-const SEAM_CLI = path.join(__dirname, '..', 'bin', 'seam.js');
-const ALLOWED_DOMAINS = new Set([
-  'status', 'msg', 'contacts', 'guardian', 'wechat', 'inbox', 'self', 'invite', 'cc', 'help', '--help', '-h',
-]);
-
-function guardianRequest(payload) {
-  const reqId = payload.req_id || randomUUID();
-  const req = { ...payload, req_id: reqId };
-  return new Promise((resolve, reject) => {
-    const conn = net.createConnection(SOCKET_PATH, () => {
-      conn.write(JSON.stringify(req));
-    });
-    let data = '';
-    conn.on('data', (chunk) => {
-      data += chunk;
-      try {
-        const res = JSON.parse(data);
-        conn.destroy();
-        resolve(res);
-      } catch {
-        // incomplete
-      }
-    });
-    conn.on('end', () => {
-      if (data) {
-        try {
-          resolve(JSON.parse(data));
-        } catch {
-          resolve({
-            error: {
-              code: 'GUARDIAN_INVALID_RESPONSE',
-              message: data,
-              req_id: reqId,
-            },
-          });
-        }
-      } else {
-        resolve({
-          error: {
-            code: 'GUARDIAN_EMPTY_RESPONSE',
-            message: 'guardian returned no data',
-            req_id: reqId,
-          },
-        });
-      }
-    });
-    conn.on('error', () => {
-      reject(
-        Object.assign(new Error('Guardian not running'), {
-          code: 'GUARDIAN_UNREACHABLE',
-          hint: '启动：`npx seam-client guardian start`',
-          docs: 'docs/maintainer-guide.md#GUARDIAN_UNREACHABLE',
-          req_id: reqId,
-        })
-      );
-    });
-    conn.setTimeout(10000, () => {
-      conn.destroy();
-      reject(
-        Object.assign(new Error('Guardian request timeout (10s)'), {
-          code: 'GUARDIAN_TIMEOUT',
-          hint: '查 guardian 日志：tail .seam/logs/guardian.jsonl',
-          docs: 'docs/maintainer-guide.md#GUARDIAN_TIMEOUT',
-          req_id: reqId,
-        })
-      );
-    });
-  });
-}
-
-function formatErrorForMcp(err) {
-  // err 可能是 { code, message, hint, docs, req_id } 或普通 Error 对象
-  const code = err.code || 'UNKNOWN';
-  const message = err.message || String(err);
-  const lines = [`[${code}] ${message}`];
-  if (err.hint) lines.push(`💡 ${err.hint}`);
-  if (err.docs) lines.push(`📄 ${err.docs}`);
-  if (err.req_id) {
-    lines.push(
-      `🔍 req_id: ${err.req_id}`,
-      `   查日志: jq 'select(.req_id=="${err.req_id}")' ${LOG_PATH}`
-    );
-  }
-  return lines.join('\n');
-}
-
-// MCP protocol: stdio JSON-RPC
-const rl = readline.createInterface({ input: process.stdin });
-
-// 唯一一个 MCP tool：调用 seam CLI（bin/seam.js）。AI 传参数数组，MCP execFile 执行，parse JSON 返回。
-// 扩展能力只需要改 CLI + 更新下面的 description，不改 mcp-server。
-const tools = [
-  {
-    name: 'seam',
-    description: `Seam 网络工具。通过 CLI 风格子命令操作 IM 消息、联系人、本机 Claude Code 实例等。
-
-用法：seam({ args: ["<domain>", "<action>", "--opt", "value", ...] })
-返回：JSON { ok: true, data } 或 { ok: false, error }
-
-## IM 消息
-
-- 发私聊文本：seam({args: ["msg", "send", "--to", "<userId>", "--text", "你好"]})
-- 发私聊图片：seam({args: ["msg", "send", "--to", "<userId>", "--image", "<path>"]})
-- 发私聊文件：seam({args: ["msg", "send", "--to", "<userId>", "--file", "<path>"]})
-- 发群消息：seam({args: ["msg", "group", "--group", "<groupId>", "--text", "hello"]})
-- 长文本先写文件：seam({args: ["msg", "send", "--to", "<userId>", "--text-file", "<path>"]})
-
-## 联系人
-
-- 列表：seam({args: ["contacts", "list"]})
-- 查某人：seam({args: ["contacts", "get", "--user", "<userId>"]})
-
-## 自身状态
-
-- 查状态：seam({args: ["status"]})
-- 邀请码：seam({args: ["invite", "generate"]})
-
-## 定时任务
-
-- 查看：seam({args: ["self", "list"]})
-- 新建：seam({args: ["self", "schedule", "--id", "<id>", "--every", "<duration>", "--text", "<msg>"]})
-- 取消：seam({args: ["self", "cancel", "--id", "<id>"]})
-
-## Claude Code 管理（cc）
-
-管理本机 tmux 中运行的所有 Claude Code 实例：
-
-- 列出所有实例：seam({args: ["cc", "list"]})
-- 读某个实例输出：seam({args: ["cc", "read", "--session", "<name>", "--lines", "20"]})
-- 给某个实例发消息：seam({args: ["cc", "send", "--session", "<name>", "--text", "<msg>"]})
-- 启动新实例：seam({args: ["cc", "start", "--dir", "<path>", "--session", "<name>"]})
-
-## 可用 domain
-
-status · msg · contacts · guardian · wechat · inbox · self · invite · cc
-
-完整帮助：seam({args: ["--help"]})`,
-    inputSchema: {
-      type: 'object',
-      properties: {
-        args: {
-          type: 'array',
-          items: { type: 'string' },
-          description: 'CLI 参数数组，等同命令行里 seam 后面的所有 token。',
-        },
-      },
-      required: ['args'],
-    },
-  },
-];
-
-function runSeamCli(args) {
-  return new Promise((resolve) => {
-    // 安全：只允许已知 domain，拒绝空数组或任意 domain
-    const firstArg = Array.isArray(args) && args.length ? String(args[0]) : '';
-    if (!ALLOWED_DOMAINS.has(firstArg)) {
-      resolve({ ok: false, error: `Unknown domain "${firstArg}". Allowed: ${[...ALLOWED_DOMAINS].join(', ')}` });
-      return;
-    }
-    execFile(
-      process.execPath,
-      [SEAM_CLI, ...args.map((a) => String(a))],
-      { timeout: 20000, cwd: process.cwd(), maxBuffer: 4 * 1024 * 1024 },
-      (err, stdout, stderr) => {
-        if (err && !stdout) {
-          resolve({ ok: false, error: stderr || err.message });
-          return;
-        }
-        try {
-          resolve(JSON.parse((stdout || '').trim().split('\n').pop() || '{}'));
-        } catch (e) {
-          resolve({ ok: false, error: `Bad CLI output: ${stdout.slice(0, 400)}` });
-        }
-      }
-    );
-  });
-}
-
-function sendResponse(id, result) {
-  process.stdout.write(JSON.stringify({ jsonrpc: '2.0', id, result }) + '\n');
-}
-
-function sendError(id, code, message) {
-  process.stdout.write(
-    JSON.stringify({ jsonrpc: '2.0', id, error: { code, message } }) + '\n'
-  );
-}
-
-rl.on('line', async (line) => {
-  let req;
-  try {
-    req = JSON.parse(line);
-  } catch {
-    return;
-  }
-
-  const { id, method, params } = req;
-
-  if (method === 'initialize') {
-    sendResponse(id, {
-      protocolVersion: '2024-11-05',
-      capabilities: { tools: {} },
-      serverInfo: { name: 'seam', version: '0.5.0' },
-    });
-  } else if (method === 'notifications/initialized') {
-    // no response needed
-  } else if (method === 'tools/list') {
-    sendResponse(id, { tools });
-  } else if (method === 'tools/call') {
-    const { name, arguments: args } = params;
-    if (name !== 'seam') {
-      sendError(id, -32601, `Unknown tool: ${name}`);
-      return;
-    }
-    const argv = Array.isArray(args?.args) ? args.args : [];
-    const result = await runSeamCli(argv);
-    if (result.ok === false) {
-      sendResponse(id, {
-        content: [{ type: 'text', text: `[seam] ${result.error}` }],
-        isError: true,
-      });
-    } else {
-      const payload = result.data !== undefined ? result.data : result;
-      const text = typeof payload === 'string' ? payload : JSON.stringify(payload, null, 2);
-      sendResponse(id, {
-        content: [{ type: 'text', text }],
-      });
-    }
-  } else {
-    sendError(id, -32601, `Unknown method: ${method}`);
-  }
-});