cli-remote-agent 1.0.8 → 1.0.11

package/dist/index.js

@@ -59,6 +59,7 @@ var TMUX_LIST = "tmux:list";
 var TMUX_LIST_RESULT = "tmux:list:result";
 var TMUX_KILL = "tmux:kill";
 var TMUX_KILL_RESULT = "tmux:kill:result";
+var TMUX_SCROLL = "tmux:scroll";
 
 // ../shared/src/constants.ts
 var HEARTBEAT_INTERVAL = 15e3;
@@ -372,6 +373,7 @@ function getLiveClaudeSessions() {
       out.push({
         pid: obj.pid,
         cwd: typeof obj.cwd === "string" ? obj.cwd : "",
+        sessionId: typeof obj.sessionId === "string" ? obj.sessionId : void 0,
         name: typeof obj.name === "string" ? obj.name : void 0,
         status: typeof obj.status === "string" ? obj.status : void 0,
         updatedAt: typeof obj.updatedAt === "number" ? obj.updatedAt : void 0
@@ -402,6 +404,15 @@ function isDescendantOf(pid, ancestor, parents) {
   }
   return false;
 }
+async function findClaudeSessionForPtyPid(ptyPid) {
+  const live = getLiveClaudeSessions().filter((s) => s.sessionId);
+  if (live.length === 0) return null;
+  const parents = await getPidParents();
+  for (let i = live.length - 1; i >= 0; i--) {
+    if (isDescendantOf(live[i].pid, ptyPid, parents)) return live[i].sessionId;
+  }
+  return null;
+}
 
 // src/tmux.ts
 var execFileAsync2 = (0, import_util2.promisify)(import_child_process3.execFile);
@@ -459,6 +470,41 @@ async function killTmuxSession(name) {
     return { ok: false, error: msg };
   }
 }
+async function scrollTmux(name, direction) {
+  const bin = resolveTmuxPath();
+  if (!bin) return { inCopyMode: false };
+  const target = `=${name}`;
+  const run = (args) => execFileAsync2(bin, args, { timeout: 4e3 }).catch(() => {
+  });
+  const inMode = async () => {
+    try {
+      const { stdout } = await execFileAsync2(bin, ["display-message", "-t", target, "-p", "#{pane_in_mode}"], { timeout: 3e3 });
+      return stdout.trim() === "1";
+    } catch {
+      return false;
+    }
+  };
+  if (direction === "exit") {
+    if (await inMode()) await run(["send-keys", "-t", target, "-X", "cancel"]);
+    return { inCopyMode: false };
+  }
+  if (direction === "up") {
+    await run(["copy-mode", "-t", target]);
+    await run(["send-keys", "-t", target, "-X", "halfpage-up"]);
+    return { inCopyMode: true };
+  }
+  if (!await inMode()) return { inCopyMode: false };
+  await run(["send-keys", "-t", target, "-X", "halfpage-down"]);
+  try {
+    const { stdout } = await execFileAsync2(bin, ["display-message", "-t", target, "-p", "#{scroll_position}"], { timeout: 3e3 });
+    if ((parseInt(stdout.trim(), 10) || 0) === 0) {
+      await run(["send-keys", "-t", target, "-X", "cancel"]);
+      return { inCopyMode: false };
+    }
+  } catch {
+  }
+  return { inCopyMode: true };
+}
 async function enrichWithPanesAndClaude(sessions2) {
   if (IS_WIN || sessions2.length === 0) return;
   try {
@@ -639,6 +685,9 @@ var PtySession = class {
       });
     }
   }
+  get pid() {
+    return this.pty.pid;
+  }
   write(data) {
     this.pty.write(data);
   }
@@ -704,6 +753,9 @@ function createTerminalSession(sessionId, cols, rows, shellPreference, cwd, onDa
   sessions.set(sessionId, session);
   logger.info({ sessionId, cols, rows }, "PTY session created");
 }
+function getSessionPid(sessionId) {
+  return sessions.get(sessionId)?.pid;
+}
 function writeToSession(sessionId, data) {
   sessions.get(sessionId)?.write(data);
 }
@@ -1614,9 +1666,12 @@ startLocalControl(LOCAL_CONTROL_PORT, (raw) => {
     socket.emit(CLAUDE_HOOK, payload);
   }
 });
+var sessionTmuxName = /* @__PURE__ */ new Map();
+var sessionInCopyMode = /* @__PURE__ */ new Map();
 socket.on(TERMINAL_OPEN, (payload) => {
   const { sessionId, cols, rows, tmux, launch } = payload;
   if (!sessionId) return;
+  if (tmux) sessionTmuxName.set(sessionId, tmux);
   let launchSpec;
   if (tmux) {
     const spec = buildTmuxLaunch(tmux, launch);
@@ -1640,6 +1695,8 @@ socket.on(TERMINAL_OPEN, (payload) => {
     },
     (sid, exitCode) => {
       socket.emit(TERMINAL_EXIT, { sessionId: sid, exitCode });
+      sessionTmuxName.delete(sid);
+      sessionInCopyMode.delete(sid);
     },
     launchSpec
   );
@@ -1661,7 +1718,20 @@ socket.on(TMUX_KILL, async (payload) => {
   logger.info({ name, ok: result.ok, error: result.error }, "tmux kill requested");
   socket.emit(TMUX_KILL_RESULT, { requestId, name, ok: result.ok, error: result.error });
 });
+socket.on(TMUX_SCROLL, async (payload) => {
+  const { sessionId, direction } = payload;
+  const name = sessionId && sessionTmuxName.get(sessionId);
+  if (!name) return;
+  const { inCopyMode } = await scrollTmux(name, direction);
+  sessionInCopyMode.set(sessionId, inCopyMode);
+});
 socket.on(TERMINAL_INPUT, (payload) => {
+  const name = sessionTmuxName.get(payload.sessionId);
+  if (name && sessionInCopyMode.get(payload.sessionId)) {
+    sessionInCopyMode.set(payload.sessionId, false);
+    scrollTmux(name, "exit").catch(() => {
+    });
+  }
   writeToSession(payload.sessionId, payload.data);
 });
 socket.on(TERMINAL_RESIZE, (payload) => {
@@ -1669,6 +1739,8 @@ socket.on(TERMINAL_RESIZE, (payload) => {
 });
 socket.on(TERMINAL_CLOSE, (payload) => {
   closeSession(payload.sessionId);
+  sessionTmuxName.delete(payload.sessionId);
+  sessionInCopyMode.delete(payload.sessionId);
 });
 socket.on(SESSION_SYNC, () => {
   const aliveIds = getAliveSessionIds();
@@ -1745,7 +1817,17 @@ socket.on(AGENT_EXEC, async (payload) => {
 });
 socket.on(CLAUDE_CONV_READ, async (payload) => {
   try {
-    const result = await readConversation(payload.projectPath, payload.afterLine || 0, payload.sessionId);
+    let sessionId = payload.sessionId;
+    if (!sessionId && payload.terminalSessionId) {
+      const ptyPid = getSessionPid(payload.terminalSessionId);
+      const resolved = ptyPid ? await findClaudeSessionForPtyPid(ptyPid) : null;
+      if (!resolved) {
+        socket.emit(CLAUDE_CONV_DATA, { sessionId: "", messages: [], totalLines: 0 });
+        return;
+      }
+      sessionId = resolved;
+    }
+    const result = await readConversation(payload.projectPath, payload.afterLine || 0, sessionId);
     if (result) {
       socket.emit(CLAUDE_CONV_DATA, {
         sessionId: result.sessionId,