Bill
beeb32a76b
面板 id 曾直接复用 pty 会话 id（`addPanel({ id: sessionId })`），而
`updateParameters` 只能换会话、不能改面板 id。于是恢复时面板 id 指向一个
已不存在的会话：分屏少一个、剩下的 pane 背后没有 pty，界面看起来是空白，
也无法输入。
- 新增 `panelId()`，面板 id 与会话 id 彻底分离，并用于所有建面板处
（新建终端、SSH 连接、分屏复制）
- 新增 `breakIdCoincidence()`：旧快照仍带 `panelId === sessionId`，
在 `fromJSON` 之前重写 grid/panels/views/activeView 中的 id，
返回 old→new 映射
- `rebindSessionPanels` 用该映射回查快照，恢复每个 pane 自己的目录
（否则新 id 查不到记录，cwd 会静默退回 home）
验证（重启恢复 E2E，legacy 快照 + 2 分屏）：
2/2 pane 挂载、2 个独立存活会话、输入可回环、
cwd 分别回到 D:/AIGC/OpenTerminal 与 C:/Windows、回写快照无 id 冲突；
restoreSession=false 时正确忽略快照只建 1 个终端。
123 lines
4.7 KiB
TypeScript
123 lines
4.7 KiB
TypeScript
import type { TerminalTheme } from './theme'
|
|
|
|
/** One terminal keyword-highlight rule (regex → ANSI color injection). */
|
|
export interface HighlightRule {
|
|
id: string
|
|
/** regex source; compiled with 'g' flag at use site */
|
|
pattern: string
|
|
enabled: boolean
|
|
/** 1..100, lower runs first and claims its spans first */
|
|
priority: number
|
|
/** truecolor hex (#rrggbb); fg required, bg optional */
|
|
color: { fg: string; bg?: string }
|
|
note?: string
|
|
/** part of the factory preset set (restored by 恢复默认) */
|
|
builtin?: boolean
|
|
}
|
|
|
|
export interface TerminalSettings {
|
|
fontFamily: string
|
|
fontSize: number
|
|
/** 100..900 */
|
|
fontWeight: number
|
|
/** 100..900 */
|
|
boldFontWeight: number
|
|
letterSpacing: number
|
|
lineHeight: number
|
|
scrollback: number
|
|
cursorBlink: boolean
|
|
cursorStyle: 'bar' | 'block' | 'underline'
|
|
cursorInactiveStyle: 'outline' | 'block' | 'bar' | 'underline' | 'none'
|
|
themeId: string
|
|
rendererMode: 'auto' | 'webgl' | 'dom'
|
|
autoWrap: boolean
|
|
copyOnSelect: boolean
|
|
/** confirm before pasting multi-line / suspicious text */
|
|
pasteRiskConfirm: boolean
|
|
/** inline command suggestion popup while typing (history + library) */
|
|
suggestEnabled: boolean
|
|
/** accent color for the active tab outline, rail indicator and SSH badges */
|
|
tabAccentColor: string
|
|
}
|
|
|
|
export interface SystemSettings {
|
|
/** register the app to launch at OS login */
|
|
launchAtLogin: boolean
|
|
/** hold a powerSaveBlocker so the OS never auto-suspends while running */
|
|
preventSleep: boolean
|
|
/** Electron accelerator that toggles window visibility; '' = disabled (M6) */
|
|
globalShowHide?: string
|
|
/** close-button behavior: prompt every time / hide to tray / quit directly */
|
|
closeAction?: 'ask' | 'tray' | 'exit'
|
|
/** check for updates shortly after startup (manual check always available) */
|
|
autoCheckUpdate?: boolean
|
|
/**
|
|
* Restore the previous layout and each pane's working directory on launch
|
|
* (see the session snapshot). On by default — that is the point of it.
|
|
*/
|
|
restoreSession?: boolean
|
|
/**
|
|
* Let the shell announce its cwd over OSC 7 (shell integration). Exact, but
|
|
* it wraps the user's prompt, so it is opt-in; without it the app falls back
|
|
* to parsing typed `cd` commands.
|
|
*/
|
|
shellIntegration?: boolean
|
|
}
|
|
|
|
export interface AppSettings {
|
|
terminal: TerminalSettings
|
|
/** user-created themes; builtin themes are immutable and live in shared/theme.ts */
|
|
customThemes: TerminalTheme[]
|
|
/** terminal keyword highlight rules, applied at write time in priority order */
|
|
highlightRules: HighlightRule[]
|
|
system: SystemSettings
|
|
}
|
|
|
|
const RULE = (
|
|
id: string,
|
|
pattern: string,
|
|
priority: number,
|
|
fg: string,
|
|
note: string,
|
|
bg?: string
|
|
): HighlightRule => ({ id, pattern, enabled: true, priority, color: { fg, bg }, note, builtin: true })
|
|
|
|
export const DEFAULT_HIGHLIGHT_RULES: HighlightRule[] = [
|
|
RULE('perm', '^[-dlbcps][rwxstST-]{9}', 1, '#3fb950', 'Linux 权限与用户'),
|
|
RULE('path', '(?:^|[\\s:=])(?:/[A-Za-z0-9_.\\-/@+]+|~[A-Za-z0-9_.\\-/]*)', 2, '#58a6ff', 'Linux 文件路径'),
|
|
RULE('shellkw', '\\b(if|then|else|elif|fi|for|while|do|done|case|esac|function|return|break|continue|export|source)\\b', 3, '#d2a8ff', 'Shell 关键字与流程'),
|
|
RULE('okstate', '\\b(SUCCESS|PASS|OK|DONE|PASSED)\\b', 5, '#3fb950', '成功状态'),
|
|
RULE('badstate', '\\b(FAILED|ERROR|FAIL|FATAL|WARN|WARNING|DENIED)\\b', 6, '#f85149', '错误/警告状态'),
|
|
RULE('quoted', '"[^"\\n]*"|\'[^\'\\n]*\'', 8, '#e3b341', '字符串与引号'),
|
|
RULE('envvar', '\\$\\{?[A-Za-z_][A-Za-z0-9_]*\\}?', 10, '#79c0ff', '环境变量与参数'),
|
|
RULE('ipv4', '\\b(?:\\d{1,3}\\.){3}\\d{1,3}(?::\\d{1,5})?\\b', 15, '#58a6ff', '网络与 IP 地址'),
|
|
RULE('datetime', '\\b\\d{4}[-/]\\d{1,2}[-/]\\d{1,2}(?:[ T]\\d{1,2}:\\d{2}(?::\\d{2})?)?\\b|\\b\\d{1,2}:\\d{2}(?::\\d{2})?\\b', 20, '#bc8cff', '时间与日期'),
|
|
RULE('numbers', '\\b\\d+(?:\\.\\d+)?(?:%)?\\b', 25, '#f2cc60', '数字与计数'),
|
|
RULE('url', 'https?://[^\\s]+', 30, '#58a6ff', '网址链接')
|
|
]
|
|
|
|
export const DEFAULT_SETTINGS: AppSettings = {
|
|
terminal: {
|
|
fontFamily: "'Cascadia Mono', Consolas, 'JetBrains Mono', 'Courier New', monospace",
|
|
fontSize: 14,
|
|
fontWeight: 400,
|
|
boldFontWeight: 700,
|
|
letterSpacing: 0,
|
|
lineHeight: 1,
|
|
scrollback: 5000,
|
|
cursorBlink: true,
|
|
cursorStyle: 'block',
|
|
cursorInactiveStyle: 'outline',
|
|
themeId: 'material-dark',
|
|
rendererMode: 'auto',
|
|
autoWrap: true,
|
|
copyOnSelect: false,
|
|
pasteRiskConfirm: true,
|
|
suggestEnabled: true,
|
|
tabAccentColor: '#3fb950'
|
|
},
|
|
customThemes: [],
|
|
highlightRules: DEFAULT_HIGHLIGHT_RULES,
|
|
system: { launchAtLogin: false, preventSleep: false, globalShowHide: '', closeAction: 'tray', autoCheckUpdate: true, restoreSession: true, shellIntegration: false }
|
|
}
|