@seamnet/client 0.17.0 → 0.17.1

package/lib/tmux-utils.cjs

@@ -93,30 +93,65 @@ function startCC(dir, session, socketPath) {
   );
 }
 
+function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+
 /**
  * 给 CC 发 /exit 然后重启（带 --continue）。
  * guardian 升级后自动重启 CC 用这个。
+ *
+ * 不再固定等 3s——有 Stop hook（auto-save / semantic_memory）的 AI 退出要
+ * 60-90s，3s 时旧 claude 还活着，重启命令会被当成旧 TUI 的 queued message，
+ * CC 永远没重启。改成轮询 isCCRunning 确认状态再动作。
  */
-function restartCC(session, { socketPath, continueSession = true } = {}) {
+async function restartCC(session, { socketPath, continueSession = true } = {}) {
   const tmux = tmuxCmd(socketPath);
-  // 发 /exit
+  const restartCmd = continueSession
+    ? 'claude --dangerously-skip-permissions --continue'
+    : 'claude --dangerously-skip-permissions';
+
+  // 1. 发 /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);
-  });
+
+  // 2. 轮询直到 CC 退出（120s 覆盖 90s Stop hook + 余量）
+  const exitDeadline = Date.now() + 120000;
+  while (isCCRunning(session, socketPath)) {
+    if (Date.now() >= exitDeadline) {
+      // 旧 CC 还没退，发重启命令会变成 queued message 污染 TUI——放弃
+      return false;
+    }
+    await sleep(1000);
+  }
+
+  // 3. 退出确认后等 shell prompt 落定
+  await sleep(500);
+
+  // 4-5. 发重启命令 + 轮询确认 CC 起来（30s 超时）
+  const tryStart = async () => {
+    try {
+      execSync(`${tmux} send-keys -t "${session}" -l ${JSON.stringify(restartCmd)}`, EXEC_OPTS);
+      execSync(`${tmux} send-keys -t "${session}" Enter`, EXEC_OPTS);
+    } catch {
+      return false;
+    }
+    const upDeadline = Date.now() + 30000;
+    while (!isCCRunning(session, socketPath)) {
+      if (Date.now() >= upDeadline) return false;
+      await sleep(1000);
+    }
+    return true;
+  };
+
+  if (await tryStart()) return true;
+
+  // 6. 超时没起来：C-c 清掉可能的半行，重试一次
+  try {
+    execSync(`${tmux} send-keys -t "${session}" C-c`, EXEC_OPTS);
+  } catch {}
+  await sleep(500);
+  return tryStart();
 }
 
 module.exports = { listSessions, isCCRunning, sendToCC, readOutput, startCC, restartCC, tmuxCmd };

package/package.json

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