fix(web): preserve project terminal history

skulidropek · skulidropek · commit 25fedfeb1df7 · 2026-05-18T19:01:59.000Z
diff --git a/docs/pr-screenshots/issue-317/terminal-latest-output.png b/docs/pr-screenshots/issue-317/terminal-latest-output.png
diff --git a/docs/pr-screenshots/issue-317/terminal-scrolled-history.png b/docs/pr-screenshots/issue-317/terminal-scrolled-history.png
diff --git a/packages/api/src/services/terminal-sessions.ts b/packages/api/src/services/terminal-sessions.ts
@@ -976,10 +976,12 @@ export const renderTmuxAttachCommand = (
     `if ! command -v tmux >/dev/null 2>&1; then printf '%s\\n' ${
       shellQuote(args.missingMessage ?? tmuxMissingMessage)
     } >&2; exit 127; fi`,
-    `tmux has-session -t ${shellQuote(args.tmuxName)} 2>/dev/null || tmux new-session -d -s ${
+    `tmux has-session -t ${shellQuote(args.tmuxName)} 2>/dev/null || tmux start-server \\; set-option -g history-limit 50000 \\; new-session -d -s ${
       shellQuote(args.tmuxName)
     } -c ${shellQuote(args.targetDir)}`,
     `tmux set-option -t ${shellQuote(args.tmuxName)} status off >/dev/null 2>&1 || true`,
+    `tmux set-option -t ${shellQuote(args.tmuxName)} history-limit 50000 >/dev/null 2>&1 || true`,
+    `tmux set-option -t ${shellQuote(args.tmuxName)} mouse on >/dev/null 2>&1 || true`,
     `exec tmux attach-session -t ${shellQuote(args.tmuxName)}`
   ].join("; ")
   return `bash --noprofile --norc -lc ${shellQuote(script)}`
diff --git a/packages/api/tests/terminal-sessions.test.ts b/packages/api/tests/terminal-sessions.test.ts
@@ -247,9 +247,13 @@ describe("terminal sessions service", () => {
     expect(command).toContain("command -v tmux")
     expect(command).toContain("bash --noprofile --norc -lc")
     expect(command).toContain("tmux missing")
-    expect(command).toContain("tmux new-session -d -s")
+    expect(command).toContain("tmux start-server")
+    expect(command).toContain("set-option -g history-limit 50000")
+    expect(command).toContain("new-session -d -s")
     expect(command).toContain("tmux set-option")
     expect(command).toContain("status off")
+    expect(command).toContain("history-limit 50000")
+    expect(command).toContain("mouse on")
     expect(command).toContain("tmux attach-session -t")
     expect(command).toContain("docker-git-session-1")
     expect(command).toContain("/home/dev/project with spaces")
diff --git a/packages/app/src/docker-git/api-client-auth.ts b/packages/app/src/docker-git/api-client-auth.ts
@@ -25,11 +25,11 @@ import type {
   AuthGithubLoginCommand,
   AuthGithubLogoutCommand,
   AuthGithubStatusCommand,
-  AuthGrokLogoutCommand,
-  AuthGrokStatusCommand,
   AuthGitlabLoginCommand,
   AuthGitlabLogoutCommand,
-  AuthGitlabStatusCommand
+  AuthGitlabStatusCommand,
+  AuthGrokLogoutCommand,
+  AuthGrokStatusCommand
 } from "./frontend-lib/core/domain.js"
 import { resolvePathFromCwd } from "./frontend-lib/usecases/path-helpers.js"
 import type { ApiAuthRequiredError, ApiRequestError } from "./host-errors.js"
diff --git a/packages/app/src/docker-git/api-client.ts b/packages/app/src/docker-git/api-client.ts
@@ -31,11 +31,11 @@ export {
   githubLogin,
   githubLogout,
   githubStatus,
-  grokLogout,
-  grokStatus,
   gitlabLogin,
   gitlabLogout,
-  gitlabStatus
+  gitlabStatus,
+  grokLogout,
+  grokStatus
 } from "./api-client-auth.js"
 export {
   type ApiContainerTask,
diff --git a/packages/app/src/docker-git/program-auth.ts b/packages/app/src/docker-git/program-auth.ts
@@ -1,6 +1,7 @@
 import { Effect, Match, pipe } from "effect"
 
 import {
+  type ApiTerminalSession,
   codexImport,
   codexLogin,
   codexLogout,
@@ -9,19 +10,19 @@ import {
   githubLogin,
   githubLogout,
   githubStatus,
-  grokLogout,
-  grokStatus,
   gitlabLogin,
   gitlabLogout,
   gitlabStatus,
+  grokLogout,
+  grokStatus,
   type JsonValue,
   renderJsonPayload
 } from "./api-client.js"
 import { type ControllerRuntime, ensureControllerReady } from "./controller.js"
 import type { Command } from "./frontend-lib/core/domain.js"
-import type { ApiRequestError, CliError } from "./host-errors.js"
+import type { ApiRequestError, CliError, ControllerBootstrapError } from "./host-errors.js"
 import { terminalAuthTitle } from "./menu-auth-shared.js"
-import { attachTerminalSession } from "./terminal-session-client.js"
+import { attachTerminalSession, type TerminalSessionClientError } from "./terminal-session-client.js"
 
 type OperationalCommand = Exclude<Command, { readonly _tag: "Help" }>
 
@@ -45,7 +46,9 @@ export type RoutedAuthCommand = Extract<
   }
 >
 
-const withControllerReady = <E, R>(effect: Effect.Effect<void, E, R>) =>
+const withControllerReady = <E extends CliError, R>(
+  effect: Effect.Effect<void, E, R>
+): Effect.Effect<void, E | ControllerBootstrapError, R | ControllerRuntime> =>
   pipe(ensureControllerReady(), Effect.zipRight(effect))
 
 const renderAuthPayload = (payload: JsonValue) => Effect.log(renderJsonPayload(payload))
@@ -57,6 +60,17 @@ const missingAuthTerminalSessionError = (provider: "GrokOauth"): ApiRequestError
   message: `Controller did not create a terminal session for ${provider}.`
 })
 
+const attachGrokTerminalSession = (
+  session: ApiTerminalSession | null
+): Effect.Effect<void, ApiRequestError | TerminalSessionClientError> =>
+  session === null
+    ? Effect.fail(missingAuthTerminalSessionError("GrokOauth"))
+    : attachTerminalSession({
+      header: terminalAuthTitle("GrokOauth"),
+      session,
+      websocketPath: `/auth/terminal-sessions/${encodeURIComponent(session.id)}/ws`
+    })
+
 const routedAuthTags: Readonly<Record<string, true>> = {
   AuthCodexImport: true,
   AuthCodexLogin: true,
@@ -111,15 +125,7 @@ const handleGrokLoginCommand = (
 ) =>
   withControllerReady(
     createAuthTerminalSession("GrokOauth", command.label).pipe(
-      Effect.flatMap((session) =>
-        session === null
-          ? Effect.fail(missingAuthTerminalSessionError("GrokOauth"))
-          : attachTerminalSession({
-            header: terminalAuthTitle("GrokOauth"),
-            session,
-            websocketPath: `/auth/terminal-sessions/${encodeURIComponent(session.id)}/ws`
-          })
-      )
+      Effect.flatMap((session) => attachGrokTerminalSession(session))
     )
   )
 
diff --git a/packages/app/src/web/app-ready-terminal-screen.tsx b/packages/app/src/web/app-ready-terminal-screen.tsx
@@ -7,9 +7,9 @@ import type { ReadyLayoutProps } from "./app-ready-layout.js"
 import { Box, Text } from "./elements.js"
 import { TaskPanel } from "./panel-tasks.js"
 import { TerminalPanel } from "./panel-terminal.js"
-import type { TerminalExitInfo } from "./terminal-panel-runtime-types.js"
 import { type BrowserScreen, projectPickerScreen } from "./screen.js"
 import { shouldShowTerminalTabs } from "./terminal-mobile-layout.js"
+import type { TerminalExitInfo } from "./terminal-panel-runtime-types.js"
 import { terminalSessionId } from "./terminal-state.js"
 import { type ActiveTerminalSession, isPendingActiveTerminalSession, terminalTitleById } from "./terminal.js"
 
@@ -521,6 +521,7 @@ export const TerminalScreen = (props: TerminalScreenProps): JSX.Element | null =
             <TerminalPane
               key={terminalSessionId(activeSession)}
               onApplyProjectById={props.onApplyProjectById}
+              onAuthTerminalExitSuccess={props.onAuthTerminalExitSuccess}
               onCloseTaskManager={() => {
                 setTerminalView("terminal")
               }}
diff --git a/packages/app/src/web/panel-terminal.tsx b/packages/app/src/web/panel-terminal.tsx
@@ -3,7 +3,6 @@ import "xterm/css/xterm.css"
 import { type CSSProperties, type JSX, useCallback, useEffect, useRef, useState } from "react"
 
 import {
-  type TerminalExitInfo,
   isModifierOnlyTerminalKey,
   type MobileTerminalKey,
   mobileTerminalKeyInput,
@@ -12,6 +11,7 @@ import {
 import { resolveTerminalCompactHeaderMode, resolveTerminalTypingMode } from "./terminal-mobile-layout.js"
 import {
   type TerminalConnectionState,
+  type TerminalExitInfo,
   type TerminalInputController,
   type TerminalStatus,
   useTerminalSessionLifecycle
diff --git a/packages/app/src/web/terminal-panel-runtime-core.ts b/packages/app/src/web/terminal-panel-runtime-core.ts
@@ -30,14 +30,18 @@ import type {
   TerminalSocketListenerArgs,
   TerminalSocketRef
 } from "./terminal-panel-runtime-types.js"
-import { installTerminalQuerySuppression } from "./terminal-query-suppression.js"
+import { installTerminalQuerySuppression, type TerminalQuerySuppressionOptions } from "./terminal-query-suppression.js"
 import { resolveTerminalReconnectDelay, terminalReconnectGraceMs } from "./terminal-reconnect.js"
 import { parseTerminalServerMessage, resolveTerminalWebSocketUrl } from "./terminal.js"
 
 type TerminalClientMessage =
   | { readonly data: string; readonly type: "input" }
   | { readonly cols: number; readonly rows: number; readonly type: "resize" }
 
+type TerminalRuntimeOptions = {
+  readonly querySuppression?: TerminalQuerySuppressionOptions
+}
+
 type TerminalInlineImageFetchError = {
   readonly _tag: "TerminalInlineImageFetchError"
   readonly message: string
@@ -76,16 +80,20 @@ const clearReconnectTimer = (lifecycle: TerminalLifecycleState): void => {
   }
 }
 
-export const createTerminalRuntime = (host: HTMLDivElement): TerminalRuntime => {
+export const createTerminalRuntime = (
+  host: HTMLDivElement,
+  options: TerminalRuntimeOptions = {}
+): TerminalRuntime => {
   const terminal = new Terminal({
     allowProposedApi: true,
     convertEol: false,
     cursorBlink: true,
     fontFamily: "'IBM Plex Mono', 'SFMono-Regular', monospace",
     fontSize: 14,
+    scrollback: 50_000,
     theme: { background: "#080a0d", foreground: "#f4f7fb" }
   })
-  installTerminalQuerySuppression(terminal)
+  installTerminalQuerySuppression(terminal, options.querySuppression)
   const fitAddon = new FitAddon()
   terminal.loadAddon(fitAddon)
   terminal.open(host)
diff --git a/packages/app/src/web/terminal-panel-runtime.ts b/packages/app/src/web/terminal-panel-runtime.ts
@@ -168,6 +168,9 @@ const resolveMountHost = (
   return hostRef.current
 }
 
+const shouldAllowTerminalMouseTracking = (session: TerminalLifecycleArgs["session"]): boolean =>
+  session.browserProjectId !== undefined
+
 const mountTerminalSession = (args: TerminalLifecycleArgs): (() => void) | undefined => {
   const host = resolveMountHost(args)
   if (host === null) {
@@ -177,7 +180,11 @@ const mountTerminalSession = (args: TerminalLifecycleArgs): (() => void) | undef
   args.connectionRef.current = { closing: false, opened: false }
   const lifecycle = createLifecycleState()
   const socketRef: TerminalSocketRef = { current: null }
-  const { fitAddon, terminal } = createTerminalRuntime(host)
+  const { fitAddon, terminal } = createTerminalRuntime(host, {
+    querySuppression: {
+      allowMouseTracking: shouldAllowTerminalMouseTracking(args.session)
+    }
+  })
   const terminalInputController = createTerminalInputController(terminal, socketRef)
   const pasteGuard = createTerminalPasteGuard()
   const sendResize = (): void => {
@@ -240,8 +247,8 @@ export const useTerminalSessionLifecycle = (
 }
 
 export {
-  type TerminalExitInfo,
   type TerminalConnectionState,
+  type TerminalExitInfo,
   type TerminalInputController,
   type TerminalStatus
 } from "./terminal-panel-runtime-types.js"
diff --git a/packages/app/src/web/terminal-query-suppression.ts b/packages/app/src/web/terminal-query-suppression.ts
@@ -1,5 +1,9 @@
 export type TerminalQuerySuppression = { readonly dispose: () => void }
 
+export type TerminalQuerySuppressionOptions = {
+  readonly allowMouseTracking?: boolean
+}
+
 type Disposable = { readonly dispose: () => void }
 
 type FunctionIdentifier = {
@@ -29,26 +33,29 @@ export type TerminalQuerySuppressionTarget = {
   }
 }
 
-// DEC private modes whose `h`/`l` setter causes xterm.js to start emitting
-// unsolicited reply bytes back through `onData` on later DOM events:
-//   1000/1002/1003/1006/1015/1016 — mouse tracking (mouse events -> bytes)
-//   1004                          — focus reporting (focus/blur -> CSI I/O)
-// Suppressing the SET (`h`) leaves xterm.js in the default state (no event
-// emission); suppressing the RESET (`l`) is harmless and kept for symmetry.
+// DEC private modes whose `h`/`l` setter can cause xterm.js to emit event bytes
+// back through `onData` on later DOM events.
+const MOUSE_TRACKING_PRIVATE_MODES: ReadonlySet<number> = new Set([
+  1000,
+  1002,
+  1003,
+  1006,
+  1015,
+  1016
+])
+const FOCUS_REPORTING_PRIVATE_MODE = 1004
+
+// Suppressing SET leaves xterm.js in the default state (no event emission);
+// suppressing RESET is harmless and kept for symmetry.
 // Modes intentionally left to fall through to xterm's built-in handlers:
 //   25   — cursor visibility
 //   1049 — alternate screen buffer
 //   2004 — bracketed paste
 //   2026 — synchronized output (Ink uses BSU/ESU around every frame)
 //   1007 — alternate scroll (only changes wheel semantics, no leak)
 const SUPPRESSED_PRIVATE_MODES: ReadonlySet<number> = new Set([
-  1000,
-  1002,
-  1003,
-  1004,
-  1006,
-  1015,
-  1016
+  ...MOUSE_TRACKING_PRIVATE_MODES,
+  FOCUS_REPORTING_PRIVATE_MODE
 ])
 
 const isColorQuery = (data: string): boolean => {
@@ -68,10 +75,20 @@ const extractParam = (param: CsiParam): number | null => {
   return typeof head === "number" ? head : null
 }
 
-const containsSuppressedPrivateMode = (params: CsiParams): boolean => {
+const shouldSuppressPrivateMode = (
+  mode: number,
+  options: TerminalQuerySuppressionOptions
+): boolean =>
+  mode === FOCUS_REPORTING_PRIVATE_MODE ||
+  (options.allowMouseTracking !== true && MOUSE_TRACKING_PRIVATE_MODES.has(mode))
+
+const containsSuppressedPrivateMode = (
+  params: CsiParams,
+  options: TerminalQuerySuppressionOptions
+): boolean => {
   for (const param of params) {
     const value = extractParam(param)
-    if (value !== null && SUPPRESSED_PRIVATE_MODES.has(value)) {
+    if (value !== null && shouldSuppressPrivateMode(value, options)) {
       return true
     }
   }
@@ -95,15 +112,17 @@ const registerDcsSuppressor = (
 
 const registerSelectivePrivateModeSuppressor = (
   terminal: TerminalQuerySuppressionTarget,
-  final: "h" | "l"
+  final: "h" | "l",
+  options: TerminalQuerySuppressionOptions
 ): Disposable =>
   terminal.parser.registerCsiHandler(
     { final, prefix: "?" },
-    (params) => containsSuppressedPrivateMode(params)
+    (params) => containsSuppressedPrivateMode(params, options)
   )
 
 export const installTerminalQuerySuppression = (
-  terminal: TerminalQuerySuppressionTarget
+  terminal: TerminalQuerySuppressionTarget,
+  options: TerminalQuerySuppressionOptions = {}
 ): TerminalQuerySuppression => {
   const disposables: ReadonlyArray<Disposable> = [
     // OSC 4/10/11/12 — color queries (`?` payload). Set-color payloads fall through.
@@ -132,11 +151,11 @@ export const installTerminalQuerySuppression = (
     // CSI Pm t — window manipulation. Gated by `windowOptions` (off by default);
     // suppressed so an accidental future enable does not leak size reports.
     registerCsiSuppressor(terminal, { final: "t" }),
-    // CSI ? h / CSI ? l — block xterm from enabling focus reporting and mouse
-    // tracking modes that would later pump unsolicited bytes back through onData.
+    // CSI ? h / CSI ? l — block xterm from enabling focus reporting and,
+    // unless explicitly allowed for tmux project terminals, mouse tracking modes.
     // Other DEC private modes fall through to xterm's built-in setters.
-    registerSelectivePrivateModeSuppressor(terminal, "h"),
-    registerSelectivePrivateModeSuppressor(terminal, "l")
+    registerSelectivePrivateModeSuppressor(terminal, "h", options),
+    registerSelectivePrivateModeSuppressor(terminal, "l", options)
   ]
   return {
     dispose: () => {
diff --git a/packages/app/tests/docker-git/terminal-query-suppression.test.ts b/packages/app/tests/docker-git/terminal-query-suppression.test.ts
@@ -123,7 +123,11 @@ const ADDED_CSI_IDENTIFIERS: ReadonlyArray<FunctionIdentifier> = [
   { final: "t" }
 ]
 
-const SUPPRESSED_MODES: ReadonlyArray<number> = [1000, 1002, 1003, 1004, 1006, 1015, 1016]
+const MOUSE_TRACKING_MODES: ReadonlyArray<number> = [1000, 1002, 1003, 1006, 1015, 1016]
+
+const FOCUS_REPORTING_MODE = 1004
+
+const SUPPRESSED_MODES: ReadonlyArray<number> = [...MOUSE_TRACKING_MODES, FOCUS_REPORTING_MODE]
 
 const PASS_THROUGH_MODES: ReadonlyArray<number> = [25, 1007, 1049, 2004, 2026]
 
@@ -218,6 +222,20 @@ describe("terminal query suppression", () => {
     }
   })
 
+  it("allows DEC private mouse tracking when explicitly enabled for tmux project terminals", () => {
+    const mock = createMockTerminal()
+    installTerminalQuerySuppression(mock.terminal, { allowMouseTracking: true })
+    const setHandler = findCsi(mock, { final: "h", prefix: "?" })
+    const resetHandler = findCsi(mock, { final: "l", prefix: "?" })
+
+    for (const mode of MOUSE_TRACKING_MODES) {
+      expect(setHandler.callback([mode])).toBe(false)
+      expect(resetHandler.callback([mode])).toBe(false)
+    }
+    expect(setHandler.callback([FOCUS_REPORTING_MODE])).toBe(true)
+    expect(resetHandler.callback([FOCUS_REPORTING_MODE])).toBe(true)
+  })
+
   it("lets benign DEC private modes fall through to the built-in handler", () => {
     const mock = createMockTerminal()
     installTerminalQuerySuppression(mock.terminal)
