aicodeman 1.5.0 → 1.6.0

package/dist/tmux-manager.d.ts

@@ -213,6 +213,27 @@ export declare function buildDockerRemoveCommand(docker: SessionDocker): string;
  * launch path (createSession/respawnPane no-op under VITEST).
  */
 export declare function resolveDockerLaunchOptions(mode: SessionMode, docker: SessionDocker, sessionId: string, resumeSessionId?: string): DockerLaunchOptions;
+/**
+ * COD-105 — build the SSH command that ATTACHES to an EXISTING `codeman-*` tmux
+ * session on the remote host (one this Codeman didn't create — discovered via
+ * `listRemoteCodemanSessions`). Sibling of `buildRemoteLaunchCommand`.
+ *
+ * Emits:
+ *   ssh -o BatchMode=yes -t [<COD-107 connection opts>] user@host \
+ *     'tmux -L codeman attach -t <session>'
+ *
+ * - `attach` (NOT `new-session -A`) so we only join an existing session; the
+ *   remote session keeps running independent of us, which is exactly why the
+ *   resulting Codeman session is NON-OWNED (see `SessionRemote.owned`): closing
+ *   the local tab must detach, never `kill-session` the remote.
+ * - The remote session name is shell-escaped so a value with metachars stays a
+ *   single token inside the quoted tmux invocation.
+ * - COD-107 — connection options (`-p`, `-i`, `-J`, SOCKS `-o ProxyCommand`,
+ *   arbitrary `-o`) come from the shared `buildSshConnectionArgs`, so attach
+ *   connects identically to launch / discovery / the prereq probe. `-t` sits
+ *   right after `ssh -o BatchMode=yes` (a PTY is required for interactive tmux).
+ */
+export declare function buildRemoteAttachCommand(remote: SessionRemote, remoteSessionName: string): string;
 /**
  * Manages tmux sessions that wrap Claude CLI or shell processes.
  *
@@ -240,6 +261,15 @@ export declare class TmuxManager extends EventEmitter implements TerminalMultipl
     private mouseSyncInterval;
     /** Track last-known pane count per session to avoid unnecessary tmux set-option calls */
     private lastPaneCount;
+    /** Periodic watcher that re-establishes dropped remote sessions. */
+    private remoteReconnectInterval;
+    /** Per-session backoff/attempt bookkeeping (sessionId → state). */
+    private reconnectState;
+    /**
+     * Sessions excluded from auto-reconnect because they are being intentionally
+     * torn down (killed/detached/stopping). A guarded session is NEVER revived.
+     */
+    private reconnectGuard;
     private trueColorConfigured;
     constructor();
     /** The dedicated tmux socket all Codeman sessions live on (see {@link TerminalMultiplexer.muxSocket}). */
@@ -349,6 +379,42 @@ export declare class TmuxManager extends EventEmitter implements TerminalMultipl
      */
     startMouseModeSync(intervalMs?: number): void;
     stopMouseModeSync(): void;
+    /**
+     * Start the remote-reconnect watcher (COD-108). Each tick, for every tracked
+     * session with `session.remote` whose local pane is DEAD, not intentionally
+     * guarded, and within its backoff budget, emit `remoteSessionDropped` so the
+     * session owner reattaches (re-running the idempotent remote command rejoins
+     * the durable remote tmux session). After the attempt cap, emit
+     * `remoteReconnectExhausted` once and go quiet.
+     *
+     * No-op tick body under `IS_TEST_MODE` (mirrors `startMouseModeSync`): tests
+     * drive the logic deterministically via {@link runRemoteReconnectTick}.
+     */
+    startRemoteReconnectWatcher(intervalMs?: number): void;
+    stopRemoteReconnectWatcher(): void;
+    /**
+     * Run ONE watcher tick. Extracted (and given an injected `now`/`enabled`) so
+     * the reconnect logic is deterministically testable even though the live
+     * `setInterval` body no-ops under test mode. For each remote session it
+     * applies the pure {@link decideReconnect} decision and translates the result
+     * into events + backoff/state transitions. Public for tests + the watcher.
+     */
+    runRemoteReconnectTick(now: number, enabled: boolean): void;
+    /**
+     * Tell the watcher a reattach attempt for `sessionId` finished. On success,
+     * reset the backoff so the session is healthy again; on failure, just clear
+     * the in-flight flag so the next due tick can retry under the existing
+     * backoff schedule. Called by the session owner after `respawnPane`.
+     */
+    noteRemoteReconnect(sessionId: string, success: boolean): void;
+    /**
+     * Exclude a session from auto-reconnect (intentional teardown). Adds it to the
+     * guard set and drops any backoff state so a closed/killed tab — especially a
+     * non-owned remote DETACH — is never auto-revived. Idempotent.
+     */
+    guardRemoteReconnect(sessionId: string): void;
+    /** Clear all per-session reconnect + guard state (e.g. when a session is removed). */
+    clearRemoteReconnectState(sessionId: string): void;
     destroy(): void;
     registerSession(session: MuxSession): void;
     setAttached(sessionId: string, attached: boolean): void;

package/dist/tmux-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tmux-manager.d.ts","sourceRoot":"","sources":["../src/tmux-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tmux-manager.d.ts","sourceRoot":"","sources":["../src/tmux-manager.ts"],"names":[],"mappings":"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"}

package/dist/tmux-manager.js

@@ -34,6 +34,7 @@ import { buildEffortCliArgs } from './session-cli-builder.js';
 import { buildSshConnectionArgs, defaultRemoteCommandForMode, remoteSshTarget } from './remote-hosts.js';
 import { buildDockerBaseArgs, buildDockerCreateArgs, containerApiUrl, CONTAINER_HOME, defaultDockerCommandForMode, hostGatewayAlias, resolveDockerClaudeArtifacts, resolveDockerCredentialArtifacts, } from './docker-hosts.js';
 import { wrapWithNice, SAFE_PATH_PATTERN, findClaudeDir, resolveOpenCodeDir, resolveCodexDir, resolveGeminiDir, } from './utils/index.js';
+import { decideReconnect, advanceBackoff, freshReconnectState, resetReconnectState, } from './remote-reconnect.js';
 // ============================================================================
 // Timing Constants
 // ============================================================================
@@ -57,6 +58,8 @@ const TMUX_KILL_WAIT_MS = 200;
 const GRACEFUL_SHUTDOWN_WAIT_MS = 100;
 /** Default stats collection interval (2 seconds) */
 const DEFAULT_STATS_INTERVAL_MS = 2000;
+/** Default remote-reconnect watcher poll interval (5 seconds) — COD-108 */
+const DEFAULT_REMOTE_RECONNECT_INTERVAL_MS = 5000;
 /** Stable cwd for tmux server/pane launch; actual session cwd is reached inside the pane. */
 const TMUX_LAUNCH_CWD = '/tmp';
 /** Claude Code native macOS recommendation for avoiding low nofile startup failures. */
@@ -77,6 +80,20 @@ export const CLAUDE_CODE_NOFILE_LIMIT = 2147483646;
 const IS_TEST_MODE = !!process.env.VITEST;
 /** Path to persisted mux session metadata */
 const MUX_SESSIONS_FILE = dataPath('mux-sessions.json');
+/**
+ * COD-108 kill-switch: `remoteAutoReconnect` app setting (default ON). Read at
+ * call time (like headroom routing) so a settings change takes effect without a
+ * restart. Absent/non-boolean ⇒ true (feature on).
+ */
+function isRemoteAutoReconnectEnabled() {
+    try {
+        const s = JSON.parse(readFileSync(dataPath('settings.json'), 'utf8'));
+        return typeof s.remoteAutoReconnect === 'boolean' ? s.remoteAutoReconnect : true;
+    }
+    catch {
+        return true;
+    }
+}
 /** Regex to validate tmux session names (only allow safe characters) */
 const SAFE_MUX_NAME_PATTERN = /^codeman-[a-f0-9-]+$/;
 /** Legacy pattern for pre-rename sessions (claudeman- prefix) */
@@ -687,6 +704,13 @@ export function buildRemoteLaunchCommand(options) {
         `set -t ${remoteName} mouse off`,
         `set -t ${remoteName} prefix C-q`,
         'set -s escape-time 0',
+        // COD-106 — shared/collaborative sessions: tmux defaults to sizing a window
+        // to the SMALLEST attached client, so two Codemans at different viewports
+        // would fight (clamp to the smaller). `window-size latest` sizes to the
+        // most-recently-active client instead, so concurrent clients coexist.
+        // Per-session scoped (`set -t <name>`, matching #145's hardening) so a shared
+        // remote tmux server's other sessions keep their own sizing behavior.
+        `set -t ${remoteName} window-size latest`,
     ].join(' \\; ');
     // ssh runs its trailing args through the remote login shell, so the entire
     // tmux invocation is passed as one shell-quoted argument.
@@ -741,16 +765,16 @@ export function dockerTmuxSessionName(sessionId) {
 /** Resume ids are UUID-ish; reject anything with shell metacharacters (defensive). */
 const RESUME_ID_SAFE = /^[A-Za-z0-9._-]+$/;
 /**
- * Append the CLI-specific resume flag to a pane command. Only fires when the
- * in-container tmux is RE-CREATED (`new-session -A` makes the flag inert on a
- * live reattach), i.e. exactly when the previous live agent was lost and we want
- * to resume the conversation from the bind-mounted transcript.
+ * Append the CLI-specific resume flag to a pane command (codex/gemini). Only fires
+ * when the in-container tmux is RE-CREATED (`new-session -A` makes the flag inert
+ * on a live reattach), i.e. exactly when the previous live agent was lost and we
+ * want to resume the conversation from the bind-mounted transcript. Claude mode
+ * uses claudeDockerPaneCommand instead.
  */
 function appendResumeFlag(modeCommand, mode, resumeId) {
     if (!RESUME_ID_SAFE.test(resumeId))
         return modeCommand;
     switch (mode) {
-        case 'claude':
         case 'gemini':
             return `${modeCommand} --resume ${resumeId}`;
         case 'codex':
@@ -759,6 +783,30 @@ function appendResumeFlag(modeCommand, mode, resumeId) {
             return modeCommand; // shell / opencode: no resume
     }
 }
+/**
+ * Claude-mode pane command with a DETERMINISTIC conversation id (the docker analog
+ * of buildSpawnCommand's --resume/--session-id logic). A fresh launch passes
+ * `--session-id <sessionId>`, so the in-container conversation id is knowable
+ * host-side (resume-id capture + subagent/workflow correlation) WITHOUT relying on
+ * hook reachability. When the in-container tmux was re-created after a container
+ * stop/reboot, the same command re-runs against the surviving transcript:
+ * `--session-id` exits 1 ("already in use") and the `||` fallback RESUMES that
+ * conversation (verified CLI behavior). An explicit resumeId gets the local
+ * builder's shape — resume first, session-id fallback — so a stale id never
+ * dead-panes. The leading `exec ` is stripped: an exec'd first branch could never
+ * fall back.
+ */
+function claudeDockerPaneCommand(modeCommand, sessionId, resumeId) {
+    if (!RESUME_ID_SAFE.test(sessionId))
+        return modeCommand; // defensive — ids are server-minted uuids
+    const cmd = modeCommand.replace(/^exec\s+/, '');
+    const rid = resumeId && RESUME_ID_SAFE.test(resumeId) ? resumeId : undefined;
+    if (rid && rid !== sessionId) {
+        return `${cmd} --resume ${rid} || ${cmd} --session-id ${sessionId}`;
+    }
+    const cid = rid ?? sessionId;
+    return `${cmd} --session-id ${cid} || ${cmd} --resume ${cid}`;
+}
 /**
  * Build the ONE `bash -c` launch string for a docker session: image-check ->
  * ensure (inspect-or-create) -> start -> `exec docker exec -it` into the durable
@@ -776,8 +824,12 @@ export function buildDockerLaunchCommand(opts) {
     const dkrName = dockerTmuxSessionName(sessionId);
     const sid = sessionId.slice(0, 8);
     let modeCommand = docker.commands?.[mode] || defaultDockerCommandForMode(mode);
-    if (resumeSessionId)
+    if (mode === 'claude') {
+        modeCommand = claudeDockerPaneCommand(modeCommand, sessionId, resumeSessionId);
+    }
+    else if (resumeSessionId) {
         modeCommand = appendResumeFlag(modeCommand, mode, resumeSessionId);
+    }
     // Run by tmux via /bin/sh -c, so the path is shell-quoted here. `exec` makes the
     // pane PID the agent itself.
     const paneCommand = `cd ${workdir} && ${modeCommand}`;
@@ -931,6 +983,48 @@ export function resolveDockerLaunchOptions(mode, docker, sessionId, resumeSessio
             : [];
     return { mode, docker, sessionId, resumeSessionId, createContext, execEnv, execEnvNames, seedCopies };
 }
+/**
+ * COD-105 — build the SSH command that ATTACHES to an EXISTING `codeman-*` tmux
+ * session on the remote host (one this Codeman didn't create — discovered via
+ * `listRemoteCodemanSessions`). Sibling of `buildRemoteLaunchCommand`.
+ *
+ * Emits:
+ *   ssh -o BatchMode=yes -t [<COD-107 connection opts>] user@host \
+ *     'tmux -L codeman attach -t <session>'
+ *
+ * - `attach` (NOT `new-session -A`) so we only join an existing session; the
+ *   remote session keeps running independent of us, which is exactly why the
+ *   resulting Codeman session is NON-OWNED (see `SessionRemote.owned`): closing
+ *   the local tab must detach, never `kill-session` the remote.
+ * - The remote session name is shell-escaped so a value with metachars stays a
+ *   single token inside the quoted tmux invocation.
+ * - COD-107 — connection options (`-p`, `-i`, `-J`, SOCKS `-o ProxyCommand`,
+ *   arbitrary `-o`) come from the shared `buildSshConnectionArgs`, so attach
+ *   connects identically to launch / discovery / the prereq probe. `-t` sits
+ *   right after `ssh -o BatchMode=yes` (a PTY is required for interactive tmux).
+ */
+export function buildRemoteAttachCommand(remote, remoteSessionName) {
+    const tmuxInvocation = `tmux -L codeman attach -t ${shellescape(remoteSessionName)}`;
+    const [ssh, batchMode, ...connectionArgs] = buildSshConnectionArgs(remote);
+    const sshParts = [ssh, batchMode, '-t', ...connectionArgs, remoteSshTarget(remote), shellescape(tmuxInvocation)];
+    return sshParts.join(' ');
+}
+/**
+ * COD-105 — choose the right remote ssh command for a session's ownership:
+ *   - NON-owned (`remote.owned === false`): ATTACH to a discovered remote tmux
+ *     session by its EXISTING name (`remote.remoteSessionName`, falling back to
+ *     this session's deterministic name). We only join — never create.
+ *   - owned (default): LAUNCH/attach-or-create via `buildRemoteLaunchCommand`
+ *     (COD-104), which we then own and may explicitly kill.
+ */
+function buildRemoteSessionCommand(options) {
+    const { remote, sessionId } = options;
+    if (remote.owned === false) {
+        const target = remote.remoteSessionName || remoteTmuxSessionName(sessionId);
+        return buildRemoteAttachCommand(remote, target);
+    }
+    return buildRemoteLaunchCommand(options);
+}
 /**
  * Set sensitive environment variables on a tmux session via setenv.
  * These are inherited by panes but not visible in ps output or tmux history.
@@ -1084,6 +1178,16 @@ export class TmuxManager extends EventEmitter {
     mouseSyncInterval = null;
     /** Track last-known pane count per session to avoid unnecessary tmux set-option calls */
     lastPaneCount = new Map();
+    // ── COD-108 remote-reconnect watcher state ────────────────────────────────
+    /** Periodic watcher that re-establishes dropped remote sessions. */
+    remoteReconnectInterval = null;
+    /** Per-session backoff/attempt bookkeeping (sessionId → state). */
+    reconnectState = new Map();
+    /**
+     * Sessions excluded from auto-reconnect because they are being intentionally
+     * torn down (killed/detached/stopping). A guarded session is NEVER revived.
+     */
+    reconnectGuard = new Set();
     trueColorConfigured = false;
     constructor() {
         super();
@@ -1368,7 +1472,7 @@ export class TmuxManager extends EventEmitter {
             const fullCmd = docker
                 ? buildDockerLaunchCommand(resolveDockerLaunchOptions(mode, docker, sessionId, resumeSessionId))
                 : remote
-                    ? buildRemoteLaunchCommand({ mode, remote, sessionId, claudeMode, allowedTools })
+                    ? buildRemoteSessionCommand({ mode, remote, sessionId, claudeMode, allowedTools })
                     : localFullCmd;
             // Create tmux session in three steps to handle cold-start (no server running)
             // and avoid the race where the command exits before remain-on-exit is set:
@@ -1587,7 +1691,7 @@ export class TmuxManager extends EventEmitter {
         const fullCmd = docker
             ? buildDockerLaunchCommand(resolveDockerLaunchOptions(mode, docker, sessionId, resumeSessionId))
             : remote
-                ? buildRemoteLaunchCommand({ mode, remote, sessionId, claudeMode, allowedTools })
+                ? buildRemoteSessionCommand({ mode, remote, sessionId, claudeMode, allowedTools })
                 : localFullCmd;
         try {
             // For OpenCode: set sensitive env vars via tmux setenv before respawn
@@ -1696,9 +1800,15 @@ export class TmuxManager extends EventEmitter {
         if (!session) {
             return false;
         }
+        // COD-108: an intentional kill/detach must NEVER be auto-revived by the
+        // remote-reconnect watcher. Guard BEFORE any teardown so a tick that fires
+        // mid-kill (especially the non-owned DETACH early-return below, where the
+        // dead local pane would otherwise look reconnectable) sees the guard.
+        this.guardRemoteReconnect(sessionId);
         // TEST MODE: Remove from memory only — NEVER touch real tmux sessions
         if (IS_TEST_MODE) {
             this.sessions.delete(sessionId);
+            this.clearRemoteReconnectState(sessionId);
             this.emit('sessionKilled', { sessionId });
             return true;
         }
@@ -1708,6 +1818,40 @@ export class TmuxManager extends EventEmitter {
             console.error(`[TmuxManager] BLOCKED: Refusing to kill own tmux session: ${session.muxName}`);
             return false;
         }
+        // COD-105 — DETACH-NOT-KILL for NON-owned remote sessions.
+        //
+        // When this session was created by ATTACHING a remote tmux session another
+        // Codeman owns (`remote.owned === false`), closing the tab must NOT propagate
+        // a remote `tmux kill-session` — that would nuke work the remote's own
+        // Codeman (or another instance) still relies on. We tear down ONLY the LOCAL
+        // pane that holds the ssh client: killing the local ssh sends SIGHUP to its
+        // remote `tmux attach`, which DETACHES (the durable remote session survives).
+        //
+        // This early return is the structural guarantee: no code below this point
+        // (now or in future for owned sessions) can ever issue a remote kill-session
+        // for a non-owned session. The only `kill-session` we run is on OUR LOCAL
+        // socket (`this.tmux()` = `tmux -L codeman` on THIS host), which kills the
+        // local pane — it does NOT reach the REMOTE socket.
+        if (session.remote && session.remote.owned === false) {
+            console.log(`[TmuxManager] DETACH (non-owned remote): tearing down local pane only for ${session.muxName}`);
+            if (isValidMuxName(session.muxName)) {
+                try {
+                    // Local socket only — detaches the remote session by killing the local ssh pane.
+                    execSync(`${this.tmux()} kill-session -t "${session.muxName}" 2>/dev/null`, {
+                        timeout: EXEC_TIMEOUT_MS,
+                    });
+                }
+                catch {
+                    // Local pane may already be gone.
+                }
+            }
+            this.lastPaneCount.delete(session.muxName);
+            this.sessions.delete(sessionId);
+            this.clearRemoteReconnectState(sessionId);
+            this.saveSessions();
+            this.emit('sessionKilled', { sessionId });
+            return true;
+        }
         // Get current PID (may have changed)
         const currentPid = this.getPanePid(session.muxName) || session.pid;
         console.log(`[TmuxManager] Killing session ${session.muxName} (PID ${currentPid})`);
@@ -1806,6 +1950,7 @@ export class TmuxManager extends EventEmitter {
         }
         this.lastPaneCount.delete(session.muxName);
         this.sessions.delete(sessionId);
+        this.clearRemoteReconnectState(sessionId);
         this.saveSessions();
         this.emit('sessionKilled', { sessionId });
         return true;
@@ -1867,6 +2012,7 @@ export class TmuxManager extends EventEmitter {
             else {
                 dead.push(sessionId);
                 this.sessions.delete(sessionId);
+                this.clearRemoteReconnectState(sessionId);
                 this.emit('sessionDied', { sessionId });
             }
         }
@@ -2103,9 +2249,115 @@ export class TmuxManager extends EventEmitter {
         }
         this.lastPaneCount.clear();
     }
+    // ── COD-108 remote-session auto-reconnect watcher ─────────────────────────
+    /**
+     * Start the remote-reconnect watcher (COD-108). Each tick, for every tracked
+     * session with `session.remote` whose local pane is DEAD, not intentionally
+     * guarded, and within its backoff budget, emit `remoteSessionDropped` so the
+     * session owner reattaches (re-running the idempotent remote command rejoins
+     * the durable remote tmux session). After the attempt cap, emit
+     * `remoteReconnectExhausted` once and go quiet.
+     *
+     * No-op tick body under `IS_TEST_MODE` (mirrors `startMouseModeSync`): tests
+     * drive the logic deterministically via {@link runRemoteReconnectTick}.
+     */
+    startRemoteReconnectWatcher(intervalMs = DEFAULT_REMOTE_RECONNECT_INTERVAL_MS) {
+        if (this.remoteReconnectInterval) {
+            clearInterval(this.remoteReconnectInterval);
+        }
+        this.remoteReconnectInterval = setInterval(() => {
+            if (IS_TEST_MODE)
+                return;
+            try {
+                this.runRemoteReconnectTick(Date.now(), isRemoteAutoReconnectEnabled());
+            }
+            catch (err) {
+                console.error('[TmuxManager] Remote reconnect watcher error:', err);
+            }
+        }, intervalMs);
+    }
+    stopRemoteReconnectWatcher() {
+        if (this.remoteReconnectInterval) {
+            clearInterval(this.remoteReconnectInterval);
+            this.remoteReconnectInterval = null;
+        }
+    }
+    /**
+     * Run ONE watcher tick. Extracted (and given an injected `now`/`enabled`) so
+     * the reconnect logic is deterministically testable even though the live
+     * `setInterval` body no-ops under test mode. For each remote session it
+     * applies the pure {@link decideReconnect} decision and translates the result
+     * into events + backoff/state transitions. Public for tests + the watcher.
+     */
+    runRemoteReconnectTick(now, enabled) {
+        for (const session of this.sessions.values()) {
+            if (!session.remote)
+                continue;
+            const sessionId = session.sessionId;
+            const state = this.reconnectState.get(sessionId);
+            const action = decideReconnect({
+                session: {
+                    sessionId,
+                    isRemote: true,
+                    paneDead: this.isPaneDead(session.muxName),
+                },
+                state,
+                guarded: this.reconnectGuard.has(sessionId),
+                enabled,
+                now,
+            });
+            if (action.kind === 'emit') {
+                const base = state ?? freshReconnectState();
+                // Mark in-flight + advance backoff BEFORE emitting so a re-entrant tick
+                // (or a synchronous listener) can never stack a second reconnect.
+                this.reconnectState.set(sessionId, { ...advanceBackoff(base, now), inFlight: true });
+                this.emit('remoteSessionDropped', { sessionId, attempt: action.attempt });
+            }
+            else if (action.kind === 'exhaust') {
+                const base = state ?? freshReconnectState();
+                if (!base.exhaustedEmitted) {
+                    this.reconnectState.set(sessionId, { ...base, exhausted: true, exhaustedEmitted: true });
+                    this.emit('remoteReconnectExhausted', { sessionId });
+                }
+            }
+            // 'skip' → nothing to do.
+        }
+    }
+    /**
+     * Tell the watcher a reattach attempt for `sessionId` finished. On success,
+     * reset the backoff so the session is healthy again; on failure, just clear
+     * the in-flight flag so the next due tick can retry under the existing
+     * backoff schedule. Called by the session owner after `respawnPane`.
+     */
+    noteRemoteReconnect(sessionId, success) {
+        if (success) {
+            this.reconnectState.set(sessionId, resetReconnectState());
+            return;
+        }
+        const state = this.reconnectState.get(sessionId);
+        if (state)
+            this.reconnectState.set(sessionId, { ...state, inFlight: false });
+    }
+    /**
+     * Exclude a session from auto-reconnect (intentional teardown). Adds it to the
+     * guard set and drops any backoff state so a closed/killed tab — especially a
+     * non-owned remote DETACH — is never auto-revived. Idempotent.
+     */
+    guardRemoteReconnect(sessionId) {
+        this.reconnectGuard.add(sessionId);
+        this.reconnectState.delete(sessionId);
+    }
+    /** Clear all per-session reconnect + guard state (e.g. when a session is removed). */
+    clearRemoteReconnectState(sessionId) {
+        this.reconnectState.delete(sessionId);
+        this.reconnectGuard.delete(sessionId);
+    }
     destroy() {
         this.stopStatsCollection();
         this.stopMouseModeSync();
+        this.stopRemoteReconnectWatcher();
+        this.reconnectState.clear();
+        this.reconnectGuard.clear();
     }
     registerSession(session) {
         this.sessions.set(session.sessionId, session);