@seamnet/client 0.20.4 → 0.20.5

package/lib/tmux-utils.cjs

@@ -15,10 +15,18 @@ 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）
-// - busyPatterns/idleWaitMs/idleSettleMs：restart 先等 TUI 真空闲并短暂复核稳定；超时才退回 resetKeys 强推
+// - busyLineMatchers/idleWaitMs/idleSettleMs：restart 先等 TUI 真空闲并短暂复核稳定；超时才退回 resetKeys 强推
 // - resetKeys/resetWaitMs：仅兜底路径用；发 exit 前尝试把 TUI 从忙窗口里拉回可退出态
 // - exit：TUI 内的优雅退出命令（空闲时直接发它 + Enter）
 // - downTimeout：发了 exit 后等进程退出的轮询超时（ms）
@@ -26,7 +34,7 @@ const KIND_CMD = {
   cc: {
     fresh: 'claude --dangerously-skip-permissions',
     resume: 'claude --dangerously-skip-permissions --continue',
-    busyPatterns: [/esc to interrupt/i],
+    busyLineMatchers: [isCcBusyLine],
     idleWaitMs: 120000,
     idleSettleMs: 500,
     resetKeys: ['Escape'],
@@ -35,9 +43,9 @@ const KIND_CMD = {
     downTimeout: 120000, // cc 退出跑 Stop hook（auto-save / semantic_memory）要 ~90s
   },
   codex: {
-    fresh: 'codex',
-    resume: 'codex resume --last',
-    busyPatterns: [/esc to interrupt/i, /Working \(/i],
+    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'],
@@ -154,16 +162,19 @@ function readViewport(session, { lines = 80, socketPath } = {}) {
   return raw.replace(/\s+$/, '').split('\n').slice(-n).join('\n');
 }
 
-function matchesBusy(screenText, busyPatterns = []) {
-  return busyPatterns.some((pattern) => pattern.test(screenText));
+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, busyPatterns = [], idleWaitMs = 0, idleSettleMs = 0 }
+  { targetKind, busyLineMatchers = [], idleWaitMs = 0, idleSettleMs = 0 }
 ) {
-  if (!(idleWaitMs > 0) || busyPatterns.length === 0) {
+  if (!(idleWaitMs > 0) || busyLineMatchers.length === 0) {
     return { ok: true, lastScreen: '' };
   }
   const deadline = Date.now() + idleWaitMs;
@@ -174,7 +185,7 @@ async function waitForIdle(
       return { ok: true, kindChanged: true, lastScreen };
     }
     lastScreen = readViewport(session, { socketPath });
-    if (!matchesBusy(lastScreen, busyPatterns)) {
+    if (!matchesBusy(lastScreen, busyLineMatchers)) {
       if (!(idleSettleMs > 0)) {
         return { ok: true, lastScreen };
       }
@@ -266,7 +277,7 @@ async function restartSkeleton(
   socketPath,
   {
     targetKind,
-    busyPatterns = [],
+    busyLineMatchers = [],
     idleWaitMs = 0,
     idleSettleMs = 0,
     resetAction = async () => {},
@@ -281,7 +292,7 @@ async function restartSkeleton(
   // 1. 先等真空闲；整段预算都没等到，才退回 resetKey 强推
   const idleState = await waitForIdle(session, socketPath, {
     targetKind,
-    busyPatterns,
+    busyLineMatchers,
     idleWaitMs,
     idleSettleMs,
   });
@@ -378,7 +389,7 @@ async function restartTerm(session, { socketPath, continueSession = true } = {})
   const startCmd = continueSession ? spec.resume : spec.fresh;
   return restartSkeleton(session, socketPath, {
     targetKind: kind,
-    busyPatterns: spec.busyPatterns,
+    busyLineMatchers: spec.busyLineMatchers,
     idleWaitMs: spec.idleWaitMs,
     idleSettleMs: spec.idleSettleMs,
     resetAction: async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seamnet/client",
-  "version": "0.20.4",
+  "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",