aicodeman 1.35.0 → 1.41.0

package/dist/session.js

@@ -28,6 +28,7 @@
  * @module session
  */
 import { EventEmitter } from 'node:events';
+import { basename } from 'node:path';
 import { execSync, execFileSync } from 'node:child_process';
 import { v4 as uuidv4 } from 'uuid';
 import * as pty from 'node-pty';
@@ -42,7 +43,7 @@ import { RalphTracker } from './ralph-tracker.js';
 import { BashToolParser } from './bash-tool-parser.js';
 import { isTrustDialogScreen, trustDialogNextKey, TRUST_KEY_CONFIRM, TRUST_DIALOG_WINDOW_MS, TRUST_DIALOG_RETRY_MS, TRUST_DIALOG_MAX_ATTEMPTS, TRUST_DIALOG_SCAN_BYTES, } from './session-trust-dialog.js';
 import { trackActivityStreak, isSustainedActivity, isPaneQuiet, watchingLabel, isAwaitingWorkers, WATCHING_TAIL_LINES, IDLE_RECHECK_MS, PANE_PROBE_MIN_INTERVAL_MS, PANE_PROBE_RECHECK_MS, } from './session-activity.js';
-import { BufferAccumulator, ANSI_ESCAPE_PATTERN_FULL, TOKEN_PATTERN, SPINNER_PATTERN, CLAUDE_WORKING_LINE_PATTERN, MAX_SESSION_TOKENS, execPattern, getClaudeCliVersion, getClaudeBinaryPath, spawnPtyWithHelperRepair, resolveLocalShell, } from './utils/index.js';
+import { BufferAccumulator, ANSI_ESCAPE_PATTERN_FULL, TOKEN_PATTERN, SPINNER_PATTERN, CLAUDE_WORKING_LINE_PATTERN, MAX_SESSION_TOKENS, execPattern, getClaudeCliVersion, getClaudeBinaryPath, spawnPtyWithHelperRepair, resolveLocalShell, waitForProcessesExit, } from './utils/index.js';
 import { MAX_TERMINAL_BUFFER_SIZE, TRIM_TERMINAL_TO as TERMINAL_BUFFER_TRIM_SIZE, MAX_TEXT_OUTPUT_SIZE, TRIM_TEXT_TO as TEXT_OUTPUT_TRIM_SIZE, MAX_MESSAGES, MAX_LINE_BUFFER_SIZE, } from './config/buffer-limits.js';
 import { DEFAULT_TMUX_HISTORY_LIMIT } from './config/terminal-history.js';
 import { EXEC_TIMEOUT_MS } from './config/exec-timeout.js';
@@ -58,6 +59,9 @@ import { InteractivePtyExitBreaker } from './session-pty-exit-breaker.js';
 import { isGeneratedSessionName, SubmittedPromptTracker } from './session-auto-name.js';
 import { parseTerminalAttachmentRequests } from './attachment-magic.js';
 import { sanitizeAttachmentHistory, upsertAttachmentHistory as upsertAttachmentHistoryList, } from './session-attachment-history.js';
+import { resolveConfigModel } from './model-config-resolvers.js';
+import { legacyConfigForMode } from './session-cli-registry-bridge.js';
+import { launchModelFor, readScreenModel, resolveDisplayModel, restoredReportedModel, sanitizeModelName, } from './session-display-model.js';
 /** Line buffer flush interval (100ms) - forces processing of partial lines */
 const LINE_BUFFER_FLUSH_INTERVAL = 100;
 // ============================================================================
@@ -75,7 +79,10 @@ const IDLE_DETECTION_DELAY_MS = 2000;
 // (input, task assignment, respawn) always stamp through it.
 const WIRE_ACTIVITY_SETTLE_MS = 15_000;
 // Note: Auto-compact/clear timing constants moved to session-auto-ops.ts
-/** Graceful shutdown delay when stopping session (100ms) */
+/**
+ * Longest the PTY process gets to exit on SIGTERM before SIGKILL when stopping a
+ * session. A deadline, not a sleep: stop() moves on as soon as it has exited.
+ */
 const GRACEFUL_SHUTDOWN_DELAY_MS = 100;
 // Conversations kept in a pane's chain. A pane that /clears repeatedly would
 // otherwise grow state.json without bound; 32 covers any real session's history
@@ -163,10 +170,11 @@ function cliExportsTruecolor(mode) {
  * Codex, Claude Code, and Gemini are known, controlled (Ink/React) TUIs that
  * repaint via cursor positioning, so dropping the alt-screen switch is safe —
  * content stays in the normal buffer. Excluded: `shell` (arbitrary programs like
- * vim/less/htop legitimately need the alt screen), `opencode` (renders its own
- * TUI that may rely on it), `pi` (below) and `grok` (a fullscreen alt-screen TUI
- * with mouse support, i.e. the opencode case, not the Ink case). Keep parity
- * with the replay-side strip in session-routes.ts.
+ * vim/less/htop legitimately need the alt screen), `opencode` (its own MIDDLE strip,
+ * isMuxMouseStripMode), `pi` (below) and `grok` (a fullscreen alt-screen TUI with
+ * mouse support). Keep parity with the replay-side strip (`stripReplayBuffer` in
+ * session-routes.ts); the table in `CliCapabilities.altScreen` is pinned for every
+ * stock CLI in test/claude-scrollback-strip.test.ts.
  *
  * ⚠️ Being excluded here does NOT preserve the alt screen. Every excluded mode
  * falls through to isMuxAltScreenOnlyStripMode(), which strips the alt-screen
@@ -185,8 +193,10 @@ export function isAltScreenStripMode(mode) {
 }
 /**
  * Modes that need the NARROW strip: alt-screen toggles only, leaving `\x1b[3J`
- * and the mouse-tracking DECSETs alone. Applies to every mode `isAltScreenStripMode`
- * excludes, but ONLY when the session is tmux-backed (`useMux`).
+ * and the mouse-tracking DECSETs alone. Applies to every mode that is neither
+ * `strip-full` (isAltScreenStripMode) nor `strip-mux-and-mouse` (isMuxMouseStripMode),
+ * so `strip-mux-only` and `preserve` alike, but ONLY when the session is tmux-backed
+ * (`useMux`).
  *
  * The bug (issue #205): the tmux CLIENT emits `smcup` (`\x1b[?1049h`) as its first
  * bytes on attach, before any program has run. Unstripped, xterm.js parks in the
@@ -211,7 +221,31 @@ export function isAltScreenStripMode(mode) {
  * `\x1b[3J` from a user's own `clear` is a deliberate "wipe my scrollback".
  */
 export function isMuxAltScreenOnlyStripMode(mode, useMux) {
-    return useMux && !isAltScreenStripMode(mode);
+    if (!useMux)
+        return false;
+    const altScreen = getCli(mode)?.capabilities.altScreen;
+    return altScreen !== 'strip-full' && altScreen !== 'strip-mux-and-mouse';
+}
+/**
+ * Modes whose mouse-tracking DECSETs must be stripped, leaving `3J` alone:
+ * `altScreen: 'strip-mux-and-mouse'`, i.e. a mouse-capable full-screen TUI.
+ *
+ * Why this exists (opencode, measured 2026-09-16): the TUI enables tracking
+ * DECSETs, tmux runs with `mouse off` and therefore passes the PANE's DECSETs
+ * straight through to the tmux client, and the browser's xterm obeyed them —
+ * `mouseTrackingMode` flipped to `'any'` and xterm then reported DRAGS to the TUI
+ * instead of selecting locally. "Mark text, copy on select" silently did nothing
+ * (measured 62 `none` / 18 `any` over 16s, and 5/5 dead drags while `any`), and
+ * the obvious fallback — Ctrl+C — is opencode's `app_exit`, so the failure also
+ * ended sessions. Stripping at the source keeps xterm in selection mode; clicks
+ * still reach the CLI through the browser's hand-encoded tap, which this strip
+ * publishes as `cliMouseTracking` (`_recordStrippedMouseMode`).
+ *
+ * Gated on `useMux` for the same reason as the narrow strip: on the direct-PTY
+ * fallback the program's own DECSETs really do reach xterm and must be honoured.
+ */
+export function isMuxMouseStripMode(mode, useMux) {
+    return useMux && getCli(mode)?.capabilities.altScreen === 'strip-mux-and-mouse';
 }
 // Note: Claude CLI PATH resolution moved to session-cli-builder.ts (buildClaudeEnv)
 /** PTY fallback geometry when tmux can't be queried (matches pre-#80 hardcoded values). */
@@ -405,6 +439,27 @@ export class Session extends EventEmitter {
     _watchingWindow = WATCHING_TAIL_LINES;
     /** Lazily compiled `capabilities.workDetect.awaitingLine`. See _awaitingLinePattern(). */
     _awaitingLineRe = undefined;
+    /**
+     * The newest model the running CLI reported for itself (its statusline, or its own
+     * footer read off the probe's capture), or null when none has. Feeds `displayModel`
+     * (src/session-display-model.ts). Persisted through `toState()` and restored after a
+     * restart, so an idle session keeps naming its model until the next report.
+     */
+    _reportedModel = null;
+    /**
+     * The model the CLI's own config pins for this session (`modelDetect.configResolver`),
+     * read at each pane start, attach or relaunch; null when it pins none. Below any
+     * report from the running CLI in `displayModel`. Not persisted: the next start reads it.
+     */
+    _configModel = null;
+    /** Bumped per config read, so a read that lands after a newer one is dropped. */
+    _configModelGen = 0;
+    /** Lazily compiled `capabilities.modelDetect.screenLine`. See _modelLinePattern(). */
+    _modelLineRe = undefined;
+    /** Resolved with the pattern above: how many rows at the foot of the screen it sees. */
+    _modelLineRows = 1;
+    /** Resolved with the pattern above: the fields it shows that are never the model. */
+    _modelRejectWords = [];
     _trustDialogAccepted = false; // Stops the trust-dialog scan (answered, or given up)
     _trustDialogAttempts = 0; // Keystrokes sent at the trust dialog
     _lastTrustDialogScanAt = 0; // Throttle for the trust-dialog screen read
@@ -697,6 +752,7 @@ export class Session extends EventEmitter {
         // replaces it with a first-hand reading. NOT the stats collector, which a
         // browser panel arms and disarms — see `startPaneExitWatcher`.
         this.setPaneExit(config.paneExit);
+        this._reportedModel = restoredReportedModel(config.displayModel) ?? null;
         // Never self-parent: a session pointing at itself would draw a zero-length
         // lineage arc under its own tab. Only reachable via the recovery path, where
         // both the id and the saved parent come from disk.
@@ -964,6 +1020,9 @@ export class Session extends EventEmitter {
         finally {
             this._paneLifecycleOps--;
             this._paneStartedAt = Date.now();
+            // A start, attach or relaunch is when the CLI read its config, so it is when
+            // the model that config pins is read here too.
+            this._refreshConfigModel();
         }
     }
     /**
@@ -1010,7 +1069,7 @@ export class Session extends EventEmitter {
     /**
      * True when this session's PTY is a tmux client rather than the program itself.
      * Read by the replay-side alt-screen strip, which must apply the same
-     * `useMux` gate as the live strip (isMuxAltScreenOnlyStripMode).
+     * `useMux` gate as the live strip (isMuxAltScreenOnlyStripMode, isMuxMouseStripMode).
      */
     get usesMux() {
         return this._useMux;
@@ -1482,6 +1541,7 @@ export class Session extends EventEmitter {
             model: cliTakesSessionModel(this.mode) ? this._model : undefined,
             advisorModel: this._advisorModel,
             customModel: this.customModel,
+            displayModel: this.displayModel,
             // COD-118: runtime-only — surfaced so the frontend can require explicit user
             // intent before restarting a crash-looped session. Deliberately NOT restored
             // by the constructor: a Codeman restart starts with a fresh breaker so boot
@@ -2094,14 +2154,21 @@ export class Session extends EventEmitter {
         // redraws overwrite only the cells they target, so non-erased rows keep
         // their content. Gated to Codex/Claude/Gemini (isAltScreenStripMode).
         //
-        // Every OTHER mode (shell/opencode/antigravity) gets the NARROW strip when it
-        // is tmux-backed: alt-screen toggles only, because the sequence that breaks
+        // Every OTHER mode (shell/antigravity/pi/grok/deepseek/omp) gets the NARROW strip
+        // when it is tmux-backed: alt-screen toggles only, because the sequence that breaks
         // scrollback there is tmux's own client-side smcup at attach, not anything the
         // program in the pane emitted (issue #205, see isMuxAltScreenOnlyStripMode).
         // 3J and the mouse DECSETs stay, so `clear` and mouse-aware TUIs keep working.
+        //
+        // The MIDDLE case (isMuxMouseStripMode) is a mouse-capable full-screen TUI:
+        // it needs smcup AND the mouse DECSETs gone — otherwise the pane's tracking
+        // reaches xterm and every drag becomes a mouse report instead of a text
+        // selection, which is what killed mark-and-copy in opencode — while 3J stays,
+        // because a TUI is not a `clear` consumer.
         const fullStrip = isAltScreenStripMode(this.mode);
-        const altOnlyStrip = !fullStrip && isMuxAltScreenOnlyStripMode(this.mode, this._useMux);
-        if (fullStrip || altOnlyStrip) {
+        const mouseStrip = isMuxMouseStripMode(this.mode, this._useMux);
+        const altOnlyStrip = !fullStrip && !mouseStrip && isMuxAltScreenOnlyStripMode(this.mode, this._useMux);
+        if (fullStrip || mouseStrip || altOnlyStrip) {
             // Reassemble sequences split across PTY chunk boundaries first: a chunk
             // ending mid-sequence ('\x1b[?104' now, '9h' next) would slip past the
             // strip below and leave xterm stuck in the scrollback-less alt buffer
@@ -2121,11 +2188,13 @@ export class Session extends EventEmitter {
             // eslint-disable-next-line no-control-regex
             data = data.replace(/\x1b\[\?(?:47|1047|1049)[hl]/g, '');
             if (fullStrip) {
-                data = data
-                    // eslint-disable-next-line no-control-regex
-                    .replace(/\x1b\[3J/g, '')
-                    // eslint-disable-next-line no-control-regex
-                    .replace(/\x1b\[\?(?:1000|1001|1002|1003|1005|1006|1007)[hl]/g, (seq) => {
+                // eslint-disable-next-line no-control-regex
+                data = data.replace(/\x1b\[3J/g, '');
+            }
+            if (fullStrip || mouseStrip) {
+                data = data.replace(
+                // eslint-disable-next-line no-control-regex
+                /\x1b\[\?(?:1000|1001|1002|1003|1005|1006|1007)[hl]/g, (seq) => {
                     this._recordStrippedMouseMode(seq);
                     return '';
                 });
@@ -2337,20 +2406,14 @@ export class Session extends EventEmitter {
                         this._codexConfig?.resumeSessionId ||
                         this.id;
                 // For NEW mux sessions: wait for readiness then clean buffer
-                // For RESTORED mux sessions: don't do anything - client will fetch buffer on tab switch
+                // For RESTORED mux sessions: leave the buffer alone - client will fetch it on tab switch
                 if (!isRestored) {
                     if (isExternalCliMode(this.mode)) {
                         // External CLIs use custom TUIs — no ❯ prompt to detect.
                         // Wait for TUI to stabilize (output stops changing), then mark ready.
                         // Don't clear the buffer — the TUI's initial render IS the useful content.
                         // Emit needsRefresh so the client fetches the full buffer once the TUI has rendered.
-                        this._promptCheckTimeout = setTimeout(() => {
-                            this._promptCheckTimeout = null;
-                            if (this._isStopped)
-                                return;
-                            this._status = 'idle';
-                            this.emit('needsRefresh');
-                        }, 3000);
+                        this._armPaneSettle(false);
                     }
                     else {
                         // Claude mode: wait for ❯ prompt
@@ -2384,6 +2447,9 @@ export class Session extends EventEmitter {
                         }, 5000);
                     }
                 }
+                else {
+                    this._armPaneSettle(true);
+                }
             }
             catch (err) {
                 console.error('[Session] Failed to create mux session, falling back to direct PTY:', err);
@@ -2707,8 +2773,128 @@ export class Session extends EventEmitter {
         this._lastPaneProbeWorking =
             text === null ? null : this._workingLinePattern().test(text) || this._paneAwaitsWorkers(text);
         this._readWatching(text);
+        this._readScreenModel(text);
         return this._lastPaneProbeWorking;
     }
+    /**
+     * Read the model the CLI's own footer names off the same capture, for a CLI whose
+     * registry entry declares `capabilities.modelDetect`.
+     *
+     * Unlike `_readWatching`, a capture that could not be read, or a footer the pattern
+     * does not find (a popup covering it, a footer turned off), KEEPS the last model. The
+     * two are not symmetric: background work ends and its badge must go, while a model does
+     * not stop running because something was drawn over the row that names it.
+     */
+    _readScreenModel(paneText) {
+        if (paneText === null)
+            return;
+        const pattern = this._modelLinePattern();
+        if (!pattern)
+            return;
+        const model = readScreenModel(paneText, pattern, this._modelLineRows, {
+            rejectWords: this._modelRejectWords,
+            // A footer field equal to the folder this session runs in is the folder, never the
+            // model: the generic half of the rule, for every CLI.
+            cwdBasename: basename(this.workingDir),
+        });
+        if (model)
+            this.noteReportedModel('screen', model);
+    }
+    /**
+     * The regex reading this CLI's model off its footer, or null for a CLI that declares
+     * none. Compiled once per session through `compileVersionRegex()` (null, never a throw,
+     * for a pattern it refuses), like the working- and watching-line patterns.
+     */
+    _modelLinePattern() {
+        if (this._modelLineRe === undefined) {
+            const detect = getCli(this.mode)?.capabilities.modelDetect;
+            this._modelLineRe = detect?.screenLine ? compileVersionRegex(detect.screenLine) : null;
+            this._modelLineRows = detect?.screenLines ?? 1;
+            this._modelRejectWords = detect?.rejectWords ?? [];
+        }
+        return this._modelLineRe;
+    }
+    /**
+     * Record a model the running CLI reported for itself: its statusline (claude's
+     * exporter, via `POST /api/status-telemetry`) or its own footer. The newest report
+     * wins whatever its source. An empty or unprintable report changes nothing.
+     *
+     * @returns true when the reported model changed (and `displayModelChanged` was emitted)
+     */
+    noteReportedModel(source, raw) {
+        const model = sanitizeModelName(raw);
+        if (!model)
+            return false;
+        if (this._reportedModel?.model === model && this._reportedModel.source === source)
+            return false;
+        this._reportedModel = { model, source };
+        // The status does not change with it, so it needs a broadcast (and a persist) of its own.
+        this.emit('displayModelChanged');
+        return true;
+    }
+    /**
+     * The model this session runs as far as the server knows, and where that came from:
+     * the custom endpoint's model, else the newest report from the CLI, else the launch
+     * model (src/session-display-model.ts). Undefined when none is known.
+     */
+    get displayModel() {
+        return resolveDisplayModel({
+            customModelId: this._customModel?.modelId,
+            reported: this._reportedModel,
+            configModel: this._configModel,
+            launchModel: launchModelFor(this.mode, this._launchOptionBag()),
+        });
+    }
+    /**
+     * The same option bag the spawn reads its launch params from: `model` at the top for
+     * claude (the `--model` or app-wide default it was created with; inert for every other
+     * CLI, which is why it is not handed over for them), each other CLI's own
+     * `<Mode>Config`. Where a param lives is registry data (`legacyConfigForMode`).
+     */
+    _launchOptionBag() {
+        return {
+            model: cliTakesSessionModel(this.mode) ? this._model : undefined,
+            openCodeConfig: this._openCodeConfig,
+            codexConfig: this._codexConfig,
+            geminiConfig: this._geminiConfig,
+            antigravityConfig: this._antigravityConfig,
+            piConfig: this._piConfig,
+            grokConfig: this._grokConfig,
+            deepSeekConfig: this._deepSeekConfig,
+            ompConfig: this._ompConfig,
+        };
+    }
+    /**
+     * Read the model this session's CLI config pins, with the reader its registry entry
+     * names (`capabilities.modelDetect.configResolver`), and announce a change. Async and
+     * bounded (the reader probes before it reads); a read that lands after a newer one,
+     * or after the session stopped, is dropped. A remote or docker session's CLI reads its
+     * config on another machine or in its container, so nothing local is read for it.
+     */
+    _refreshConfigModel() {
+        const name = getCli(this.mode)?.capabilities.modelDetect?.configResolver;
+        if (!name || this._remote || this._docker)
+            return;
+        const gen = ++this._configModelGen;
+        const overrides = this._envOverrides;
+        resolveConfigModel(name, {
+            config: legacyConfigForMode(this.mode, this._launchOptionBag()),
+            // The session's own env first (already clamped for a non-granted owner), then the
+            // server's: what the pane's CLI inherits.
+            env: (key) => overrides?.[key] ?? process.env[key],
+        }).then((model) => {
+            if (gen !== this._configModelGen || this._isStopped)
+                return;
+            // Sanitized where it is published (resolveDisplayModel), like every source.
+            const next = model || null;
+            if (next === this._configModel)
+                return;
+            this._configModel = next;
+            this.emit('displayModelChanged');
+        }, () => {
+            /* A reader answers null on doubt and never throws; a throw changes nothing. */
+        });
+    }
     /**
      * Read the background-work chip off the same capture the working probe just took.
      *
@@ -2843,15 +3029,77 @@ export class Session extends EventEmitter {
         // 1. Claude was working and is now at prompt (normal case)
         // 2. Session just started and is ready (status is 'busy' but _isWorking is false)
         const wasWorking = this._isWorking;
-        const isInitialReady = this._status === 'busy' && !this._isWorking;
-        if (wasWorking || isInitialReady) {
-            this._isWorking = false;
-            this._status = 'idle';
-            this._lastPromptTime = Date.now();
-            if (wasWorking)
-                this._maybeCaptureOmpSessionId();
-            this.emit('idle');
-        }
+        if (wasWorking || this._status === 'busy')
+            this._concludeIdle(wasWorking);
+    }
+    /**
+     * The one place a pane is concluded idle: status, working flag and prompt stamp
+     * change together, and the change is ANNOUNCED. The `idle` event is what the web
+     * server turns into `session:idle` plus a state broadcast, so a path that flips
+     * `_status` without it leaves every browser on the `busy` it was last sent. A fresh
+     * codex pane used to stay "working" in the UI for its whole life that way.
+     *
+     * @param turnEnded a real turn just finished (not a pane becoming ready at launch)
+     */
+    _concludeIdle(turnEnded) {
+        this._isWorking = false;
+        this._status = 'idle';
+        this._lastPromptTime = Date.now();
+        // Only a finished turn proves omp has written its session file; a pane that is
+        // merely ready has nothing to resolve yet and could claim a neighbour's file.
+        if (turnEnded)
+            this._maybeCaptureOmpSessionId();
+        this.emit('idle');
+    }
+    /**
+     * Arm the launch settle (`_settlePaneStartup`) for a pane `startInteractive()` just
+     * started or re-attached, when one applies:
+     * - a NEW pane of an external CLI, whose TUI has no ❯ for the Claude wait to find;
+     * - a RESTORED pane (Codeman restart, auto-reattach, tile Attach) of a CLI that
+     *   declares no `capabilities.workDetect`. It is `busy` from `_resetBuffers()` like a
+     *   new pane, and with no composer glyph to arm `_confirmIdle()` nothing else would
+     *   ever settle it. A restored claude or codex pane is left to its glyph, which
+     *   reads the screen first, so a restart in mid-turn is never called idle.
+     */
+    _armPaneSettle(isRestored) {
+        const applies = isRestored ? !getCli(this.mode)?.capabilities.workDetect : isExternalCliMode(this.mode);
+        if (!applies)
+            return;
+        const armedAt = Date.now();
+        this._promptCheckTimeout = setTimeout(() => this._settlePaneStartup(!isRestored, armedAt), 3000);
+    }
+    /**
+     * The launch settle: 3 s after a NEW external-CLI pane spawned, or after ANY pane of a
+     * CLI without work detection was re-attached, its TUI is taken to have rendered. A pane
+     * still in its spawn-time `busy` is concluded idle (announced, see `_concludeIdle`),
+     * then, for a new pane, the browser is told to refetch the rendered screen.
+     *
+     * ⚠️ This used to set `_status = 'idle'` without an event. When the launch paint
+     * never tripped `_markWorking()`, the later `_confirmIdle()` found the status
+     * already idle and emitted nothing, so no browser ever learned the pane was ready.
+     *
+     * A pane is left to `_confirmIdle()` only when its CLI declares
+     * `capabilities.workDetect` (its composer glyph arms that confirmation, which reads
+     * the screen first) AND it is already working, or a prompt was submitted since the
+     * timer was armed: a turn started 2.9 s in is not marked working before the deferred
+     * parsers run, and an idle edge here would end a send-and-wait registered for it.
+     * For every other CLI this timer is the only thing that ever settles a fresh pane,
+     * so it settles it even if a stray spinner glyph in the launch paint latched
+     * `_isWorking`.
+     *
+     * @param refreshScreen emit `needsRefresh` (a new pane; an attach refetches by itself)
+     * @param armedAt when the timer was armed (a submit at or after it means a prompt)
+     */
+    _settlePaneStartup(refreshScreen, armedAt) {
+        this._promptCheckTimeout = null;
+        if (this._isStopped)
+            return;
+        const busyWithTurn = this._isWorking || this.lastSubmitAt >= armedAt;
+        const leaveToConfirm = busyWithTurn && !!getCli(this.mode)?.capabilities.workDetect;
+        if (this._status === 'busy' && !leaveToConfirm)
+            this._concludeIdle(false);
+        if (refreshScreen)
+            this.emit('needsRefresh');
     }
     /**
      * A brand-new omp session (never yet respawned, so
@@ -3736,7 +3984,7 @@ export class Session extends EventEmitter {
                 : this._mux.capturePaneText?.(this._muxSession.muxName),
             sendEnter: () => this._mux?.sendInput(this.id, '\r'),
             // ⚠ NO fallback glyph here, unlike the screen-reading probe elsewhere in this file.
-            // Only claude and codex declare a promptGlyph; the other eight modes would fall back
+            // Only claude, codex, pi, opencode, omp and gemini declare a promptGlyph; the other modes would fall back
             // to claude's `❯`, which is ALSO starship's default shell prompt (and pure's, and
             // spaceship's, and p10k lean's). On a shell session the line `❯ npm run build` sits
             // on screen for as long as the command runs, promptStillInComposer() reads that as
@@ -3990,8 +4238,11 @@ export class Session extends EventEmitter {
                 catch (err) {
                     console.warn('[Session] Failed to send SIGTERM to PTY process (may already be dead):', err);
                 }
-                // Give it a moment to terminate gracefully
-                await new Promise((resolve) => setTimeout(resolve, GRACEFUL_SHUTDOWN_DELAY_MS));
+                // Give it a moment to terminate gracefully. For a tmux-backed session this
+                // is the attach client, gone within a few ms of SIGTERM, and this used to be
+                // a fixed 100ms sleep on every close.
+                if (pid)
+                    await waitForProcessesExit([pid], { timeoutMs: GRACEFUL_SHUTDOWN_DELAY_MS });
                 // Force kill with SIGKILL if still alive
                 try {
                     if (pid) {