diff --git a/.github/swift-file-length-budget.tsv b/.github/swift-file-length-budget.tsv index 89f4d41cfc45..fc5e286fcec0 100644 --- a/.github/swift-file-length-budget.tsv +++ b/.github/swift-file-length-budget.tsv @@ -1,27 +1,27 @@ # cmux-owned Swift file length budget. # Format: max_linesrelative path # Reduce counts as files shrink. CI fails if tracked files exceed this budget. -34475 CLI/cmux.swift -17604 Sources/AppDelegate.swift -15933 Sources/ContentView.swift -14104 Sources/TerminalController.swift +34566 CLI/cmux.swift +17641 Sources/AppDelegate.swift +15944 Sources/ContentView.swift +14187 Sources/TerminalController.swift 12658 Sources/Workspace.swift 12115 cmuxTests/AppDelegateShortcutRoutingTests.swift -11833 Sources/GhosttyTerminalView.swift +11837 Sources/GhosttyTerminalView.swift 11413 Sources/Panels/BrowserPanel.swift 9331 cmuxTests/CLINotifyProcessIntegrationRegressionTests.swift 7953 Sources/Panels/BrowserPanelView.swift -7356 cmuxTests/WorkspaceUnitTests.swift +7410 cmuxTests/WorkspaceUnitTests.swift 7221 cmuxTests/WorkspaceRemoteConnectionTests.swift 6317 cmuxTests/SessionPersistenceTests.swift 6223 cmuxTests/GhosttyConfigTests.swift -6172 Sources/TabManager.swift +6176 Sources/TabManager.swift 6153 CLI/cmux_open.swift 6074 Sources/TextBoxInput.swift 5925 cmuxTests/TerminalAndGhosttyTests.swift 5566 Packages/iOS/CmuxMobileShell/Sources/CmuxMobileShell/MobileShellComposite.swift 5526 cmuxTests/BrowserConfigTests.swift -4516 Sources/cmuxApp.swift +4521 Sources/cmuxApp.swift 4467 Sources/Panels/FilePreviewPanel.swift 4401 cmuxTests/BrowserPanelTests.swift 4225 Sources/BrowserWindowPortal.swift @@ -35,7 +35,7 @@ 3055 Sources/Update/UpdateTitlebarAccessory.swift 2878 Sources/SessionIndexView.swift 2871 cmuxTests/CMUXOpenCommandTests.swift -2585 Sources/KeyboardShortcutSettings.swift +2593 Sources/KeyboardShortcutSettings.swift 2565 Sources/Panels/CmuxWebView.swift 2546 cmuxTests/WorkspaceManualUnreadTests.swift 2460 cmuxTests/CommandPaletteSearchEngineTests.swift @@ -47,8 +47,8 @@ 2117 cmuxTests/CmuxConfigTests.swift 2092 cmuxTests/ShortcutAndCommandPaletteTests.swift 2082 Sources/SessionPersistence.swift +1969 Sources/KeyboardShortcutSettingsFileStore.swift 1949 Sources/Panels/BrowserWebAuthnSupport.swift -1941 Sources/KeyboardShortcutSettingsFileStore.swift 1880 Sources/RestorableAgentSession.swift 1860 cmuxTests/NotificationAndMenuBarTests.swift 1810 Sources/SessionIndexStore.swift @@ -159,8 +159,8 @@ 620 cmuxTests/TerminalNotificationQueueTests.swift 615 cmuxTests/RemoteTmuxControlParserTests.swift 614 Sources/PortScanner.swift +614 Sources/SettingsNavigation.swift 608 Packages/macOS/CmuxWorkspaces/Sources/CmuxWorkspaces/Coordinators/WorkspaceGroupCoordinator.swift -606 Sources/SettingsNavigation.swift 604 Packages/macOS/CmuxCommandPalette/Tests/CmuxCommandPaletteTests/CommandPaletteNucleoFFITests.swift 599 Packages/macOS/CMUXAgentLaunch/Sources/CMUXAgentLaunch/AgentLaunchSanitizerPrimaryPolicies.swift 596 cmuxTests/CmuxEventBusTests.swift @@ -217,3 +217,4 @@ 504 cmuxTests/TerminalNotificationSocketActionTests.swift 503 Sources/Settings/ConfigSource.swift 502 Sources/CmuxEventPublishing.swift +501 Sources/QuickTerminalController.swift diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bb84f7b7b63..92bc64368194 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -381,6 +381,7 @@ All notable changes to cmux are documented here. ## [0.64.10] - 2026-05-23 ### Added +- Quick Terminal panel with a configurable position/size, Option-Command-backtick shortcut, command palette action, and `cmux quick-terminal` CLI controls. - Copy on Select setting copies the active terminal selection to the clipboard as soon as the mouse is released ([#4011](https://github.com/manaflow-ai/cmux/pull/4011)) -- thanks @kallioaleksi for the report! - CmuxExtensionKit sidebar prototypes showcase the upcoming extension API for custom workspace sidebars ([#4309](https://github.com/manaflow-ai/cmux/pull/4309)) - Ghostty Settings command palette action opens the embedded Ghostty configuration directly ([#4654](https://github.com/manaflow-ai/cmux/pull/4654)) diff --git a/CLI/cmux.swift b/CLI/cmux.swift index 6f5d547ade51..4bdf998bfce9 100644 --- a/CLI/cmux.swift +++ b/CLI/cmux.swift @@ -3568,6 +3568,20 @@ struct CMUXCLI { ) return } + if command == "quick-terminal" { + let client = try connectClient( + socketPath: resolvedSocketPath, + explicitPassword: socketPasswordArg, + launchIfNeeded: true + ) + defer { client.close() } + try runQuickTerminal( + commandArgs: commandArgs, + client: client, + jsonOutput: jsonOutput + ) + return + } if command == "open" { try runOpenCommand(commandArgs: commandArgs, socketPath: resolvedSocketPath, explicitPassword: socketPasswordArg, jsonOutput: jsonOutput, idFormat: try resolvedIDFormat(jsonOutput: jsonOutput, raw: idFormatArg)); return } if command == "diff" { try runDiffCommand(commandArgs: commandArgs, socketPath: resolvedSocketPath, explicitPassword: socketPasswordArg, jsonOutput: jsonOutput, idFormat: try resolvedIDFormat(jsonOutput: jsonOutput, raw: idFormatArg)); return } if command == "restore-session" { @@ -5822,6 +5836,64 @@ struct CMUXCLI { CLIExecutableLocator.enclosingAppBundle()?.bundleURL.path ?? "cmux" } + private func runQuickTerminal( + commandArgs: [String], + client: SocketClient, + jsonOutput: Bool + ) throws { + let normalizedArgs = Array(commandArgs.drop(while: { $0 == "--" })) + let subcommand = normalizedArgs.first?.lowercased() ?? "toggle" + let remaining = Array(normalizedArgs.dropFirst()).filter { $0 != "--" } + + let method: String + switch subcommand { + case "toggle": + method = "quick_terminal.toggle" + case "show": + method = "quick_terminal.show" + case "hide": + method = "quick_terminal.hide" + case "status": + method = "quick_terminal.status" + default: + throw CLIError(message: "quick-terminal requires one of: toggle, show, hide, status") + } + if !remaining.isEmpty { + let suffix = remaining.count == 1 ? "" : "s" + throw CLIError(message: "quick-terminal \(subcommand): unexpected \(remaining.count) argument\(suffix)") + } + + let payload = try client.sendV2(method: method) + if jsonOutput { + print(jsonString(payload)) + return + } + + if subcommand == "status" { + print(formatQuickTerminalStatusPayload(payload)) + } else { + print("OK") + } + } + + private func formatQuickTerminalStatusPayload(_ payload: [String: Any]) -> String { + let available = (payload["available"] as? Bool) ?? false + let visible = (payload["visible"] as? Bool) ?? false + let position = (payload["position"] as? String) ?? "unknown" + let autoHide = (payload["auto_hide"] as? Bool) ?? false + let primarySizeRatio = (payload["primary_size_ratio"] as? Double) ?? 0 + let secondarySizeRatio = (payload["secondary_size_ratio"] as? Double) ?? 0 + + return """ + available: \(available ? "yes" : "no") + visible: \(visible ? "yes" : "no") + position: \(position) + auto_hide: \(autoHide ? "yes" : "no") + primary_size_ratio: \(String(format: "%.2f", primarySizeRatio)) + secondary_size_ratio: \(String(format: "%.2f", secondarySizeRatio)) + """ + } + private func runFeedback( commandArgs: [String], socketPath: String, @@ -7476,15 +7548,14 @@ struct CMUXCLI { commandName )) } - if let unknown = remaining.first(where: { $0.hasPrefix("--") }) { + if remaining.contains(where: { $0.hasPrefix("--") }) { throw CLIError(message: String( format: String( localized: "cli.workspace.create.error.unknownFlag", - defaultValue: "%@: unknown flag '%@'. Known flags: --name , --description <text>, --command <text>, --cwd <path>, --env KEY=VALUE, --env-file <path>, --layout <json>, --window <id|ref|index>, --focus <true|false>" + defaultValue: "%@: unknown flag. Known flags: --name <title>, --description <text>, --command <text>, --cwd <path>, --env KEY=VALUE, --env-file <path>, --layout <json>, --window <id|ref|index>, --focus <true|false>" ), locale: .current, - commandName, - unknown + commandName )) } var params: [String: Any] = [:] @@ -7626,12 +7697,11 @@ struct CMUXCLI { throw CLIError(message: String( format: String( localized: "cli.workspace.env.error.invalidAssignment", - defaultValue: "%@: %@ entry '%@' must be in KEY=VALUE form" + defaultValue: "%@: %@ entry must be in KEY=VALUE form" ), locale: .current, commandName, - source, - raw + source )) } let key = String(raw[..<eq]).trimmingCharacters(in: .whitespaces) @@ -7640,12 +7710,11 @@ struct CMUXCLI { throw CLIError(message: String( format: String( localized: "cli.workspace.env.error.emptyKey", - defaultValue: "%@: %@ entry '%@' has an empty key" + defaultValue: "%@: %@ entry has an empty key" ), locale: .current, commandName, - source, - raw + source )) } return (key, value) @@ -7689,17 +7758,20 @@ struct CMUXCLI { let (workspaceArg, rem0) = parseOption(rest, name: "--workspace") let (_, rem1) = parseOption(rem0, name: "--window") - if let unknown = rem1.first(where: { $0.hasPrefix("--") }) { + if rem1.contains(where: { $0.hasPrefix("--") }) { throw CLIError(message: String( format: String( localized: "cli.workspace.env.error.unknownFlag", - defaultValue: "workspace env: unknown flag '%@'. Known flags: --workspace <id|ref|index>, --window <id|ref|index>, --mask" + defaultValue: "workspace env: unknown flag. Known flags: --workspace <id|ref|index>, --window <id|ref|index>, --mask" ), - locale: .current, - unknown + locale: .current )) } - let positional = rem1.first(where: { !$0.hasPrefix("--") }) + let positionals = rem1.filter { !$0.hasPrefix("--") } + if positionals.count > 1 { + throw CLIError(message: String(localized: "cli.workspace.env.error.unexpectedExtraArgument", defaultValue: "workspace env: unexpected extra argument")) + } + let positional = positionals.first let windowRaw = windowFromArgsOrOverride(commandArgs, windowOverride: windowOverride) // Match reconnect/disconnect: default to the caller's workspace // ($CMUX_WORKSPACE_ID) before the selected one, but only when no explicit @@ -8765,7 +8837,7 @@ struct CMUXCLI { if destination == nil { destination = arg } else { - throw CLIError(message: "ssh-tmux: unexpected extra argument '\(arg)'") + throw CLIError(message: String(localized: "cli.ssh-tmux.error.unexpectedExtraArgument", defaultValue: "ssh-tmux: unexpected extra argument")) } index += 1 } @@ -14501,6 +14573,23 @@ struct CMUXCLI { Open the Settings window to Keyboard Shortcuts. """ + case "quick-terminal": + return """ + Usage: cmux quick-terminal [toggle|show|hide|status] + + Control the floating quick terminal panel. + + Subcommands: + toggle Toggle quick terminal visibility (default) + show Show quick terminal + hide Hide quick terminal + status Print quick terminal status + + Examples: + cmux quick-terminal + cmux quick-terminal show + cmux --json quick-terminal status + """ case "disable-browser": return """ Usage: cmux disable-browser [--json] @@ -34240,6 +34329,7 @@ export default function cmuxPiSessionExtension(pi: ExtensionAPI) { settings [open [target]|path|docs|<target>] config <doctor|check|validate|path|paths|docs|documentation|reload> shortcuts + quick-terminal [toggle|show|hide|status] disable-browser | enable-browser | browser-status agent-hibernation <on|off> restore-session @@ -34336,6 +34426,7 @@ export default function cmuxPiSessionExtension(pi: ExtensionAPI) { clear-log [--workspace <id|ref|index>] [--window <id|ref|index>] list-log [--workspace <id|ref|index>] [--window <id|ref|index>] [--limit <n>] sidebar-state [--workspace <id|ref|index>] [--window <id|ref|index>] + quick-terminal [toggle|show|hide|status] set-app-focus <active|inactive|clear> simulate-app-active simulate-sidebar-drag --window <id|ref|index> --from <ws> --to <ws> [--duration-ms <n>] [--steps <n>] diff --git a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/TerminalCatalogSection.swift b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/TerminalCatalogSection.swift index 0dbc0e73b0c3..2dd5712a33bd 100644 --- a/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/TerminalCatalogSection.swift +++ b/Packages/macOS/CmuxSettings/Sources/CmuxSettings/Keys/TerminalCatalogSection.swift @@ -74,6 +74,66 @@ public struct TerminalCatalogSection: SettingCatalogSection { userDefaultsKey: "terminal.focusTextBoxOnNewTerminals" ) + /// The screen position used by the floating quick terminal panel. + /// + /// Valid values are `"top"`, `"bottom"`, `"left"`, `"right"`, and + /// `"center"`. The default is `"top"`. The `UserDefaults` key intentionally + /// uses the existing `quickTerminal.*` namespace so preferences written by + /// the quick-terminal runtime continue to be read by the settings catalog. + /// + /// ```swift + /// let key = SettingCatalog().terminal.quickTerminalPosition + /// ``` + public let quickTerminalPosition = DefaultsKey<String>( + id: "terminal.quickTerminalPosition", + defaultValue: "top", + userDefaultsKey: "quickTerminal.position" + ) + + /// The quick terminal size ratio along the slide-in axis. + /// + /// Values are clamped by the quick-terminal runtime to the range + /// `0.2...1.0`. For top and bottom positions this controls height; for + /// left and right positions this controls width. The default is `0.38`. + /// + /// ```swift + /// let key = SettingCatalog().terminal.quickTerminalPrimarySizeRatio + /// ``` + public let quickTerminalPrimarySizeRatio = DefaultsKey<Double>( + id: "terminal.quickTerminalPrimarySizeRatio", + defaultValue: 0.38, + userDefaultsKey: "quickTerminal.primarySizeRatio" + ) + + /// The quick terminal size ratio across the axis opposite the slide-in direction. + /// + /// Values are clamped by the quick-terminal runtime to the range + /// `0.2...1.0`. For top and bottom positions this controls width; for left, + /// right, and center positions this controls height. The default is `1.0`. + /// + /// ```swift + /// let key = SettingCatalog().terminal.quickTerminalSecondarySizeRatio + /// ``` + public let quickTerminalSecondarySizeRatio = DefaultsKey<Double>( + id: "terminal.quickTerminalSecondarySizeRatio", + defaultValue: 1.0, + userDefaultsKey: "quickTerminal.secondarySizeRatio" + ) + + /// Whether the quick terminal hides automatically after losing key focus. + /// + /// The default is `true`. When disabled, the panel remains visible until a + /// toggle, hide command, or app shutdown closes it. + /// + /// ```swift + /// let key = SettingCatalog().terminal.quickTerminalAutoHide + /// ``` + public let quickTerminalAutoHide = DefaultsKey<Bool>( + id: "terminal.quickTerminalAutoHide", + defaultValue: true, + userDefaultsKey: "quickTerminal.autoHide" + ) + public let textBoxMaxLines = DefaultsKey<Int>( id: "terminal.textBoxMaxLines", defaultValue: 10, diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift index b59a3abe2604..6157dfb7c0ad 100644 --- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift +++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Default.swift @@ -78,6 +78,10 @@ extension Array where Element == CuratedSettingEntry { .init(section: .terminal, id: "scrollbar", title: "Show Terminal Scroll Bar", synonyms: "terminal.showScrollBar scrollback scrollbar scroll bar right edge alternate screen tui"), .init(section: .terminal, id: "copy-on-select", title: "Copy on Selection", synonyms: "terminal.copyOnSelect copy on selection select clipboard mouse double click triple click iterm"), .init(section: .terminal, id: "agent-auto-resume", title: "Resume Agent Sessions on Reopen", synonyms: "terminal.autoResumeAgentSessions auto resume restore reopen relaunch quit sessions agents claude code codex opencode rovo dev rovodev toggle"), + .init(section: .terminal, id: "quick-terminal-position", title: "Quick Terminal Position", synonyms: "terminal.quickTerminalPosition quick terminal dropdown quake position top bottom left right center"), + .init(section: .terminal, id: "quick-terminal-primary-size", title: "Quick Terminal Primary Size", synonyms: "terminal.quickTerminalPrimarySizeRatio quick terminal dropdown quake primary size height width"), + .init(section: .terminal, id: "quick-terminal-secondary-size", title: "Quick Terminal Secondary Size", synonyms: "terminal.quickTerminalSecondarySizeRatio quick terminal dropdown quake secondary size height width"), + .init(section: .terminal, id: "quick-terminal-auto-hide", title: "Quick Terminal Auto-Hide", synonyms: "terminal.quickTerminalAutoHide quick terminal dropdown quake auto hide blur focus"), .init(section: .terminal, id: "agent-hibernation", title: "Agent Hibernation", synonyms: "terminal.agentHibernation.enabled idle hibernate suspend background agents claude code codex opencode live terminals"), .init(section: .terminal, id: "agent-hibernation-idle", title: "Hibernate After Idle Seconds", synonyms: "terminal.agentHibernation.idleSeconds idle seconds timeout delay hibernate suspend"), .init(section: .terminal, id: "agent-hibernation-max", title: "Max Live Agent Terminals", synonyms: "terminal.agentHibernation.maxLiveTerminals max live agent terminals limit count hibernate"), diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/TerminalSection.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/TerminalSection.swift index 8eb4f164ffa9..763bda6dcde1 100644 --- a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/TerminalSection.swift +++ b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/TerminalSection.swift @@ -16,6 +16,10 @@ public struct TerminalSection: View { @State private var fontSaveTask: Task<Void, Never>? @State private var scrollBar: DefaultsValueModel<Bool> @State private var copyOnSelect: DefaultsValueModel<Bool> + @State private var quickTerminalPosition: DefaultsValueModel<String> + @State private var quickTerminalPrimarySizeRatio: DefaultsValueModel<Double> + @State private var quickTerminalSecondarySizeRatio: DefaultsValueModel<Double> + @State private var quickTerminalAutoHide: DefaultsValueModel<Bool> @State private var autoResume: DefaultsValueModel<Bool> @State private var hibernation: DefaultsValueModel<Bool> @State private var idleSeconds: DefaultsValueModel<Double> @@ -36,6 +40,10 @@ public struct TerminalSection: View { _surfaceTabBarFont = State(initialValue: hostActions.surfaceTabBarFontSize()) _scrollBar = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.terminal.showScrollBar)) _copyOnSelect = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.terminal.copyOnSelect)) + _quickTerminalPosition = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.terminal.quickTerminalPosition)) + _quickTerminalPrimarySizeRatio = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.terminal.quickTerminalPrimarySizeRatio)) + _quickTerminalSecondarySizeRatio = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.terminal.quickTerminalSecondarySizeRatio)) + _quickTerminalAutoHide = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.terminal.quickTerminalAutoHide)) _autoResume = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.terminal.autoResumeAgentSessions)) _hibernation = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.terminal.agentHibernationEnabled)) _idleSeconds = State(initialValue: DefaultsValueModel(store: defaultsStore, key: catalog.terminal.agentHibernationIdleSeconds)) @@ -58,6 +66,10 @@ public struct TerminalSection: View { let models: [any SettingObservationStarting] = [ scrollBar, copyOnSelect, + quickTerminalPosition, + quickTerminalPrimarySizeRatio, + quickTerminalSecondarySizeRatio, + quickTerminalAutoHide, autoResume, hibernation, idleSeconds, @@ -80,6 +92,36 @@ public struct TerminalSection: View { } } + private var quickTerminalPositionBinding: Binding<String> { + Binding( + get: { + QuickTerminalPositionOption(rawValue: quickTerminalPosition.current)?.rawValue + ?? QuickTerminalPositionOption.top.rawValue + }, + set: { newValue in + quickTerminalPosition.set( + QuickTerminalPositionOption(rawValue: newValue)?.rawValue + ?? QuickTerminalPositionOption.top.rawValue + ) + } + ) + } + + private func quickTerminalRatioBinding(_ model: DefaultsValueModel<Double>) -> Binding<Double> { + Binding( + get: { clampedQuickTerminalRatio(model.current) }, + set: { model.set(clampedQuickTerminalRatio($0)) } + ) + } + + private func clampedQuickTerminalRatio(_ value: Double) -> Double { + min(max(value, 0.2), 1.0) + } + + private func quickTerminalRatioPercentLabel(_ ratio: Double) -> String { + "\(Int((clampedQuickTerminalRatio(ratio) * 100).rounded()))%" + } + @ViewBuilder private var resumeCommandsCard: some View { SettingsCard { @@ -177,6 +219,86 @@ public struct TerminalSection: View { .accessibilityIdentifier("SettingsTerminalCopyOnSelectToggle") } SettingsCardDivider() + SettingsCardRow( + configurationReview: .json("terminal.quickTerminalPosition"), + String(localized: "settings.quickTerminal.position", defaultValue: "Quick Terminal Position"), + subtitle: String(localized: "settings.quickTerminal.position.subtitle", defaultValue: "Choose where the quick terminal slides in."), + controlWidth: 196 + ) { + Picker("", selection: quickTerminalPositionBinding) { + ForEach(QuickTerminalPositionOption.allCases) { option in + Text(verbatim: option.localizedName) + .tag(option.rawValue) + } + } + .labelsHidden() + .pickerStyle(.menu) + .accessibilityIdentifier("SettingsQuickTerminalPositionPicker") + .accessibilityLabel( + String(localized: "settings.quickTerminal.position", defaultValue: "Quick Terminal Position") + ) + } + SettingsCardDivider() + SettingsCardRow( + configurationReview: .json("terminal.quickTerminalPrimarySizeRatio"), + String(localized: "settings.quickTerminal.primarySize", defaultValue: "Quick Terminal Primary Size"), + subtitle: String(localized: "settings.quickTerminal.primarySize.subtitle", defaultValue: "Size along the slide-in axis."), + controlWidth: 196 + ) { + HStack(spacing: 8) { + Slider( + value: quickTerminalRatioBinding(quickTerminalPrimarySizeRatio), + in: 0.2...1.0 + ) + .frame(width: 132) + + Text(verbatim: quickTerminalRatioPercentLabel(quickTerminalPrimarySizeRatio.current)) + .font(.system(size: 11, weight: .medium)) + .foregroundStyle(.secondary) + .monospacedDigit() + .frame(width: 42, alignment: .trailing) + } + .accessibilityIdentifier("SettingsQuickTerminalPrimarySizeSlider") + } + SettingsCardDivider() + SettingsCardRow( + configurationReview: .json("terminal.quickTerminalSecondarySizeRatio"), + String(localized: "settings.quickTerminal.secondarySize", defaultValue: "Quick Terminal Secondary Size"), + subtitle: String(localized: "settings.quickTerminal.secondarySize.subtitle", defaultValue: "Size across the opposite axis."), + controlWidth: 196 + ) { + HStack(spacing: 8) { + Slider( + value: quickTerminalRatioBinding(quickTerminalSecondarySizeRatio), + in: 0.2...1.0 + ) + .frame(width: 132) + + Text(verbatim: quickTerminalRatioPercentLabel(quickTerminalSecondarySizeRatio.current)) + .font(.system(size: 11, weight: .medium)) + .foregroundStyle(.secondary) + .monospacedDigit() + .frame(width: 42, alignment: .trailing) + } + .accessibilityIdentifier("SettingsQuickTerminalSecondarySizeSlider") + } + SettingsCardDivider() + SettingsCardRow( + configurationReview: .json("terminal.quickTerminalAutoHide"), + String(localized: "settings.quickTerminal.autoHide", defaultValue: "Quick Terminal Auto-Hide"), + subtitle: quickTerminalAutoHide.current + ? String(localized: "settings.quickTerminal.autoHide.subtitleOn", defaultValue: "Hide automatically when it loses focus.") + : String(localized: "settings.quickTerminal.autoHide.subtitleOff", defaultValue: "Keep visible when focus moves away.") + ) { + Toggle("", isOn: Binding(get: { quickTerminalAutoHide.current }, set: { quickTerminalAutoHide.set($0) })) + .labelsHidden() + .controlSize(.small) + .accessibilityIdentifier("SettingsQuickTerminalAutoHideToggle") + .accessibilityLabel( + String(localized: "settings.quickTerminal.autoHide", defaultValue: "Quick Terminal Auto-Hide") + ) + } + SettingsCardDivider() SettingsCardRow( configurationReview: .json("terminal.autoResumeAgentSessions"), String(localized: "settings.terminal.agentAutoResume", defaultValue: "Resume Agent Sessions on Reopen"), @@ -279,3 +401,28 @@ public struct TerminalSection: View { } } + +private enum QuickTerminalPositionOption: String, CaseIterable, Identifiable { + case top + case bottom + case left + case right + case center + + var id: String { rawValue } + + var localizedName: String { + switch self { + case .top: + return String(localized: "settings.quickTerminal.position.top", defaultValue: "Top") + case .bottom: + return String(localized: "settings.quickTerminal.position.bottom", defaultValue: "Bottom") + case .left: + return String(localized: "settings.quickTerminal.position.left", defaultValue: "Left") + case .right: + return String(localized: "settings.quickTerminal.position.right", defaultValue: "Right") + case .center: + return String(localized: "settings.quickTerminal.position.center", defaultValue: "Center") + } + } +} diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SettingsRowAnchorResolutionTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SettingsRowAnchorResolutionTests.swift index 8090ef83ed6a..bf9e22995579 100644 --- a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SettingsRowAnchorResolutionTests.swift +++ b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/SettingsRowAnchorResolutionTests.swift @@ -114,6 +114,10 @@ struct SettingsRowAnchorResolutionTests { "terminal.rendererRealization.maxWarmRenderers", "terminal.autoResumeAgentSessions", "terminal.copyOnSelect", + "terminal.quickTerminalAutoHide", + "terminal.quickTerminalPosition", + "terminal.quickTerminalPrimarySizeRatio", + "terminal.quickTerminalSecondarySizeRatio", "terminal.resumeCommands", "terminal.focusTextBoxOnNewTerminals", "terminal.showScrollBar", diff --git a/README.md b/README.md index 2dd588da552d..25f9091c9f26 100644 --- a/README.md +++ b/README.md @@ -220,6 +220,7 @@ Command palette navigation shortcuts, including ⌃ P, are also customizable and | Shortcut | Action | |----------|--------| +| ⌥ ⌘ ` | Toggle quick terminal (system-wide) | | ⌘ K | Clear scrollback | | ⌘ C | Copy (with selection) | | ⌘ V | Paste | diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings index 95309aaca27f..1634afc63810 100644 --- a/Resources/Localizable.xcstrings +++ b/Resources/Localizable.xcstrings @@ -57423,6 +57423,25 @@ } } }, + "command.toggleQuickTerminal.subtitle": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"bs":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"da":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"de":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"en":{"stringUnit":{"state":"translated","value":"Terminal"}},"es":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"fr":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"it":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"ja":{"stringUnit":{"state":"translated","value":"ターミナル"}},"km":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"ko":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"nb":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"pl":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"ru":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"th":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"tr":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"uk":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Terminal"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Terminal"}}}}, + "command.toggleQuickTerminal.title": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"bs":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"da":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"de":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"en":{"stringUnit":{"state":"translated","value":"Toggle Quick Terminal"}},"es":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"fr":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"it":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"ja":{"stringUnit":{"state":"translated","value":"クイックターミナルを切り替え"}},"km":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"ko":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"nb":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"pl":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"ru":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"th":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"tr":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"uk":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}}}}, + "menu.view.toggleQuickTerminal": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"bs":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"da":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"de":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"en":{"stringUnit":{"state":"translated","value":"Toggle Quick Terminal"}},"es":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"fr":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"it":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"ja":{"stringUnit":{"state":"translated","value":"クイックターミナルを切り替え"}},"km":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"ko":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"nb":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"pl":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"ru":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"th":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"tr":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"uk":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}}}}, + "quickTerminal.window.title": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"bs":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"da":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"de":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"en":{"stringUnit":{"state":"translated","value":"Quick Terminal"}},"es":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"fr":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"it":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"ja":{"stringUnit":{"state":"translated","value":"クイックターミナル"}},"km":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"ko":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"nb":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"pl":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"ru":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"th":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"tr":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"uk":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Quick Terminal"}}}}, + "settings.quickTerminal.autoHide": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"bs":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"da":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"de":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"en":{"stringUnit":{"state":"translated","value":"Quick Terminal Auto-Hide"}},"es":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"fr":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"it":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"ja":{"stringUnit":{"state":"translated","value":"クイックターミナルを自動的に隠す"}},"km":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"ko":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"nb":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"pl":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"ru":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"th":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"tr":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"uk":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Auto-Hide"}}}}, + "settings.quickTerminal.autoHide.subtitleOff": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"bs":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"da":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"de":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"en":{"stringUnit":{"state":"translated","value":"Keep visible when focus moves away."}},"es":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"fr":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"it":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"ja":{"stringUnit":{"state":"translated","value":"フォーカスが移動しても表示したままにします。"}},"km":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"ko":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"nb":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"pl":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"ru":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"th":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"tr":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"uk":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Keep visible when focus moves away."}}}}, + "settings.quickTerminal.autoHide.subtitleOn": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"bs":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"da":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"de":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"en":{"stringUnit":{"state":"translated","value":"Hide automatically when it loses focus."}},"es":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"fr":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"it":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"ja":{"stringUnit":{"state":"translated","value":"フォーカスを失うと自動的に隠します。"}},"km":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"ko":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"nb":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"pl":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"ru":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"th":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"tr":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"uk":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Hide automatically when it loses focus."}}}}, + "settings.quickTerminal.position": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"bs":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"da":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"de":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"en":{"stringUnit":{"state":"translated","value":"Quick Terminal Position"}},"es":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"fr":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"it":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"ja":{"stringUnit":{"state":"translated","value":"クイックターミナルの位置"}},"km":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"ko":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"nb":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"pl":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"ru":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"th":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"tr":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"uk":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Position"}}}}, + "settings.quickTerminal.position.bottom": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"bs":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"da":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"de":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"en":{"stringUnit":{"state":"translated","value":"Bottom"}},"es":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"fr":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"it":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"ja":{"stringUnit":{"state":"translated","value":"下"}},"km":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"ko":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"nb":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"pl":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"ru":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"th":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"tr":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"uk":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Bottom"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Bottom"}}}}, + "settings.quickTerminal.position.center": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Center"}},"bs":{"stringUnit":{"state":"needs_review","value":"Center"}},"da":{"stringUnit":{"state":"needs_review","value":"Center"}},"de":{"stringUnit":{"state":"needs_review","value":"Center"}},"en":{"stringUnit":{"state":"translated","value":"Center"}},"es":{"stringUnit":{"state":"needs_review","value":"Center"}},"fr":{"stringUnit":{"state":"needs_review","value":"Center"}},"it":{"stringUnit":{"state":"needs_review","value":"Center"}},"ja":{"stringUnit":{"state":"translated","value":"中央"}},"km":{"stringUnit":{"state":"needs_review","value":"Center"}},"ko":{"stringUnit":{"state":"needs_review","value":"Center"}},"nb":{"stringUnit":{"state":"needs_review","value":"Center"}},"pl":{"stringUnit":{"state":"needs_review","value":"Center"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Center"}},"ru":{"stringUnit":{"state":"needs_review","value":"Center"}},"th":{"stringUnit":{"state":"needs_review","value":"Center"}},"tr":{"stringUnit":{"state":"needs_review","value":"Center"}},"uk":{"stringUnit":{"state":"needs_review","value":"Center"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Center"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Center"}}}}, + "settings.quickTerminal.position.left": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Left"}},"bs":{"stringUnit":{"state":"needs_review","value":"Left"}},"da":{"stringUnit":{"state":"needs_review","value":"Left"}},"de":{"stringUnit":{"state":"needs_review","value":"Left"}},"en":{"stringUnit":{"state":"translated","value":"Left"}},"es":{"stringUnit":{"state":"needs_review","value":"Left"}},"fr":{"stringUnit":{"state":"needs_review","value":"Left"}},"it":{"stringUnit":{"state":"needs_review","value":"Left"}},"ja":{"stringUnit":{"state":"translated","value":"左"}},"km":{"stringUnit":{"state":"needs_review","value":"Left"}},"ko":{"stringUnit":{"state":"needs_review","value":"Left"}},"nb":{"stringUnit":{"state":"needs_review","value":"Left"}},"pl":{"stringUnit":{"state":"needs_review","value":"Left"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Left"}},"ru":{"stringUnit":{"state":"needs_review","value":"Left"}},"th":{"stringUnit":{"state":"needs_review","value":"Left"}},"tr":{"stringUnit":{"state":"needs_review","value":"Left"}},"uk":{"stringUnit":{"state":"needs_review","value":"Left"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Left"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Left"}}}}, + "settings.quickTerminal.position.right": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Right"}},"bs":{"stringUnit":{"state":"needs_review","value":"Right"}},"da":{"stringUnit":{"state":"needs_review","value":"Right"}},"de":{"stringUnit":{"state":"needs_review","value":"Right"}},"en":{"stringUnit":{"state":"translated","value":"Right"}},"es":{"stringUnit":{"state":"needs_review","value":"Right"}},"fr":{"stringUnit":{"state":"needs_review","value":"Right"}},"it":{"stringUnit":{"state":"needs_review","value":"Right"}},"ja":{"stringUnit":{"state":"translated","value":"右"}},"km":{"stringUnit":{"state":"needs_review","value":"Right"}},"ko":{"stringUnit":{"state":"needs_review","value":"Right"}},"nb":{"stringUnit":{"state":"needs_review","value":"Right"}},"pl":{"stringUnit":{"state":"needs_review","value":"Right"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Right"}},"ru":{"stringUnit":{"state":"needs_review","value":"Right"}},"th":{"stringUnit":{"state":"needs_review","value":"Right"}},"tr":{"stringUnit":{"state":"needs_review","value":"Right"}},"uk":{"stringUnit":{"state":"needs_review","value":"Right"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Right"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Right"}}}}, + "settings.quickTerminal.position.subtitle": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"bs":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"da":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"de":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"en":{"stringUnit":{"state":"translated","value":"Choose where the quick terminal slides in."}},"es":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"fr":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"it":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"ja":{"stringUnit":{"state":"translated","value":"クイックターミナルがスライドインする位置を選びます。"}},"km":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"ko":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"nb":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"pl":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"ru":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"th":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"tr":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"uk":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Choose where the quick terminal slides in."}}}}, + "settings.quickTerminal.position.top": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Top"}},"bs":{"stringUnit":{"state":"needs_review","value":"Top"}},"da":{"stringUnit":{"state":"needs_review","value":"Top"}},"de":{"stringUnit":{"state":"needs_review","value":"Top"}},"en":{"stringUnit":{"state":"translated","value":"Top"}},"es":{"stringUnit":{"state":"needs_review","value":"Top"}},"fr":{"stringUnit":{"state":"needs_review","value":"Top"}},"it":{"stringUnit":{"state":"needs_review","value":"Top"}},"ja":{"stringUnit":{"state":"translated","value":"上"}},"km":{"stringUnit":{"state":"needs_review","value":"Top"}},"ko":{"stringUnit":{"state":"needs_review","value":"Top"}},"nb":{"stringUnit":{"state":"needs_review","value":"Top"}},"pl":{"stringUnit":{"state":"needs_review","value":"Top"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Top"}},"ru":{"stringUnit":{"state":"needs_review","value":"Top"}},"th":{"stringUnit":{"state":"needs_review","value":"Top"}},"tr":{"stringUnit":{"state":"needs_review","value":"Top"}},"uk":{"stringUnit":{"state":"needs_review","value":"Top"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Top"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Top"}}}}, + "settings.quickTerminal.primarySize": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"bs":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"da":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"de":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"en":{"stringUnit":{"state":"translated","value":"Quick Terminal Primary Size"}},"es":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"fr":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"it":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"ja":{"stringUnit":{"state":"translated","value":"クイックターミナルの主サイズ"}},"km":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"ko":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"nb":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"pl":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"ru":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"th":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"tr":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"uk":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Primary Size"}}}}, + "settings.quickTerminal.primarySize.subtitle": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"bs":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"da":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"de":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"en":{"stringUnit":{"state":"translated","value":"Size along the slide-in axis."}},"es":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"fr":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"it":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"ja":{"stringUnit":{"state":"translated","value":"スライドイン方向のサイズです。"}},"km":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"ko":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"nb":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"pl":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"ru":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"th":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"tr":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"uk":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Size along the slide-in axis."}}}}, + "settings.quickTerminal.secondarySize": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"bs":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"da":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"de":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"en":{"stringUnit":{"state":"translated","value":"Quick Terminal Secondary Size"}},"es":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"fr":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"it":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"ja":{"stringUnit":{"state":"translated","value":"クイックターミナルの副サイズ"}},"km":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"ko":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"nb":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"pl":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"ru":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"th":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"tr":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"uk":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Quick Terminal Secondary Size"}}}}, + "settings.quickTerminal.secondarySize.subtitle": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"bs":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"da":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"de":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"en":{"stringUnit":{"state":"translated","value":"Size across the opposite axis."}},"es":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"fr":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"it":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"ja":{"stringUnit":{"state":"translated","value":"反対方向のサイズです。"}},"km":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"ko":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"nb":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"pl":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"ru":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"th":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"tr":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"uk":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Size across the opposite axis."}}}}, + "shortcut.toggleQuickTerminal.label": {"extractionState":"manual","localizations":{"ar":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"bs":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"da":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"de":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"en":{"stringUnit":{"state":"translated","value":"Toggle Quick Terminal"}},"es":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"fr":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"it":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"ja":{"stringUnit":{"state":"translated","value":"クイックターミナルを切り替え"}},"km":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"ko":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"nb":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"pl":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"pt-BR":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"ru":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"th":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"tr":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"uk":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"zh-Hans":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}},"zh-Hant":{"stringUnit":{"state":"needs_review","value":"Toggle Quick Terminal"}}}}, "command.toggleSplitZoom.subtitle": { "extractionState": "manual", "localizations": { @@ -178266,6 +178285,74 @@ } } }, + "settings.search.alias.setting.terminal.quick-terminal-position": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "terminal.quickTerminalPosition quick terminal dropdown quake position top bottom left right center" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "terminal.quickTerminalPosition quick terminal dropdown quake position top bottom left right center クイックターミナル ドロップダウン 位置 上 下 左 右 中央" + } + } + } + }, + "settings.search.alias.setting.terminal.quick-terminal-primary-size": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "terminal.quickTerminalPrimarySizeRatio quick terminal dropdown quake primary size height width" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "terminal.quickTerminalPrimarySizeRatio quick terminal dropdown quake primary size height width クイックターミナル ドロップダウン 主サイズ 高さ 幅" + } + } + } + }, + "settings.search.alias.setting.terminal.quick-terminal-secondary-size": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "terminal.quickTerminalSecondarySizeRatio quick terminal dropdown quake secondary size height width" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "terminal.quickTerminalSecondarySizeRatio quick terminal dropdown quake secondary size height width クイックターミナル ドロップダウン 副サイズ 高さ 幅" + } + } + } + }, + "settings.search.alias.setting.terminal.quick-terminal-auto-hide": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "terminal.quickTerminalAutoHide quick terminal dropdown quake auto hide blur focus" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "terminal.quickTerminalAutoHide quick terminal dropdown quake auto hide blur focus クイックターミナル ドロップダウン 自動 非表示 フォーカス" + } + } + } + }, "settings.search.alias.setting.textBox.focus-textbox-new-terminals": { "extractionState": "manual", "localizations": { @@ -198768,25 +198855,25 @@ "en": { "stringUnit": { "state": "translated", - "value": "%@: unknown flag '%@'. Known flags: --name <title>, --description <text>, --command <text>, --cwd <path>, --env KEY=VALUE, --env-file <path>, --layout <json>, --window <id|ref|index>, --focus <true|false>" + "value": "%@: unknown flag. Known flags: --name <title>, --description <text>, --command <text>, --cwd <path>, --env KEY=VALUE, --env-file <path>, --layout <json>, --window <id|ref|index>, --focus <true|false>" } }, "ja": { "stringUnit": { "state": "translated", - "value": "%@: 不明なフラグ '%@'。利用可能なフラグ: --name <title>, --description <text>, --command <text>, --cwd <path>, --env KEY=VALUE, --env-file <path>, --layout <json>, --window <id|ref|index>, --focus <true|false>" + "value": "%@: 不明なフラグです。利用可能なフラグ: --name <title>, --description <text>, --command <text>, --cwd <path>, --env KEY=VALUE, --env-file <path>, --layout <json>, --window <id|ref|index>, --focus <true|false>" } }, "ko": { "stringUnit": { "state": "translated", - "value": "%@: 알 수 없는 플래그 '%@'. 사용 가능한 플래그: --name <title>, --description <text>, --command <text>, --cwd <path>, --env KEY=VALUE, --env-file <path>, --layout <json>, --window <id|ref|index>, --focus <true|false>" + "value": "%@: 알 수 없는 플래그입니다. 사용 가능한 플래그: --name <title>, --description <text>, --command <text>, --cwd <path>, --env KEY=VALUE, --env-file <path>, --layout <json>, --window <id|ref|index>, --focus <true|false>" } }, "uk": { "stringUnit": { "state": "translated", - "value": "%@: невідомий прапорець '%@'. Доступні прапорці: --name <title>, --description <text>, --command <text>, --cwd <path>, --env KEY=VALUE, --env-file <path>, --layout <json>, --window <id|ref|index>, --focus <true|false>" + "value": "%@: невідомий прапорець. Доступні прапорці: --name <title>, --description <text>, --command <text>, --cwd <path>, --env KEY=VALUE, --env-file <path>, --layout <json>, --window <id|ref|index>, --focus <true|false>" } } } @@ -198855,25 +198942,25 @@ "en": { "stringUnit": { "state": "translated", - "value": "%@: %@ entry '%@' has an empty key" + "value": "%@: %@ entry has an empty key" } }, "ja": { "stringUnit": { "state": "translated", - "value": "%@: %@ のエントリ '%@' のキーが空です" + "value": "%@: %@ のエントリのキーが空です" } }, "ko": { "stringUnit": { "state": "translated", - "value": "%@: %@ 항목 '%@'의 키가 비어 있습니다" + "value": "%@: %@ 항목의 키가 비어 있습니다" } }, "uk": { "stringUnit": { "state": "translated", - "value": "%@: запис %@ '%@' має порожній ключ" + "value": "%@: запис %@ має порожній ключ" } } } @@ -198884,25 +198971,25 @@ "en": { "stringUnit": { "state": "translated", - "value": "%@: %@ entry '%@' must be in KEY=VALUE form" + "value": "%@: %@ entry must be in KEY=VALUE form" } }, "ja": { "stringUnit": { "state": "translated", - "value": "%@: %@ のエントリ '%@' は KEY=VALUE 形式である必要があります" + "value": "%@: %@ のエントリは KEY=VALUE 形式である必要があります" } }, "ko": { "stringUnit": { "state": "translated", - "value": "%@: %@ 항목 '%@'은(는) KEY=VALUE 형식이어야 합니다" + "value": "%@: %@ 항목은 KEY=VALUE 형식이어야 합니다" } }, "uk": { "stringUnit": { "state": "translated", - "value": "%@: запис %@ '%@' має бути у форматі KEY=VALUE" + "value": "%@: запис %@ має бути у форматі KEY=VALUE" } } } @@ -198913,25 +199000,83 @@ "en": { "stringUnit": { "state": "translated", - "value": "workspace env: unknown flag '%@'. Known flags: --workspace <id|ref|index>, --window <id|ref|index>, --mask" + "value": "workspace env: unknown flag. Known flags: --workspace <id|ref|index>, --window <id|ref|index>, --mask" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "workspace env: 不明なフラグです。利用可能なフラグ: --workspace <id|ref|index>, --window <id|ref|index>, --mask" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "workspace env: 알 수 없는 플래그입니다. 사용 가능한 플래그: --workspace <id|ref|index>, --window <id|ref|index>, --mask" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "workspace env: невідомий прапорець. Доступні прапорці: --workspace <id|ref|index>, --window <id|ref|index>, --mask" + } + } + } + }, + "cli.workspace.env.error.unexpectedExtraArgument": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "workspace env: unexpected extra argument" + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "workspace env: 予期しない追加引数です" + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "workspace env: 예기치 않은 추가 인수입니다" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "workspace env: неочікуваний зайвий аргумент" + } + } + } + }, + "cli.ssh-tmux.error.unexpectedExtraArgument": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "ssh-tmux: unexpected extra argument" } }, "ja": { "stringUnit": { "state": "translated", - "value": "workspace env: 不明なフラグ '%@'。利用可能なフラグ: --workspace <id|ref|index>, --window <id|ref|index>, --mask" + "value": "ssh-tmux: 予期しない追加引数です" } }, "ko": { "stringUnit": { "state": "translated", - "value": "workspace env: 알 수 없는 플래그 '%@'. 사용 가능한 플래그: --workspace <id|ref|index>, --window <id|ref|index>, --mask" + "value": "ssh-tmux: 예기치 않은 추가 인수입니다" } }, "uk": { "stringUnit": { "state": "translated", - "value": "workspace env: невідомий прапорець '%@'. Доступні прапорці: --workspace <id|ref|index>, --window <id|ref|index>, --mask" + "value": "ssh-tmux: неочікуваний зайвий аргумент" } } } diff --git a/Sources/App/ShortcutBareStartRouting.swift b/Sources/App/ShortcutBareStartRouting.swift index 1cb18ec0f821..d46aeb7319bd 100644 --- a/Sources/App/ShortcutBareStartRouting.swift +++ b/Sources/App/ShortcutBareStartRouting.swift @@ -15,7 +15,7 @@ enum KeyboardShortcutBareStartCache { let resolvedKeys = Set( KeyboardShortcutSettings.Action.allCases.compactMap { action -> String? in - guard action != .showHideAllWindows else { return nil } + guard action != .showHideAllWindows && action != .globalSearch && action != .toggleQuickTerminal else { return nil } guard !action.isBrowserContentShortcut else { return nil } return KeyboardShortcutSettings.shortcut(for: action).bareShortcutStartKey } diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift index 8f80f0d62afe..0e51c9b6a4b7 100644 --- a/Sources/AppDelegate.swift +++ b/Sources/AppDelegate.swift @@ -896,6 +896,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent } ) ) + private lazy var quickTerminalController = QuickTerminalController() private static let serviceErrorNoPath = NSString(string: String(localized: "error.clipboardFolderPath", defaultValue: "Could not load any folder path from the clipboard.")) private static let didInstallWindowKeyEquivalentSwizzle: Void = { let targetClass: AnyClass = NSWindow.self @@ -1982,6 +1983,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent _ = saveSessionSnapshotIncludingProcessDetectedIndexes(includeScrollback: true, removeWhenEmpty: false) ClosedItemHistoryStore.shared.flushPendingSaves() stopSessionAutosaveTimer() + quickTerminalController.teardown() CloudVMActionLauncher.shared.terminateAll() CmuxSSHURLProcessLauncher.shared.terminateAll() MobileHostService.shared.stop() @@ -6492,6 +6494,35 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent return false } + @discardableResult + func toggleQuickTerminalVisibility(activateApp: Bool = true) -> Bool { + quickTerminalController.toggle(activateApp: activateApp) + } + + @discardableResult + func showQuickTerminal(activateApp: Bool = true) -> Bool { + quickTerminalController.show(activateApp: activateApp) + } + + @discardableResult + func hideQuickTerminal(restorePreviousApp: Bool = true) -> Bool { + quickTerminalController.hide(restorePreviousApp: restorePreviousApp) + } + + func quickTerminalStatusPayload() -> [String: Any] { + quickTerminalController.statusPayload() + } + + @discardableResult + func handleQuickTerminalChildExited(surfaceId: UUID) -> Bool { + quickTerminalController.handleChildExited(surfaceId: surfaceId) + } + + @objc func toggleQuickTerminal(_ sender: Any?) { + _ = sender + _ = toggleQuickTerminalVisibility() + } + @discardableResult func toggleRightSidebarInActiveMainWindow(preferredWindow: NSWindow? = nil) -> Bool { guard let context = preferredRegisteredMainWindowContext(preferredWindow: preferredWindow) else { @@ -12191,7 +12222,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent // here would swallow the first stroke and leave the second one // orphaned, breaking that keystroke for the focused terminal/browser // input. - guard action != .showHideAllWindows && action != .globalSearch else { return false } + guard action != .showHideAllWindows && action != .globalSearch && action != .toggleQuickTerminal else { return false } guard !action.isBrowserContentShortcut else { return false } return KeyboardShortcutSettings.shortcut(for: action).hasChord } @@ -13002,6 +13033,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent return true } + if matchConfiguredShortcut(event: event, action: .toggleQuickTerminal) { + _ = toggleQuickTerminalVisibility() + return true + } + if matchConfiguredShortcut(event: event, action: .newTab) { #if DEBUG cmuxDebugLog("shortcut.action name=newWorkspace \(debugShortcutRouteSnapshot(event: event))") @@ -15114,7 +15150,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent } private func isMenuBackedShortcutAction(_ action: KeyboardShortcutSettings.Action) -> Bool { - action != .showHideAllWindows && action != .globalSearch && action != .clearScreenKeepScrollback + action != .showHideAllWindows && + action != .globalSearch && + action != .toggleQuickTerminal && + action != .clearScreenKeepScrollback } private func isCloseShortcutAction(_ action: KeyboardShortcutSettings.Action) -> Bool { diff --git a/Sources/CmuxSettingsJSONPathSupport.swift b/Sources/CmuxSettingsJSONPathSupport.swift index bc81ca6dbc68..6bcea95a49cf 100644 --- a/Sources/CmuxSettingsJSONPathSupport.swift +++ b/Sources/CmuxSettingsJSONPathSupport.swift @@ -354,6 +354,10 @@ extension CmuxSettingsFileStore { "terminal.rendererRealization.enabled", "terminal.rendererRealization.idleSeconds", "terminal.rendererRealization.maxWarmRenderers", + "terminal.quickTerminalPosition", + "terminal.quickTerminalPrimarySizeRatio", + "terminal.quickTerminalSecondarySizeRatio", + "terminal.quickTerminalAutoHide", "terminal.textBoxMaxLines", "terminal.resumeCommands", "notifications.dockBadge", diff --git a/Sources/ContentView+RightSidebarCommandPalette.swift b/Sources/ContentView+RightSidebarCommandPalette.swift index 8fd442578e62..5a234700fb71 100644 --- a/Sources/ContentView+RightSidebarCommandPalette.swift +++ b/Sources/ContentView+RightSidebarCommandPalette.swift @@ -14,6 +14,8 @@ extension ContentView { return .newBrowserWorkspace case "palette.newWindow": return .newWindow + case "palette.toggleQuickTerminal": + return .toggleQuickTerminal case "palette.openFolder": return .openFolder case "palette.reopenPreviousSession": diff --git a/Sources/ContentView.swift b/Sources/ContentView.swift index 68cd17653a67..63eafa8e446d 100644 --- a/Sources/ContentView.swift +++ b/Sources/ContentView.swift @@ -6462,6 +6462,14 @@ struct ContentView: View { keywords: ["toggle", "sidebar", "left", "layout"] ) ) + contributions.append( + CommandPaletteCommandContribution( + commandId: "palette.toggleQuickTerminal", + title: constant(String(localized: "command.toggleQuickTerminal.title", defaultValue: "Toggle Quick Terminal")), + subtitle: constant(String(localized: "command.toggleQuickTerminal.subtitle", defaultValue: "Terminal")), + keywords: ["quick", "terminal", "toggle", "dropdown", "quake"] + ) + ) // "Sidebar: <provider>" switch commands for each available view. The // built-in views are always offered; `descriptors` adds the hosted // extension sidebar only while the experimental Extensions beta is on. @@ -7644,6 +7652,9 @@ struct ContentView: View { registry.register(commandId: "palette.toggleSidebar") { sidebarState.toggle() } + registry.register(commandId: "palette.toggleQuickTerminal") { + AppDelegate.shared?.toggleQuickTerminal(nil) + } // Register a handler for every possible view (including the hosted // extension sidebar) regardless of the beta flag, so a contribution that // was visible when the flag was on still resolves after a runtime flip. diff --git a/Sources/GhosttyTerminalView.swift b/Sources/GhosttyTerminalView.swift index 6ff8387630e6..a8396a36cc1d 100644 --- a/Sources/GhosttyTerminalView.swift +++ b/Sources/GhosttyTerminalView.swift @@ -2730,6 +2730,10 @@ class GhosttyApp { // dispatching this action callback. DispatchQueue.main.async { guard let app = AppDelegate.shared else { return } + if let callbackSurfaceId, + app.handleQuickTerminalChildExited(surfaceId: callbackSurfaceId) { + return + } if let callbackTabId, let callbackSurfaceId, let manager = app.tabManagerFor(tabId: callbackTabId) ?? app.tabManager, diff --git a/Sources/KeyboardShortcutSettings.swift b/Sources/KeyboardShortcutSettings.swift index b8f39e63ccf2..002e130f9418 100644 --- a/Sources/KeyboardShortcutSettings.swift +++ b/Sources/KeyboardShortcutSettings.swift @@ -65,6 +65,7 @@ enum KeyboardShortcutSettings { case reloadConfiguration case showHideAllWindows case globalSearch + case toggleQuickTerminal case newWindow case closeWindow case toggleFullScreen @@ -188,6 +189,7 @@ enum KeyboardShortcutSettings { case .reloadConfiguration: return String(localized: "menu.app.reloadConfiguration", defaultValue: "Reload Configuration") case .showHideAllWindows: return String(localized: "settings.globalHotkey.shortcut", defaultValue: "Show/Hide All Windows") case .globalSearch: return String(localized: "shortcut.globalSearch.label", defaultValue: "Global Search") + case .toggleQuickTerminal: return String(localized: "shortcut.toggleQuickTerminal.label", defaultValue: "Toggle Quick Terminal") case .newWindow: return String(localized: "shortcut.newWindow.label", defaultValue: "New Window") case .closeWindow: return String(localized: "shortcut.closeWindow.label", defaultValue: "Close Window") case .toggleFullScreen: return String(localized: "command.toggleFullScreen.title", defaultValue: "Toggle Full Screen") @@ -324,6 +326,8 @@ enum KeyboardShortcutSettings { return StoredShortcut(key: ".", command: true, shift: false, option: true, control: true) case .globalSearch: return StoredShortcut(key: "f", command: true, shift: false, option: true, control: false) + case .toggleQuickTerminal: + return StoredShortcut(key: "`", command: true, shift: false, option: true, control: false) case .newWindow: return StoredShortcut(key: "n", command: true, shift: true, option: false, control: false) case .closeWindow: @@ -675,7 +679,7 @@ enum KeyboardShortcutSettings { // Preserve invalid settings-file values for the show/hide hotkey so managed // configuration remains visible instead of silently falling back to defaults. // Runtime registration still rejects unsupported Carbon hotkey shapes. - if usesNumberedDigitMatching || self == .globalSearch { + if usesNumberedDigitMatching || self == .globalSearch || self == .toggleQuickTerminal { return nil } return shortcut @@ -687,7 +691,7 @@ enum KeyboardShortcutSettings { } switch self { - case .showHideAllWindows, .globalSearch: + case .showHideAllWindows, .globalSearch, .toggleQuickTerminal: return KeyboardShortcutSettings.normalizedSystemWideHotkeyShortcutResult( shortcut, for: self, @@ -951,7 +955,7 @@ enum KeyboardShortcutSettings { case let .accepted(normalizedShortcut): return normalizedShortcut case .rejected: - if action.usesNumberedDigitMatching || action == .showHideAllWindows || action == .globalSearch { + if action.usesNumberedDigitMatching || action == .showHideAllWindows || action == .globalSearch || action == .toggleQuickTerminal { return nil } return shortcut @@ -1180,10 +1184,12 @@ final class SystemWideHotkeyController { private static let hotKeyIDs: [KeyboardShortcutSettings.Action: UInt32] = [ .showHideAllWindows: 1, .globalSearch: 2, + .toggleQuickTerminal: 3, ] private static let systemWideActions: [KeyboardShortcutSettings.Action] = [ .showHideAllWindows, .globalSearch, + .toggleQuickTerminal, ] private var hotKeyRefs: [KeyboardShortcutSettings.Action: EventHotKeyRef] = [:] @@ -1347,7 +1353,7 @@ final class SystemWideHotkeyController { switch action { case .showHideAllWindows: return SystemWideHotkeySettings.isEnabled() - case .globalSearch: + case .globalSearch, .toggleQuickTerminal: return true default: assertionFailure("Unhandled system-wide hotkey action: \(action.rawValue)") @@ -1440,6 +1446,8 @@ final class SystemWideHotkeyController { AppDelegate.shared?.toggleApplicationVisibilityFromGlobalHotkey() case .globalSearch: AppDelegate.shared?.toggleGlobalSearchPaletteFromGlobalHotkey() + case .toggleQuickTerminal: + _ = AppDelegate.shared?.toggleQuickTerminalVisibility(activateApp: true) default: assertionFailure("Unhandled system-wide hotkey action: \(action.rawValue)") break diff --git a/Sources/KeyboardShortcutSettingsFileStore+Template.swift b/Sources/KeyboardShortcutSettingsFileStore+Template.swift index 0e2362e75878..b086499e181e 100644 --- a/Sources/KeyboardShortcutSettingsFileStore+Template.swift +++ b/Sources/KeyboardShortcutSettingsFileStore+Template.swift @@ -107,6 +107,10 @@ extension CmuxSettingsFileStore { "maxWarmRenderers": RendererRealizationSettings.defaultMaxWarmRenderers, ], "textBoxMaxLines": TerminalTextBoxInputSettings.defaultMaxLines, + "quickTerminalPosition": QuickTerminalSettings.defaultPosition.rawValue, + "quickTerminalPrimarySizeRatio": QuickTerminalSettings.defaultPrimarySizeRatio, + "quickTerminalSecondarySizeRatio": QuickTerminalSettings.defaultSecondarySizeRatio, + "quickTerminalAutoHide": QuickTerminalSettings.defaultAutoHide, "resumeCommands": [], ], ], diff --git a/Sources/KeyboardShortcutSettingsFileStore.swift b/Sources/KeyboardShortcutSettingsFileStore.swift index 1f75954e5be5..b4354236bf49 100644 --- a/Sources/KeyboardShortcutSettingsFileStore.swift +++ b/Sources/KeyboardShortcutSettingsFileStore.swift @@ -570,6 +570,34 @@ final class CmuxSettingsFileStore { } else if section.keys.contains("textBoxMaxLines") { logInvalid("terminal.textBoxMaxLines", sourcePath: sourcePath) } + + if let raw = jsonString(section["quickTerminalPosition"]) { + if let position = QuickTerminalPosition(rawValue: raw) { + snapshot.managedUserDefaults[QuickTerminalSettings.positionKey] = .string(position.rawValue) + } else { + logInvalid("terminal.quickTerminalPosition", sourcePath: sourcePath) + } + } else if section.keys.contains("quickTerminalPosition") { + logInvalid("terminal.quickTerminalPosition", sourcePath: sourcePath) + } + + if let value = jsonDouble(section["quickTerminalPrimarySizeRatio"]) { + snapshot.managedUserDefaults[QuickTerminalSettings.primarySizeRatioKey] = .double(QuickTerminalSettings.clampRatio(value)) + } else if section.keys.contains("quickTerminalPrimarySizeRatio") { + logInvalid("terminal.quickTerminalPrimarySizeRatio", sourcePath: sourcePath) + } + + if let value = jsonDouble(section["quickTerminalSecondarySizeRatio"]) { + snapshot.managedUserDefaults[QuickTerminalSettings.secondarySizeRatioKey] = .double(QuickTerminalSettings.clampRatio(value)) + } else if section.keys.contains("quickTerminalSecondarySizeRatio") { + logInvalid("terminal.quickTerminalSecondarySizeRatio", sourcePath: sourcePath) + } + + if let value = jsonBool(section["quickTerminalAutoHide"]) { + snapshot.managedUserDefaults[QuickTerminalSettings.autoHideKey] = .bool(value) + } else if section.keys.contains("quickTerminalAutoHide") { + logInvalid("terminal.quickTerminalAutoHide", sourcePath: sourcePath) + } } private func parseMarkdownSection( diff --git a/Sources/QuickTerminalController.swift b/Sources/QuickTerminalController.swift new file mode 100644 index 000000000000..2e275e76b5cd --- /dev/null +++ b/Sources/QuickTerminalController.swift @@ -0,0 +1,501 @@ +import AppKit +import CmuxTerminal +import Foundation +import QuartzCore + +enum QuickTerminalSettings { + static let positionKey = "quickTerminal.position" + static let primarySizeRatioKey = "quickTerminal.primarySizeRatio" + static let secondarySizeRatioKey = "quickTerminal.secondarySizeRatio" + static let autoHideKey = "quickTerminal.autoHide" + + static let defaultPosition: QuickTerminalPosition = .top + static let defaultPrimarySizeRatio: Double = 0.38 + static let defaultSecondarySizeRatio: Double = 1.0 + static let defaultAutoHide = true + static let defaultAnimationDuration: TimeInterval = 0.16 + + static func resolved(defaults: UserDefaults = .standard) -> QuickTerminalResolvedSettings { + let rawPosition = defaults.string(forKey: positionKey) + let position = QuickTerminalPosition(rawValue: rawPosition ?? "") ?? defaultPosition + + let rawPrimary = defaults.double(forKey: primarySizeRatioKey) + let primarySizeRatio = clampRatio( + defaults.object(forKey: primarySizeRatioKey) == nil ? defaultPrimarySizeRatio : rawPrimary + ) + + let rawSecondary = defaults.double(forKey: secondarySizeRatioKey) + let secondarySizeRatio = clampRatio( + defaults.object(forKey: secondarySizeRatioKey) == nil ? defaultSecondarySizeRatio : rawSecondary + ) + + let autoHide = defaults.object(forKey: autoHideKey) == nil + ? defaultAutoHide + : defaults.bool(forKey: autoHideKey) + + return QuickTerminalResolvedSettings( + position: position, + primarySizeRatio: primarySizeRatio, + secondarySizeRatio: secondarySizeRatio, + autoHide: autoHide, + animationDuration: defaultAnimationDuration + ) + } + + static func clampRatio(_ value: Double) -> Double { + min(max(value, 0.2), 1.0) + } +} + +struct QuickTerminalResolvedSettings { + let position: QuickTerminalPosition + let primarySizeRatio: Double + let secondarySizeRatio: Double + let autoHide: Bool + let animationDuration: TimeInterval +} + +enum QuickTerminalPosition: String, CaseIterable, Identifiable { + case top + case bottom + case left + case right + case center + + var id: String { rawValue } + + func finalFrame( + in visibleFrame: NSRect, + primarySizeRatio: Double, + secondarySizeRatio: Double + ) -> NSRect { + let primary = CGFloat(QuickTerminalSettings.clampRatio(primarySizeRatio)) + let secondary = CGFloat(QuickTerminalSettings.clampRatio(secondarySizeRatio)) + let minWidth: CGFloat = 420 + let minHeight: CGFloat = 200 + + let size: NSSize = { + switch self { + case .top, .bottom: + return NSSize( + width: max(minWidth, visibleFrame.width * secondary), + height: max(minHeight, visibleFrame.height * primary) + ) + case .left, .right: + return NSSize( + width: max(minWidth, visibleFrame.width * primary), + height: max(minHeight, visibleFrame.height * secondary) + ) + case .center: + return NSSize( + width: max(minWidth, visibleFrame.width * primary), + height: max(minHeight, visibleFrame.height * secondary) + ) + } + }() + + let clamped = NSSize( + width: min(size.width, visibleFrame.width), + height: min(size.height, visibleFrame.height) + ) + + switch self { + case .top: + return NSRect( + x: round(visibleFrame.midX - clamped.width / 2), + y: visibleFrame.maxY - clamped.height, + width: clamped.width, + height: clamped.height + ) + case .bottom: + return NSRect( + x: round(visibleFrame.midX - clamped.width / 2), + y: visibleFrame.minY, + width: clamped.width, + height: clamped.height + ) + case .left: + return NSRect( + x: visibleFrame.minX, + y: round(visibleFrame.midY - clamped.height / 2), + width: clamped.width, + height: clamped.height + ) + case .right: + return NSRect( + x: visibleFrame.maxX - clamped.width, + y: round(visibleFrame.midY - clamped.height / 2), + width: clamped.width, + height: clamped.height + ) + case .center: + return NSRect( + x: round(visibleFrame.midX - clamped.width / 2), + y: round(visibleFrame.midY - clamped.height / 2), + width: clamped.width, + height: clamped.height + ) + } + } + + func hiddenFrame(from finalFrame: NSRect, visibleFrame: NSRect) -> NSRect { + switch self { + case .top: + return NSRect( + x: finalFrame.origin.x, + y: visibleFrame.maxY, + width: finalFrame.width, + height: finalFrame.height + ) + case .bottom: + return NSRect( + x: finalFrame.origin.x, + y: visibleFrame.minY - finalFrame.height, + width: finalFrame.width, + height: finalFrame.height + ) + case .left: + return NSRect( + x: visibleFrame.minX - finalFrame.width, + y: finalFrame.origin.y, + width: finalFrame.width, + height: finalFrame.height + ) + case .right: + return NSRect( + x: visibleFrame.maxX, + y: finalFrame.origin.y, + width: finalFrame.width, + height: finalFrame.height + ) + case .center: + return NSRect( + x: finalFrame.origin.x, + y: visibleFrame.maxY + 18, + width: finalFrame.width, + height: finalFrame.height + ) + } + } +} + +private final class QuickTerminalPanel: NSPanel { + override var canBecomeKey: Bool { true } + override var canBecomeMain: Bool { true } +} + +@MainActor +final class QuickTerminalController: NSObject, NSWindowDelegate { + private enum VisibilityPhase { + case hidden + case showing + case visible + case hiding + + var reportsVisible: Bool { + switch self { + case .showing, .visible: + return true + case .hiding, .hidden: + return false + } + } + + var canAutoHide: Bool { + switch self { + case .visible: + return true + case .showing, .hiding, .hidden: + return false + } + } + + var isTransitioning: Bool { + switch self { + case .showing, .hiding: + return true + case .visible, .hidden: + return false + } + } + } + + private enum PendingTransitionAction { + case show(activateApp: Bool) + case hide(restorePreviousApp: Bool) + } + + private var panel: QuickTerminalPanel? + private var terminalSurface: TerminalSurface? + private var previousFrontmostApp: NSRunningApplication? + private let workspaceId = UUID() + private var portOrdinal: Int? + private var phase: VisibilityPhase = .hidden + private var pendingTransitionAction: PendingTransitionAction? + + private var isVisible: Bool { phase.reportsVisible } + + @discardableResult + func toggle(activateApp: Bool = true) -> Bool { + if isVisible { + return hide(restorePreviousApp: activateApp) + } else { + return show(activateApp: activateApp) + } + } + + @discardableResult + func show(activateApp: Bool = true) -> Bool { + if phase.isTransitioning { + pendingTransitionAction = .show(activateApp: activateApp) + return true + } + guard !isVisible else { return true } + + let settings = QuickTerminalSettings.resolved() + guard let panel = ensurePanel(), + let visibleFrame = screen(for: panel)?.visibleFrame else { + return false + } + let finalFrame = settings.position.finalFrame( + in: visibleFrame, + primarySizeRatio: settings.primarySizeRatio, + secondarySizeRatio: settings.secondarySizeRatio + ) + let hiddenFrame = settings.position.hiddenFrame(from: finalFrame, visibleFrame: visibleFrame) + + if activateApp, + !NSApp.isActive, + let frontmost = NSWorkspace.shared.frontmostApplication, + frontmost.bundleIdentifier != Bundle.main.bundleIdentifier { + previousFrontmostApp = frontmost + } + + phase = .showing + panel.alphaValue = 0 + panel.setFrame(hiddenFrame, display: false) + panel.level = .popUpMenu + if activateApp { + panel.orderFrontRegardless() + panel.makeKeyAndOrderFront(nil) + } else { + panel.orderFront(nil) + } + + terminalSurface?.hostedView.setVisibleInUI(true) + terminalSurface?.hostedView.setActive(activateApp) + + if activateApp, !NSApp.isActive { + NSApp.activate(ignoringOtherApps: true) + } + + NSAnimationContext.runAnimationGroup { context in + context.duration = settings.animationDuration + context.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut) + panel.animator().alphaValue = 1 + panel.animator().setFrame(finalFrame, display: true) + } completionHandler: { [weak self] in + MainActor.assumeIsolated { + guard let self else { return } + self.phase = .visible + panel.level = .floating + if activateApp { + panel.makeKeyAndOrderFront(nil) + panel.makeFirstResponder(self.terminalSurface?.hostedView) + self.terminalSurface?.hostedView.setActive(true) + self.terminalSurface?.hostedView.moveFocus() + } else { + panel.orderFront(nil) + self.terminalSurface?.hostedView.setActive(false) + } + self.replayPendingTransitionActionIfNeeded() + } + } + return true + } + + @discardableResult + func hide(restorePreviousApp: Bool) -> Bool { + if phase.isTransitioning { + pendingTransitionAction = .hide(restorePreviousApp: restorePreviousApp) + return true + } + guard isVisible else { return true } + + let settings = QuickTerminalSettings.resolved() + guard let panel else { + phase = .hidden + previousFrontmostApp = nil + return false + } + + guard let visibleFrame = screen(for: panel)?.visibleFrame else { + finishHide(panel: panel, restorePreviousApp: restorePreviousApp) + return true + } + let hiddenFrame = settings.position.hiddenFrame(from: panel.frame, visibleFrame: visibleFrame) + + phase = .hiding + + NSAnimationContext.runAnimationGroup { context in + context.duration = settings.animationDuration + context.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut) + panel.animator().alphaValue = 0 + panel.animator().setFrame(hiddenFrame, display: false) + } completionHandler: { [weak self] in + MainActor.assumeIsolated { + self?.finishHide(panel: panel, restorePreviousApp: restorePreviousApp) + } + } + return true + } + + func statusPayload() -> [String: Any] { + let settings = QuickTerminalSettings.resolved() + return [ + "available": true, + "visible": isVisible, + "position": settings.position.rawValue, + "auto_hide": settings.autoHide, + "primary_size_ratio": settings.primarySizeRatio, + "secondary_size_ratio": settings.secondarySizeRatio + ] + } + + func teardown() { + panel?.orderOut(nil) + terminalSurface?.hostedView.setActive(false) + terminalSurface?.hostedView.setVisibleInUI(false) + panel = nil + terminalSurface = nil + portOrdinal = nil + phase = .hidden + previousFrontmostApp = nil + pendingTransitionAction = nil + } + + @discardableResult + func handleChildExited(surfaceId: UUID) -> Bool { + guard terminalSurface?.id == surfaceId else { + return false + } + teardown() + return true + } + + func windowDidResignKey(_ notification: Notification) { + guard let panel = notification.object as? NSWindow, panel === self.panel else { return } + guard panel.attachedSheet == nil else { return } + guard phase.canAutoHide else { return } + + let settings = QuickTerminalSettings.resolved() + if settings.autoHide { + hide(restorePreviousApp: false) + } else { + previousFrontmostApp = nil + } + } + + private func replayPendingTransitionActionIfNeeded() { + guard !phase.isTransitioning, let action = pendingTransitionAction else { return } + pendingTransitionAction = nil + switch action { + case .show(let activateApp): + show(activateApp: activateApp) + case .hide(let restorePreviousApp): + hide(restorePreviousApp: restorePreviousApp) + } + } + + private func ensurePanel() -> QuickTerminalPanel? { + if let panel { + return panel + } + + let settings = QuickTerminalSettings.resolved() + guard let visibleFrame = screen(for: nil)?.visibleFrame else { + return nil + } + let initialFrame = settings.position.finalFrame( + in: visibleFrame, + primarySizeRatio: settings.primarySizeRatio, + secondarySizeRatio: settings.secondarySizeRatio + ) + let panel = QuickTerminalPanel( + contentRect: initialFrame, + styleMask: [.borderless, .resizable, .nonactivatingPanel], + backing: .buffered, + defer: false + ) + panel.identifier = NSUserInterfaceItemIdentifier("cmux.quick-terminal") + panel.title = String(localized: "quickTerminal.window.title", defaultValue: "Quick Terminal") + panel.titleVisibility = .hidden + panel.titlebarAppearsTransparent = true + panel.collectionBehavior = [.moveToActiveSpace, .fullScreenAuxiliary, .ignoresCycle] + panel.isMovableByWindowBackground = true + panel.hidesOnDeactivate = false + panel.isReleasedWhenClosed = false + panel.level = .floating + panel.delegate = self + + if terminalSurface == nil { + terminalSurface = TerminalSurface( + tabId: workspaceId, + context: GHOSTTY_SURFACE_CONTEXT_WINDOW, + configTemplate: nil, + portOrdinal: quickTerminalPortOrdinal(), + initialEnvironmentOverrides: ["CMUX_QUICK_TERMINAL": "1"] + ) + } + + if let terminalSurface { + terminalSurface.hostedView.frame = NSRect(origin: .zero, size: initialFrame.size) + terminalSurface.hostedView.autoresizingMask = [.width, .height] + terminalSurface.hostedView.setVisibleInUI(false) + terminalSurface.hostedView.setActive(false) + panel.contentView = terminalSurface.hostedView + } + + self.panel = panel + return panel + } + + private func quickTerminalPortOrdinal() -> Int { + if let portOrdinal { + return portOrdinal + } + let allocatedOrdinal = TabManager.allocatePortOrdinal() + portOrdinal = allocatedOrdinal + return allocatedOrdinal + } + + private func finishHide(panel: QuickTerminalPanel, restorePreviousApp: Bool) { + phase = .hidden + panel.orderOut(nil) + terminalSurface?.hostedView.setActive(false) + terminalSurface?.hostedView.setVisibleInUI(false) + if restorePreviousApp, + let previousFrontmostApp, + !previousFrontmostApp.isTerminated { + _ = previousFrontmostApp.activate(options: []) + } + previousFrontmostApp = nil + replayPendingTransitionActionIfNeeded() + } + + private func screen(for panel: NSWindow?) -> NSScreen? { + if let panel, let panelScreen = panel.screen { + return panelScreen + } + if let keyScreen = NSApp.keyWindow?.screen { + return keyScreen + } + if let main = NSScreen.main { + return main + } + if let first = NSScreen.screens.first { + return first + } + return nil + } +} diff --git a/Sources/SettingsNavigation.swift b/Sources/SettingsNavigation.swift index 471469934524..ccdf6baa9a08 100644 --- a/Sources/SettingsNavigation.swift +++ b/Sources/SettingsNavigation.swift @@ -367,6 +367,10 @@ enum SettingsSearchIndex { setting(.terminal, "scrollbar", String(localized: "settings.terminal.scrollBar", defaultValue: "Show Terminal Scroll Bar"), "terminal shell scrollback"), setting(.terminal, "copy-on-select", String(localized: "settings.terminal.copyOnSelect", defaultValue: "Copy on Selection"), "terminal.copyOnSelect clipboard selection mouse double click triple click"), setting(.terminal, "tab-bar-font-size", String(localized: "settings.terminal.tabBarFontSize", defaultValue: "Tab Bar Font Size"), "font size text scale terminal browser pane tab title surface-tab-bar-font-size"), + setting(.terminal, "quick-terminal-position", String(localized: "settings.quickTerminal.position", defaultValue: "Quick Terminal Position"), "terminal.quickTerminalPosition quick terminal dropdown quake position top bottom left right center"), + setting(.terminal, "quick-terminal-primary-size", String(localized: "settings.quickTerminal.primarySize", defaultValue: "Quick Terminal Primary Size"), "terminal.quickTerminalPrimarySizeRatio quick terminal dropdown quake height width size"), + setting(.terminal, "quick-terminal-secondary-size", String(localized: "settings.quickTerminal.secondarySize", defaultValue: "Quick Terminal Secondary Size"), "terminal.quickTerminalSecondarySizeRatio quick terminal dropdown quake height width size"), + setting(.terminal, "quick-terminal-auto-hide", String(localized: "settings.quickTerminal.autoHide", defaultValue: "Quick Terminal Auto-Hide"), "terminal.quickTerminalAutoHide quick terminal dropdown quake hide focus blur"), setting(.terminal, "agent-auto-resume", String(localized: "settings.terminal.agentAutoResume", defaultValue: "Resume Agent Sessions on Reopen"), "terminal.autoResumeAgentSessions auto resume restore reopen relaunch quit sessions agents claude code codex opencode rovo dev rovodev toggle"), setting(.terminal, "agent-hibernation", String(localized: "settings.terminal.agentHibernation", defaultValue: "Agent Hibernation"), "terminal.agentHibernation idle hibernate suspend background agents claude code codex opencode live terminals"), setting(.terminal, "renderer-realization", String(localized: "settings.terminal.rendererRealization", defaultValue: "Reclaim Offscreen Terminal Memory"), "terminal.rendererRealization renderer reclaim offscreen memory iosurface gpu idle warm release background terminals"), @@ -528,6 +532,10 @@ enum SettingsSearchIndex { "terminal.focusTextBoxOnNewTerminals": settingID(for: .textBox, idSuffix: "focus-textbox-new-terminals"), "terminal.textBoxMaxLines": settingID(for: .textBox, idSuffix: "textbox-max-lines"), "terminal.copyOnSelect": settingID(for: .terminal, idSuffix: "copy-on-select"), + "terminal.quickTerminalPosition": settingID(for: .terminal, idSuffix: "quick-terminal-position"), + "terminal.quickTerminalPrimarySizeRatio": settingID(for: .terminal, idSuffix: "quick-terminal-primary-size"), + "terminal.quickTerminalSecondarySizeRatio": settingID(for: .terminal, idSuffix: "quick-terminal-secondary-size"), + "terminal.quickTerminalAutoHide": settingID(for: .terminal, idSuffix: "quick-terminal-auto-hide"), "terminal.autoResumeAgentSessions": settingID(for: .terminal, idSuffix: "agent-auto-resume"), "terminal.agentHibernation.enabled": settingID(for: .terminal, idSuffix: "agent-hibernation"), "terminal.agentHibernation.idleSeconds": settingID(for: .terminal, idSuffix: "agent-hibernation"), diff --git a/Sources/SettingsSearchAliases.swift b/Sources/SettingsSearchAliases.swift index c449619730a3..9f6013550b08 100644 --- a/Sources/SettingsSearchAliases.swift +++ b/Sources/SettingsSearchAliases.swift @@ -95,6 +95,10 @@ enum SettingsSearchAliasIndex { "terminal:scrollbar": localized("settings.search.alias.setting.terminal.scrollbar", defaultValue: "terminal.showScrollBar scrollback scrollbar scroll bar right edge alternate screen tui"), "terminal:copy-on-select": localized("settings.search.alias.setting.terminal.copy-on-select", defaultValue: "terminal.copyOnSelect copy on selection select clipboard mouse double click triple click iterm"), "terminal:tab-bar-font-size": localized("settings.search.alias.setting.terminal.tab-bar-font-size", defaultValue: "surface-tab-bar-font-size tab bar font size text scale terminal browser pane tab title"), + "terminal:quick-terminal-position": localized("settings.search.alias.setting.terminal.quick-terminal-position", defaultValue: "terminal.quickTerminalPosition quick terminal dropdown quake position top bottom left right center"), + "terminal:quick-terminal-primary-size": localized("settings.search.alias.setting.terminal.quick-terminal-primary-size", defaultValue: "terminal.quickTerminalPrimarySizeRatio quick terminal dropdown quake primary size height width"), + "terminal:quick-terminal-secondary-size": localized("settings.search.alias.setting.terminal.quick-terminal-secondary-size", defaultValue: "terminal.quickTerminalSecondarySizeRatio quick terminal dropdown quake secondary size height width"), + "terminal:quick-terminal-auto-hide": localized("settings.search.alias.setting.terminal.quick-terminal-auto-hide", defaultValue: "terminal.quickTerminalAutoHide quick terminal dropdown quake auto hide blur focus"), "terminal:resume-commands": localized("settings.search.alias.setting.terminal.resume-commands", defaultValue: "surface resume commands approvals command prefixes auto restore ask manual tmux hibernation sticky process"), "textBox:show-textbox-new-terminals": localized("settings.search.alias.setting.textBox.show-textbox-new-terminals", defaultValue: "terminal.showTextBoxOnNewTerminals show textbox text box rich input prompt default new terminal workspace split tab beta"), "textBox:focus-textbox-new-terminals": localized("settings.search.alias.setting.textBox.focus-textbox-new-terminals", defaultValue: "terminal.focusTextBoxOnNewTerminals focus textbox text box rich input prompt default new terminal workspace split tab beta"), diff --git a/Sources/TabManager+DetachedWorkspace.swift b/Sources/TabManager+DetachedWorkspace.swift index 430f24b01541..ecbebb090c11 100644 --- a/Sources/TabManager+DetachedWorkspace.swift +++ b/Sources/TabManager+DetachedWorkspace.swift @@ -58,8 +58,7 @@ extension TabManager { snapshot: snapshot, placementOverride: placementOverride ) - let ordinal = Self.nextPortOrdinal - Self.nextPortOrdinal += 1 + let ordinal = Self.allocatePortOrdinal() let newWorkspace = Workspace( title: title ?? detached.title, workingDirectory: normalizedWorkingDirectory(detached.directory) ?? snapshot.preferredWorkingDirectory, diff --git a/Sources/TabManager.swift b/Sources/TabManager.swift index f21ee16d6e4f..71ba47d54355 100644 --- a/Sources/TabManager.swift +++ b/Sources/TabManager.swift @@ -272,7 +272,14 @@ class TabManager: ObservableObject { /// Global monotonically increasing counter for CMUX_PORT ordinal assignment. /// Static so port ranges don't overlap across multiple windows (each window has its own TabManager). - static var nextPortOrdinal: Int = 0 + private(set) static var nextPortOrdinal: Int = 0 + + static func allocatePortOrdinal() -> Int { + let ordinal = nextPortOrdinal + nextPortOrdinal += 1 + return ordinal + } + var selectedTabId: UUID? { get { workspaces.selectedTabId } set { workspaces.selectedTabId = newValue } @@ -1104,8 +1111,7 @@ class TabManager: ObservableObject { // boots terminal state. The ssh/new-workspace path can otherwise crash while // reading @Published placement state from existing workspaces mid-creation. let insertIndex = newTabInsertIndex(snapshot: snapshot, placementOverride: placementOverride) - let ordinal = Self.nextPortOrdinal - Self.nextPortOrdinal += 1 + let ordinal = Self.allocatePortOrdinal() let defaultTitle: String switch initialSurface { case .terminal: @@ -5950,8 +5956,7 @@ extension TabManager { .prefix(SessionPersistencePolicy.maxWorkspacesPerWindow) var restoredOriginalWorkspaceIds: [UUID?] = [] for workspaceSnapshot in workspaceSnapshots { - let ordinal = Self.nextPortOrdinal - Self.nextPortOrdinal += 1 + let ordinal = Self.allocatePortOrdinal() let workspace = Workspace( title: workspaceSnapshot.processTitle, workingDirectory: workspaceSnapshot.currentDirectory, @@ -5966,8 +5971,7 @@ extension TabManager { } if newTabs.isEmpty { - let ordinal = Self.nextPortOrdinal - Self.nextPortOrdinal += 1 + let ordinal = Self.allocatePortOrdinal() let fallback = Workspace(title: "Terminal 1", portOrdinal: ordinal) fallback.owningTabManager = self wireClosedBrowserTracking(for: fallback) diff --git a/Sources/TerminalController.swift b/Sources/TerminalController.swift index a734a352c076..6fcbdbbdd491 100644 --- a/Sources/TerminalController.swift +++ b/Sources/TerminalController.swift @@ -223,6 +223,9 @@ class TerminalController { "browser.tab.switch", "notification.open", "notification.jump_to_unread", + "quick_terminal.toggle", + "quick_terminal.show", + "quick_terminal.hide", "debug.command_palette.toggle", "debug.notification.focus", "debug.app.activate", @@ -1841,6 +1844,16 @@ class TerminalController { // App focus (app.focus_override.set/app.simulate_active) handled by ControlCommandCoordinator. + // Quick Terminal + case "quick_terminal.toggle": + return v2Result(id: id, self.v2QuickTerminalToggle()) + case "quick_terminal.show": + return v2Result(id: id, self.v2QuickTerminalShow()) + case "quick_terminal.hide": + return v2Result(id: id, self.v2QuickTerminalHide()) + case "quick_terminal.status": + return v2Ok(id: id, result: self.v2QuickTerminalStatus()) + // Browser case "browser.open_split": return v2Result(id: id, self.v2BrowserOpenSplit(params: params)) @@ -2108,6 +2121,10 @@ class TerminalController { "notification.jump_to_unread", "app.focus_override.set", "app.simulate_active", + "quick_terminal.toggle", + "quick_terminal.show", + "quick_terminal.hide", + "quick_terminal.status", "file.open", "markdown.open", "browser.open_split", @@ -5394,6 +5411,72 @@ class TerminalController { return .ok(["delivered": true]) } + private func v2QuickTerminalToggle() -> V2CallResult { + var didToggle: Bool? + v2MainSync { + guard let appDelegate = AppDelegate.shared else { + return + } + didToggle = appDelegate.toggleQuickTerminalVisibility(activateApp: false) + } + guard let didToggle else { + return .err(code: "service_unavailable", message: "Quick terminal service is not available", data: nil) + } + guard didToggle else { + return .err(code: "action_failed", message: "Could not toggle quick terminal", data: nil) + } + return .ok(v2QuickTerminalStatus()) + } + + private func v2QuickTerminalShow() -> V2CallResult { + var didShow: Bool? + v2MainSync { + guard let appDelegate = AppDelegate.shared else { + return + } + didShow = appDelegate.showQuickTerminal(activateApp: false) + } + guard let didShow else { + return .err(code: "service_unavailable", message: "Quick terminal service is not available", data: nil) + } + guard didShow else { + return .err(code: "action_failed", message: "Could not show quick terminal", data: nil) + } + return .ok(v2QuickTerminalStatus()) + } + + private func v2QuickTerminalHide() -> V2CallResult { + var didHide: Bool? + v2MainSync { + guard let appDelegate = AppDelegate.shared else { + return + } + didHide = appDelegate.hideQuickTerminal(restorePreviousApp: false) + } + guard let didHide else { + return .err(code: "service_unavailable", message: "Quick terminal service is not available", data: nil) + } + guard didHide else { + return .err(code: "action_failed", message: "Could not hide quick terminal", data: nil) + } + return .ok(v2QuickTerminalStatus()) + } + + private func v2QuickTerminalStatus() -> [String: Any] { + var payload: [String: Any]? + v2MainSync { + payload = AppDelegate.shared?.quickTerminalStatusPayload() + } + + guard let payload else { + return [ + "available": false, + "visible": false + ] + } + return payload + } + // MARK: - V2 Browser Methods func v2BrowserWithPanel( diff --git a/Sources/cmuxApp.swift b/Sources/cmuxApp.swift index 3a3833de3e68..5708a3774ba7 100644 --- a/Sources/cmuxApp.swift +++ b/Sources/cmuxApp.swift @@ -895,6 +895,10 @@ struct cmuxApp: App { } } + splitCommandButton(title: String(localized: "menu.view.toggleQuickTerminal", defaultValue: "Toggle Quick Terminal"), shortcut: menuShortcut(for: .toggleQuickTerminal)) { + AppDelegate.shared?.toggleQuickTerminal(nil) + } + splitCommandButton(title: String(localized: "menu.view.toggleRightSidebar", defaultValue: "Toggle Right Sidebar"), shortcut: menuShortcut(for: .toggleRightSidebar)) { if AppDelegate.shared?.toggleRightSidebarInActiveMainWindow( preferredWindow: NSApp.keyWindow ?? NSApp.mainWindow @@ -1455,6 +1459,7 @@ private let cmuxAuxiliaryWindowIdentifiers: Set<String> = [ "cmux.browser-popup", "cmux.browserProfilePopoverDebug", "cmux.configEditor", + "cmux.quick-terminal", "cmux.defaultTerminalRegistrationError", "cmux.feedButtonStyleDebug", "cmux.feedPreview", diff --git a/cmux.xcodeproj/project.pbxproj b/cmux.xcodeproj/project.pbxproj index c31baec97cc9..a8f4d774801d 100644 --- a/cmux.xcodeproj/project.pbxproj +++ b/cmux.xcodeproj/project.pbxproj @@ -595,6 +595,7 @@ A5C0DE0000000000000000B4 /* ProjectPanelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C0DE0000000000000000B3 /* ProjectPanelView.swift */; }; A5C0DE0000000000000000BC /* ProjectSchemesTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C0DE0000000000000000BB /* ProjectSchemesTabView.swift */; }; A5C0DE0000000000000000B8 /* ProjectTargetsTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C0DE0000000000000000B7 /* ProjectTargetsTabView.swift */; }; + C4327001A1B2C3D4E5F60718 /* QuickTerminalController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4327002A1B2C3D4E5F60718 /* QuickTerminalController.swift */; }; A500RG01 /* ReactGrab.swift in Sources */ = {isa = PBXBuildFile; fileRef = A500RG00 /* ReactGrab.swift */; }; EE30D5000000000000000002 /* RemoteDaemonStrings+App.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE30D5000000000000000001 /* RemoteDaemonStrings+App.swift */; }; E30780000000000000000016 /* RemoteDropUploadError+LocalizedError.swift in Sources */ = {isa = PBXBuildFile; fileRef = E30780000000000000000015 /* RemoteDropUploadError+LocalizedError.swift */; }; @@ -1543,6 +1544,7 @@ A5C0DE0000000000000000B3 /* ProjectPanelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Panels/ProjectPanelView.swift; sourceTree = "<group>"; }; A5C0DE0000000000000000BB /* ProjectSchemesTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Panels/ProjectSchemesTabView.swift; sourceTree = "<group>"; }; A5C0DE0000000000000000B7 /* ProjectTargetsTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Panels/ProjectTargetsTabView.swift; sourceTree = "<group>"; }; + C4327002A1B2C3D4E5F60718 /* QuickTerminalController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickTerminalController.swift; sourceTree = "<group>"; }; A500RG00 /* ReactGrab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Panels/ReactGrab.swift; sourceTree = "<group>"; }; EE30D5000000000000000001 /* RemoteDaemonStrings+App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RemoteDaemonStrings+App.swift"; sourceTree = "<group>"; }; E30780000000000000000015 /* RemoteDropUploadError+LocalizedError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RemoteDropUploadError+LocalizedError.swift"; sourceTree = "<group>"; }; @@ -2445,6 +2447,7 @@ F4350A130000000000000001 /* AppBundleIconPersistencePolicy.swift */, D1320AA0D1320AA0D1320AA4 /* AppIconDockTilePlugin.swift */, A5001090 /* AppDelegate.swift */, + C4327002A1B2C3D4E5F60718 /* QuickTerminalController.swift */, 3865B0063865B0063865B006 /* AppDelegate+GlobalSearch.swift */, C3873002C3873002C3873002 /* GhosttyCrashBreadcrumb.swift */, C3873004C3873004C3873004 /* GhosttyCrashReportMetadata.swift */, @@ -3760,6 +3763,7 @@ A5C0DE0000000000000000B4 /* ProjectPanelView.swift in Sources */, A5C0DE0000000000000000BC /* ProjectSchemesTabView.swift in Sources */, A5C0DE0000000000000000B8 /* ProjectTargetsTabView.swift in Sources */, + C4327001A1B2C3D4E5F60718 /* QuickTerminalController.swift in Sources */, A500RG01 /* ReactGrab.swift in Sources */, EE30D5000000000000000002 /* RemoteDaemonStrings+App.swift in Sources */, E30780000000000000000016 /* RemoteDropUploadError+LocalizedError.swift in Sources */, diff --git a/cmuxTests/GlobalSearchShortcutSettingsTests.swift b/cmuxTests/GlobalSearchShortcutSettingsTests.swift index 4e38287fc477..5171d55bee61 100644 --- a/cmuxTests/GlobalSearchShortcutSettingsTests.swift +++ b/cmuxTests/GlobalSearchShortcutSettingsTests.swift @@ -292,4 +292,55 @@ final class GlobalSearchShortcutSettingsTests: XCTestCase { XCTAssertNil(store.override(for: .globalSearch)) } + + func testQuickTerminalDefaultShortcutIsRemappableAndSystemWideSafe() { + let defaultShortcut = KeyboardShortcutSettings.shortcut(for: .toggleQuickTerminal) + + XCTAssertEqual( + defaultShortcut, + StoredShortcut(key: "`", command: true, shift: false, option: true, control: false) + ) + XCTAssertTrue(KeyboardShortcutSettings.publicShortcutActions.contains(.toggleQuickTerminal)) + XCTAssertTrue(KeyboardShortcutSettings.settingsVisibleActions.contains(.toggleQuickTerminal)) + XCTAssertEqual( + KeyboardShortcutSettings.Action.toggleQuickTerminal.normalizedRecordedShortcutResult(defaultShortcut), + .accepted(defaultShortcut) + ) + } + + func testQuickTerminalRejectsBareSystemWideShortcut() { + let bareShortcut = StoredShortcut(key: "`", command: false, shift: false, option: false, control: false) + + XCTAssertEqual( + KeyboardShortcutSettings.Action.toggleQuickTerminal.normalizedRecordedShortcutResult(bareShortcut), + .rejected(.systemWideHotkeyRequiresModifier) + ) + } + + func testSettingsFileStoreParsesQuickTerminalShortcut() throws { + let directoryURL = FileManager.default.temporaryDirectory + .appendingPathComponent("cmux-quick-terminal-settings-\(UUID().uuidString)", isDirectory: true) + try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true) + defer { try? FileManager.default.removeItem(at: directoryURL) } + + let settingsFileURL = directoryURL.appendingPathComponent("cmux.json", isDirectory: false) + try """ + { + "shortcuts": { + "toggleQuickTerminal": "cmd+ctrl+`" + } + } + """.write(to: settingsFileURL, atomically: true, encoding: .utf8) + + let store = KeyboardShortcutSettingsFileStore( + primaryPath: settingsFileURL.path, + fallbackPath: nil, + startWatching: false + ) + + XCTAssertEqual( + store.override(for: .toggleQuickTerminal), + StoredShortcut(key: "`", command: true, shift: false, option: false, control: true) + ) + } } diff --git a/cmuxTests/WorkspaceUnitTests.swift b/cmuxTests/WorkspaceUnitTests.swift index 0fda3b7f229f..d85a81944198 100644 --- a/cmuxTests/WorkspaceUnitTests.swift +++ b/cmuxTests/WorkspaceUnitTests.swift @@ -2938,6 +2938,60 @@ final class WorkspacePlacementSettingsTests: XCTestCase { } } +final class QuickTerminalSettingsTests: XCTestCase { + func testDefaultsClampAndResolveFromUserDefaults() { + let suiteName = "QuickTerminalSettingsTests.Default.\(UUID().uuidString)" + guard let defaults = UserDefaults(suiteName: suiteName) else { + XCTFail("Failed to create isolated UserDefaults suite") + return + } + defer { defaults.removePersistentDomain(forName: suiteName) } + + var settings = QuickTerminalSettings.resolved(defaults: defaults) + XCTAssertEqual(settings.position, .top) + XCTAssertEqual(settings.primarySizeRatio, 0.38, accuracy: 0.001) + XCTAssertEqual(settings.secondarySizeRatio, 1.0, accuracy: 0.001) + XCTAssertTrue(settings.autoHide) + + defaults.set(QuickTerminalPosition.left.rawValue, forKey: QuickTerminalSettings.positionKey) + defaults.set(0.05, forKey: QuickTerminalSettings.primarySizeRatioKey) + defaults.set(1.4, forKey: QuickTerminalSettings.secondarySizeRatioKey) + defaults.set(false, forKey: QuickTerminalSettings.autoHideKey) + + settings = QuickTerminalSettings.resolved(defaults: defaults) + XCTAssertEqual(settings.position, .left) + XCTAssertEqual(settings.primarySizeRatio, 0.2, accuracy: 0.001) + XCTAssertEqual(settings.secondarySizeRatio, 1.0, accuracy: 0.001) + XCTAssertFalse(settings.autoHide) + } + + func testEdgePositionsResolveVisibleAndHiddenFrames() { + let visibleFrame = NSRect(x: 100, y: 80, width: 1000, height: 800) + + let topFrame = QuickTerminalPosition.top.finalFrame( + in: visibleFrame, + primarySizeRatio: 0.25, + secondarySizeRatio: 0.8 + ) + XCTAssertEqual(topFrame, NSRect(x: 200, y: 680, width: 800, height: 200)) + XCTAssertEqual( + QuickTerminalPosition.top.hiddenFrame(from: topFrame, visibleFrame: visibleFrame), + NSRect(x: 200, y: 880, width: 800, height: 200) + ) + + let leftFrame = QuickTerminalPosition.left.finalFrame( + in: visibleFrame, + primarySizeRatio: 0.3, + secondarySizeRatio: 0.5 + ) + XCTAssertEqual(leftFrame, NSRect(x: 100, y: 280, width: 420, height: 400)) + XCTAssertEqual( + QuickTerminalPosition.left.hiddenFrame(from: leftFrame, visibleFrame: visibleFrame), + NSRect(x: -320, y: 280, width: 420, height: 400) + ) + } +} + final class WorkspaceWorkingDirectoryInheritanceSettingsTests: XCTestCase { func testDefaultsToEnabledWhenUnset() { let suiteName = "WorkspaceWorkingDirectoryInheritanceSettingsTests.Default.\(UUID().uuidString)" diff --git a/web/app/[locale]/docs/changelog/page.tsx b/web/app/[locale]/docs/changelog/page.tsx index 9220aa710d72..29072f29171f 100644 --- a/web/app/[locale]/docs/changelog/page.tsx +++ b/web/app/[locale]/docs/changelog/page.tsx @@ -30,6 +30,13 @@ interface ChangelogVersion { sections: ChangelogSection[]; } +const quickTerminalChangelogItem = + "Quick Terminal panel with a configurable position/size, Option-Command-backtick shortcut, command palette action, and `cmux quick-terminal` CLI controls."; + +const localizedChangelogItems: Record<string, string> = { + [quickTerminalChangelogItem]: "entries.quickTerminal", +}; + function parseChangelog(markdown: string): ChangelogVersion[] { const versions: ChangelogVersion[] = []; let current: ChangelogVersion | null = null; @@ -312,11 +319,14 @@ export default function ChangelogPage() { <SectionBadge heading={section.heading} /> )} <ul style={{ margin: 0, paddingTop: 8, paddingBottom: 0, paddingLeft: 24, listStyle: "disc" }}> - {section.items.map((item, j) => ( - <li key={j} style={{ margin: 0, padding: 0, fontSize: 14, lineHeight: 1.6, color: "var(--muted)" }}> - <InlineMarkdown text={item} /> - </li> - ))} + {section.items.map((item, j) => { + const localizedKey = localizedChangelogItems[item]; + return ( + <li key={j} style={{ margin: 0, padding: 0, fontSize: 14, lineHeight: 1.6, color: "var(--muted)" }}> + <InlineMarkdown text={localizedKey ? t(localizedKey) : item} /> + </li> + ); + })} </ul> </div> ); diff --git a/web/app/[locale]/docs/configuration/page.tsx b/web/app/[locale]/docs/configuration/page.tsx index 2dd54b6c9bfc..33ae18934f50 100644 --- a/web/app/[locale]/docs/configuration/page.tsx +++ b/web/app/[locale]/docs/configuration/page.tsx @@ -5,7 +5,7 @@ import { Link } from "../../../../i18n/navigation"; import { CodeBlock } from "../../components/code-block"; import { Callout } from "../../components/callout"; import settingsSchema from "../../../../data/cmux.schema.json"; -import { shortcutCategories, type LocalizedText } from "../../../../data/cmux-shortcuts"; +import { localizedShortcutText, shortcutCategories } from "../../../../data/cmux-shortcuts"; import { DocsHeading } from "../../components/docs-heading"; type SchemaProperty = { @@ -83,7 +83,11 @@ function buildSettingsFileExample(t: ConfigurationTranslation) { // "idleSeconds": 5, // "maxLiveTerminals": 12 // }, - // "textBoxMaxLines": 10 + // "textBoxMaxLines": 10, + // "quickTerminalPosition": "top", + // "quickTerminalPrimarySizeRatio": 0.38, + // "quickTerminalSecondarySizeRatio": 1, + // "quickTerminalAutoHide": true // }, // "browser": { @@ -134,6 +138,7 @@ function buildSettingsFileExample(t: ConfigurationTranslation) { // "shortcuts": { // "bindings": { // "toggleSidebar": "cmd+b", + // "toggleQuickTerminal": "cmd+opt+\`", // "toggleFileExplorer": "cmd+opt+b", // "newTab": ["ctrl+b", "c"], // "commandPalettePrevious": null @@ -152,10 +157,6 @@ export async function generateMetadata({ params }: { params: Promise<{ locale: s }; } -function localizedText(text: LocalizedText, locale: string) { - return text[locale as keyof LocalizedText] ?? (locale.startsWith("ja") ? text.ja : text.en); -} - function shortcutToConfig(shortcut: { combos: string[][]; configValue?: string }) { if (shortcut.configValue) return shortcut.configValue; return shortcutComboToConfig(shortcut.combos[0] ?? []); @@ -451,10 +452,10 @@ working-directory = ~/code`}</CodeBlock> <code className="text-[12px] font-medium">{shortcut.id}</code> </div> <p className="text-sm text-foreground/90"> - {localizedText(shortcut.description, locale)} + {localizedShortcutText(shortcut.description, locale)} {shortcut.note && ( <span className="ml-2 text-xs text-muted"> - {localizedText(shortcut.note, locale)} + {localizedShortcutText(shortcut.note, locale)} </span> )} </p> diff --git a/web/app/[locale]/keyboard-shortcuts.tsx b/web/app/[locale]/keyboard-shortcuts.tsx index e4b973cd082c..61f33ba99638 100644 --- a/web/app/[locale]/keyboard-shortcuts.tsx +++ b/web/app/[locale]/keyboard-shortcuts.tsx @@ -2,11 +2,7 @@ import { useMemo, useState } from "react"; import { useLocale, useTranslations } from "next-intl"; -import { shortcutCategories, type LocalizedText, type Shortcut } from "../../data/cmux-shortcuts"; - -function localizedText(text: LocalizedText, locale: string) { - return text[locale as keyof LocalizedText] ?? (locale.startsWith("ja") ? text.ja : text.en); -} +import { localizedShortcutText, shortcutCategories, type Shortcut } from "../../data/cmux-shortcuts"; function normalize(s: string) { return s.toLowerCase().replace(/\s+/g, " ").trim(); @@ -34,8 +30,8 @@ function KeyCombo({ combo }: { combo: string[] }) { } function ShortcutRow({ shortcut, locale }: { shortcut: Shortcut; locale: string }) { - const description = localizedText(shortcut.description, locale); - const note = shortcut.note ? localizedText(shortcut.note, locale) : undefined; + const description = localizedShortcutText(shortcut.description, locale); + const note = shortcut.note ? localizedShortcutText(shortcut.note, locale) : undefined; return ( <div className="flex items-center justify-between gap-4 px-4 py-[11px] transition-colors hover:bg-foreground/[0.025]"> @@ -73,8 +69,8 @@ export function KeyboardShortcuts() { ...cat, shortcuts: cat.shortcuts.filter((shortcut) => { const catTitle = t(`cat.${cat.titleKey}`); - const description = localizedText(shortcut.description, locale); - const note = shortcut.note ? localizedText(shortcut.note, locale) : ""; + const description = localizedShortcutText(shortcut.description, locale); + const note = shortcut.note ? localizedShortcutText(shortcut.note, locale) : ""; const combos = shortcut.combos.map(comboToText).join(" "); return normalize(`${catTitle} ${combos} ${description} ${note}`).includes(q); }), diff --git a/web/data/cmux-shortcuts.ts b/web/data/cmux-shortcuts.ts index 7772c694fbdb..efd0591385a8 100644 --- a/web/data/cmux-shortcuts.ts +++ b/web/data/cmux-shortcuts.ts @@ -5,6 +5,12 @@ export type LocalizedText = { ja: string; } & Partial<Record<Exclude<Locale, "en" | "ja">, string>>; +export function localizedShortcutText(text: LocalizedText, locale: string) { + const exact = (text as Partial<Record<string, string>>)[locale]; + if (exact) return exact; + return locale.startsWith("ja") ? text.ja : text.en; +} + export type Shortcut = { id: string; combos: string[][]; @@ -40,6 +46,54 @@ export const shortcutCategories: ShortcutCategory[] = [ description: { en: "Global search", ja: "グローバル検索" }, note: { en: "system-wide hotkey", ja: "システム全体のホットキー" }, }, + { + id: "toggleQuickTerminal", + combos: [["⌥", "⌘", "`"]], + description: { + en: "Toggle quick terminal", + ja: "クイックターミナルを切り替え", + "zh-CN": "切换快速终端", + "zh-TW": "切換快速終端", + ko: "빠른 터미널 전환", + de: "Schnellterminal ein-/ausblenden", + es: "Alternar terminal rápido", + fr: "Afficher/masquer le terminal rapide", + it: "Attiva/disattiva terminale rapido", + da: "Slå hurtig terminal til/fra", + pl: "Przełącz szybki terminal", + ru: "Переключить быстрый терминал", + bs: "Uključi/isključi brzi terminal", + ar: "تبديل الطرفية السريعة", + no: "Slå hurtigterminal av/på", + "pt-BR": "Alternar terminal rápido", + th: "สลับเทอร์มินัลด่วน", + tr: "Hızlı terminali aç/kapat", + km: "បិទ/បើក terminal រហ័ស", + uk: "Перемкнути швидкий термінал", + }, + note: { + en: "system-wide hotkey", + ja: "システム全体のホットキー", + "zh-CN": "系统级热键", + "zh-TW": "系統層級快速鍵", + ko: "시스템 전체 단축키", + de: "systemweiter Kurzbefehl", + es: "atajo global del sistema", + fr: "raccourci système global", + it: "scorciatoia a livello di sistema", + da: "systemgenvej", + pl: "globalny skrót systemowy", + ru: "общесистемная горячая клавиша", + bs: "sistemska prečica", + ar: "اختصار على مستوى النظام", + no: "systemomfattende hurtigtast", + "pt-BR": "atalho global do sistema", + th: "ปุ่มลัดทั้งระบบ", + tr: "sistem genelinde kısayol", + km: "គ្រាប់ចុចកាត់ប្រព័ន្ធទាំងមូល", + uk: "загальносистемна гаряча клавіша", + }, + }, { id: "commandPalette", combos: [["⌘", "⇧", "P"]], description: { en: "Command palette", ja: "コマンドパレット" } }, { id: "commandPaletteNext", diff --git a/web/data/cmux.schema.json b/web/data/cmux.schema.json index 659da63b482c..fbd91130f897 100644 --- a/web/data/cmux.schema.json +++ b/web/data/cmux.schema.json @@ -483,6 +483,35 @@ "default": 10, "description": "Maximum number of lines the rich terminal TextBox input can grow to before it scrolls." }, + "quickTerminalPosition": { + "type": "string", + "enum": ["top", "bottom", "left", "right", "center"], + "default": "top", + "descriptionKey": "schemaDescriptions.terminal.quickTerminalPosition", + "description": "Screen edge or center position for the floating quick terminal." + }, + "quickTerminalPrimarySizeRatio": { + "type": "number", + "minimum": 0.2, + "maximum": 1, + "default": 0.38, + "descriptionKey": "schemaDescriptions.terminal.quickTerminalPrimarySizeRatio", + "description": "Quick terminal size along its slide-in axis, as a fraction of the visible screen." + }, + "quickTerminalSecondarySizeRatio": { + "type": "number", + "minimum": 0.2, + "maximum": 1, + "default": 1, + "descriptionKey": "schemaDescriptions.terminal.quickTerminalSecondarySizeRatio", + "description": "Quick terminal size across the opposite axis, as a fraction of the visible screen." + }, + "quickTerminalAutoHide": { + "type": "boolean", + "default": true, + "descriptionKey": "schemaDescriptions.terminal.quickTerminalAutoHide", + "description": "Hide the quick terminal automatically when it loses key focus." + }, "resumeCommands": { "type": "array", "default": [], @@ -1194,6 +1223,7 @@ "reloadConfiguration", "showHideAllWindows", "globalSearch", + "toggleQuickTerminal", "newWindow", "closeWindow", "toggleFullScreen", diff --git a/web/messages/ar.json b/web/messages/ar.json index 5695d1a6f76c..ee7e007ac3e9 100644 --- a/web/messages/ar.json +++ b/web/messages/ar.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "ينسخ نص الطرفية المحدد إلى حافظة النظام عند تثبيت التحديد، بما في ذلك تحديد الكلمات والأسطر بالنقر المزدوج والثلاثي.", "showTextBoxOnNewTerminals": "يعرض إدخال TextBox التجريبي افتراضيًا لمساحات العمل وتبويبات الطرفية وتقسيماتها المنشأة حديثًا.", - "focusTextBoxOnNewTerminals": "يركز إدخال TextBox التجريبي افتراضيًا لمساحات العمل وتبويبات الطرفية وتقسيماتها المنشأة حديثًا. التركيز يعرض TextBox أيضًا." + "focusTextBoxOnNewTerminals": "يركز إدخال TextBox التجريبي افتراضيًا لمساحات العمل وتبويبات الطرفية وتقسيماتها المنشأة حديثًا. التركيز يعرض TextBox أيضًا.", + "quickTerminalPosition": "موضع حافة الشاشة أو الوسط للـ Quick Terminal العائم.", + "quickTerminalPrimarySizeRatio": "حجم Quick Terminal على محور الانزلاق، كنسبة من الشاشة المرئية.", + "quickTerminalSecondarySizeRatio": "حجم Quick Terminal على المحور المقابل، كنسبة من الشاشة المرئية.", + "quickTerminalAutoHide": "إخفاء Quick Terminal تلقائيًا عندما يفقد تركيز لوحة المفاتيح." }, "browser": { "defaultSearchEngine": "محرك البحث الافتراضي لاستعلامات شريط عنوان المتصفح التي ليست عناوين URL. استخدم custom مع customSearchEngineURLTemplate لموفري بحث آخرين.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "سجل التغييرات", "metaDescription": "ملاحظات إصدار cmux وسجل الإصدارات. الميزات الجديدة وإصلاحات الأخطاء والتغييرات لطرفية macOS الأصلية.", - "metaTitle": "سجل التغييرات" + "metaTitle": "سجل التغييرات", + "entries": { + "quickTerminal": "لوحة Quick Terminal مع موضع/حجم قابلين للضبط، واختصار Option-Command-backtick، وإجراء في لوحة الأوامر، وعناصر تحكم CLI عبر `cmux quick-terminal`." + } }, "navItems": { "gettingStarted": "البدء", diff --git a/web/messages/bs.json b/web/messages/bs.json index 62dd666a3327..3c92b994c982 100644 --- a/web/messages/bs.json +++ b/web/messages/bs.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Kopira odabrani tekst iz terminala u sistemski međuspremnik kada se odabir potvrdi, uključujući riječi i redove odabrane dvoklikom ili troklikom.", "showTextBoxOnNewTerminals": "Podrazumijevano prikazuje beta TextBox unos za novokreirane radne prostore, terminalske tabove i podjele.", - "focusTextBoxOnNewTerminals": "Podrazumijevano fokusira beta TextBox unos za novokreirane radne prostore, terminalske tabove i podjele. Fokusiranje također prikazuje TextBox." + "focusTextBoxOnNewTerminals": "Podrazumijevano fokusira beta TextBox unos za novokreirane radne prostore, terminalske tabove i podjele. Fokusiranje također prikazuje TextBox.", + "quickTerminalPosition": "Položaj na ivici ekrana ili u sredini za plutajući Quick Terminal.", + "quickTerminalPrimarySizeRatio": "Veličina Quick Terminala duž ose uvlačenja, kao udio vidljivog ekrana.", + "quickTerminalSecondarySizeRatio": "Veličina Quick Terminala na suprotnoj osi, kao udio vidljivog ekrana.", + "quickTerminalAutoHide": "Automatski sakrij Quick Terminal kada izgubi fokus tastature." }, "browser": { "defaultSearchEngine": "Zadani pretraživač za upite u adresnoj traci preglednika koji nisu URL-ovi. Koristite custom uz customSearchEngineURLTemplate za druge pružatelje.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Zapisnik promjena", "metaDescription": "cmux bilješke o izdanjima i historija verzija. Nove funkcionalnosti, ispravke grešaka i promjene za nativni macOS terminal.", - "metaTitle": "Dnevnik promjena" + "metaTitle": "Dnevnik promjena", + "entries": { + "quickTerminal": "Quick Terminal panel s podesivom pozicijom/veličinom, Option-Command-backtick prečicom, akcijom u paleti komandi i `cmux quick-terminal` CLI kontrolama." + } }, "navItems": { "gettingStarted": "Početak rada", diff --git a/web/messages/da.json b/web/messages/da.json index f8720475e48d..8973b662f8a1 100644 --- a/web/messages/da.json +++ b/web/messages/da.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Kopierer markeret terminaltekst til systemets udklipsholder, når markeringen bekræftes, inklusive ord- og linjemarkeringer fra dobbelt- og tredobbeltklik.", "showTextBoxOnNewTerminals": "Viser beta-TextBox-input som standard for nyoprettede arbejdsområder, terminalfaner og terminalsplits.", - "focusTextBoxOnNewTerminals": "Fokuserer beta-TextBox-input som standard for nyoprettede arbejdsområder, terminalfaner og terminalsplits. Fokus viser også TextBox." + "focusTextBoxOnNewTerminals": "Fokuserer beta-TextBox-input som standard for nyoprettede arbejdsområder, terminalfaner og terminalsplits. Fokus viser også TextBox.", + "quickTerminalPosition": "Skærmkant- eller centerplacering for den flydende Quick Terminal.", + "quickTerminalPrimarySizeRatio": "Quick Terminal-størrelse langs indskydningsaksen som en andel af den synlige skærm.", + "quickTerminalSecondarySizeRatio": "Quick Terminal-størrelse på den modsatte akse som en andel af den synlige skærm.", + "quickTerminalAutoHide": "Skjul automatisk Quick Terminal, når den mister tastaturfokus." }, "browser": { "defaultSearchEngine": "Standardsøgemaskine for forespørgsler i browserens adresselinje, der ikke er URLer. Brug custom med customSearchEngineURLTemplate til andre udbydere.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Ændringslog", "metaDescription": "cmux udgivelsesnoter og versionshistorik. Nye funktioner, fejlrettelser og ændringer for den native macOS-terminal.", - "metaTitle": "Ændringslog" + "metaTitle": "Ændringslog", + "entries": { + "quickTerminal": "Quick Terminal-panel med konfigurerbar placering/størrelse, Option-Kommando-backtick-genvej, kommandopalet-handling og `cmux quick-terminal` CLI-styring." + } }, "navItems": { "gettingStarted": "Kom i gang", diff --git a/web/messages/de.json b/web/messages/de.json index 9c4fcb89f260..1ffe40d26d3b 100644 --- a/web/messages/de.json +++ b/web/messages/de.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Kopiert ausgewählten Terminaltext in die Systemzwischenablage, sobald die Auswahl bestätigt wird, einschließlich Wort- und Zeilenauswahl per Doppel- und Dreifachklick.", "showTextBoxOnNewTerminals": "Zeigt die Beta-TextBox-Eingabe standardmaessig fuer neu erstellte Workspaces, Terminal-Tabs und Terminal-Splits an.", - "focusTextBoxOnNewTerminals": "Fokussiert die Beta-TextBox-Eingabe standardmaessig fuer neu erstellte Workspaces, Terminal-Tabs und Terminal-Splits. Fokussieren zeigt die TextBox ebenfalls an." + "focusTextBoxOnNewTerminals": "Fokussiert die Beta-TextBox-Eingabe standardmaessig fuer neu erstellte Workspaces, Terminal-Tabs und Terminal-Splits. Fokussieren zeigt die TextBox ebenfalls an.", + "quickTerminalPosition": "Bildschirmrand- oder Mittenposition für das schwebende Quick Terminal.", + "quickTerminalPrimarySizeRatio": "Größe des Quick Terminals entlang seiner Einschubachse als Anteil des sichtbaren Bildschirms.", + "quickTerminalSecondarySizeRatio": "Größe des Quick Terminals entlang der Gegenachse als Anteil des sichtbaren Bildschirms.", + "quickTerminalAutoHide": "Quick Terminal automatisch ausblenden, wenn es den Tastaturfokus verliert." }, "browser": { "defaultSearchEngine": "Standardsuchmaschine für Nicht-URL-Eingaben in der Browser-Adressleiste. Verwenden Sie custom mit customSearchEngineURLTemplate für beliebige Anbieter.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Changelog", "metaDescription": "cmux Release-Notes und Versionshistorie. Neue Funktionen, Fehlerbehebungen und Änderungen für das native macOS-Terminal.", - "metaTitle": "Änderungsprotokoll" + "metaTitle": "Änderungsprotokoll", + "entries": { + "quickTerminal": "Quick-Terminal-Panel mit konfigurierbarer Position/Größe, Option-Befehl-Backtick-Kurzbefehl, Command-Palette-Aktion und `cmux quick-terminal`-CLI-Steuerung." + } }, "navItems": { "gettingStarted": "Erste Schritte", diff --git a/web/messages/en.json b/web/messages/en.json index e9c44d0eb962..19ebe9136fcf 100644 --- a/web/messages/en.json +++ b/web/messages/en.json @@ -929,7 +929,11 @@ "terminal": { "copyOnSelect": "Copy selected terminal text to the system clipboard when the selection is committed, including word and line selections from double- and triple-click.", "showTextBoxOnNewTerminals": "Show the beta TextBox input by default for newly created workspaces, terminal tabs, and terminal splits.", - "focusTextBoxOnNewTerminals": "Focus the beta TextBox input by default for newly created workspaces, terminal tabs, and terminal splits. Focusing also shows the TextBox." + "focusTextBoxOnNewTerminals": "Focus the beta TextBox input by default for newly created workspaces, terminal tabs, and terminal splits. Focusing also shows the TextBox.", + "quickTerminalPosition": "Screen edge or center position for the floating quick terminal.", + "quickTerminalPrimarySizeRatio": "Quick terminal size along its slide-in axis, as a fraction of the visible screen.", + "quickTerminalSecondarySizeRatio": "Quick terminal size across the opposite axis, as a fraction of the visible screen.", + "quickTerminalAutoHide": "Hide the quick terminal automatically when it loses key focus." }, "browser": { "defaultSearchEngine": "Default search engine for non-URL browser address bar queries. Use custom with customSearchEngineURLTemplate for arbitrary providers.", @@ -1512,7 +1516,10 @@ "changelog": { "title": "Changelog", "metaTitle": "Changelog", - "metaDescription": "cmux release notes and version history. New features, bug fixes, and changes for the native macOS terminal." + "metaDescription": "cmux release notes and version history. New features, bug fixes, and changes for the native macOS terminal.", + "entries": { + "quickTerminal": "Quick Terminal panel with a configurable position/size, Option-Command-backtick shortcut, command palette action, and `cmux quick-terminal` CLI controls." + } }, "claudeCodeTeams": { "title": "Claude Code Teams", diff --git a/web/messages/es.json b/web/messages/es.json index 141cc369f8df..abd657287baf 100644 --- a/web/messages/es.json +++ b/web/messages/es.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Copia el texto seleccionado del terminal al portapapeles del sistema cuando se confirma la selección, incluidas las selecciones de palabras y líneas con doble y triple clic.", "showTextBoxOnNewTerminals": "Muestra la entrada TextBox beta de forma predeterminada en espacios de trabajo, pestañas y divisiones de terminal recién creados.", - "focusTextBoxOnNewTerminals": "Enfoca la entrada TextBox beta de forma predeterminada en espacios de trabajo, pestañas y divisiones de terminal recién creados. Enfocar también muestra TextBox." + "focusTextBoxOnNewTerminals": "Enfoca la entrada TextBox beta de forma predeterminada en espacios de trabajo, pestañas y divisiones de terminal recién creados. Enfocar también muestra TextBox.", + "quickTerminalPosition": "Posición en el borde de la pantalla o en el centro para el Quick Terminal flotante.", + "quickTerminalPrimarySizeRatio": "Tamaño del Quick Terminal a lo largo de su eje de deslizamiento, como fracción de la pantalla visible.", + "quickTerminalSecondarySizeRatio": "Tamaño del Quick Terminal en el eje opuesto, como fracción de la pantalla visible.", + "quickTerminalAutoHide": "Oculta el Quick Terminal automáticamente cuando pierde el foco de teclado." }, "browser": { "defaultSearchEngine": "Motor de búsqueda predeterminado para consultas de la barra de direcciones del navegador que no son URL. Usa custom con customSearchEngineURLTemplate para otros proveedores.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Changelog", "metaDescription": "Notas de versión e historial de versiones de cmux. Nuevas funciones, correcciones de errores y cambios para la terminal nativa de macOS.", - "metaTitle": "Registro de cambios" + "metaTitle": "Registro de cambios", + "entries": { + "quickTerminal": "Panel Quick Terminal con posición/tamaño configurable, atajo Opción-Comando-acento grave, acción de paleta de comandos y controles CLI `cmux quick-terminal`." + } }, "navItems": { "gettingStarted": "Primeros pasos", diff --git a/web/messages/fr.json b/web/messages/fr.json index f1255144a0f2..4a2bc28298ce 100644 --- a/web/messages/fr.json +++ b/web/messages/fr.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Copie le texte sélectionné dans le terminal dans le presse-papiers système lorsque la sélection est validée, y compris les sélections de mots et de lignes par double ou triple clic.", "showTextBoxOnNewTerminals": "Affiche l'entrée TextBox bêta par défaut pour les espaces de travail, onglets et divisions de terminal nouvellement créés.", - "focusTextBoxOnNewTerminals": "Place le focus sur l'entrée TextBox bêta par défaut pour les espaces de travail, onglets et divisions de terminal nouvellement créés. Le focus affiche aussi TextBox." + "focusTextBoxOnNewTerminals": "Place le focus sur l'entrée TextBox bêta par défaut pour les espaces de travail, onglets et divisions de terminal nouvellement créés. Le focus affiche aussi TextBox.", + "quickTerminalPosition": "Position au bord de l'écran ou au centre pour le Quick Terminal flottant.", + "quickTerminalPrimarySizeRatio": "Taille du Quick Terminal le long de son axe d'apparition, sous forme de fraction de l'écran visible.", + "quickTerminalSecondarySizeRatio": "Taille du Quick Terminal sur l'axe opposé, sous forme de fraction de l'écran visible.", + "quickTerminalAutoHide": "Masque automatiquement le Quick Terminal lorsqu'il perd le focus clavier." }, "browser": { "defaultSearchEngine": "Moteur de recherche par défaut pour les saisies de la barre d’adresse du navigateur qui ne sont pas des URL. Utilisez custom avec customSearchEngineURLTemplate pour d’autres fournisseurs.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Changelog", "metaDescription": "Notes de version et historique des versions de cmux. Nouvelles fonctionnalités, corrections de bugs et changements pour le terminal macOS natif.", - "metaTitle": "Journal des modifications" + "metaTitle": "Journal des modifications", + "entries": { + "quickTerminal": "Panneau Quick Terminal avec position/taille configurables, raccourci Option-Commande-accent grave, action de palette de commandes et contrôles CLI `cmux quick-terminal`." + } }, "navItems": { "gettingStarted": "Premiers pas", diff --git a/web/messages/it.json b/web/messages/it.json index 6cc157c6b5de..b331f5a3b706 100644 --- a/web/messages/it.json +++ b/web/messages/it.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Copia il testo selezionato nel terminale negli appunti di sistema quando la selezione viene confermata, incluse le selezioni di parole e righe con doppio e triplo clic.", "showTextBoxOnNewTerminals": "Mostra l'input TextBox beta per impostazione predefinita nei workspace, nelle schede e nelle divisioni del terminale appena creati.", - "focusTextBoxOnNewTerminals": "Mette a fuoco l'input TextBox beta per impostazione predefinita nei workspace, nelle schede e nelle divisioni del terminale appena creati. Il focus mostra anche TextBox." + "focusTextBoxOnNewTerminals": "Mette a fuoco l'input TextBox beta per impostazione predefinita nei workspace, nelle schede e nelle divisioni del terminale appena creati. Il focus mostra anche TextBox.", + "quickTerminalPosition": "Posizione sul bordo dello schermo o al centro per il Quick Terminal flottante.", + "quickTerminalPrimarySizeRatio": "Dimensione del Quick Terminal lungo l'asse di scorrimento in entrata, come frazione dello schermo visibile.", + "quickTerminalSecondarySizeRatio": "Dimensione del Quick Terminal sull'asse opposto, come frazione dello schermo visibile.", + "quickTerminalAutoHide": "Nasconde automaticamente il Quick Terminal quando perde il focus della tastiera." }, "browser": { "defaultSearchEngine": "Motore di ricerca predefinito per le query nella barra degli indirizzi del browser che non sono URL. Usa custom con customSearchEngineURLTemplate per altri provider.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Changelog", "metaDescription": "Note di rilascio e cronologia delle versioni di cmux. Nuove funzionalità, correzioni di bug e modifiche per il terminale macOS nativo.", - "metaTitle": "Registro modifiche" + "metaTitle": "Registro modifiche", + "entries": { + "quickTerminal": "Pannello Quick Terminal con posizione/dimensioni configurabili, scorciatoia Opzione-Comando-accento grave, azione nella palette comandi e controlli CLI `cmux quick-terminal`." + } }, "navItems": { "gettingStarted": "Per iniziare", diff --git a/web/messages/ja.json b/web/messages/ja.json index 9dd5e0cea348..1349f636e2aa 100644 --- a/web/messages/ja.json +++ b/web/messages/ja.json @@ -888,7 +888,11 @@ "terminal": { "copyOnSelect": "選択が確定したとき、ダブルクリックやトリプルクリックによる単語・行の選択を含め、選択したターミナルテキストをシステムクリップボードへコピーします。", "showTextBoxOnNewTerminals": "新しいワークスペース、ターミナルタブ、ターミナル分割でベータ版の TextBox 入力を既定で表示します。", - "focusTextBoxOnNewTerminals": "新しいワークスペース、ターミナルタブ、ターミナル分割でベータ版の TextBox 入力に既定でフォーカスします。フォーカスする場合は TextBox も表示されます。" + "focusTextBoxOnNewTerminals": "新しいワークスペース、ターミナルタブ、ターミナル分割でベータ版の TextBox 入力に既定でフォーカスします。フォーカスする場合は TextBox も表示されます。", + "quickTerminalPosition": "浮動 Quick Terminal の画面端または中央の位置。", + "quickTerminalPrimarySizeRatio": "Quick Terminal がスライドインする軸方向のサイズ(表示中の画面に対する割合)。", + "quickTerminalSecondarySizeRatio": "Quick Terminal の反対軸方向のサイズ(表示中の画面に対する割合)。", + "quickTerminalAutoHide": "キー入力フォーカスを失ったときに Quick Terminal を自動的に隠します。" }, "browser": { "defaultSearchEngine": "ブラウザのアドレスバーでURLではない入力に使う既定の検索エンジンです。任意のプロバイダには custom と customSearchEngineURLTemplate を使います。", @@ -1415,7 +1419,10 @@ "changelog": { "title": "変更履歴", "metaDescription": "cmuxのリリースノートとバージョン履歴。ネイティブmacOSターミナルの新機能、バグ修正、変更点。", - "metaTitle": "変更履歴" + "metaTitle": "変更履歴", + "entries": { + "quickTerminal": "位置とサイズを設定できる Quick Terminal パネル、Option-Command-バッククォートのショートカット、コマンドパレットアクション、`cmux quick-terminal` CLI コントロールを追加しました。" + } }, "claudeCodeTeams": { "title": "Claude Code Teams", diff --git a/web/messages/km.json b/web/messages/km.json index 0845c973b9ad..97717f3b1468 100644 --- a/web/messages/km.json +++ b/web/messages/km.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "ចម្លងអត្ថបទ terminal ដែលបានជ្រើសទៅក្ដារតម្រៀបរបស់ប្រព័ន្ធ ពេលការជ្រើសត្រូវបានបញ្ជាក់ រួមទាំងការជ្រើសពាក្យ និងបន្ទាត់ដោយចុចពីរដង និងចុចបីដង។", "showTextBoxOnNewTerminals": "បង្ហាញការបញ្ចូល TextBox បេតាជាលំនាំដើមសម្រាប់ workspace ផ្ទាំងស្ថានីយ និងស្ប្លីតស្ថានីយដែលទើបបង្កើតថ្មី។", - "focusTextBoxOnNewTerminals": "ផ្តោតការបញ្ចូល TextBox បេតាជាលំនាំដើមសម្រាប់ workspace ផ្ទាំងស្ថានីយ និងស្ប្លីតស្ថានីយដែលទើបបង្កើតថ្មី។ ការផ្តោតក៏បង្ហាញ TextBox ផងដែរ។" + "focusTextBoxOnNewTerminals": "ផ្តោតការបញ្ចូល TextBox បេតាជាលំនាំដើមសម្រាប់ workspace ផ្ទាំងស្ថានីយ និងស្ប្លីតស្ថានីយដែលទើបបង្កើតថ្មី។ ការផ្តោតក៏បង្ហាញ TextBox ផងដែរ។", + "quickTerminalPosition": "ទីតាំងនៅគែមអេក្រង់ ឬកណ្ដាល សម្រាប់ Quick Terminal អណ្ដែត។", + "quickTerminalPrimarySizeRatio": "ទំហំ Quick Terminal តាមអ័ក្សរុញចូល ជាសមាមាត្រនៃអេក្រង់ដែលមើលឃើញ។", + "quickTerminalSecondarySizeRatio": "ទំហំ Quick Terminal តាមអ័ក្សផ្ទុយ ជាសមាមាត្រនៃអេក្រង់ដែលមើលឃើញ។", + "quickTerminalAutoHide": "លាក់ Quick Terminal ដោយស្វ័យប្រវត្តិ នៅពេលវាបាត់បង់ focus ក្ដារចុច។" }, "browser": { "defaultSearchEngine": "ម៉ាស៊ីនស្វែងរកលំនាំដើមសម្រាប់សំណួរនៅក្នុងរបារអាសយដ្ឋានដែលមិនមែនជា URL។ ប្រើ custom ជាមួយ customSearchEngineURLTemplate សម្រាប់អ្នកផ្តល់ផ្សេងៗ។", @@ -1215,7 +1219,10 @@ "changelog": { "title": "កំណត់ត្រាផ្លាស់ប្ដូរ", "metaDescription": "កំណត់ត្រាការចេញផ្សាយ cmux និងប្រវត្តិកំណែ។ មុខងារថ្មី, ការជួសជុលកំហុស, និងការផ្លាស់ប្ដូរសម្រាប់ទែមីណល macOS ដើម។", - "metaTitle": "កំណត់ហេតុផ្លាស់ប្ដូរ" + "metaTitle": "កំណត់ហេតុផ្លាស់ប្ដូរ", + "entries": { + "quickTerminal": "ផ្ទាំង Quick Terminal ដែលកំណត់ទីតាំង/ទំហំបាន ជាមួយផ្លូវកាត់ Option-Command-backtick សកម្មភាព command palette និងការគ្រប់គ្រង CLI `cmux quick-terminal`។" + } }, "navItems": { "gettingStarted": "ចាប់ផ្ដើម", diff --git a/web/messages/ko.json b/web/messages/ko.json index fa30d60fa1ac..5ca7a6098fe5 100644 --- a/web/messages/ko.json +++ b/web/messages/ko.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "선택이 확정되면 더블 클릭 및 트리플 클릭으로 선택한 단어와 줄을 포함해 선택한 터미널 텍스트를 시스템 클립보드에 복사합니다.", "showTextBoxOnNewTerminals": "새로 생성된 작업공간, 터미널 탭, 터미널 분할에서 베타 TextBox 입력을 기본으로 표시합니다.", - "focusTextBoxOnNewTerminals": "새로 생성된 작업공간, 터미널 탭, 터미널 분할에서 베타 TextBox 입력에 기본으로 포커스합니다. 포커스하면 TextBox도 표시됩니다." + "focusTextBoxOnNewTerminals": "새로 생성된 작업공간, 터미널 탭, 터미널 분할에서 베타 TextBox 입력에 기본으로 포커스합니다. 포커스하면 TextBox도 표시됩니다.", + "quickTerminalPosition": "플로팅 Quick Terminal의 화면 가장자리 또는 중앙 위치입니다.", + "quickTerminalPrimarySizeRatio": "Quick Terminal이 슬라이드되어 들어오는 축의 크기이며, 보이는 화면에 대한 비율입니다.", + "quickTerminalSecondarySizeRatio": "Quick Terminal의 반대 축 크기이며, 보이는 화면에 대한 비율입니다.", + "quickTerminalAutoHide": "키 포커스를 잃으면 Quick Terminal을 자동으로 숨깁니다." }, "browser": { "defaultSearchEngine": "브라우저 주소 표시줄에서 URL이 아닌 입력에 사용할 기본 검색 엔진입니다. 다른 제공자는 custom과 customSearchEngineURLTemplate을 사용하세요.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "변경 로그", "metaDescription": "cmux 릴리스 노트 및 버전 히스토리. 네이티브 macOS 터미널의 새로운 기능, 버그 수정, 변경 사항.", - "metaTitle": "변경 내역" + "metaTitle": "변경 내역", + "entries": { + "quickTerminal": "위치와 크기를 설정할 수 있는 Quick Terminal 패널, Option-Command-백틱 단축키, 명령 팔레트 작업, `cmux quick-terminal` CLI 제어를 추가했습니다." + } }, "navItems": { "gettingStarted": "시작하기", diff --git a/web/messages/no.json b/web/messages/no.json index 479bd2783d66..fd5eff6a273c 100644 --- a/web/messages/no.json +++ b/web/messages/no.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Kopierer markert terminaltekst til systemutklippstavlen når markeringen bekreftes, inkludert ord- og linjemarkeringer fra dobbelt- og trippelklikk.", "showTextBoxOnNewTerminals": "Viser beta-TextBox-inndata som standard for nyopprettede arbeidsområder, terminalfaner og terminalsplitt.", - "focusTextBoxOnNewTerminals": "Fokuserer beta-TextBox-inndata som standard for nyopprettede arbeidsområder, terminalfaner og terminalsplitt. Fokus viser også TextBox." + "focusTextBoxOnNewTerminals": "Fokuserer beta-TextBox-inndata som standard for nyopprettede arbeidsområder, terminalfaner og terminalsplitt. Fokus viser også TextBox.", + "quickTerminalPosition": "Skjermkant- eller midtposisjon for den flytende Quick Terminal.", + "quickTerminalPrimarySizeRatio": "Quick Terminal-størrelse langs innskyvingsaksen som en andel av den synlige skjermen.", + "quickTerminalSecondarySizeRatio": "Quick Terminal-størrelse på motsatt akse som en andel av den synlige skjermen.", + "quickTerminalAutoHide": "Skjul Quick Terminal automatisk når den mister tastaturfokus." }, "browser": { "defaultSearchEngine": "Standard søkemotor for søk i nettleserens adresselinje som ikke er URLer. Bruk custom med customSearchEngineURLTemplate for andre leverandører.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Endringslogg", "metaDescription": "cmux utgivelsesnotater og versjonshistorikk. Nye funksjoner, feilrettinger og endringer for den native macOS-terminalen.", - "metaTitle": "Endringslogg" + "metaTitle": "Endringslogg", + "entries": { + "quickTerminal": "Quick Terminal-panel med konfigurerbar posisjon/størrelse, Option-Kommando-backtick-snarvei, kommandopalett-handling og `cmux quick-terminal` CLI-kontroller." + } }, "navItems": { "gettingStarted": "Kom i gang", diff --git a/web/messages/pl.json b/web/messages/pl.json index a594b25b6e48..102a90c0c8af 100644 --- a/web/messages/pl.json +++ b/web/messages/pl.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Kopiuje zaznaczony tekst terminala do schowka systemowego po zatwierdzeniu zaznaczenia, w tym zaznaczenia słów i wierszy wykonane dwuklikiem lub potrójnym kliknięciem.", "showTextBoxOnNewTerminals": "Domyślnie pokazuje wejście TextBox beta dla nowo utworzonych obszarów roboczych, kart terminala i podziałów.", - "focusTextBoxOnNewTerminals": "Domyślnie ustawia fokus na wejściu TextBox beta dla nowo utworzonych obszarów roboczych, kart terminala i podziałów. Fokus pokazuje też TextBox." + "focusTextBoxOnNewTerminals": "Domyślnie ustawia fokus na wejściu TextBox beta dla nowo utworzonych obszarów roboczych, kart terminala i podziałów. Fokus pokazuje też TextBox.", + "quickTerminalPosition": "Pozycja przy krawędzi ekranu lub na środku dla pływającego Quick Terminal.", + "quickTerminalPrimarySizeRatio": "Rozmiar Quick Terminal wzdłuż osi wysuwania jako ułamek widocznego ekranu.", + "quickTerminalSecondarySizeRatio": "Rozmiar Quick Terminal na przeciwnej osi jako ułamek widocznego ekranu.", + "quickTerminalAutoHide": "Automatycznie ukrywaj Quick Terminal po utracie fokusu klawiatury." }, "browser": { "defaultSearchEngine": "Domyślna wyszukiwarka dla wpisów w pasku adresu przeglądarki, które nie są URL-ami. Użyj custom z customSearchEngineURLTemplate dla innych dostawców.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Dziennik zmian", "metaDescription": "Notatki wydań i historia wersji cmux. Nowe funkcje, poprawki błędów i zmiany dla natywnego terminala macOS.", - "metaTitle": "Historia zmian" + "metaTitle": "Historia zmian", + "entries": { + "quickTerminal": "Panel Quick Terminal z konfigurowalną pozycją/rozmiarem, skrótem Option-Command-backtick, akcją w palecie poleceń i sterowaniem CLI `cmux quick-terminal`." + } }, "navItems": { "gettingStarted": "Szybki start", diff --git a/web/messages/pt-BR.json b/web/messages/pt-BR.json index 1393909d81a8..f3f2df80c5f7 100644 --- a/web/messages/pt-BR.json +++ b/web/messages/pt-BR.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Copia o texto selecionado no terminal para a área de transferência do sistema quando a seleção é confirmada, incluindo seleções de palavras e linhas por clique duplo e triplo.", "showTextBoxOnNewTerminals": "Mostra a entrada TextBox beta por padrão em áreas de trabalho, abas e divisões de terminal recém-criadas.", - "focusTextBoxOnNewTerminals": "Foca a entrada TextBox beta por padrão em áreas de trabalho, abas e divisões de terminal recém-criadas. Focar também mostra o TextBox." + "focusTextBoxOnNewTerminals": "Foca a entrada TextBox beta por padrão em áreas de trabalho, abas e divisões de terminal recém-criadas. Focar também mostra o TextBox.", + "quickTerminalPosition": "Posição na borda da tela ou no centro para o Quick Terminal flutuante.", + "quickTerminalPrimarySizeRatio": "Tamanho do Quick Terminal ao longo do eixo de entrada, como fração da tela visível.", + "quickTerminalSecondarySizeRatio": "Tamanho do Quick Terminal no eixo oposto, como fração da tela visível.", + "quickTerminalAutoHide": "Oculta automaticamente o Quick Terminal quando ele perde o foco do teclado." }, "browser": { "defaultSearchEngine": "Mecanismo de busca padrão para consultas na barra de endereço do navegador que não são URLs. Use custom com customSearchEngineURLTemplate para outros provedores.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Changelog", "metaDescription": "Notas de lançamento e histórico de versões do cmux. Novos recursos, correções de bugs e mudanças para o terminal macOS nativo.", - "metaTitle": "Registro de alterações" + "metaTitle": "Registro de alterações", + "entries": { + "quickTerminal": "Painel Quick Terminal com posição/tamanho configuráveis, atalho Option-Command-acento grave, ação na paleta de comandos e controles CLI `cmux quick-terminal`." + } }, "navItems": { "gettingStarted": "Primeiros Passos", diff --git a/web/messages/ru.json b/web/messages/ru.json index cf8019ea4b47..b68e9bef1dd2 100644 --- a/web/messages/ru.json +++ b/web/messages/ru.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Копирует выделенный текст терминала в системный буфер обмена после подтверждения выделения, включая слова и строки, выбранные двойным или тройным щелчком.", "showTextBoxOnNewTerminals": "По умолчанию показывает бета-ввод TextBox для новых рабочих пространств, вкладок терминала и разделений.", - "focusTextBoxOnNewTerminals": "По умолчанию фокусирует бета-ввод TextBox для новых рабочих пространств, вкладок терминала и разделений. Фокус также показывает TextBox." + "focusTextBoxOnNewTerminals": "По умолчанию фокусирует бета-ввод TextBox для новых рабочих пространств, вкладок терминала и разделений. Фокус также показывает TextBox.", + "quickTerminalPosition": "Положение у края экрана или по центру для плавающего Quick Terminal.", + "quickTerminalPrimarySizeRatio": "Размер Quick Terminal вдоль оси появления как доля видимой области экрана.", + "quickTerminalSecondarySizeRatio": "Размер Quick Terminal по противоположной оси как доля видимой области экрана.", + "quickTerminalAutoHide": "Автоматически скрывать Quick Terminal при потере фокуса клавиатуры." }, "browser": { "defaultSearchEngine": "Поисковая система по умолчанию для запросов в адресной строке браузера, которые не являются URL. Используйте custom с customSearchEngineURLTemplate для других провайдеров.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "История изменений", "metaDescription": "Заметки о релизах cmux и история версий. Новые функции, исправления ошибок и изменения для нативного macOS-терминала.", - "metaTitle": "Журнал изменений" + "metaTitle": "Журнал изменений", + "entries": { + "quickTerminal": "Панель Quick Terminal с настраиваемыми положением/размером, сочетанием Option-Command-обратная кавычка, действием в палитре команд и управлением CLI `cmux quick-terminal`." + } }, "navItems": { "gettingStarted": "Начало работы", diff --git a/web/messages/th.json b/web/messages/th.json index 4dfc593f2067..4e469d9763a2 100644 --- a/web/messages/th.json +++ b/web/messages/th.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "คัดลอกข้อความเทอร์มินัลที่เลือกไปยังคลิปบอร์ดของระบบเมื่อยืนยันการเลือก รวมถึงการเลือกคำและบรรทัดจากการดับเบิลคลิกและทริปเปิลคลิก", "showTextBoxOnNewTerminals": "แสดงอินพุต TextBox รุ่นเบต้าเป็นค่าเริ่มต้นสำหรับเวิร์กสเปซ แท็บเทอร์มินัล และการแบ่งเทอร์มินัลที่สร้างใหม่", - "focusTextBoxOnNewTerminals": "โฟกัสอินพุต TextBox รุ่นเบต้าเป็นค่าเริ่มต้นสำหรับเวิร์กสเปซ แท็บเทอร์มินัล และการแบ่งเทอร์มินัลที่สร้างใหม่ การโฟกัสจะแสดง TextBox ด้วย" + "focusTextBoxOnNewTerminals": "โฟกัสอินพุต TextBox รุ่นเบต้าเป็นค่าเริ่มต้นสำหรับเวิร์กสเปซ แท็บเทอร์มินัล และการแบ่งเทอร์มินัลที่สร้างใหม่ การโฟกัสจะแสดง TextBox ด้วย", + "quickTerminalPosition": "ตำแหน่งริมหน้าจอหรือกึ่งกลางสำหรับ Quick Terminal แบบลอย", + "quickTerminalPrimarySizeRatio": "ขนาดของ Quick Terminal ตามแกนที่สไลด์เข้ามา คิดเป็นสัดส่วนของหน้าจอที่มองเห็น", + "quickTerminalSecondarySizeRatio": "ขนาดของ Quick Terminal ตามแกนตรงข้าม คิดเป็นสัดส่วนของหน้าจอที่มองเห็น", + "quickTerminalAutoHide": "ซ่อน Quick Terminal โดยอัตโนมัติเมื่อเสียโฟกัสแป้นพิมพ์" }, "browser": { "defaultSearchEngine": "เครื่องมือค้นหาเริ่มต้นสำหรับคำค้นในแถบที่อยู่ของเบราว์เซอร์ที่ไม่ใช่ URL ใช้ custom กับ customSearchEngineURLTemplate สำหรับผู้ให้บริการอื่น", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Changelog", "metaDescription": "บันทึกการอัปเดต cmux และประวัติเวอร์ชัน ฟีเจอร์ใหม่, แก้ไขบั๊ก และการเปลี่ยนแปลงสำหรับเทอร์มินัล macOS เนทีฟ", - "metaTitle": "บันทึกการเปลี่ยนแปลง" + "metaTitle": "บันทึกการเปลี่ยนแปลง", + "entries": { + "quickTerminal": "เพิ่มพาเนล Quick Terminal ที่กำหนดตำแหน่ง/ขนาดได้ พร้อมปุ่มลัด Option-Command-backtick, คำสั่งใน command palette และตัวควบคุม CLI `cmux quick-terminal`" + } }, "navItems": { "gettingStarted": "เริ่มต้นใช้งาน", diff --git a/web/messages/tr.json b/web/messages/tr.json index 5232077bb788..40ca85783ae1 100644 --- a/web/messages/tr.json +++ b/web/messages/tr.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Seçim kesinleştiğinde seçilen terminal metnini sistem panosuna kopyalar; çift ve üçlü tıklamayla yapılan sözcük ve satır seçimleri dahil.", "showTextBoxOnNewTerminals": "Yeni oluşturulan çalışma alanları, terminal sekmeleri ve terminal bölmeleri için beta TextBox girişini varsayılan olarak gösterir.", - "focusTextBoxOnNewTerminals": "Yeni oluşturulan çalışma alanları, terminal sekmeleri ve terminal bölmeleri için beta TextBox girişini varsayılan olarak odaklar. Odaklamak TextBox'ı da gösterir." + "focusTextBoxOnNewTerminals": "Yeni oluşturulan çalışma alanları, terminal sekmeleri ve terminal bölmeleri için beta TextBox girişini varsayılan olarak odaklar. Odaklamak TextBox'ı da gösterir.", + "quickTerminalPosition": "Yüzen Quick Terminal için ekran kenarı veya merkez konumu.", + "quickTerminalPrimarySizeRatio": "Quick Terminal'in içeri kayma ekseni boyunca boyutu; görünür ekranın oranı olarak.", + "quickTerminalSecondarySizeRatio": "Quick Terminal'in karşı eksendeki boyutu; görünür ekranın oranı olarak.", + "quickTerminalAutoHide": "Klavye odağını kaybettiğinde Quick Terminal'i otomatik olarak gizle." }, "browser": { "defaultSearchEngine": "Tarayıcı adres çubuğundaki URL olmayan sorgular için varsayılan arama motoru. Diğer sağlayıcılar için custom ile customSearchEngineURLTemplate kullanın.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Değişiklik Günlüğü", "metaDescription": "cmux sürüm notları ve sürüm geçmişi. Yerel macOS terminali için yeni özellikler, hata düzeltmeleri ve değişiklikler.", - "metaTitle": "Değişiklik günlüğü" + "metaTitle": "Değişiklik günlüğü", + "entries": { + "quickTerminal": "Yapılandırılabilir konum/boyut, Option-Command-backtick kısayolu, komut paleti eylemi ve `cmux quick-terminal` CLI denetimleri içeren Quick Terminal paneli." + } }, "navItems": { "gettingStarted": "Başlarken", diff --git a/web/messages/uk.json b/web/messages/uk.json index fe9466b85f74..bb65cf845f55 100644 --- a/web/messages/uk.json +++ b/web/messages/uk.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "Копіює вибраний текст термінала до системного буфера обміну після підтвердження виділення, зокрема слова й рядки, вибрані подвійним або потрійним клацанням.", "showTextBoxOnNewTerminals": "Типово показує бета-ввід TextBox для новостворених робочих просторів, вкладок термінала й розділень.", - "focusTextBoxOnNewTerminals": "Типово фокусує бета-ввід TextBox для новостворених робочих просторів, вкладок термінала й розділень. Фокусування також показує TextBox." + "focusTextBoxOnNewTerminals": "Типово фокусує бета-ввід TextBox для новостворених робочих просторів, вкладок термінала й розділень. Фокусування також показує TextBox.", + "quickTerminalPosition": "Положення біля краю екрана або по центру для плаваючого Quick Terminal.", + "quickTerminalPrimarySizeRatio": "Розмір Quick Terminal уздовж осі появи як частка видимого екрана.", + "quickTerminalSecondarySizeRatio": "Розмір Quick Terminal по протилежній осі як частка видимого екрана.", + "quickTerminalAutoHide": "Автоматично приховувати Quick Terminal, коли він втрачає фокус клавіатури." }, "browser": { "defaultSearchEngine": "Пошукова система за замовчуванням для запитів в адресному рядку браузера, які не є URL. Для інших провайдерів використовуйте custom з customSearchEngineURLTemplate.", @@ -1215,7 +1219,10 @@ "changelog": { "title": "Журнал змін", "metaTitle": "Журнал змін", - "metaDescription": "Примітки до випусків та історія версій cmux. Нові можливості, виправлення помилок та зміни для нативного терміналу macOS." + "metaDescription": "Примітки до випусків та історія версій cmux. Нові можливості, виправлення помилок та зміни для нативного терміналу macOS.", + "entries": { + "quickTerminal": "Панель Quick Terminal із налаштовуваними позицією/розміром, скороченням Option-Command-backtick, дією в палітрі команд і керуванням CLI `cmux quick-terminal`." + } }, "claudeCodeTeams": { "title": "Claude Code Teams", diff --git a/web/messages/zh-CN.json b/web/messages/zh-CN.json index d772d55688bc..886ef0b529bd 100644 --- a/web/messages/zh-CN.json +++ b/web/messages/zh-CN.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "确认选择后,将所选终端文本复制到系统剪贴板,包括通过双击和三击选择的单词和整行。", "showTextBoxOnNewTerminals": "默认在新建的工作区、终端标签页和终端分屏中显示测试版 TextBox 输入。", - "focusTextBoxOnNewTerminals": "默认在新建的工作区、终端标签页和终端分屏中聚焦测试版 TextBox 输入。聚焦也会显示 TextBox。" + "focusTextBoxOnNewTerminals": "默认在新建的工作区、终端标签页和终端分屏中聚焦测试版 TextBox 输入。聚焦也会显示 TextBox。", + "quickTerminalPosition": "浮动 Quick Terminal 在屏幕边缘或中央的位置。", + "quickTerminalPrimarySizeRatio": "Quick Terminal 沿滑入轴的大小,占可见屏幕的比例。", + "quickTerminalSecondarySizeRatio": "Quick Terminal 沿另一轴的大小,占可见屏幕的比例。", + "quickTerminalAutoHide": "当 Quick Terminal 失去键盘焦点时自动隐藏。" }, "browser": { "defaultSearchEngine": "浏览器地址栏输入不是 URL 时使用的默认搜索引擎。对于任意提供商,请使用 custom 和 customSearchEngineURLTemplate。", @@ -1215,7 +1219,10 @@ "changelog": { "title": "更新日志", "metaDescription": "cmux 发布说明和版本历史。原生 macOS 终端的新功能、问题修复和变更记录。", - "metaTitle": "更新日志" + "metaTitle": "更新日志", + "entries": { + "quickTerminal": "新增 Quick Terminal 面板,支持可配置的位置/大小、Option-Command-反引号快捷键、命令面板操作,以及 `cmux quick-terminal` CLI 控制。" + } }, "navItems": { "gettingStarted": "入门指南", diff --git a/web/messages/zh-TW.json b/web/messages/zh-TW.json index bc0ef87b9809..800ca1baf6d8 100644 --- a/web/messages/zh-TW.json +++ b/web/messages/zh-TW.json @@ -775,7 +775,11 @@ "terminal": { "copyOnSelect": "確認選取後,將所選終端機文字複製到系統剪貼簿,包括透過按兩下和按三下選取的單字與整行。", "showTextBoxOnNewTerminals": "預設在新建的工作區、終端機分頁和終端機分割中顯示測試版 TextBox 輸入。", - "focusTextBoxOnNewTerminals": "預設在新建的工作區、終端機分頁和終端機分割中聚焦測試版 TextBox 輸入。聚焦也會顯示 TextBox。" + "focusTextBoxOnNewTerminals": "預設在新建的工作區、終端機分頁和終端機分割中聚焦測試版 TextBox 輸入。聚焦也會顯示 TextBox。", + "quickTerminalPosition": "浮動 Quick Terminal 在螢幕邊緣或中央的位置。", + "quickTerminalPrimarySizeRatio": "Quick Terminal 沿滑入軸的大小,作為可見螢幕的比例。", + "quickTerminalSecondarySizeRatio": "Quick Terminal 沿另一軸的大小,作為可見螢幕的比例。", + "quickTerminalAutoHide": "當 Quick Terminal 失去鍵盤焦點時自動隱藏。" }, "browser": { "defaultSearchEngine": "瀏覽器位址列輸入不是 URL 時使用的預設搜尋引擎。任意提供者請使用 custom 與 customSearchEngineURLTemplate。", @@ -1215,7 +1219,10 @@ "changelog": { "title": "更新日誌", "metaDescription": "cmux 版本說明和版本歷史。原生 macOS 終端機的新功能、錯誤修復和變更。", - "metaTitle": "更新日誌" + "metaTitle": "更新日誌", + "entries": { + "quickTerminal": "新增 Quick Terminal 面板,支援可設定的位置/大小、Option-Command-反引號快捷鍵、指令面板動作,以及 `cmux quick-terminal` CLI 控制。" + } }, "navItems": { "gettingStarted": "入門指南",