fpasoterm 1.6.0 → 1.6.1

package/scripts/tests/smoke.js

@@ -10,6 +10,7 @@ const {
   defaultConfigExample,
   discoverPluginFiles,
   loadConfig,
+  migrateLegacyLogKeybindings,
   migrateLegacyTerminalLineHeight,
   mergeConfig,
   missingConfigKeys,
@@ -47,6 +48,29 @@ assert.equal(platformDefaultConfig('linux', 'x64').security.osc8Open, false);
 assert.equal(platformDefaultConfig('linux', 'x64').security.oscNotifications, false);
 assert.equal(platformDefaultConfig('linux', 'x64').security.oscNotificationMinIntervalMs, 5000);
 assert.equal(platformDefaultConfig('linux', 'x64').keybindings.openCwd, 'o');
+assert.equal(platformDefaultConfig('linux', 'x64').keybindings.logToggle, 's');
+assert.equal(platformDefaultConfig('linux', 'x64').keybindings.logShow, 'l');
+assert.equal(Object.hasOwn(platformDefaultConfig('linux', 'x64').keybindings, 'logMenu'), false);
+assert.deepEqual(
+  migrateLegacyLogKeybindings({ keybindings: { logMenu: 'L', logShow: 'P' } }).keybindings,
+  { logShow: 'l' },
+);
+assert.deepEqual(
+  migrateLegacyLogKeybindings({ keybindings: { logShow: 'P' } }).keybindings,
+  { logShow: 'l' },
+);
+assert.deepEqual(
+  migrateLegacyLogKeybindings({ keybindings: { logToggle: 'S' } }).keybindings,
+  { logToggle: 's' },
+);
+assert.deepEqual(
+  migrateLegacyLogKeybindings({ keybindings: { copy: 'C', paste: 'V', menu: 'M', help: 'H', newWindow: 'N', broadcast: 'B', kill: 'K', tile: 'T', closeAll: 'X' } }).keybindings,
+  { copy: 'c', paste: 'v', menu: 'm', help: 'h', newWindow: 'n', broadcast: 'b', kill: 'k', tile: 't', closeAll: 'x' },
+);
+assert.deepEqual(
+  migrateLegacyLogKeybindings({ keybindings: { logShow: 'Ctrl+Shift+P' } }).keybindings,
+  { logShow: 'Ctrl+Shift+P' },
+);
 assert.match(platformDefaultConfig('darwin', 'arm64').terminal.fontFamily, /^Menlo, "SF Mono"/);
 assert.match(platformDefaultConfig('win32', 'x64').terminal.fontFamily, /^"DejaVu Sans Mono"/);
 assert.match(platformDefaultConfig('win32', 'x64').terminal.fontFamily, /"Noto Sans CJK KR"/);
@@ -362,7 +386,7 @@ const migratedConfig = mergeConfig(writableConfigDefaults(), {
   keybindings: { prefix: 'Ctrl+Alt' },
 });
 assert.equal(migratedConfig.keybindings.prefix, 'Ctrl+Alt');
-assert.equal(migratedConfig.keybindings.newWindow, 'N');
+assert.equal(migratedConfig.keybindings.newWindow, 'n');
 assert.equal(migratedConfig.terminal.images, undefined);
 const prunedConfig = pruneUnsupportedConfig(writableConfigDefaults(), {
   ...migratedConfig,
@@ -639,7 +663,7 @@ assert.equal(stateConfig.config.window.width, 1200);
 assert.equal(stateConfig.config.window.height, 900);
 assert.equal(stateConfig.config.terminal.shell, '');
 assert.equal(stateConfig.config.keybindings.prefix, 'Ctrl+Alt');
-assert.equal(stateConfig.config.keybindings.newWindow, 'N');
+assert.equal(stateConfig.config.keybindings.newWindow, 'n');
 assert.ok(fs.existsSync(path.join(stateTestDir, 'fpasoterm', 'User', 'plugins')));
 fs.writeFileSync(path.join(stateTestDir, 'fpasoterm', 'User', 'config.toml'), [
   '[terminal]',
@@ -969,22 +993,13 @@ assert.match(rustMain, /fn window_arrange/);
 assert.match(rustMain, /fn window_close_all/);
 assert.match(rustMain, /fn window_new/);
 assert.match(rustMain, /spawn_new_instance/);
-assert.match(rustMain, /fn window_confirm_close_all/);
 assert.match(rustMain, /fn window_close_all_confirmed/);
-assert.match(rustMain, /fn windows_confirm_close_all/);
 assert.match(rustMain, /MessageBoxW/);
 assert.match(rustMain, /MB_OKCANCEL/);
-assert.match(rustMain, /WebviewWindowBuilder/);
+assert.doesNotMatch(rustMain, /"close-all-confirm"/);
 assert.match(rustMain, /OpenProcess/);
 assert.match(rustMain, /GetExitCodeProcess/);
 assert.match(rustMain, /PROCESS_QUERY_LIMITED_INFORMATION/);
-assert.match(rustMain, /\.decorations\(true\)/);
-assert.match(rustMain, /\.transparent\(false\)/);
-assert.match(rustMain, /\.visible\(true\)/);
-assert.match(rustMain, /\.always_on_top\(true\)/);
-assert.match(rustMain, /window\.set_focus\(\)/);
-assert.match(rustMain, /fn window_focus_main/);
-assert.match(rustMain, /fn window_cancel_close_all/);
 assert.match(rustMain, /Ignore a close request left by an earlier application session/);
 assert.match(rustMain, /close_all_request_path/);
 assert.match(rustMain, /start_arrange_listener/);
@@ -1130,7 +1145,14 @@ const indexHtml = read('src/renderer/index.html');
 assert.match(indexHtml, /id="terminal-broadcast-target-list"/);
 assert.match(indexHtml, /id="terminal-broadcast-control"/);
 assert.match(indexHtml, /id="terminal-broadcast-control-insert"/);
+assert.match(indexHtml, /id="terminal-broadcast-examples"/);
+assert.match(indexHtml, /clear\\x0D\\x01jclear/);
+assert.match(indexHtml, /\\x02\\key\[ArrowUp\]/);
 assert.match(indexHtml, /Enter \/ CR \(0x0D\)/);
+assert.match(indexHtml, /Ctrl\+A \(0x01\)/);
+assert.match(indexHtml, /Ctrl\+B \(0x02\)/);
+assert.match(indexHtml, /Arrow Up/);
+assert.match(indexHtml, /Arrow Down/);
 assert.match(indexHtml, /id="terminal-broadcast-hint"/);
 assert.match(indexHtml, /<strong>Send: Shift\+Enter<\/strong>\. New line: Enter\./);
 assert.match(indexHtml, /id="terminal-broadcast-focus-status"/);
@@ -1151,7 +1173,6 @@ assert.match(indexHtml, /id="terminal-capability-preview"/);
 assert.match(indexHtml, /data-panel-drag-handle/);
 assert.match(indexHtml, /Select All/);
 assert.match(indexHtml, /Select None/);
-const confirmHtml = read('src/renderer/confirm.html');
 assert.match(indexHtml, /id="drag-region"/);
 assert.match(indexHtml, /id="window-title"/);
 assert.match(indexHtml, /id="window-controls"/);
@@ -1228,7 +1249,7 @@ assert.match(indexHtml, /id="keybinding-prefix"/);
 assert.match(indexHtml, /Shortcut prefix: Ctrl\+Shift/);
 assert.match(indexHtml, /aria-keyshortcuts="[^"]*Control\+Shift\+L[^"]*"/);
 assert.match(indexHtml, /aria-keyshortcuts="Control\+Shift\+S"/);
-assert.match(indexHtml, /aria-keyshortcuts="Control\+Shift\+P"/);
+assert.doesNotMatch(indexHtml, /aria-keyshortcuts="Control\+Shift\+P"/);
 assert.match(indexHtml, /aria-keyshortcuts="Control\+Shift\+C"/);
 assert.match(indexHtml, /aria-keyshortcuts="Control\+Shift\+V"/);
 assert.doesNotMatch(indexHtml, /id="terminal-log-clear"/);
@@ -1245,37 +1266,30 @@ assert.match(indexHtml, /id="terminal-log-confirm"/);
 assert.match(indexHtml, /role="dialog"/);
 assert.match(indexHtml, /id="terminal-log-confirm-ok"/);
 assert.match(indexHtml, /id="terminal-log-confirm-cancel"/);
-assert.doesNotMatch(indexHtml, />Log \(\^L\)</);
-assert.match(indexHtml, />Log Start \(S\)</);
-assert.match(indexHtml, />Log Show \(P\)</);
-assert.match(indexHtml, />Copy \(C\)</);
-assert.match(indexHtml, />Paste \(V\)</);
+assert.match(indexHtml, />Log Start \(s\)</);
+assert.match(indexHtml, />Log Show \(l\)</);
+assert.match(indexHtml, />Copy \(c\)</);
+assert.match(indexHtml, />Paste \(v\)</);
 assert.doesNotMatch(indexHtml, />Clear</);
 assert.match(indexHtml, /id="minimize-window"/);
 assert.match(indexHtml, /id="maximize-window"/);
 assert.match(indexHtml, /id="new-window"/);
-assert.match(indexHtml, />New \(N\)</);
+assert.match(indexHtml, />New \(n\)</);
 assert.match(indexHtml, /aria-keyshortcuts="Control\+Shift\+N"/);
 assert.match(indexHtml, /id="arrange-window"/);
 assert.match(indexHtml, /id="close-all-windows"/);
-assert.match(indexHtml, />Close All \(X\)</);
+assert.match(indexHtml, />Close All \(x\)</);
 assert.match(indexHtml, /aria-keyshortcuts="Control\+Shift\+X"/);
 assert.match(indexHtml, /id="close-all-confirm" hidden role="dialog"/);
 assert.match(indexHtml, /id="close-all-confirm-ok"/);
 assert.match(indexHtml, /id="close-all-confirm-cancel"/);
-assert.match(confirmHtml, /Close all fpasoterm windows/);
-assert.match(confirmHtml, /window_close_all_confirmed/);
-assert.match(confirmHtml, /event\.key === 'Tab'/);
-assert.match(confirmHtml, /event\.key === 'Enter'/);
-assert.match(confirmHtml, /currentWindow\.setFocus/);
-assert.match(confirmHtml, /cancel\.focus/);
-assert.match(confirmHtml, /window_cancel_close_all/);
-assert.match(indexHtml, />Tile \(T\)</);
+assert.match(indexHtml, /id="close-all-confirm-unmount"/);
+assert.match(indexHtml, />Tile \(t\)</);
 assert.match(indexHtml, /aria-keyshortcuts="Control\+Shift\+T"/);
 assert.match(indexHtml, /id="window-menu-toggle"/);
-assert.match(indexHtml, /id="window-menu-toggle"[^>]+aria-keyshortcuts="Control\+Shift\+M Control\+Shift\+L"/);
+assert.match(indexHtml, /id="window-menu-toggle"[^>]+aria-keyshortcuts="Control\+Shift\+M"/);
 assert.match(indexHtml, /id="keyboard-shortcuts-help"/);
-assert.match(indexHtml, />Help \(H\)</);
+assert.match(indexHtml, />Help \(h\)</);
 assert.match(indexHtml, /aria-keyshortcuts="Control\+Shift\+H"/);
 assert.match(indexHtml, /id="window-menu-items"/);
 assert.match(indexHtml, /id="plugin-menu-section"/);
@@ -1319,7 +1333,7 @@ assert.match(readme, /PowerShell\\7\\pwsh\.exe/);
 assert.match(readme, /PowerShell 7 \(`pwsh\.exe`\) by default/);
 assert.match(readme, /fpasoterm executable directory at the[\s\S]*front of `Path`/);
 assert.match(readme, /GTK application id is disabled/);
-assert.match(readme, /Tile \(\^T\)/);
+assert.match(readme, /Tile \(\^t\)/);
 assert.match(readme, /ChromeOS shelf/);
 assert.match(readme, /removes fpasoterm-specific directories from the[\s\S]*current user's `Path`/);
 assert.match(readme, /By default, fpasoterm keeps its configured title/);
@@ -1416,9 +1430,9 @@ assert.match(configDocsEn, /\[sync\]/);
 assert.match(configDocsEn, /provider = "folder"/);
 assert.match(configDocsEn, /sync\.en\.md/);
 assert.match(configDocsEn, /\[logging\]/);
-assert.match(configDocsEn, /Ctrl\+Shift\+L/);
-assert.match(configDocsEn, /Ctrl\+Shift\+S/);
-assert.match(configDocsEn, /Ctrl\+Shift\+P/);
+assert.match(configDocsEn, /Ctrl\+Shift\+l/);
+assert.match(configDocsEn, /Ctrl\+Shift\+s/);
+assert.match(configDocsEn, /Ctrl\+Shift\+p/);
 assert.match(configDocsEn, /Ctrl\+Esc.*invalid/);
 assert.match(configDocsEn, /Ctrl\+Alt\+Escape/);
 assert.match(configDocsEn, /absolute path of the configuration/);
@@ -1485,9 +1499,9 @@ assert.match(configDocsJa, /\[sync\]/);
 assert.match(configDocsJa, /provider = "folder"/);
 assert.match(configDocsJa, /sync\.ja\.md/);
 assert.match(configDocsJa, /\[logging\]/);
-assert.match(configDocsJa, /Ctrl\+Shift\+L/);
-assert.match(configDocsJa, /Ctrl\+Shift\+S/);
-assert.match(configDocsJa, /Ctrl\+Shift\+P/);
+assert.match(configDocsJa, /Ctrl\+Shift\+l/);
+assert.match(configDocsJa, /Ctrl\+Shift\+s/);
+assert.match(configDocsJa, /Ctrl\+Shift\+p/);
 assert.match(configDocsJa, /Ctrl\+Esc.*無効/);
 assert.match(configDocsJa, /Ctrl\+Alt\+Escape/);
 assert.match(configDocsJa, /設定ファイルの絶対path/);
@@ -1520,11 +1534,12 @@ assert.doesNotMatch(specEn, removedTemporaryHttpUiPattern);
 assert.match(specEn, /OSC 52 copy requests/);
 assert.match(specEn, /selected terminal text/);
 assert.match(specEn, /hamburger window menu contains `Log Start/);
-assert.match(specEn, /`Ctrl\+Shift\+L` opens that menu/);
-assert.match(specEn, /`Ctrl\+Shift\+M` opens the window menu/);
-assert.match(specEn, /`Help \(\^H\)` item or `Ctrl\+Shift\+H`/);
-assert.match(specEn, /`Kill \(\^K\)`, `Copy \(\^C\)`, and `Paste \(\^V\)`/);
-assert.match(specEn, /On Unix, `Kill \(\^K\)` or `Ctrl\+Shift\+K` sends `SIGKILL` to the foreground PTY process group/);
+assert.match(specEn, /`Ctrl\+Shift\+l` shows captured logs/);
+assert.match(specEn, /`Ctrl\+Shift\+p` is unassigned/);
+assert.match(specEn, /`Ctrl\+Shift\+m` opens the window menu/);
+assert.match(specEn, /`Help \(\^h\)` item or `Ctrl\+Shift\+h`/);
+assert.match(specEn, /`Kill \(\^k\)`, `Copy \(\^c\)`, and `Paste \(\^v\)`/);
+assert.match(specEn, /On Unix, `Kill \(\^k\)` or `Ctrl\+Shift\+k` sends `SIGKILL` to the foreground PTY process group/);
 assert.match(specEn, /On Windows, it force-terminates descendants of the terminal shell/);
 assert.match(specEn, /diagnostics and log panel textareas/);
 assert.match(specEn, /Terminal paste first reads the WebView clipboard API/);
@@ -1536,11 +1551,12 @@ assert.doesNotMatch(specJa, removedTemporaryHttpUiPattern);
 assert.match(specJa, /OSC 52 copy request/);
 assert.match(specJa, /選択した terminal text/);
 assert.match(specJa, /hamburger の window menu には `Log Start/);
-assert.match(specJa, /`Ctrl\+Shift\+L` は log 操作に focus/);
-assert.match(specJa, /`Ctrl\+Shift\+M` で window menu を開き/);
-assert.match(specJa, /`Help \(\^H\)` または `Ctrl\+Shift\+H`/);
-assert.match(specJa, /`Kill \(\^K\)`、`Copy \(\^C\)`、`Paste \(\^V\)`/);
-assert.match(specJa, /`Ctrl\+Shift\+K` が前景 PTY process group に `SIGKILL` を送ります/);
+assert.match(specJa, /`Ctrl\+Shift\+l` は captured log を表示/);
+assert.match(specJa, /`Ctrl\+Shift\+p` は将来のcommand palette用に未割り当て/);
+assert.match(specJa, /`Ctrl\+Shift\+m` で window menu を開き/);
+assert.match(specJa, /`Help \(\^h\)` または `Ctrl\+Shift\+h`/);
+assert.match(specJa, /`Kill \(\^k\)`、`Copy \(\^c\)`、`Paste \(\^v\)`/);
+assert.match(specJa, /`Ctrl\+Shift\+k` が前景 PTY process group に `SIGKILL` を送ります/);
 assert.match(specJa, /Windowsではterminal shellの子孫processを深い順に強制終了/);
 assert.match(specJa, /diagnostics \/ log panel の textarea/);
 assert.match(specJa, /terminal paste は、user gesture中のWebView clipboard APIを先に読み/);
@@ -1706,13 +1722,13 @@ assert.match(syncDocsEn, /debounced diagnostics snapshot/);
 assert.match(syncDocsEn, /sync\.enabled = false/);
 assert.match(syncDocsEn, /not the terminal output log/);
 assert.doesNotMatch(syncDocsEn, /titlebar shows a compact `Sync:` status/);
-assert.match(syncDocsEn, /Ctrl\+Shift\+L/);
-assert.match(syncDocsEn, /Ctrl\+Shift\+S/);
-assert.match(syncDocsEn, /Ctrl\+Shift\+P/);
+assert.match(syncDocsEn, /Ctrl\+Shift\+l/);
+assert.match(syncDocsEn, /Ctrl\+Shift\+s/);
+assert.match(syncDocsEn, /Ctrl\+Shift\+p/);
 assert.match(syncDocsEn, /Delete All/);
 assert.match(syncDocsEn, /opens a selector/);
 assert.match(syncDocsEn, /delete the selected stopped log/);
-assert.match(syncDocsEn, /press `Ctrl\+Shift\+C`/);
+assert.match(syncDocsEn, /press `Ctrl\+Shift\+c`/);
 assert.match(syncDocsEn, /same clipboard path/);
 assert.match(syncDocsEn, /tmux capture-pane/);
 assert.match(syncDocsEn, /Store terminal output logs in the sync folder/);
@@ -1763,13 +1779,13 @@ assert.match(syncDocsJa, /terminal output log ではありません/);
 assert.doesNotMatch(syncDocsJa, /titlebar に `Sync:` status が表示されます/);
 assert.doesNotMatch(syncDocsJa, /clipboard\.json/);
 assert.match(syncDocsJa, /diagnostics\.json/);
-assert.match(syncDocsJa, /Ctrl\+Shift\+L/);
-assert.match(syncDocsJa, /Ctrl\+Shift\+S/);
-assert.match(syncDocsJa, /Ctrl\+Shift\+P/);
+assert.match(syncDocsJa, /Ctrl\+Shift\+l/);
+assert.match(syncDocsJa, /Ctrl\+Shift\+s/);
+assert.match(syncDocsJa, /Ctrl\+Shift\+p/);
 assert.match(syncDocsJa, /Delete All/);
 assert.match(syncDocsJa, /一覧から表示対象を選択/);
 assert.match(syncDocsJa, /選択した停止済み log/);
-assert.match(syncDocsJa, /`Ctrl\+Shift\+C` を押す/);
+assert.match(syncDocsJa, /`Ctrl\+Shift\+c` を押す/);
 assert.match(syncDocsJa, /同じ clipboard 経路/);
 assert.match(syncDocsJa, /tmux capture-pane/);
 assert.match(syncDocsJa, /Store terminal output logs in the sync folder/);
@@ -1831,7 +1847,9 @@ assert.match(defaultConfig, /foreground = "#e8edf2"/);
 assert.match(defaultConfig, /cursor = "#f5d76e"/);
 assert.match(defaultConfig, /\[keybindings\]/);
 assert.match(defaultConfig, /prefix = "Mod\+Shift"/);
-assert.match(defaultConfig, /newWindow = "N"/);
+assert.match(defaultConfig, /logShow = "l"/);
+assert.doesNotMatch(defaultConfig, /logMenu =/);
+assert.match(defaultConfig, /newWindow = "n"/);
 
 const minimalConfig = read('examples/config/minimal.toml');
 assert.match(minimalConfig, /\[keybindings\]/);
@@ -1862,8 +1880,14 @@ assert.match(pluginTypes, /registerCommand:/);
 assert.match(pluginTypes, /getOfficialPluginIndex:/);
 
 const renderer = read('src/renderer/renderer.js');
+const embeddedDefaultConfig = read('src-tauri/default-config.toml');
+assert.match(embeddedDefaultConfig, /logShow = "l"/);
+assert.doesNotMatch(embeddedDefaultConfig, /logMenu =/);
 assert.match(renderer, /function terminalBroadcastFocusItems\(\)/);
 assert.match(renderer, /function focusTerminalBroadcastItem\(delta\)/);
+assert.match(renderer, /function sshfsManagerFocusItems\(\)/);
+assert.match(renderer, /function focusSshfsManagerItem\(delta\)/);
+assert.match(renderer, /sshfsManagerDialog\.addEventListener\('focusout'/);
 assert.match(renderer, /function terminalBroadcastFocusLabel\(element\)/);
 assert.match(renderer, /function updateTerminalBroadcastFocusStatus\(element\)/);
 assert.match(renderer, /function terminalBroadcastSubmitKeyEvent\(\)/);
@@ -1872,6 +1896,10 @@ assert.match(renderer, /terminal:broadcast-key/);
 assert.match(renderer, /key: 'Enter', code: 'Enter', shiftKey: false/);
 assert.match(renderer, /function handleTerminalBroadcastKeyboard\(event\)/);
 assert.match(renderer, /event\.key === 'Enter' && event\.shiftKey && !event\.isComposing/);
+assert.match(renderer, /function enableCheckboxKeyboardToggle\(checkbox\)/);
+assert.match(renderer, /\[' ', 'Enter'\]\.includes\(event\.key\)/);
+assert.match(renderer, /enableCheckboxKeyboardToggle\(terminalBroadcastSync\)/);
+assert.match(renderer, /enableCheckboxKeyboardToggle\(checkbox\)/);
 assert.match(renderer, /decodeTerminalBroadcastControls\(normalizePasteText\(rawText\)\.replace\(\/\\r\+\$\/, ''\)\)/);
 assert.match(renderer, /registerPluginReadyCallback/);
 assert.match(renderer, /notifyPluginsReady/);
@@ -1894,6 +1922,12 @@ assert.match(renderer, /arrangeWindows/);
 assert.match(renderer, /closeAllWindows/);
 assert.match(renderer, /confirmCloseAllWindows/);
 assert.match(renderer, /confirmCloseAllWindows/);
+assert.match(renderer, /closeAllConfirmed/);
+assert.match(renderer, /on every platform/);
+assert.match(renderer, /closeAllConfirmCancelButton\.focus/);
+assert.match(renderer, /closeAllConfirmUnmountButton/);
+assert.match(renderer, /function scheduleCloseAllConfirmationFocus/);
+assert.match(renderer, /closeAllConfirmElement\.addEventListener\('focusout'/);
 assert.match(renderer, /resolveCloseAllWindows/);
 assert.match(renderer, /Close all running fpasoterm windows/);
 assert.match(renderer, /isCloseAllShortcut/);
@@ -2003,7 +2037,7 @@ assert.match(renderer, /event\.shiftKey \? -1 : 1/);
 assert.match(renderer, /event\.key !== 'Enter'/);
 assert.match(renderer, /key\.toLowerCase\(\) === 'j'/);
 assert.match(renderer, /key\.toLowerCase\(\) === 'k'/);
-assert.match(renderer, /matchesKeybinding\(event, 'logMenu'\)/);
+assert.doesNotMatch(renderer, /matchesKeybinding\(event, 'logMenu'\)/);
 assert.match(renderer, /matchesKeybinding\(event, 'logToggle'\)/);
 assert.match(renderer, /matchesKeybinding\(event, 'logShow'\)/);
 assert.doesNotMatch(renderer, /document\.execCommand\('copy'\)/);
@@ -2220,6 +2254,7 @@ assert.match(renderer, /window\.innerHeight - top - 8/);
 assert.match(renderer, /window\.addEventListener\('resize', fitWindowMenuToViewport\)/);
 
 const styles = read('src/renderer/styles.css');
+assert.match(styles, /#close-all-confirm button:focus/);
 assert.match(styles, /This is visual-only and never writes to the PTY/);
 assert.match(styles, /#ime-preedit/);
 assert.match(styles, /#ime-preedit\s*\{[\s\S]*z-index: 10010/);
@@ -2281,15 +2316,31 @@ const broadcastControlDocsJa = read('docs/config.ja.md');
 assert.match(broadcastControlDocsEn, /Every send uses the target terminal's actual Enter key event/);
 assert.match(broadcastControlDocsEn, /Its \*\*Control byte\*\* picker inserts visible/);
 assert.match(broadcastControlDocsEn, /`\\x03`/);
+assert.match(broadcastControlDocsEn, /`\\x01`/);
+assert.match(broadcastControlDocsEn, /`\\x02`/);
+assert.match(broadcastControlDocsEn, /\\key\[Arrow/);
+assert.match(broadcastControlDocsEn, /clear\\x0D\\x01jclear/);
 assert.match(broadcastControlDocsEn, /second confirmation/);
 assert.match(broadcastControlDocsEn, /git reset/);
 assert.match(broadcastControlDocsJa, /送信時は常に本文の後にtarget terminalの実際のEnter key event/);
 assert.match(broadcastControlDocsJa, /dialogの \*\*Control byte\*\* pickerでは/);
 assert.match(broadcastControlDocsJa, /`\\x03`/);
+assert.match(broadcastControlDocsJa, /`\\x01`/);
+assert.match(broadcastControlDocsJa, /`\\x02`/);
+assert.match(broadcastControlDocsJa, /\\key\[Arrow/);
+assert.match(broadcastControlDocsJa, /clear\\x0D\\x01jclear/);
 assert.match(broadcastControlDocsJa, /追加確認/);
 assert.match(renderer, /function insertTerminalBroadcastControl/);
 assert.match(renderer, /function decodeTerminalBroadcastControls/);
+assert.match(renderer, /function extractTerminalBroadcastKeyEvent/);
+assert.match(renderer, /ArrowUp: 38/);
+assert.match(renderer, /\\\\key\[ArrowUp\]/);
 assert.match(renderer, /\\\\x0d/);
+assert.match(renderer, /'\\\\x01': '\\x01'/);
+assert.match(renderer, /'\\\\x02': '\\x02'/);
+assert.match(renderer, /0d\|1b\|09\|01\|02\|03/);
+assert.match(renderer, /'ctrl-a': \{ text: '\\\\x01'/);
+assert.match(renderer, /'ctrl-b': \{ text: '\\\\x02'/);
 assert.match(renderer, /function dangerousBroadcastCommandLabels/);
 assert.match(renderer, /'git reset --hard'/);
 assert.match(renderer, /function confirmDangerousBroadcast/);
@@ -2361,6 +2412,7 @@ assert.match(config, /Ctrl\+Alt\+KeyN/);
 assert.match(config, /enabled: false/);
 assert.match(config, /kittySupport: false/);
 assert.match(config, /function writableConfigDefaults/);
+assert.match(config, /function migrateLegacyLogKeybindings/);
 assert.match(config, /sixelSupport: false/);
 assert.match(config, /commandTtlSeconds: 60/);
 assert.match(config, /sync:/);

package/src/config.js

@@ -89,19 +89,18 @@ const defaultConfig = Object.freeze({
   },
   keybindings: {
     prefix: 'Mod+Shift',
-    logMenu: 'L',
-    logToggle: 'S',
-    logShow: 'P',
-    copy: 'C',
-    paste: 'V',
-    menu: 'M',
-    help: 'H',
-    newWindow: 'N',
+    logToggle: 's',
+    logShow: 'l',
+    copy: 'c',
+    paste: 'v',
+    menu: 'm',
+    help: 'h',
+    newWindow: 'n',
     openCwd: 'o',
-    broadcast: 'B',
-    kill: 'K',
-    tile: 'T',
-    closeAll: 'X',
+    broadcast: 'b',
+    kill: 'k',
+    tile: 't',
+    closeAll: 'x',
   },
   plugins: {
     enabled: [],
@@ -182,6 +181,35 @@ function migrateLegacyTerminalLineHeight(config, platform = process.platform) {
   return config;
 }
 
+// Moves former single-letter shortcut defaults to lowercase display form.
+// Longer user-defined bindings remain unchanged.
+function migrateLegacyLogKeybindings(config) {
+  const keybindings = config?.keybindings;
+  if (!keybindings) {
+    return config;
+  }
+  const legacyBindings = {
+    logShow: ['P', 'l'], logToggle: ['S', 's'], copy: ['C', 'c'], paste: ['V', 'v'],
+    menu: ['M', 'm'], help: ['H', 'h'], newWindow: ['N', 'n'], broadcast: ['B', 'b'],
+    kill: ['K', 'k'], tile: ['T', 't'], closeAll: ['X', 'x'],
+  };
+  const needsMigration = keybindings.logMenu === 'L'
+    || Object.entries(legacyBindings).some(([name, [legacy]]) => keybindings[name] === legacy);
+  if (!needsMigration) {
+    return config;
+  }
+  const migrated = mergeConfig(config, { keybindings: {} });
+  for (const [name, [legacy, replacement]] of Object.entries(legacyBindings)) {
+    if (migrated.keybindings[name] === legacy) {
+      migrated.keybindings[name] = replacement;
+    }
+  }
+  if (migrated.keybindings.logMenu === 'L') {
+    delete migrated.keybindings.logMenu;
+  }
+  return migrated;
+}
+
 // Returns the settings persisted in user config files. Image protocol options
 // remain internal until their renderer support is stable.
 function writableConfigDefaults(platform = process.platform, architecture = process.arch) {
@@ -277,19 +305,18 @@ brightWhite = "#ffffff"
 # "Ctrl+Alt+KeyN". Use KeyN-style values for physical-key bindings.
 [keybindings]
 prefix = "Mod+Shift"
-logMenu = "L"
-logToggle = "S"
-logShow = "P"
-copy = "C"
-paste = "V"
-menu = "M"
-help = "H"
-newWindow = "N"
+logToggle = "s"
+logShow = "l"
+copy = "c"
+paste = "v"
+menu = "m"
+help = "h"
+newWindow = "n"
 openCwd = "o"
-broadcast = "B"
-kill = "K"
-tile = "T"
-closeAll = "X"
+broadcast = "b"
+kill = "k"
+tile = "t"
+closeAll = "x"
 
 # Plugins are relative to ~/.config/fpasoterm/User/.
 # Example: enabled = ["plugins/hello.ts", "plugins/theme.ts"]
@@ -799,7 +826,7 @@ function loadConfig() {
   const dir = path.dirname(file);
   writeDefaultConfigExample(file);
 
-  const userConfig = readUserConfig(file);
+  const userConfig = migrateLegacyLogKeybindings(readUserConfig(file));
   const selected = selectProfileConfig(userConfig);
   let config = removeUnsupportedConfigSections(mergeConfig(
     mergeConfig(platformDefaultConfig(), selected.baseConfig),
@@ -843,6 +870,7 @@ module.exports = {
   writeWindowState,
   loadConfig,
   migrateLegacyMacosFontFamily,
+  migrateLegacyLogKeybindings,
   migrateLegacyTerminalLineHeight,
   mergeConfig,
   missingConfigKeys,

package/src/renderer/index.html

@@ -14,14 +14,14 @@
         <div id="window-menu">
           <span id="terminal-log-status" hidden aria-live="polite">Logging</span>
           <span id="sshfs-mount-status" hidden aria-live="polite">SSHFS</span>
-          <button id="window-menu-toggle" type="button" aria-label="Open window menu" aria-expanded="false" aria-keyshortcuts="Control+Shift+M Control+Shift+L">&#9776;</button>
+          <button id="window-menu-toggle" type="button" aria-label="Open window menu" aria-expanded="false" aria-keyshortcuts="Control+Shift+M">&#9776;</button>
           <div id="window-menu-items" role="menu" hidden>
             <div id="keybinding-prefix" role="note">Shortcut prefix: Ctrl+Shift</div>
             <div class="window-menu-submenu" data-menu-submenu="log">
               <button id="log-menu-toggle" class="window-menu-submenu-toggle" type="button" role="menuitem" aria-haspopup="menu" aria-controls="log-menu-items" aria-expanded="false">Log</button>
               <div id="log-menu-items" class="window-menu-submenu-items" role="menu" hidden>
-                <button id="terminal-log-toggle" type="button" role="menuitem" aria-keyshortcuts="Control+Shift+S">Log Start (S)</button>
-                <button id="terminal-log-show" type="button" role="menuitem" aria-keyshortcuts="Control+Shift+P">Log Show (P)</button>
+                <button id="terminal-log-toggle" type="button" role="menuitem" aria-keyshortcuts="Control+Shift+S">Log Start (s)</button>
+                <button id="terminal-log-show" type="button" role="menuitem" aria-keyshortcuts="Control+Shift+L">Log Show (l)</button>
               </div>
             </div>
             <div class="window-menu-submenu" data-menu-submenu="sync">
@@ -37,11 +37,11 @@
               <div id="diagnostics-menu-items" class="window-menu-submenu-items" role="menu" hidden>
                 <button id="font-glyph-test" type="button" role="menuitem" aria-label="Show font and glyph diagnostics">Font / Glyph Test</button>
                 <button id="terminal-capability-test" type="button" role="menuitem" aria-label="Show terminal capability diagnostics">Capability Test</button>
-                <button id="terminal-kill" type="button" role="menuitem" aria-label="Force-stop the current terminal process" aria-keyshortcuts="Control+Shift+K">Kill (K)</button>
+                <button id="terminal-kill" type="button" role="menuitem" aria-label="Force-stop the current terminal process" aria-keyshortcuts="Control+Shift+K">Kill (k)</button>
               </div>
             </div>
-            <button id="terminal-copy" type="button" role="menuitem" aria-label="Copy selected text" aria-keyshortcuts="Control+Shift+C">Copy (C)</button>
-            <button id="terminal-paste" type="button" role="menuitem" aria-label="Paste clipboard text" aria-keyshortcuts="Control+Shift+V">Paste (V)</button>
+            <button id="terminal-copy" type="button" role="menuitem" aria-label="Copy selected text" aria-keyshortcuts="Control+Shift+C">Copy (c)</button>
+            <button id="terminal-paste" type="button" role="menuitem" aria-label="Paste clipboard text" aria-keyshortcuts="Control+Shift+V">Paste (v)</button>
             <div id="plugin-menu-section" class="window-menu-submenu" data-menu-submenu="plugins" hidden>
               <button id="plugin-menu-toggle" class="window-menu-submenu-toggle" type="button" role="menuitem" aria-haspopup="menu" aria-controls="plugin-command-items" aria-expanded="false">Plugins</button>
               <div id="plugin-command-items" class="window-menu-submenu-items" role="menu" hidden></div>
@@ -49,14 +49,14 @@
             <div class="window-menu-submenu" data-menu-submenu="window">
               <button id="window-actions-menu-toggle" class="window-menu-submenu-toggle" type="button" role="menuitem" aria-haspopup="menu" aria-controls="window-actions-menu-items" aria-expanded="false">Window</button>
               <div id="window-actions-menu-items" class="window-menu-submenu-items" role="menu" hidden>
-                <button id="new-window" type="button" role="menuitem" aria-label="Open a new fpasoterm window" aria-keyshortcuts="Control+Shift+N">New (N)</button>
+                <button id="new-window" type="button" role="menuitem" aria-label="Open a new fpasoterm window" aria-keyshortcuts="Control+Shift+N">New (n)</button>
                 <button id="new-window-cwd" type="button" role="menuitem" aria-label="Open a new terminal window in the OSC 7 current directory" aria-keyshortcuts="Control+Shift+O">New CWD (o)</button>
-                <button id="terminal-broadcast" type="button" role="menuitem" aria-label="Send text to all fpasoterm windows" aria-keyshortcuts="Control+Shift+B">Broadcast (B)</button>
-                <button id="arrange-window" type="button" role="menuitem" aria-label="Arrange fpasoterm windows" aria-keyshortcuts="Control+Shift+T">Tile (T)</button>
-                <button id="close-all-windows" type="button" role="menuitem" aria-label="Close all fpasoterm windows" aria-keyshortcuts="Control+Shift+X">Close All (X)</button>
+                <button id="terminal-broadcast" type="button" role="menuitem" aria-label="Send text to all fpasoterm windows" aria-keyshortcuts="Control+Shift+B">Broadcast (b)</button>
+                <button id="arrange-window" type="button" role="menuitem" aria-label="Arrange fpasoterm windows" aria-keyshortcuts="Control+Shift+T">Tile (t)</button>
+                <button id="close-all-windows" type="button" role="menuitem" aria-label="Close all fpasoterm windows" aria-keyshortcuts="Control+Shift+X">Close All (x)</button>
               </div>
             </div>
-            <button id="keyboard-shortcuts-help" type="button" role="menuitem" aria-label="Show keyboard shortcuts" aria-keyshortcuts="Control+Shift+H">Help (H)</button>
+            <button id="keyboard-shortcuts-help" type="button" role="menuitem" aria-label="Show keyboard shortcuts" aria-keyshortcuts="Control+Shift+H">Help (h)</button>
           </div>
         </div>
         <button id="minimize-window" type="button" aria-label="Minimize">-</button>
@@ -117,8 +117,9 @@
         <div id="close-all-confirm-title">Confirm</div>
         <pre id="close-all-confirm-message"></pre>
         <div class="terminal-log-confirm-actions">
-          <button id="close-all-confirm-ok" type="button">OK</button>
           <button id="close-all-confirm-cancel" type="button">Cancel</button>
+          <button id="close-all-confirm-unmount" type="button" hidden>Unmount &amp; Close</button>
+          <button id="close-all-confirm-ok" type="button">OK</button>
         </div>
       </div>
     </section>
@@ -134,16 +135,28 @@
               <option value="">Select</option>
               <option value="enter">Enter / CR (0x0D)</option>
               <option value="tab">Tab (0x09)</option>
+              <option value="ctrl-a">Ctrl+A (0x01)</option>
+              <option value="ctrl-b">Ctrl+B (0x02)</option>
               <option value="ctrl-c">Ctrl+C (0x03)</option>
               <option value="ctrl-d">Ctrl+D (0x04)</option>
               <option value="ctrl-x">Ctrl+X (0x18)</option>
               <option value="ctrl-z">Ctrl+Z (0x1A)</option>
+              <option value="arrow-up">Arrow Up</option>
+              <option value="arrow-down">Arrow Down</option>
+              <option value="arrow-left">Arrow Left</option>
+              <option value="arrow-right">Arrow Right</option>
               <option value="alt-prefix">Alt prefix / Esc (0x1B)</option>
             </select>
           </label>
           <button id="terminal-broadcast-control-insert" type="button">Insert</button>
           <span id="terminal-broadcast-control-status" aria-live="polite"></span>
         </div>
+        <details id="terminal-broadcast-examples">
+          <summary>Examples</summary>
+          <p>Run a command, then send a multiplexer prefix and key: <code>clear\x0D\x01jclear</code></p>
+          <p>For a prefix followed by an arrow key, use a trailing key marker: <code>\x02\key[ArrowUp]</code></p>
+          <p>Select only the intended local windows. Each selected window receives the whole sequence.</p>
+        </details>
         <fieldset id="terminal-broadcast-targets">
           <legend>Local windows</legend>
           <div id="terminal-broadcast-target-list" aria-live="polite"></div>