Skip to content

Revert terminal scroll position saving #742

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

Merged
Kitenite merged 2 commits into from
Jan 14, 2026
Merged

Revert terminal scroll position saving #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56b5de8
Revert "fix(desktop): scroll terminals to bottom by default (#728)"
Kitenite Jan 14, 2026
39bfa8c
Revert "fix(desktop): restore terminal scroll position when reattachi…
Kitenite Jan 14, 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
2 changes: 0 additions & 2 deletions apps/desktop/src/lib/trpc/routers/terminal/terminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ export const createTerminalRouter = () => {
isNew: result.isNew,
scrollback: result.scrollback,
wasRecovered: result.wasRecovered,
viewportY: result.viewportY,
};
}),

Expand Down Expand Up @@ -152,7 +151,6 @@ export const createTerminalRouter = () => {
.input(
z.object({
paneId: z.string(),
viewportY: z.number().optional(),
}),
)
.mutation(async ({ input }) => {
Expand Down
8 changes: 2 additions & 6 deletions apps/desktop/src/main/lib/terminal/manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export class TerminalManager extends EventEmitter {
isNew: false,
scrollback: getSerializedScrollback(existing),
wasRecovered: existing.wasRecovered,
viewportY: existing.viewportY,
};
}

Expand Down Expand Up @@ -239,8 +238,8 @@ export class TerminalManager extends EventEmitter {
}
}

detach(params: { paneId: string; viewportY?: number }): void {
const { paneId, viewportY } = params;
detach(params: { paneId: string }): void {
const { paneId } = params;
const session = this.sessions.get(paneId);

if (!session) {
Expand All @@ -249,9 +248,6 @@ export class TerminalManager extends EventEmitter {
}

session.lastActive = Date.now();
if (viewportY !== undefined) {
session.viewportY = viewportY;
}
}

clearScrollback(params: { paneId: string }): void {
Expand Down
4 changes: 0 additions & 4 deletions apps/desktop/src/main/lib/terminal/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ export interface TerminalSession {
shell: string;
startTime: number;
usedFallback: boolean;
/** Saved viewport scroll position for restoration on reattach */
viewportY?: number;
}

export interface TerminalDataEvent {
Expand All @@ -40,8 +38,6 @@ export interface SessionResult {
isNew: boolean;
scrollback: string;
wasRecovered: boolean;
/** Saved viewport scroll position for restoration on reattach */
viewportY?: number;
}

export interface CreateSessionParams {
Expand Down
20 changes: 5 additions & 15 deletions ...derer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,7 @@ import { parseCwd } from "./parseCwd";
import { ScrollToBottomButton } from "./ScrollToBottomButton";
import { TerminalSearch } from "./TerminalSearch";
import type { TerminalProps, TerminalStreamEvent } from "./types";
import {
getScrollOffsetFromBottom,
restoreScrollPosition,
shellEscapePaths,
smoothScrollToBottom,
} from "./utils";
import { shellEscapePaths, smoothScrollToBottom } from "./utils";

export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
const paneId = tabId;
Expand Down Expand Up @@ -385,12 +380,9 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
wasRecovered: boolean;
isNew: boolean;
scrollback: string;
viewportY?: number;
}) => {
xterm.write(result.scrollback, () => {
updateCwdRef.current(result.scrollback);
restoreScrollPosition(xterm, result.viewportY);
});
xterm.write(result.scrollback);
updateCwdRef.current(result.scrollback);
};

const restartTerminal = () => {
Expand Down Expand Up @@ -569,10 +561,8 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
unregisterClearCallbackRef.current(paneId);
unregisterScrollToBottomCallbackRef.current(paneId);
debouncedSetTabAutoTitleRef.current?.cancel?.();
detachRef.current({
paneId,
viewportY: getScrollOffsetFromBottom(xterm),
});
// Detach instead of kill to keep PTY running for reattachment
detachRef.current({ paneId });
setSubscriptionEnabled(false);
xterm.dispose();
xtermRef.current = null;
Expand Down
19 changes: 0 additions & 19 deletions .../renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,3 @@ export function smoothScrollToBottom(terminal: Terminal): void {
terminal.scrollToBottom();
}
}

/** Get scroll offset from bottom (0 = at bottom, >0 = scrolled up N lines) */
export function getScrollOffsetFromBottom(terminal: Terminal): number {
const { baseY, viewportY } = terminal.buffer.active;
return baseY - viewportY;
}

/** Restore scroll position from offset (0 = bottom, >0 = N lines from bottom) */
export function restoreScrollPosition(
terminal: Terminal,
offsetFromBottom: number | undefined,
): void {
if (offsetFromBottom && offsetFromBottom > 0) {
const targetLine = terminal.buffer.active.baseY - offsetFromBottom;
terminal.scrollToLine(Math.max(0, targetLine));
} else {
terminal.scrollToBottom();
}
}
Loading