fix(server): stop replayed history from re-arming mouse reporting#4821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Sy-D wants to merge 3 commits into from
Closed

fix(server): stop replayed history from re-arming mouse reporting #4821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba5ff2b
fix(server): stop replayed history from re-arming mouse reporting
Sy-D Jul 29, 2026
7a2a579
fix(server): detect every mouse enable and gate on fresh subprocess s…
Sy-D Jul 29, 2026
add5fa2
fix(server): treat X10 as a mouse tracking mode
Sy-D Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions apps/server/src/terminal/Manager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1702,3 +1702,61 @@ it.layer(
}).pipe(Effect.provide(TestClock.layer())),
);
});

const MOUSE_ENABLED_HISTORY = "$ lazygit\r\n\u001b[?1002h\u001b[?1006h";

it("clears mouse reporting from a replayed history once the shell is idle", () => {
const replayed = TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, false);

expect(replayed.startsWith(MOUSE_ENABLED_HISTORY)).toBe(true);
expect(replayed.slice(MOUSE_ENABLED_HISTORY.length)).toBe(
"\u001b[?9l\u001b[?1000l\u001b[?1001l\u001b[?1002l\u001b[?1003l\u001b[?1006l\u001b[?1015l\u001b[?1016l",
);
});

it("leaves mouse reporting alone while a child process can still consume it", () => {
assert.equal(
TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, true),
MOUSE_ENABLED_HISTORY,
);
});

it("detects mouse reporting enabled through a combined DECSET", () => {
const history = "$ lazygit\r\n\u001b[?1002;1006h";

expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects mouse reporting enabled through an 8-bit CSI introducer", () => {
const history = "$ lazygit\r\n\u009b?1003h";

expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects the X10 tracking mode", () => {
const history = "$ some-tui\r\n\u001b[?9h";

expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("ignores an encoding mode that cannot make the terminal report on its own", () => {
const history = "$ echo hi\r\n\u001b[?1006h";

expect(TerminalManager.replaySafeTerminalHistory(history, false)).toBe(history);
});

it("resets every mouse mode it recognises as an enable", () => {
const reset = TerminalManager.replaySafeTerminalHistory("\u001b[?1002h", false).slice(
"\u001b[?1002h".length,
);

for (const mode of [9, 1000, 1001, 1002, 1003, 1006, 1015, 1016]) {
expect(reset).toContain(`\u001b[?${mode}l`);
}
});

it("does not touch a history that never enabled mouse reporting", () => {
const history = "$ echo hello\r\nhello\r\n\u001b[?2004h";

assert.equal(TerminalManager.replaySafeTerminalHistory(history, false), history);
});
47 changes: 46 additions & 1 deletion apps/server/src/terminal/Manager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,46 @@ function terminalWireLabel(session: TerminalSessionState): string {
return truncateTerminalWireLabel(getTerminalLabel(session.terminalId));
}

/** Only a tracking mode makes a terminal emit reports; an encoding just shapes them. */
const MOUSE_TRACKING_MODES: ReadonlyArray<number> = [9, 1000, 1001, 1002, 1003];
const MOUSE_ENCODING_MODES: ReadonlyArray<number> = [1006, 1015, 1016];
const MOUSE_REPORTING_RESET = [...MOUSE_TRACKING_MODES, ...MOUSE_ENCODING_MODES]
.map((mode) => `\u001b[?${mode}l`)
.join("");
// A DECSET can carry several parameters at once (`ESC[?1002;1006h`) and may use the
// 7-bit `ESC [` or the 8-bit `\u009b` introducer, so match the shape of the sequence
// rather than a handful of single-parameter spellings.
// eslint-disable-next-line no-control-regex -- matching DECSET requires its control introducer.
const DECSET_PATTERN = /(?:\u001b\[|\u009b)\?([\d;]*)h/g;

function enablesMouseReporting(history: string): boolean {
DECSET_PATTERN.lastIndex = 0;
for (
let match = DECSET_PATTERN.exec(history);
match !== null;
match = DECSET_PATTERN.exec(history)
) {
const parameters = (match[1] ?? "").split(";");
if (parameters.some((parameter) => MOUSE_TRACKING_MODES.includes(Number(parameter)))) {
return true;
}
}
return false;
}

/**
* Mouse reporting is terminal state, not text. Replaying a history whose TUI was
* killed before it could restore the mode re-arms reporting on the fresh terminal,
* and every pointer move then echoes into the shell as a literal `ESC[<…M`. A live
* child process may still legitimately want the mode, so only clear it for an
* idle shell, where nothing is left to read the reports.
*/
export function replaySafeTerminalHistory(history: string, hasRunningSubprocess: boolean): string {
if (hasRunningSubprocess) return history;
if (!enablesMouseReporting(history)) return history;
return `${history}${MOUSE_REPORTING_RESET}`;
}

function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
return {
threadId: session.threadId,
Expand All@@ -331,7 +371,7 @@ function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
worktreePath: session.worktreePath,
status: session.status,
pid: session.pid,
history: session.history,
history: replaySafeTerminalHistory(session.history, session.hasRunningSubprocess),

@macroscopeappmacroscopeappBotJul 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Mediumterminal/Manager.ts:353

replaySafeTerminalHistory gates the mouse-reporting reset on the cached session.hasRunningSubprocess, which is only refreshed asynchronously by pollSubprocessActivity. If a TUI starts after the last poll and a client attaches before the next poll, the value is still false, so snapshot appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, hasRunningSubprocess remains true, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.

🤖 Copy this AI Prompt to have your agent fix this:
In file @apps/server/src/terminal/Manager.ts around line 353:
`replaySafeTerminalHistory` gates the mouse-reporting reset on the cached `session.hasRunningSubprocess`, which is only refreshed asynchronously by `pollSubprocessActivity`. If a TUI starts after the last poll and a client attaches before the next poll, the value is still `false`, so `snapshot` appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, `hasRunningSubprocess` remains `true`, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.

exitCode: session.exitCode,
exitSignal: session.exitSignal,
label: terminalWireLabel(session),
Expand DownExpand Up@@ -2370,6 +2410,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
return attachEvent ? listener(attachEvent) : Effect.void;
});

// The cached subprocess flag is only refreshed by a poller, so gating the replay
// on it would use state up to one interval old. Refresh first: a TUI that just
// started must keep its mouse reporting, and one that just exited must not leave
// it armed.
yield* pollSubprocessActivity();
const initialSnapshot = yield* openOrAttachForStream(input);

yield* listener({
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(server): stop replayed history from re-arming mouse reporting#4821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Sy-D
wants to merge
3
commits into

from

 Closed


fix(server): stop replayed history from re-arming mouse reporting
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ba5ff2b

fix(server): stop replayed history from re-arming mouse reporting


Sy-D Jul 29, 2026
7a2a579

fix(server): detect every mouse enable and gate on fresh subprocess s…


Sy-D Jul 29, 2026
add5fa2

fix(server): treat X10 as a mouse tracking mode


Sy-D Jul 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


58 changes: 58 additions & 0 deletions
apps/server/src/terminal/Manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1702,3 +1702,61 @@ it.layer(
 }).pipe(Effect.provide(TestClock.layer())),
 );
});

const MOUSE_ENABLED_HISTORY = "$ lazygit\r\n\u001b[?1002h\u001b[?1006h";

it("clears mouse reporting from a replayed history once the shell is idle", () => {
 const replayed = TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, false);

 expect(replayed.startsWith(MOUSE_ENABLED_HISTORY)).toBe(true);
 expect(replayed.slice(MOUSE_ENABLED_HISTORY.length)).toBe(
 "\u001b[?9l\u001b[?1000l\u001b[?1001l\u001b[?1002l\u001b[?1003l\u001b[?1006l\u001b[?1015l\u001b[?1016l",
 );
});

it("leaves mouse reporting alone while a child process can still consume it", () => {
 assert.equal(
 TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, true),
 MOUSE_ENABLED_HISTORY,
 );
});

it("detects mouse reporting enabled through a combined DECSET", () => {
 const history = "$ lazygit\r\n\u001b[?1002;1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects mouse reporting enabled through an 8-bit CSI introducer", () => {
 const history = "$ lazygit\r\n\u009b?1003h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects the X10 tracking mode", () => {
 const history = "$ some-tui\r\n\u001b[?9h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("ignores an encoding mode that cannot make the terminal report on its own", () => {
 const history = "$ echo hi\r\n\u001b[?1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).toBe(history);
});

it("resets every mouse mode it recognises as an enable", () => {
 const reset = TerminalManager.replaySafeTerminalHistory("\u001b[?1002h", false).slice(
 "\u001b[?1002h".length,
 );

 for (const mode of [9, 1000, 1001, 1002, 1003, 1006, 1015, 1016]) {
 expect(reset).toContain(`\u001b[?${mode}l`);
 }
});

it("does not touch a history that never enabled mouse reporting", () => {
 const history = "$ echo hello\r\nhello\r\n\u001b[?2004h";

 assert.equal(TerminalManager.replaySafeTerminalHistory(history, false), history);
});

47 changes: 46 additions & 1 deletion
apps/server/src/terminal/Manager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,46 @@ function terminalWireLabel(session: TerminalSessionState): string {
 return truncateTerminalWireLabel(getTerminalLabel(session.terminalId));
}

/** Only a tracking mode makes a terminal emit reports; an encoding just shapes them. */
const MOUSE_TRACKING_MODES: ReadonlyArray<number> = [9, 1000, 1001, 1002, 1003];
const MOUSE_ENCODING_MODES: ReadonlyArray<number> = [1006, 1015, 1016];
const MOUSE_REPORTING_RESET = [...MOUSE_TRACKING_MODES, ...MOUSE_ENCODING_MODES]
 .map((mode) => `\u001b[?${mode}l`)
 .join("");
// A DECSET can carry several parameters at once (`ESC[?1002;1006h`) and may use the
// 7-bit `ESC [` or the 8-bit `\u009b` introducer, so match the shape of the sequence
// rather than a handful of single-parameter spellings.
// eslint-disable-next-line no-control-regex -- matching DECSET requires its control introducer.
const DECSET_PATTERN = /(?:\u001b\[|\u009b)\?([\d;]*)h/g;

function enablesMouseReporting(history: string): boolean {
 DECSET_PATTERN.lastIndex = 0;
 for (
 let match = DECSET_PATTERN.exec(history);
 match !== null;
 match = DECSET_PATTERN.exec(history)
 ) {
 const parameters = (match[1] ?? "").split(";");
 if (parameters.some((parameter) => MOUSE_TRACKING_MODES.includes(Number(parameter)))) {
 return true;
 }
 }
 return false;
}

/**
 * Mouse reporting is terminal state, not text. Replaying a history whose TUI was
 * killed before it could restore the mode re-arms reporting on the fresh terminal,
 * and every pointer move then echoes into the shell as a literal `ESC[<…M`. A live
 * child process may still legitimately want the mode, so only clear it for an
 * idle shell, where nothing is left to read the reports.
 */
export function replaySafeTerminalHistory(history: string, hasRunningSubprocess: boolean): string {
 if (hasRunningSubprocess) return history;
 if (!enablesMouseReporting(history)) return history;
 return `${history}${MOUSE_REPORTING_RESET}`;
}

function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 return {
 threadId: session.threadId,
Expand All@@ -331,7 +371,7 @@ function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 worktreePath: session.worktreePath,
 status: session.status,
 pid: session.pid,
 history: session.history,
 history: replaySafeTerminalHistory(session.history, session.hasRunningSubprocess),
@macroscopeappmacroscopeappBotJul 29, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Mediumterminal/Manager.ts:353
replaySafeTerminalHistory gates the mouse-reporting reset on the cached session.hasRunningSubprocess, which is only refreshed asynchronously by pollSubprocessActivity. If a TUI starts after the last poll and a client attaches before the next poll, the value is still false, so snapshot appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, hasRunningSubprocess remains true, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.
🤖 Copy this AI Prompt to have your agent fix this:
In file @apps/server/src/terminal/Manager.ts around line 353:
`replaySafeTerminalHistory` gates the mouse-reporting reset on the cached `session.hasRunningSubprocess`, which is only refreshed asynchronously by `pollSubprocessActivity`. If a TUI starts after the last poll and a client attaches before the next poll, the value is still `false`, so `snapshot` appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, `hasRunningSubprocess` remains `true`, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.

 exitCode: session.exitCode,
 exitSignal: session.exitSignal,
 label: terminalWireLabel(session),
Expand DownExpand Up@@ -2370,6 +2410,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
 return attachEvent ? listener(attachEvent) : Effect.void;
 });

 // The cached subprocess flag is only refreshed by a poller, so gating the replay
 // on it would use state up to one interval old. Refresh first: a TUI that just
 // started must keep its mouse reporting, and one that just exited must not leave
 // it armed.
 yield* pollSubprocessActivity();
 const initialSnapshot = yield* openOrAttachForStream(input);

 yield* listener({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): stop replayed history from re-arming mouse reporting#4821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Sy-D
wants to merge
3
commits into

from

 Closed


fix(server): stop replayed history from re-arming mouse reporting
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ba5ff2b

fix(server): stop replayed history from re-arming mouse reporting


Sy-D Jul 29, 2026
7a2a579

fix(server): detect every mouse enable and gate on fresh subprocess s…


Sy-D Jul 29, 2026
add5fa2

fix(server): treat X10 as a mouse tracking mode


Sy-D Jul 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


58 changes: 58 additions & 0 deletions
apps/server/src/terminal/Manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1702,3 +1702,61 @@ it.layer(
 }).pipe(Effect.provide(TestClock.layer())),
 );
});

const MOUSE_ENABLED_HISTORY = "$ lazygit\r\n\u001b[?1002h\u001b[?1006h";

it("clears mouse reporting from a replayed history once the shell is idle", () => {
 const replayed = TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, false);

 expect(replayed.startsWith(MOUSE_ENABLED_HISTORY)).toBe(true);
 expect(replayed.slice(MOUSE_ENABLED_HISTORY.length)).toBe(
 "\u001b[?9l\u001b[?1000l\u001b[?1001l\u001b[?1002l\u001b[?1003l\u001b[?1006l\u001b[?1015l\u001b[?1016l",
 );
});

it("leaves mouse reporting alone while a child process can still consume it", () => {
 assert.equal(
 TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, true),
 MOUSE_ENABLED_HISTORY,
 );
});

it("detects mouse reporting enabled through a combined DECSET", () => {
 const history = "$ lazygit\r\n\u001b[?1002;1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects mouse reporting enabled through an 8-bit CSI introducer", () => {
 const history = "$ lazygit\r\n\u009b?1003h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects the X10 tracking mode", () => {
 const history = "$ some-tui\r\n\u001b[?9h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("ignores an encoding mode that cannot make the terminal report on its own", () => {
 const history = "$ echo hi\r\n\u001b[?1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).toBe(history);
});

it("resets every mouse mode it recognises as an enable", () => {
 const reset = TerminalManager.replaySafeTerminalHistory("\u001b[?1002h", false).slice(
 "\u001b[?1002h".length,
 );

 for (const mode of [9, 1000, 1001, 1002, 1003, 1006, 1015, 1016]) {
 expect(reset).toContain(`\u001b[?${mode}l`);
 }
});

it("does not touch a history that never enabled mouse reporting", () => {
 const history = "$ echo hello\r\nhello\r\n\u001b[?2004h";

 assert.equal(TerminalManager.replaySafeTerminalHistory(history, false), history);
});

47 changes: 46 additions & 1 deletion
apps/server/src/terminal/Manager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,46 @@ function terminalWireLabel(session: TerminalSessionState): string {
 return truncateTerminalWireLabel(getTerminalLabel(session.terminalId));
}

/** Only a tracking mode makes a terminal emit reports; an encoding just shapes them. */
const MOUSE_TRACKING_MODES: ReadonlyArray<number> = [9, 1000, 1001, 1002, 1003];
const MOUSE_ENCODING_MODES: ReadonlyArray<number> = [1006, 1015, 1016];
const MOUSE_REPORTING_RESET = [...MOUSE_TRACKING_MODES, ...MOUSE_ENCODING_MODES]
 .map((mode) => `\u001b[?${mode}l`)
 .join("");
// A DECSET can carry several parameters at once (`ESC[?1002;1006h`) and may use the
// 7-bit `ESC [` or the 8-bit `\u009b` introducer, so match the shape of the sequence
// rather than a handful of single-parameter spellings.
// eslint-disable-next-line no-control-regex -- matching DECSET requires its control introducer.
const DECSET_PATTERN = /(?:\u001b\[|\u009b)\?([\d;]*)h/g;

function enablesMouseReporting(history: string): boolean {
 DECSET_PATTERN.lastIndex = 0;
 for (
 let match = DECSET_PATTERN.exec(history);
 match !== null;
 match = DECSET_PATTERN.exec(history)
 ) {
 const parameters = (match[1] ?? "").split(";");
 if (parameters.some((parameter) => MOUSE_TRACKING_MODES.includes(Number(parameter)))) {
 return true;
 }
 }
 return false;
}

/**
 * Mouse reporting is terminal state, not text. Replaying a history whose TUI was
 * killed before it could restore the mode re-arms reporting on the fresh terminal,
 * and every pointer move then echoes into the shell as a literal `ESC[<…M`. A live
 * child process may still legitimately want the mode, so only clear it for an
 * idle shell, where nothing is left to read the reports.
 */
export function replaySafeTerminalHistory(history: string, hasRunningSubprocess: boolean): string {
 if (hasRunningSubprocess) return history;
 if (!enablesMouseReporting(history)) return history;
 return `${history}${MOUSE_REPORTING_RESET}`;
}

function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 return {
 threadId: session.threadId,
Expand All@@ -331,7 +371,7 @@ function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 worktreePath: session.worktreePath,
 status: session.status,
 pid: session.pid,
 history: session.history,
 history: replaySafeTerminalHistory(session.history, session.hasRunningSubprocess),
@macroscopeappmacroscopeappBotJul 29, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Mediumterminal/Manager.ts:353
replaySafeTerminalHistory gates the mouse-reporting reset on the cached session.hasRunningSubprocess, which is only refreshed asynchronously by pollSubprocessActivity. If a TUI starts after the last poll and a client attaches before the next poll, the value is still false, so snapshot appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, hasRunningSubprocess remains true, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.
🤖 Copy this AI Prompt to have your agent fix this:
In file @apps/server/src/terminal/Manager.ts around line 353:
`replaySafeTerminalHistory` gates the mouse-reporting reset on the cached `session.hasRunningSubprocess`, which is only refreshed asynchronously by `pollSubprocessActivity`. If a TUI starts after the last poll and a client attaches before the next poll, the value is still `false`, so `snapshot` appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, `hasRunningSubprocess` remains `true`, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.

 exitCode: session.exitCode,
 exitSignal: session.exitSignal,
 label: terminalWireLabel(session),
Expand DownExpand Up@@ -2370,6 +2410,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
 return attachEvent ? listener(attachEvent) : Effect.void;
 });

 // The cached subprocess flag is only refreshed by a poller, so gating the replay
 // on it would use state up to one interval old. Refresh first: a TUI that just
 // started must keep its mouse reporting, and one that just exited must not leave
 // it armed.
 yield* pollSubprocessActivity();
 const initialSnapshot = yield* openOrAttachForStream(input);

 yield* listener({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): stop replayed history from re-arming mouse reporting#4821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Sy-D
wants to merge
3
commits into

from

 Closed


fix(server): stop replayed history from re-arming mouse reporting
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ba5ff2b

fix(server): stop replayed history from re-arming mouse reporting


Sy-D Jul 29, 2026
7a2a579

fix(server): detect every mouse enable and gate on fresh subprocess s…


Sy-D Jul 29, 2026
add5fa2

fix(server): treat X10 as a mouse tracking mode


Sy-D Jul 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


58 changes: 58 additions & 0 deletions
apps/server/src/terminal/Manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1702,3 +1702,61 @@ it.layer(
 }).pipe(Effect.provide(TestClock.layer())),
 );
});

const MOUSE_ENABLED_HISTORY = "$ lazygit\r\n\u001b[?1002h\u001b[?1006h";

it("clears mouse reporting from a replayed history once the shell is idle", () => {
 const replayed = TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, false);

 expect(replayed.startsWith(MOUSE_ENABLED_HISTORY)).toBe(true);
 expect(replayed.slice(MOUSE_ENABLED_HISTORY.length)).toBe(
 "\u001b[?9l\u001b[?1000l\u001b[?1001l\u001b[?1002l\u001b[?1003l\u001b[?1006l\u001b[?1015l\u001b[?1016l",
 );
});

it("leaves mouse reporting alone while a child process can still consume it", () => {
 assert.equal(
 TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, true),
 MOUSE_ENABLED_HISTORY,
 );
});

it("detects mouse reporting enabled through a combined DECSET", () => {
 const history = "$ lazygit\r\n\u001b[?1002;1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects mouse reporting enabled through an 8-bit CSI introducer", () => {
 const history = "$ lazygit\r\n\u009b?1003h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects the X10 tracking mode", () => {
 const history = "$ some-tui\r\n\u001b[?9h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("ignores an encoding mode that cannot make the terminal report on its own", () => {
 const history = "$ echo hi\r\n\u001b[?1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).toBe(history);
});

it("resets every mouse mode it recognises as an enable", () => {
 const reset = TerminalManager.replaySafeTerminalHistory("\u001b[?1002h", false).slice(
 "\u001b[?1002h".length,
 );

 for (const mode of [9, 1000, 1001, 1002, 1003, 1006, 1015, 1016]) {
 expect(reset).toContain(`\u001b[?${mode}l`);
 }
});

it("does not touch a history that never enabled mouse reporting", () => {
 const history = "$ echo hello\r\nhello\r\n\u001b[?2004h";

 assert.equal(TerminalManager.replaySafeTerminalHistory(history, false), history);
});

47 changes: 46 additions & 1 deletion
apps/server/src/terminal/Manager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,46 @@ function terminalWireLabel(session: TerminalSessionState): string {
 return truncateTerminalWireLabel(getTerminalLabel(session.terminalId));
}

/** Only a tracking mode makes a terminal emit reports; an encoding just shapes them. */
const MOUSE_TRACKING_MODES: ReadonlyArray<number> = [9, 1000, 1001, 1002, 1003];
const MOUSE_ENCODING_MODES: ReadonlyArray<number> = [1006, 1015, 1016];
const MOUSE_REPORTING_RESET = [...MOUSE_TRACKING_MODES, ...MOUSE_ENCODING_MODES]
 .map((mode) => `\u001b[?${mode}l`)
 .join("");
// A DECSET can carry several parameters at once (`ESC[?1002;1006h`) and may use the
// 7-bit `ESC [` or the 8-bit `\u009b` introducer, so match the shape of the sequence
// rather than a handful of single-parameter spellings.
// eslint-disable-next-line no-control-regex -- matching DECSET requires its control introducer.
const DECSET_PATTERN = /(?:\u001b\[|\u009b)\?([\d;]*)h/g;

function enablesMouseReporting(history: string): boolean {
 DECSET_PATTERN.lastIndex = 0;
 for (
 let match = DECSET_PATTERN.exec(history);
 match !== null;
 match = DECSET_PATTERN.exec(history)
 ) {
 const parameters = (match[1] ?? "").split(";");
 if (parameters.some((parameter) => MOUSE_TRACKING_MODES.includes(Number(parameter)))) {
 return true;
 }
 }
 return false;
}

/**
 * Mouse reporting is terminal state, not text. Replaying a history whose TUI was
 * killed before it could restore the mode re-arms reporting on the fresh terminal,
 * and every pointer move then echoes into the shell as a literal `ESC[<…M`. A live
 * child process may still legitimately want the mode, so only clear it for an
 * idle shell, where nothing is left to read the reports.
 */
export function replaySafeTerminalHistory(history: string, hasRunningSubprocess: boolean): string {
 if (hasRunningSubprocess) return history;
 if (!enablesMouseReporting(history)) return history;
 return `${history}${MOUSE_REPORTING_RESET}`;
}

function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 return {
 threadId: session.threadId,
Expand All@@ -331,7 +371,7 @@ function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 worktreePath: session.worktreePath,
 status: session.status,
 pid: session.pid,
 history: session.history,
 history: replaySafeTerminalHistory(session.history, session.hasRunningSubprocess),
@macroscopeappmacroscopeappBotJul 29, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Mediumterminal/Manager.ts:353
replaySafeTerminalHistory gates the mouse-reporting reset on the cached session.hasRunningSubprocess, which is only refreshed asynchronously by pollSubprocessActivity. If a TUI starts after the last poll and a client attaches before the next poll, the value is still false, so snapshot appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, hasRunningSubprocess remains true, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.
🤖 Copy this AI Prompt to have your agent fix this:
In file @apps/server/src/terminal/Manager.ts around line 353:
`replaySafeTerminalHistory` gates the mouse-reporting reset on the cached `session.hasRunningSubprocess`, which is only refreshed asynchronously by `pollSubprocessActivity`. If a TUI starts after the last poll and a client attaches before the next poll, the value is still `false`, so `snapshot` appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, `hasRunningSubprocess` remains `true`, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.

 exitCode: session.exitCode,
 exitSignal: session.exitSignal,
 label: terminalWireLabel(session),
Expand DownExpand Up@@ -2370,6 +2410,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
 return attachEvent ? listener(attachEvent) : Effect.void;
 });

 // The cached subprocess flag is only refreshed by a poller, so gating the replay
 // on it would use state up to one interval old. Refresh first: a TUI that just
 // started must keep its mouse reporting, and one that just exited must not leave
 // it armed.
 yield* pollSubprocessActivity();
 const initialSnapshot = yield* openOrAttachForStream(input);

 yield* listener({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(server): stop replayed history from re-arming mouse reporting#4821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Sy-D
wants to merge
3
commits into

from

 Closed


fix(server): stop replayed history from re-arming mouse reporting
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ba5ff2b

fix(server): stop replayed history from re-arming mouse reporting


Sy-D Jul 29, 2026
7a2a579

fix(server): detect every mouse enable and gate on fresh subprocess s…


Sy-D Jul 29, 2026
add5fa2

fix(server): treat X10 as a mouse tracking mode


Sy-D Jul 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


58 changes: 58 additions & 0 deletions
apps/server/src/terminal/Manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1702,3 +1702,61 @@ it.layer(
 }).pipe(Effect.provide(TestClock.layer())),
 );
});

const MOUSE_ENABLED_HISTORY = "$ lazygit\r\n\u001b[?1002h\u001b[?1006h";

it("clears mouse reporting from a replayed history once the shell is idle", () => {
 const replayed = TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, false);

 expect(replayed.startsWith(MOUSE_ENABLED_HISTORY)).toBe(true);
 expect(replayed.slice(MOUSE_ENABLED_HISTORY.length)).toBe(
 "\u001b[?9l\u001b[?1000l\u001b[?1001l\u001b[?1002l\u001b[?1003l\u001b[?1006l\u001b[?1015l\u001b[?1016l",
 );
});

it("leaves mouse reporting alone while a child process can still consume it", () => {
 assert.equal(
 TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, true),
 MOUSE_ENABLED_HISTORY,
 );
});

it("detects mouse reporting enabled through a combined DECSET", () => {
 const history = "$ lazygit\r\n\u001b[?1002;1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects mouse reporting enabled through an 8-bit CSI introducer", () => {
 const history = "$ lazygit\r\n\u009b?1003h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects the X10 tracking mode", () => {
 const history = "$ some-tui\r\n\u001b[?9h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("ignores an encoding mode that cannot make the terminal report on its own", () => {
 const history = "$ echo hi\r\n\u001b[?1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).toBe(history);
});

it("resets every mouse mode it recognises as an enable", () => {
 const reset = TerminalManager.replaySafeTerminalHistory("\u001b[?1002h", false).slice(
 "\u001b[?1002h".length,
 );

 for (const mode of [9, 1000, 1001, 1002, 1003, 1006, 1015, 1016]) {
 expect(reset).toContain(`\u001b[?${mode}l`);
 }
});

it("does not touch a history that never enabled mouse reporting", () => {
 const history = "$ echo hello\r\nhello\r\n\u001b[?2004h";

 assert.equal(TerminalManager.replaySafeTerminalHistory(history, false), history);
});

47 changes: 46 additions & 1 deletion
apps/server/src/terminal/Manager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,46 @@ function terminalWireLabel(session: TerminalSessionState): string {
 return truncateTerminalWireLabel(getTerminalLabel(session.terminalId));
}

/** Only a tracking mode makes a terminal emit reports; an encoding just shapes them. */
const MOUSE_TRACKING_MODES: ReadonlyArray<number> = [9, 1000, 1001, 1002, 1003];
const MOUSE_ENCODING_MODES: ReadonlyArray<number> = [1006, 1015, 1016];
const MOUSE_REPORTING_RESET = [...MOUSE_TRACKING_MODES, ...MOUSE_ENCODING_MODES]
 .map((mode) => `\u001b[?${mode}l`)
 .join("");
// A DECSET can carry several parameters at once (`ESC[?1002;1006h`) and may use the
// 7-bit `ESC [` or the 8-bit `\u009b` introducer, so match the shape of the sequence
// rather than a handful of single-parameter spellings.
// eslint-disable-next-line no-control-regex -- matching DECSET requires its control introducer.
const DECSET_PATTERN = /(?:\u001b\[|\u009b)\?([\d;]*)h/g;

function enablesMouseReporting(history: string): boolean {
 DECSET_PATTERN.lastIndex = 0;
 for (
 let match = DECSET_PATTERN.exec(history);
 match !== null;
 match = DECSET_PATTERN.exec(history)
 ) {
 const parameters = (match[1] ?? "").split(";");
 if (parameters.some((parameter) => MOUSE_TRACKING_MODES.includes(Number(parameter)))) {
 return true;
 }
 }
 return false;
}

/**
 * Mouse reporting is terminal state, not text. Replaying a history whose TUI was
 * killed before it could restore the mode re-arms reporting on the fresh terminal,
 * and every pointer move then echoes into the shell as a literal `ESC[<…M`. A live
 * child process may still legitimately want the mode, so only clear it for an
 * idle shell, where nothing is left to read the reports.
 */
export function replaySafeTerminalHistory(history: string, hasRunningSubprocess: boolean): string {
 if (hasRunningSubprocess) return history;
 if (!enablesMouseReporting(history)) return history;
 return `${history}${MOUSE_REPORTING_RESET}`;
}

function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 return {
 threadId: session.threadId,
Expand All@@ -331,7 +371,7 @@ function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 worktreePath: session.worktreePath,
 status: session.status,
 pid: session.pid,
 history: session.history,
 history: replaySafeTerminalHistory(session.history, session.hasRunningSubprocess),
@macroscopeappmacroscopeappBotJul 29, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Mediumterminal/Manager.ts:353
replaySafeTerminalHistory gates the mouse-reporting reset on the cached session.hasRunningSubprocess, which is only refreshed asynchronously by pollSubprocessActivity. If a TUI starts after the last poll and a client attaches before the next poll, the value is still false, so snapshot appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, hasRunningSubprocess remains true, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.
🤖 Copy this AI Prompt to have your agent fix this:
In file @apps/server/src/terminal/Manager.ts around line 353:
`replaySafeTerminalHistory` gates the mouse-reporting reset on the cached `session.hasRunningSubprocess`, which is only refreshed asynchronously by `pollSubprocessActivity`. If a TUI starts after the last poll and a client attaches before the next poll, the value is still `false`, so `snapshot` appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, `hasRunningSubprocess` remains `true`, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.

 exitCode: session.exitCode,
 exitSignal: session.exitSignal,
 label: terminalWireLabel(session),
Expand DownExpand Up@@ -2370,6 +2410,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
 return attachEvent ? listener(attachEvent) : Effect.void;
 });

 // The cached subprocess flag is only refreshed by a poller, so gating the replay
 // on it would use state up to one interval old. Refresh first: a TUI that just
 // started must keep its mouse reporting, and one that just exited must not leave
 // it armed.
 yield* pollSubprocessActivity();
 const initialSnapshot = yield* openOrAttachForStream(input);

 yield* listener({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): stop replayed history from re-arming mouse reporting#4821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Sy-D
wants to merge
3
commits into

from

 Closed


fix(server): stop replayed history from re-arming mouse reporting
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ba5ff2b

fix(server): stop replayed history from re-arming mouse reporting


Sy-D Jul 29, 2026
7a2a579

fix(server): detect every mouse enable and gate on fresh subprocess s…


Sy-D Jul 29, 2026
add5fa2

fix(server): treat X10 as a mouse tracking mode


Sy-D Jul 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


58 changes: 58 additions & 0 deletions
apps/server/src/terminal/Manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1702,3 +1702,61 @@ it.layer(
 }).pipe(Effect.provide(TestClock.layer())),
 );
});

const MOUSE_ENABLED_HISTORY = "$ lazygit\r\n\u001b[?1002h\u001b[?1006h";

it("clears mouse reporting from a replayed history once the shell is idle", () => {
 const replayed = TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, false);

 expect(replayed.startsWith(MOUSE_ENABLED_HISTORY)).toBe(true);
 expect(replayed.slice(MOUSE_ENABLED_HISTORY.length)).toBe(
 "\u001b[?9l\u001b[?1000l\u001b[?1001l\u001b[?1002l\u001b[?1003l\u001b[?1006l\u001b[?1015l\u001b[?1016l",
 );
});

it("leaves mouse reporting alone while a child process can still consume it", () => {
 assert.equal(
 TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, true),
 MOUSE_ENABLED_HISTORY,
 );
});

it("detects mouse reporting enabled through a combined DECSET", () => {
 const history = "$ lazygit\r\n\u001b[?1002;1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects mouse reporting enabled through an 8-bit CSI introducer", () => {
 const history = "$ lazygit\r\n\u009b?1003h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects the X10 tracking mode", () => {
 const history = "$ some-tui\r\n\u001b[?9h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("ignores an encoding mode that cannot make the terminal report on its own", () => {
 const history = "$ echo hi\r\n\u001b[?1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).toBe(history);
});

it("resets every mouse mode it recognises as an enable", () => {
 const reset = TerminalManager.replaySafeTerminalHistory("\u001b[?1002h", false).slice(
 "\u001b[?1002h".length,
 );

 for (const mode of [9, 1000, 1001, 1002, 1003, 1006, 1015, 1016]) {
 expect(reset).toContain(`\u001b[?${mode}l`);
 }
});

it("does not touch a history that never enabled mouse reporting", () => {
 const history = "$ echo hello\r\nhello\r\n\u001b[?2004h";

 assert.equal(TerminalManager.replaySafeTerminalHistory(history, false), history);
});

47 changes: 46 additions & 1 deletion
apps/server/src/terminal/Manager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,46 @@ function terminalWireLabel(session: TerminalSessionState): string {
 return truncateTerminalWireLabel(getTerminalLabel(session.terminalId));
}

/** Only a tracking mode makes a terminal emit reports; an encoding just shapes them. */
const MOUSE_TRACKING_MODES: ReadonlyArray<number> = [9, 1000, 1001, 1002, 1003];
const MOUSE_ENCODING_MODES: ReadonlyArray<number> = [1006, 1015, 1016];
const MOUSE_REPORTING_RESET = [...MOUSE_TRACKING_MODES, ...MOUSE_ENCODING_MODES]
 .map((mode) => `\u001b[?${mode}l`)
 .join("");
// A DECSET can carry several parameters at once (`ESC[?1002;1006h`) and may use the
// 7-bit `ESC [` or the 8-bit `\u009b` introducer, so match the shape of the sequence
// rather than a handful of single-parameter spellings.
// eslint-disable-next-line no-control-regex -- matching DECSET requires its control introducer.
const DECSET_PATTERN = /(?:\u001b\[|\u009b)\?([\d;]*)h/g;

function enablesMouseReporting(history: string): boolean {
 DECSET_PATTERN.lastIndex = 0;
 for (
 let match = DECSET_PATTERN.exec(history);
 match !== null;
 match = DECSET_PATTERN.exec(history)
 ) {
 const parameters = (match[1] ?? "").split(";");
 if (parameters.some((parameter) => MOUSE_TRACKING_MODES.includes(Number(parameter)))) {
 return true;
 }
 }
 return false;
}

/**
 * Mouse reporting is terminal state, not text. Replaying a history whose TUI was
 * killed before it could restore the mode re-arms reporting on the fresh terminal,
 * and every pointer move then echoes into the shell as a literal `ESC[<…M`. A live
 * child process may still legitimately want the mode, so only clear it for an
 * idle shell, where nothing is left to read the reports.
 */
export function replaySafeTerminalHistory(history: string, hasRunningSubprocess: boolean): string {
 if (hasRunningSubprocess) return history;
 if (!enablesMouseReporting(history)) return history;
 return `${history}${MOUSE_REPORTING_RESET}`;
}

function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 return {
 threadId: session.threadId,
Expand All@@ -331,7 +371,7 @@ function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 worktreePath: session.worktreePath,
 status: session.status,
 pid: session.pid,
 history: session.history,
 history: replaySafeTerminalHistory(session.history, session.hasRunningSubprocess),
@macroscopeappmacroscopeappBotJul 29, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Mediumterminal/Manager.ts:353
replaySafeTerminalHistory gates the mouse-reporting reset on the cached session.hasRunningSubprocess, which is only refreshed asynchronously by pollSubprocessActivity. If a TUI starts after the last poll and a client attaches before the next poll, the value is still false, so snapshot appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, hasRunningSubprocess remains true, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.
🤖 Copy this AI Prompt to have your agent fix this:
In file @apps/server/src/terminal/Manager.ts around line 353:
`replaySafeTerminalHistory` gates the mouse-reporting reset on the cached `session.hasRunningSubprocess`, which is only refreshed asynchronously by `pollSubprocessActivity`. If a TUI starts after the last poll and a client attaches before the next poll, the value is still `false`, so `snapshot` appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, `hasRunningSubprocess` remains `true`, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.

 exitCode: session.exitCode,
 exitSignal: session.exitSignal,
 label: terminalWireLabel(session),
Expand DownExpand Up@@ -2370,6 +2410,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
 return attachEvent ? listener(attachEvent) : Effect.void;
 });

 // The cached subprocess flag is only refreshed by a poller, so gating the replay
 // on it would use state up to one interval old. Refresh first: a TUI that just
 // started must keep its mouse reporting, and one that just exited must not leave
 // it armed.
 yield* pollSubprocessActivity();
 const initialSnapshot = yield* openOrAttachForStream(input);

 yield* listener({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(server): stop replayed history from re-arming mouse reporting#4821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Sy-D
wants to merge
3
commits into

from

 Closed


fix(server): stop replayed history from re-arming mouse reporting
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ba5ff2b

fix(server): stop replayed history from re-arming mouse reporting


Sy-D Jul 29, 2026
7a2a579

fix(server): detect every mouse enable and gate on fresh subprocess s…


Sy-D Jul 29, 2026
add5fa2

fix(server): treat X10 as a mouse tracking mode


Sy-D Jul 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


58 changes: 58 additions & 0 deletions
apps/server/src/terminal/Manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1702,3 +1702,61 @@ it.layer(
 }).pipe(Effect.provide(TestClock.layer())),
 );
});

const MOUSE_ENABLED_HISTORY = "$ lazygit\r\n\u001b[?1002h\u001b[?1006h";

it("clears mouse reporting from a replayed history once the shell is idle", () => {
 const replayed = TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, false);

 expect(replayed.startsWith(MOUSE_ENABLED_HISTORY)).toBe(true);
 expect(replayed.slice(MOUSE_ENABLED_HISTORY.length)).toBe(
 "\u001b[?9l\u001b[?1000l\u001b[?1001l\u001b[?1002l\u001b[?1003l\u001b[?1006l\u001b[?1015l\u001b[?1016l",
 );
});

it("leaves mouse reporting alone while a child process can still consume it", () => {
 assert.equal(
 TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, true),
 MOUSE_ENABLED_HISTORY,
 );
});

it("detects mouse reporting enabled through a combined DECSET", () => {
 const history = "$ lazygit\r\n\u001b[?1002;1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects mouse reporting enabled through an 8-bit CSI introducer", () => {
 const history = "$ lazygit\r\n\u009b?1003h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects the X10 tracking mode", () => {
 const history = "$ some-tui\r\n\u001b[?9h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("ignores an encoding mode that cannot make the terminal report on its own", () => {
 const history = "$ echo hi\r\n\u001b[?1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).toBe(history);
});

it("resets every mouse mode it recognises as an enable", () => {
 const reset = TerminalManager.replaySafeTerminalHistory("\u001b[?1002h", false).slice(
 "\u001b[?1002h".length,
 );

 for (const mode of [9, 1000, 1001, 1002, 1003, 1006, 1015, 1016]) {
 expect(reset).toContain(`\u001b[?${mode}l`);
 }
});

it("does not touch a history that never enabled mouse reporting", () => {
 const history = "$ echo hello\r\nhello\r\n\u001b[?2004h";

 assert.equal(TerminalManager.replaySafeTerminalHistory(history, false), history);
});

47 changes: 46 additions & 1 deletion
apps/server/src/terminal/Manager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,46 @@ function terminalWireLabel(session: TerminalSessionState): string {
 return truncateTerminalWireLabel(getTerminalLabel(session.terminalId));
}

/** Only a tracking mode makes a terminal emit reports; an encoding just shapes them. */
const MOUSE_TRACKING_MODES: ReadonlyArray<number> = [9, 1000, 1001, 1002, 1003];
const MOUSE_ENCODING_MODES: ReadonlyArray<number> = [1006, 1015, 1016];
const MOUSE_REPORTING_RESET = [...MOUSE_TRACKING_MODES, ...MOUSE_ENCODING_MODES]
 .map((mode) => `\u001b[?${mode}l`)
 .join("");
// A DECSET can carry several parameters at once (`ESC[?1002;1006h`) and may use the
// 7-bit `ESC [` or the 8-bit `\u009b` introducer, so match the shape of the sequence
// rather than a handful of single-parameter spellings.
// eslint-disable-next-line no-control-regex -- matching DECSET requires its control introducer.
const DECSET_PATTERN = /(?:\u001b\[|\u009b)\?([\d;]*)h/g;

function enablesMouseReporting(history: string): boolean {
 DECSET_PATTERN.lastIndex = 0;
 for (
 let match = DECSET_PATTERN.exec(history);
 match !== null;
 match = DECSET_PATTERN.exec(history)
 ) {
 const parameters = (match[1] ?? "").split(";");
 if (parameters.some((parameter) => MOUSE_TRACKING_MODES.includes(Number(parameter)))) {
 return true;
 }
 }
 return false;
}

/**
 * Mouse reporting is terminal state, not text. Replaying a history whose TUI was
 * killed before it could restore the mode re-arms reporting on the fresh terminal,
 * and every pointer move then echoes into the shell as a literal `ESC[<…M`. A live
 * child process may still legitimately want the mode, so only clear it for an
 * idle shell, where nothing is left to read the reports.
 */
export function replaySafeTerminalHistory(history: string, hasRunningSubprocess: boolean): string {
 if (hasRunningSubprocess) return history;
 if (!enablesMouseReporting(history)) return history;
 return `${history}${MOUSE_REPORTING_RESET}`;
}

function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 return {
 threadId: session.threadId,
Expand All@@ -331,7 +371,7 @@ function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 worktreePath: session.worktreePath,
 status: session.status,
 pid: session.pid,
 history: session.history,
 history: replaySafeTerminalHistory(session.history, session.hasRunningSubprocess),
@macroscopeappmacroscopeappBotJul 29, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Mediumterminal/Manager.ts:353
replaySafeTerminalHistory gates the mouse-reporting reset on the cached session.hasRunningSubprocess, which is only refreshed asynchronously by pollSubprocessActivity. If a TUI starts after the last poll and a client attaches before the next poll, the value is still false, so snapshot appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, hasRunningSubprocess remains true, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.
🤖 Copy this AI Prompt to have your agent fix this:
In file @apps/server/src/terminal/Manager.ts around line 353:
`replaySafeTerminalHistory` gates the mouse-reporting reset on the cached `session.hasRunningSubprocess`, which is only refreshed asynchronously by `pollSubprocessActivity`. If a TUI starts after the last poll and a client attaches before the next poll, the value is still `false`, so `snapshot` appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, `hasRunningSubprocess` remains `true`, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.

 exitCode: session.exitCode,
 exitSignal: session.exitSignal,
 label: terminalWireLabel(session),
Expand DownExpand Up@@ -2370,6 +2410,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
 return attachEvent ? listener(attachEvent) : Effect.void;
 });

 // The cached subprocess flag is only refreshed by a poller, so gating the replay
 // on it would use state up to one interval old. Refresh first: a TUI that just
 // started must keep its mouse reporting, and one that just exited must not leave
 // it armed.
 yield* pollSubprocessActivity();
 const initialSnapshot = yield* openOrAttachForStream(input);

 yield* listener({
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(server): stop replayed history from re-arming mouse reporting#4821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Sy-D
wants to merge
3
commits into

from

 Closed


fix(server): stop replayed history from re-arming mouse reporting
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
ba5ff2b

fix(server): stop replayed history from re-arming mouse reporting


Sy-D Jul 29, 2026
7a2a579

fix(server): detect every mouse enable and gate on fresh subprocess s…


Sy-D Jul 29, 2026
add5fa2

fix(server): treat X10 as a mouse tracking mode


Sy-D Jul 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


58 changes: 58 additions & 0 deletions
apps/server/src/terminal/Manager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1702,3 +1702,61 @@ it.layer(
 }).pipe(Effect.provide(TestClock.layer())),
 );
});

const MOUSE_ENABLED_HISTORY = "$ lazygit\r\n\u001b[?1002h\u001b[?1006h";

it("clears mouse reporting from a replayed history once the shell is idle", () => {
 const replayed = TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, false);

 expect(replayed.startsWith(MOUSE_ENABLED_HISTORY)).toBe(true);
 expect(replayed.slice(MOUSE_ENABLED_HISTORY.length)).toBe(
 "\u001b[?9l\u001b[?1000l\u001b[?1001l\u001b[?1002l\u001b[?1003l\u001b[?1006l\u001b[?1015l\u001b[?1016l",
 );
});

it("leaves mouse reporting alone while a child process can still consume it", () => {
 assert.equal(
 TerminalManager.replaySafeTerminalHistory(MOUSE_ENABLED_HISTORY, true),
 MOUSE_ENABLED_HISTORY,
 );
});

it("detects mouse reporting enabled through a combined DECSET", () => {
 const history = "$ lazygit\r\n\u001b[?1002;1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects mouse reporting enabled through an 8-bit CSI introducer", () => {
 const history = "$ lazygit\r\n\u009b?1003h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("detects the X10 tracking mode", () => {
 const history = "$ some-tui\r\n\u001b[?9h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).not.toBe(history);
});

it("ignores an encoding mode that cannot make the terminal report on its own", () => {
 const history = "$ echo hi\r\n\u001b[?1006h";

 expect(TerminalManager.replaySafeTerminalHistory(history, false)).toBe(history);
});

it("resets every mouse mode it recognises as an enable", () => {
 const reset = TerminalManager.replaySafeTerminalHistory("\u001b[?1002h", false).slice(
 "\u001b[?1002h".length,
 );

 for (const mode of [9, 1000, 1001, 1002, 1003, 1006, 1015, 1016]) {
 expect(reset).toContain(`\u001b[?${mode}l`);
 }
});

it("does not touch a history that never enabled mouse reporting", () => {
 const history = "$ echo hello\r\nhello\r\n\u001b[?2004h";

 assert.equal(TerminalManager.replaySafeTerminalHistory(history, false), history);
});

47 changes: 46 additions & 1 deletion
apps/server/src/terminal/Manager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -323,6 +323,46 @@ function terminalWireLabel(session: TerminalSessionState): string {
 return truncateTerminalWireLabel(getTerminalLabel(session.terminalId));
}

/** Only a tracking mode makes a terminal emit reports; an encoding just shapes them. */
const MOUSE_TRACKING_MODES: ReadonlyArray<number> = [9, 1000, 1001, 1002, 1003];
const MOUSE_ENCODING_MODES: ReadonlyArray<number> = [1006, 1015, 1016];
const MOUSE_REPORTING_RESET = [...MOUSE_TRACKING_MODES, ...MOUSE_ENCODING_MODES]
 .map((mode) => `\u001b[?${mode}l`)
 .join("");
// A DECSET can carry several parameters at once (`ESC[?1002;1006h`) and may use the
// 7-bit `ESC [` or the 8-bit `\u009b` introducer, so match the shape of the sequence
// rather than a handful of single-parameter spellings.
// eslint-disable-next-line no-control-regex -- matching DECSET requires its control introducer.
const DECSET_PATTERN = /(?:\u001b\[|\u009b)\?([\d;]*)h/g;

function enablesMouseReporting(history: string): boolean {
 DECSET_PATTERN.lastIndex = 0;
 for (
 let match = DECSET_PATTERN.exec(history);
 match !== null;
 match = DECSET_PATTERN.exec(history)
 ) {
 const parameters = (match[1] ?? "").split(";");
 if (parameters.some((parameter) => MOUSE_TRACKING_MODES.includes(Number(parameter)))) {
 return true;
 }
 }
 return false;
}

/**
 * Mouse reporting is terminal state, not text. Replaying a history whose TUI was
 * killed before it could restore the mode re-arms reporting on the fresh terminal,
 * and every pointer move then echoes into the shell as a literal `ESC[<…M`. A live
 * child process may still legitimately want the mode, so only clear it for an
 * idle shell, where nothing is left to read the reports.
 */
export function replaySafeTerminalHistory(history: string, hasRunningSubprocess: boolean): string {
 if (hasRunningSubprocess) return history;
 if (!enablesMouseReporting(history)) return history;
 return `${history}${MOUSE_REPORTING_RESET}`;
}

function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 return {
 threadId: session.threadId,
Expand All@@ -331,7 +371,7 @@ function snapshot(session: TerminalSessionState): TerminalSessionSnapshot {
 worktreePath: session.worktreePath,
 status: session.status,
 pid: session.pid,
 history: session.history,
 history: replaySafeTerminalHistory(session.history, session.hasRunningSubprocess),
@macroscopeappmacroscopeappBotJul 29, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Mediumterminal/Manager.ts:353
replaySafeTerminalHistory gates the mouse-reporting reset on the cached session.hasRunningSubprocess, which is only refreshed asynchronously by pollSubprocessActivity. If a TUI starts after the last poll and a client attaches before the next poll, the value is still false, so snapshot appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, hasRunningSubprocess remains true, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.
🤖 Copy this AI Prompt to have your agent fix this:
In file @apps/server/src/terminal/Manager.ts around line 353:
`replaySafeTerminalHistory` gates the mouse-reporting reset on the cached `session.hasRunningSubprocess`, which is only refreshed asynchronously by `pollSubprocessActivity`. If a TUI starts after the last poll and a client attaches before the next poll, the value is still `false`, so `snapshot` appends the reset and disables mouse reporting even though the live TUI needs it — mouse input silently breaks for the running application. Conversely, after a TUI exits but before the next poll, `hasRunningSubprocess` remains `true`, so the enbling history passes through unchanged and re-arms mouse reporting on the fresh client even though no child remains to consume the reports, leaving the original garbage-input bug timing-dependent. Consider checking live subprocess state at snapshot time instead of relying on the stale cached flag.

 exitCode: session.exitCode,
 exitSignal: session.exitSignal,
 label: terminalWireLabel(session),
Expand DownExpand Up@@ -2370,6 +2410,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
 return attachEvent ? listener(attachEvent) : Effect.void;
 });

 // The cached subprocess flag is only refreshed by a poller, so gating the replay
 // on it would use state up to one interval old. Refresh first: a TUI that just
 // started must keep its mouse reporting, and one that just exited must not leave
 // it armed.
 yield* pollSubprocessActivity();
 const initialSnapshot = yield* openOrAttachForStream(input);

 yield* listener({
Expand Down
Loading