Skip to content

fix: 补全会话建立时的终端尺寸同步，修复内嵌终端画面错位 #8

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

Open
LeaFluorine wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: 补全会话建立时的终端尺寸同步，修复内嵌终端画面错位 #8

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
7cd72d5
fix: 会话建立时把终端实际尺寸同步给 PTY
LeaFluorine Sep 14, 2026
7a95cd7
fix: 为 xterm 声明 ConPTY 后端以修正行增长语义
LeaFluorine Sep 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
17 changes: 17 additions & 0 deletions src/renderer/src/components/app/TerminalPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import "@xterm/xterm/css/xterm.css";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { detectPlatformSync } from "@/lib/platform";
import { useShortcut } from "@/lib/use-shortcut";
import { cn } from "@/lib/utils";

Expand Down Expand Up @@ -41,6 +42,7 @@ const serviceTerminals: Array<{ serviceId: ServiceId; sessionId: string; title:
];

const USER_TERMINAL_SESSION_PREFIX = "user-terminal:";
const IS_WINDOWS_PLATFORM = detectPlatformSync() === "win32";
const MIN_VISIBLE_TERMINAL_WIDTH = 240;
const MIN_VISIBLE_TERMINAL_HEIGHT = 120;
const TERMINAL_LINK_PATTERN = /\b(?:https?:\/\/[^\s<>"'，。；）\])]+|logs\/[^\s<>"'，。；）\])]+\.(?:html|txt|json|log))/giu;
Expand Down Expand Up @@ -382,6 +384,7 @@ export function TerminalPanel({
rescaleOverlappingGlyphs: true,
scrollback: 100_000,
tabStopWidth: 8,
...(IS_WINDOWS_PLATFORM ? { windowsPty: { backend: "conpty" as const } } : {}),
theme: XTERM_THEME,
});
const fitAddon = new FitAddon();
Expand Down Expand Up @@ -611,6 +614,20 @@ export function TerminalPanel({
sessionsRef.current.set(snapshot.id, snapshot);
upsertUserTerminal(snapshot);
void loadSessionBuffer(snapshot.id);

// PTY 由主进程按固定尺寸创建（service-manager 的 SERVICE_TERMINAL_COLS/ROWS）。
// 此时 xterm 通常已按面板尺寸 fit 完毕，尺寸不会再变化，terminal.onResize
// 也就不会触发，PTY 会长期停留在主进程的默认尺寸上：子进程按错误宽度排版，
// 依赖行数的相对光标移动（tqdm/rich 等进度条重绘）会算错行，画面被覆盖。
// 快照是在 spawn 之后、子进程尚未输出时发出的，在这里同步一次真实尺寸最干净。
const snapshotInstance = terminalsRef.current.get(snapshot.id);
if (snapshotInstance?.opened) {
const { cols, rows } = snapshotInstance.terminal;
if (cols > 0 && rows > 0 && (snapshot.cols !== cols || snapshot.rows !== rows)) {
void bridge.pty.resize({ sessionId: snapshot.id, cols, rows }).catch(() => undefined);
}
}

notifySessionsChanged();
}),
bridge.logs.onEntry((entry) => {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/lib/platform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export type Platform = "darwin" | "win32" | "linux";
let cachedPlatform: Platform | null = null;
const subscribers = new Set<(p: Platform) => void>();

function detectPlatformSync(): Platform {
export function detectPlatformSync(): Platform {
if (typeof navigator === "undefined") return "linux";
const ua = `${navigator.platform || ""} ${navigator.userAgent || ""}`;
if (/Mac|iPhone|iPad|iPod/i.test(ua)) return "darwin";
Expand Down