@seamnet/client 0.20.3 → 0.20.5

package/lib/tmux-utils.cjs

@@ -15,24 +15,39 @@ const { basename } = require('node:path');
 
 const EXEC_OPTS = { encoding: 'utf8', timeout: 5000, stdio: ['pipe', 'pipe', 'pipe'] };
 
+function isCcBusyLine(line) {
+  return line.includes('⏵⏵') && /esc to interrupt/i.test(line);
+}
+
+function isCodexBusyLine(line) {
+  return /^[^\S\r\n]*[◦•]\s+Working \([^)]*esc to interrupt[^)]*\)(?:\s*·.*)?$/i.test(line);
+}
+
 // kind → 启动命令族。声明式数据小表，不是 adapter。新增 kind 加一行即可。
 // - fresh：全新会话的启动命令
 // - resume：续上一次会话的命令（restart 默认走这个；--no-continue 走 fresh）
-// - resetKeys/resetWaitMs：发 exit 前先把 TUI 拉回干净空闲态（逐个键发送，每个键后等一小下）
-// - exit：TUI 内的优雅退出命令（restart 发 reset 后再发它 + Enter）
+// - busyLineMatchers/idleWaitMs/idleSettleMs：restart 先等 TUI 真空闲并短暂复核稳定；超时才退回 resetKeys 强推
+// - resetKeys/resetWaitMs：仅兜底路径用；发 exit 前尝试把 TUI 从忙窗口里拉回可退出态
+// - exit：TUI 内的优雅退出命令（空闲时直接发它 + Enter）
 // - downTimeout：发了 exit 后等进程退出的轮询超时（ms）
 const KIND_CMD = {
   cc: {
     fresh: 'claude --dangerously-skip-permissions',
     resume: 'claude --dangerously-skip-permissions --continue',
+    busyLineMatchers: [isCcBusyLine],
+    idleWaitMs: 120000,
+    idleSettleMs: 500,
     resetKeys: ['Escape'],
     resetWaitMs: 1000,
     exit: '/exit',
     downTimeout: 120000, // cc 退出跑 Stop hook（auto-save / semantic_memory）要 ~90s
   },
   codex: {
-    fresh: 'codex',
-    resume: 'codex resume --last',
+    fresh: 'codex --dangerously-bypass-approvals-and-sandbox',
+    resume: 'codex resume --last --dangerously-bypass-approvals-and-sandbox',
+    busyLineMatchers: [isCodexBusyLine],
+    idleWaitMs: 60000,
+    idleSettleMs: 1000,
     resetKeys: ['Escape', 'Escape'],
     resetWaitMs: 1000,
     exit: '/exit',
@@ -137,6 +152,62 @@ function readTerm(session, { lines = 20, full = false, socketPath } = {}) {
   return raw.replace(/\s+$/, '').split('\n').slice(-n).join('\n');
 }
 
+function readViewport(session, { lines = 80, socketPath } = {}) {
+  const tmux = tmuxCmd(socketPath);
+  const raw = execSync(
+    `${tmux} capture-pane -t "${session}" -p`,
+    { ...EXEC_OPTS, maxBuffer: 4 * 1024 * 1024 }
+  );
+  const n = parseInt(lines, 10) || 80;
+  return raw.replace(/\s+$/, '').split('\n').slice(-n).join('\n');
+}
+
+function matchesBusy(screenText, busyLineMatchers = []) {
+  if (!Array.isArray(busyLineMatchers) || busyLineMatchers.length === 0) return false;
+  return String(screenText)
+    .split('\n')
+    .some((line) => busyLineMatchers.some((matchesLine) => matchesLine(line)));
+}
+
+async function waitForIdle(
+  session,
+  socketPath,
+  { targetKind, busyLineMatchers = [], idleWaitMs = 0, idleSettleMs = 0 }
+) {
+  if (!(idleWaitMs > 0) || busyLineMatchers.length === 0) {
+    return { ok: true, lastScreen: '' };
+  }
+  const deadline = Date.now() + idleWaitMs;
+  let lastScreen = '';
+  let idleSince = null;
+  while (true) {
+    if (detectKind(session, socketPath) !== targetKind) {
+      return { ok: true, kindChanged: true, lastScreen };
+    }
+    lastScreen = readViewport(session, { socketPath });
+    if (!matchesBusy(lastScreen, busyLineMatchers)) {
+      if (!(idleSettleMs > 0)) {
+        return { ok: true, lastScreen };
+      }
+      if (idleSince == null) idleSince = Date.now();
+      if (Date.now() - idleSince >= idleSettleMs) {
+        return { ok: true, lastScreen };
+      }
+    } else {
+      idleSince = null;
+    }
+    if (Date.now() >= deadline) {
+      return { ok: false, lastScreen };
+    }
+    await sleep(1000);
+  }
+}
+
+function appendWarning(existing, next) {
+  if (!existing) return next;
+  return `${existing}；${next}`;
+}
+
 /**
  * 给 session 发文本和/或命名按键。
  * - text：字面文本（-l）。默认末尾自动 Enter；noEnter 或同时有 keys 时抑制自动 Enter。
@@ -204,21 +275,47 @@ function startTerm({ kind, cmd, session, dir, socketPath } = {}) {
 async function restartSkeleton(
   session,
   socketPath,
-  { targetKind, resetAction = async () => {}, stopAction, downTimeout, startCmd }
+  {
+    targetKind,
+    busyLineMatchers = [],
+    idleWaitMs = 0,
+    idleSettleMs = 0,
+    resetAction = async () => {},
+    stopAction,
+    downTimeout,
+    startCmd,
+  }
 ) {
   const tmux = tmuxCmd(socketPath);
   let warning = null;
 
-  // 1. 先 reset TUI，再优雅退出
-  await resetAction();
-  stopAction();
+  // 1. 先等真空闲；整段预算都没等到，才退回 resetKey 强推
+  const idleState = await waitForIdle(session, socketPath, {
+    targetKind,
+    busyLineMatchers,
+    idleWaitMs,
+    idleSettleMs,
+  });
+  if (!idleState.ok) {
+    warning = appendWarning(
+      warning,
+      '未等到空闲窗口，已改用中断后退出；可能打断记忆保存'
+    );
+    await resetAction();
+  }
+  if (detectKind(session, socketPath) === targetKind) {
+    stopAction();
+  }
 
   // 2. poll-down：轮询直到 kind 不再是 targetKind；超时强制 kill 兜底
   const downDeadline = Date.now() + downTimeout;
   while (detectKind(session, socketPath) === targetKind) {
     if (Date.now() >= downDeadline) {
-      warning = `${targetKind} 未在 ${Math.round(downTimeout / 1000)}s 内优雅退出，已强制终止；`
-        + (targetKind === 'codex' ? 'resume 的会话可能不完整' : '会话状态可能不完整');
+      warning = appendWarning(
+        warning,
+        `${targetKind} 未在 ${Math.round(downTimeout / 1000)}s 内优雅退出，已强制终止；`
+          + (targetKind === 'codex' ? 'resume 的会话可能不完整' : '会话状态可能不完整')
+      );
       try { execSync(`${tmux} send-keys -t "${session}" C-c`, EXEC_OPTS); } catch {}
       await sleep(2000);
       if (detectKind(session, socketPath) === targetKind) {
@@ -292,6 +389,9 @@ async function restartTerm(session, { socketPath, continueSession = true } = {})
   const startCmd = continueSession ? spec.resume : spec.fresh;
   return restartSkeleton(session, socketPath, {
     targetKind: kind,
+    busyLineMatchers: spec.busyLineMatchers,
+    idleWaitMs: spec.idleWaitMs,
+    idleSettleMs: spec.idleSettleMs,
     resetAction: async () => {
       if (Array.isArray(spec.resetKeys) && spec.resetKeys.length > 0) {
         for (const key of spec.resetKeys) {
@@ -322,4 +422,5 @@ function stopTerm(session, { socketPath } = {}) {
 module.exports = {
   tmuxCmd, detectKind, listTerms, readTerm, sendTerm,
   startTerm, restartTerm, stopTerm, KIND_CMD,
+  readViewport, matchesBusy, waitForIdle,
 };

package/package.json

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