fix(vim): align rebased mode identifiers

commit: dd428b68ad8350894be3a57a79b357f5c7a20a88
author: brice · 2mo ago · 2026-08-13 08:53 UTC
committer: bnema · 2mo ago · 2026-08-14 02:42 UTC
parent: 1f4a728
signature: unsigned

3 files · +60 -22

M internal/domain/entity/config_types.go +35 -8


@@ -78,7 +78,7 @@ func (t *TabModeConfig) GetKeyBindings() map[string]string {
78	78		return keyBindingsFromActions(t.Actions)
79	79		}
80	80
81		-	// VimModeConfig holds page scroll mode shortcut configuration.
	81	+	// VimModeConfig holds vim scroll mode shortcut configuration.
82	82		type VimModeConfig struct {
83	83		ActivationShortcut string `mapstructure:"activation_shortcut" yaml:"activation_shortcut" toml:"activation_shortcut" json:"activation_shortcut"` //nolint:lll // struct tags must stay on one line
84	84		TimeoutMilliseconds int `mapstructure:"timeout_ms" yaml:"timeout_ms" toml:"timeout_ms" json:"timeout_ms"`

@@ -211,15 +211,42 @@ type BrowsingContextConfig struct {
211	211		// Deprecated: PopupBehaviorConfig is a compatibility alias for BrowsingContextConfig.
212	212		type PopupBehaviorConfig = BrowsingContextConfig
213	213
	214	+	// ExternalLinkBehavior defines how externally opened URLs are placed in the workspace.
	215	+	type ExternalLinkBehavior string
	216	+
	217	+	const (
	218	+	ExternalLinkBehaviorWindowed ExternalLinkBehavior = "windowed"
	219	+	ExternalLinkBehaviorTabbed ExternalLinkBehavior = "tabbed"
	220	+	ExternalLinkBehaviorSplit ExternalLinkBehavior = "split"
	221	+	ExternalLinkBehaviorStacked ExternalLinkBehavior = "stacked"
	222	+	)
	223	+
	224	+	// ExternalLinkPlacement defines the direction used when splitting for an external URL.
	225	+	type ExternalLinkPlacement string
	226	+
	227	+	const (
	228	+	ExternalLinkPlacementRight ExternalLinkPlacement = "right"
	229	+	ExternalLinkPlacementLeft ExternalLinkPlacement = "left"
	230	+	ExternalLinkPlacementTop ExternalLinkPlacement = "top"
	231	+	ExternalLinkPlacementBottom ExternalLinkPlacement = "bottom"
	232	+	)
	233	+
	234	+	// ExternalLinksConfig controls how externally opened URLs are placed in the workspace.
	235	+	type ExternalLinksConfig struct {
	236	+	Behavior ExternalLinkBehavior `mapstructure:"behavior" yaml:"behavior" toml:"behavior" json:"behavior"`
	237	+	Placement ExternalLinkPlacement `mapstructure:"placement" yaml:"placement" toml:"placement" json:"placement"`
	238	+	}
	239	+
214	240		// WorkspaceConfig holds all workspace layout and behavior settings.
215	241		type WorkspaceConfig struct {
216		-	NewPaneURL string `mapstructure:"new_pane_url" yaml:"new_pane_url" toml:"new_pane_url" json:"new_pane_url"`
217		-	PaneMode PaneModeConfig `mapstructure:"pane_mode" yaml:"pane_mode" toml:"pane_mode" json:"pane_mode"`
218		-	TabMode TabModeConfig `mapstructure:"tab_mode" yaml:"tab_mode" toml:"tab_mode" json:"tab_mode"`
219		-	VimMode VimModeConfig `mapstructure:"vim_mode" yaml:"vim_mode" toml:"vim_mode" json:"vim_mode"`
220		-	ResizeMode ResizeModeConfig `mapstructure:"resize_mode" yaml:"resize_mode" toml:"resize_mode" json:"resize_mode"`
221		-	Shortcuts GlobalShortcutsConfig `mapstructure:"shortcuts" yaml:"shortcuts" toml:"shortcuts" json:"shortcuts"`
222		-	FloatingPane FloatingPaneConfig `mapstructure:"floating_pane" yaml:"floating_pane" toml:"floating_pane" json:"floating_pane"`
	242	+	NewPaneURL string `mapstructure:"new_pane_url" yaml:"new_pane_url" toml:"new_pane_url" json:"new_pane_url"`
	243	+	PaneMode PaneModeConfig `mapstructure:"pane_mode" yaml:"pane_mode" toml:"pane_mode" json:"pane_mode"`
	244	+	TabMode TabModeConfig `mapstructure:"tab_mode" yaml:"tab_mode" toml:"tab_mode" json:"tab_mode"`
	245	+	VimMode VimModeConfig `mapstructure:"vim_mode" yaml:"vim_mode" toml:"vim_mode" json:"vim_mode"`
	246	+	ResizeMode ResizeModeConfig `mapstructure:"resize_mode" yaml:"resize_mode" toml:"resize_mode" json:"resize_mode"`
	247	+	Shortcuts GlobalShortcutsConfig `mapstructure:"shortcuts" yaml:"shortcuts" toml:"shortcuts" json:"shortcuts"`
	248	+	FloatingPane FloatingPaneConfig `mapstructure:"floating_pane" yaml:"floating_pane" toml:"floating_pane" json:"floating_pane"`
	249	+	ExternalLinks ExternalLinksConfig `mapstructure:"external_links" yaml:"external_links" toml:"external_links" json:"external_links"`
223	250
224	251		TabBarPosition string `mapstructure:"tab_bar_position" yaml:"tab_bar_position" toml:"tab_bar_position" json:"tab_bar_position"`
225	252		HideTabBarWhenSingleTab bool `mapstructure:"hide_tab_bar_when_single_tab" yaml:"hide_tab_bar_when_single_tab" toml:"hide_tab_bar_when_single_tab" json:"hide_tab_bar_when_single_tab"` //nolint:lll // struct tags must stay on one line


@@ -78,7 +78,7 @@ func (t *TabModeConfig) GetKeyBindings() map[string]string {
78		return keyBindingsFromActions(t.Actions)	78		return keyBindingsFromActions(t.Actions)
79		}	79		}
80			80
81	-	// VimModeConfig holds page scroll mode shortcut configuration.	81	+	// VimModeConfig holds vim scroll mode shortcut configuration.
82		type VimModeConfig struct {	82		type VimModeConfig struct {
83		ActivationShortcut string `mapstructure:"activation_shortcut" yaml:"activation_shortcut" toml:"activation_shortcut" json:"activation_shortcut"` //nolint:lll // struct tags must stay on one line	83		ActivationShortcut string `mapstructure:"activation_shortcut" yaml:"activation_shortcut" toml:"activation_shortcut" json:"activation_shortcut"` //nolint:lll // struct tags must stay on one line
84		TimeoutMilliseconds int `mapstructure:"timeout_ms" yaml:"timeout_ms" toml:"timeout_ms" json:"timeout_ms"`	84		TimeoutMilliseconds int `mapstructure:"timeout_ms" yaml:"timeout_ms" toml:"timeout_ms" json:"timeout_ms"`

@@ -211,15 +211,42 @@ type BrowsingContextConfig struct {
211		// Deprecated: PopupBehaviorConfig is a compatibility alias for BrowsingContextConfig.	211		// Deprecated: PopupBehaviorConfig is a compatibility alias for BrowsingContextConfig.
212		type PopupBehaviorConfig = BrowsingContextConfig	212		type PopupBehaviorConfig = BrowsingContextConfig
213			213
			214	+	// ExternalLinkBehavior defines how externally opened URLs are placed in the workspace.
			215	+	type ExternalLinkBehavior string
			216	+
			217	+	const (
			218	+	ExternalLinkBehaviorWindowed ExternalLinkBehavior = "windowed"
			219	+	ExternalLinkBehaviorTabbed ExternalLinkBehavior = "tabbed"
			220	+	ExternalLinkBehaviorSplit ExternalLinkBehavior = "split"
			221	+	ExternalLinkBehaviorStacked ExternalLinkBehavior = "stacked"
			222	+	)
			223	+
			224	+	// ExternalLinkPlacement defines the direction used when splitting for an external URL.
			225	+	type ExternalLinkPlacement string
			226	+
			227	+	const (
			228	+	ExternalLinkPlacementRight ExternalLinkPlacement = "right"
			229	+	ExternalLinkPlacementLeft ExternalLinkPlacement = "left"
			230	+	ExternalLinkPlacementTop ExternalLinkPlacement = "top"
			231	+	ExternalLinkPlacementBottom ExternalLinkPlacement = "bottom"
			232	+	)
			233	+
			234	+	// ExternalLinksConfig controls how externally opened URLs are placed in the workspace.
			235	+	type ExternalLinksConfig struct {
			236	+	Behavior ExternalLinkBehavior `mapstructure:"behavior" yaml:"behavior" toml:"behavior" json:"behavior"`
			237	+	Placement ExternalLinkPlacement `mapstructure:"placement" yaml:"placement" toml:"placement" json:"placement"`
			238	+	}
			239	+
214		// WorkspaceConfig holds all workspace layout and behavior settings.	240		// WorkspaceConfig holds all workspace layout and behavior settings.
215		type WorkspaceConfig struct {	241		type WorkspaceConfig struct {
216	-	NewPaneURL string `mapstructure:"new_pane_url" yaml:"new_pane_url" toml:"new_pane_url" json:"new_pane_url"`	242	+	NewPaneURL string `mapstructure:"new_pane_url" yaml:"new_pane_url" toml:"new_pane_url" json:"new_pane_url"`
217	-	PaneMode PaneModeConfig `mapstructure:"pane_mode" yaml:"pane_mode" toml:"pane_mode" json:"pane_mode"`	243	+	PaneMode PaneModeConfig `mapstructure:"pane_mode" yaml:"pane_mode" toml:"pane_mode" json:"pane_mode"`
218	-	TabMode TabModeConfig `mapstructure:"tab_mode" yaml:"tab_mode" toml:"tab_mode" json:"tab_mode"`	244	+	TabMode TabModeConfig `mapstructure:"tab_mode" yaml:"tab_mode" toml:"tab_mode" json:"tab_mode"`
219	-	VimMode VimModeConfig `mapstructure:"vim_mode" yaml:"vim_mode" toml:"vim_mode" json:"vim_mode"`	245	+	VimMode VimModeConfig `mapstructure:"vim_mode" yaml:"vim_mode" toml:"vim_mode" json:"vim_mode"`
220	-	ResizeMode ResizeModeConfig `mapstructure:"resize_mode" yaml:"resize_mode" toml:"resize_mode" json:"resize_mode"`	246	+	ResizeMode ResizeModeConfig `mapstructure:"resize_mode" yaml:"resize_mode" toml:"resize_mode" json:"resize_mode"`
221	-	Shortcuts GlobalShortcutsConfig `mapstructure:"shortcuts" yaml:"shortcuts" toml:"shortcuts" json:"shortcuts"`	247	+	Shortcuts GlobalShortcutsConfig `mapstructure:"shortcuts" yaml:"shortcuts" toml:"shortcuts" json:"shortcuts"`
222	-	FloatingPane FloatingPaneConfig `mapstructure:"floating_pane" yaml:"floating_pane" toml:"floating_pane" json:"floating_pane"`	248	+	FloatingPane FloatingPaneConfig `mapstructure:"floating_pane" yaml:"floating_pane" toml:"floating_pane" json:"floating_pane"`
			249	+	ExternalLinks ExternalLinksConfig `mapstructure:"external_links" yaml:"external_links" toml:"external_links" json:"external_links"`
223			250
224		TabBarPosition string `mapstructure:"tab_bar_position" yaml:"tab_bar_position" toml:"tab_bar_position" json:"tab_bar_position"`	251		TabBarPosition string `mapstructure:"tab_bar_position" yaml:"tab_bar_position" toml:"tab_bar_position" json:"tab_bar_position"`
225		HideTabBarWhenSingleTab bool `mapstructure:"hide_tab_bar_when_single_tab" yaml:"hide_tab_bar_when_single_tab" toml:"hide_tab_bar_when_single_tab" json:"hide_tab_bar_when_single_tab"` //nolint:lll // struct tags must stay on one line	252		HideTabBarWhenSingleTab bool `mapstructure:"hide_tab_bar_when_single_tab" yaml:"hide_tab_bar_when_single_tab" toml:"hide_tab_bar_when_single_tab" json:"hide_tab_bar_when_single_tab"` //nolint:lll // struct tags must stay on one line

M internal/infrastructure/config/loader.go +17 -6


@@ -175,10 +175,6 @@ func (m *Manager) transformLegacyConfig() {
175	175		transformer.TransformLegacyPopupsToBrowsingContexts(rawConfig)
176	176		}
177	177
178		-	// Merge newly added default actions into in-memory config so existing persisted
179		-	// action maps keep working before the user writes a migrated config to disk.
180		-	configMigrator.mergeMissingDefaultActions(rawConfig)
181		-
182	178		// Apply transformed config back to viper
183	179		for key, value := range rawConfig {
184	180		m.viper.Set(key, value)

@@ -378,6 +374,7 @@ func ensureDatabasePath(config *Config) error {
378	374		}
379	375
380	376		func normalizeConfig(config *Config) {
	377	+	normalizeExternalLinks(config)
381	378		normalizeAppearance(config)
382	379		normalizeMedia(config)
383	380		normalizeEngineConfig(config)

@@ -390,6 +387,20 @@ func normalizeBrowsingContexts(config *Config) {
390	387		config.Workspace.Popups = config.Workspace.BrowsingContexts
391	388		}
392	389
	390	+	func normalizeExternalLinks(config *Config) {
	391	+	switch config.Workspace.ExternalLinks.Behavior {
	392	+	case ExternalLinkBehaviorWindowed, ExternalLinkBehaviorTabbed, ExternalLinkBehaviorSplit, ExternalLinkBehaviorStacked:
	393	+	default:
	394	+	config.Workspace.ExternalLinks.Behavior = defaultExternalLinkBehavior
	395	+	}
	396	+
	397	+	switch config.Workspace.ExternalLinks.Placement {
	398	+	case ExternalLinkPlacementRight, ExternalLinkPlacementLeft, ExternalLinkPlacementTop, ExternalLinkPlacementBottom:
	399	+	default:
	400	+	config.Workspace.ExternalLinks.Placement = defaultExternalLinkPlacement
	401	+	}
	402	+	}
	403	+
393	404		func normalizeEngineConfig(config *Config) {
394	405		// Normalize GSK renderer (engine.webkit)
395	406		switch strings.ToLower(string(config.Engine.WebKit.GSKRenderer)) {

@@ -697,8 +708,6 @@ func (m Manager) setWorkspaceDefaults(defaults Config) {
697	708		m.viper.SetDefault("workspace.tab_mode.actions", defaults.Workspace.TabMode.Actions)
698	709		m.viper.SetDefault("workspace.vim_mode.activation_shortcut", defaults.Workspace.VimMode.ActivationShortcut)
699	710		m.viper.SetDefault("workspace.vim_mode.timeout_ms", defaults.Workspace.VimMode.TimeoutMilliseconds)
700		-	m.viper.SetDefault("workspace.vim_mode.sequence_timeout_ms", defaults.Workspace.VimMode.SequenceTimeoutMilliseconds)
701		-	m.viper.SetDefault("workspace.vim_mode.preload_accessibility", defaults.Workspace.VimMode.PreloadAccessibility)
702	711		m.viper.SetDefault("workspace.vim_mode.actions", defaults.Workspace.VimMode.Actions)
703	712		m.viper.SetDefault("workspace.resize_mode.activation_shortcut", defaults.Workspace.ResizeMode.ActivationShortcut)
704	713		m.viper.SetDefault("workspace.resize_mode.timeout_ms", defaults.Workspace.ResizeMode.TimeoutMilliseconds)

@@ -709,6 +718,8 @@ func (m Manager) setWorkspaceDefaults(defaults Config) {
709	718		m.viper.SetDefault("workspace.floating_pane.width_pct", defaults.Workspace.FloatingPane.WidthPct)
710	719		m.viper.SetDefault("workspace.floating_pane.height_pct", defaults.Workspace.FloatingPane.HeightPct)
711	720		m.viper.SetDefault("workspace.floating_pane.profiles", defaults.Workspace.FloatingPane.Profiles)
	721	+	m.viper.SetDefault("workspace.external_links.behavior", string(defaults.Workspace.ExternalLinks.Behavior))
	722	+	m.viper.SetDefault("workspace.external_links.placement", string(defaults.Workspace.ExternalLinks.Placement))
712	723		m.viper.SetDefault("workspace.tab_bar_position", defaults.Workspace.TabBarPosition)
713	724		m.viper.SetDefault("workspace.hide_tab_bar_when_single_tab", defaults.Workspace.HideTabBarWhenSingleTab)
714	725		m.viper.SetDefault("workspace.switch_to_tab_on_move", defaults.Workspace.SwitchToTabOnMove)

 		transformer.TransformLegacyPopupsToBrowsingContexts(rawConfig)
 	}
-	// Merge newly added default actions into in-memory config so existing persisted
-	// action maps keep working before the user writes a migrated config to disk.
-	configMigrator.mergeMissingDefaultActions(rawConfig)
 	// Apply transformed config back to viper
 	for key, value := range rawConfig {
 		m.viper.Set(key, value)
 }
 func normalizeConfig(config *Config) {
+	normalizeExternalLinks(config)
 	normalizeAppearance(config)
 	normalizeMedia(config)
 	normalizeEngineConfig(config)
 	config.Workspace.Popups = config.Workspace.BrowsingContexts
 }
+func normalizeExternalLinks(config *Config) {
+	switch config.Workspace.ExternalLinks.Behavior {
+	case ExternalLinkBehaviorWindowed, ExternalLinkBehaviorTabbed, ExternalLinkBehaviorSplit, ExternalLinkBehaviorStacked:
+	default:
+		config.Workspace.ExternalLinks.Behavior = defaultExternalLinkBehavior
+	}
+	switch config.Workspace.ExternalLinks.Placement {
+	case ExternalLinkPlacementRight, ExternalLinkPlacementLeft, ExternalLinkPlacementTop, ExternalLinkPlacementBottom:
+	default:
+		config.Workspace.ExternalLinks.Placement = defaultExternalLinkPlacement
+	}
+}
 func normalizeEngineConfig(config *Config) {
 	// Normalize GSK renderer (engine.webkit)
 	switch strings.ToLower(string(config.Engine.WebKit.GSKRenderer)) {
 	m.viper.SetDefault("workspace.tab_mode.actions", defaults.Workspace.TabMode.Actions)
 	m.viper.SetDefault("workspace.vim_mode.activation_shortcut", defaults.Workspace.VimMode.ActivationShortcut)
 	m.viper.SetDefault("workspace.vim_mode.timeout_ms", defaults.Workspace.VimMode.TimeoutMilliseconds)
-	m.viper.SetDefault("workspace.vim_mode.sequence_timeout_ms", defaults.Workspace.VimMode.SequenceTimeoutMilliseconds)
-	m.viper.SetDefault("workspace.vim_mode.preload_accessibility", defaults.Workspace.VimMode.PreloadAccessibility)
 	m.viper.SetDefault("workspace.vim_mode.actions", defaults.Workspace.VimMode.Actions)
 	m.viper.SetDefault("workspace.resize_mode.activation_shortcut", defaults.Workspace.ResizeMode.ActivationShortcut)
 	m.viper.SetDefault("workspace.resize_mode.timeout_ms", defaults.Workspace.ResizeMode.TimeoutMilliseconds)
 	m.viper.SetDefault("workspace.floating_pane.width_pct", defaults.Workspace.FloatingPane.WidthPct)
 	m.viper.SetDefault("workspace.floating_pane.height_pct", defaults.Workspace.FloatingPane.HeightPct)
 	m.viper.SetDefault("workspace.floating_pane.profiles", defaults.Workspace.FloatingPane.Profiles)
+	m.viper.SetDefault("workspace.external_links.behavior", string(defaults.Workspace.ExternalLinks.Behavior))
+	m.viper.SetDefault("workspace.external_links.placement", string(defaults.Workspace.ExternalLinks.Placement))
 	m.viper.SetDefault("workspace.tab_bar_position", defaults.Workspace.TabBarPosition)
 	m.viper.SetDefault("workspace.hide_tab_bar_when_single_tab", defaults.Workspace.HideTabBarWhenSingleTab)
 	m.viper.SetDefault("workspace.switch_to_tab_on_move", defaults.Workspace.SwitchToTabOnMove)

M internal/ui/app.go +8 -8


@@ -1100,7 +1100,7 @@ func (a App) initBrowserWindowInput(ctx context.Context, bw browserWindow) {
1100	1100		a.activateBrowserWindow(bw)
1101	1101		a.handleModeChange(ctx, bw, from, to)
1102	1102		})
1103		-	a.bindPageModeSequenceToaster(ctx, bw)
	1103	+	a.bindVimModeSequenceToaster(ctx, bw)
1104	1104		bw.keyboardHandler.SetRouteKey(func(kc input.KeyContext) input.KeyRoute {
1105	1105		if bw.sessionManager != nil && bw.sessionManager.IsVisible() {
1106	1106		return input.RoutePassToWidget

@@ -4055,9 +4055,9 @@ func (a App) updateModeIndicatorToaster(ctx context.Context, bw browserWindow,
4055	4055		)
4056	4056		}
4057	4057
4058		-	// bindPageModeSequenceToaster wires pending Vim-sequence text onto this
	4058	+	// bindVimModeSequenceToaster wires pending Vim-sequence text onto this
4059	4059		// window's modeToaster only (never appToaster / pane toasters).
4060		-	func (a App) bindPageModeSequenceToaster(ctx context.Context, bw browserWindow) {
	4060	+	func (a App) bindVimModeSequenceToaster(ctx context.Context, bw browserWindow) {
4061	4061		if a == nil \|\| bw == nil \|\| bw.keyboardHandler == nil {
4062	4062		return
4063	4063		}

@@ -4066,7 +4066,7 @@ func (a App) bindPageModeSequenceToaster(ctx context.Context, bw browserWindow
4066	4066		})
4067	4067		logging.FromContext(ctx).Debug().
4068	4068		Str("window_id", bw.id).
4069		-	Msg("page mode pending sequence toaster bound")
	4069	+	Msg("vim mode pending sequence toaster bound")
4070	4070		}
4071	4071
4072	4072		// showPendingSequence shows "PAGE MODE · pending" on the per-window modeToaster

@@ -4080,24 +4080,24 @@ func (a App) showPendingSequence(ctx context.Context, bw browserWindow, pendin
4080	4080		log := logging.FromContext(ctx)
4081	4081		if !a.runtimeConfigSnapshot().UI.Workspace.Styling.ModeIndicatorToasterEnabled {
4082	4082		bw.modeToaster.Hide()
4083		-	log.Debug().Str("window_id", bw.id).Msg("page mode pending toaster hidden (disabled)")
	4083	+	log.Debug().Str("window_id", bw.id).Msg("vim mode pending toaster hidden (disabled)")
4084	4084		return
4085	4085		}
4086	4086
4087		-	text := input.ModePage.DisplayName()
	4087	+	text := input.ModeVim.DisplayName()
4088	4088		if pending != "" {
4089	4089		text = text + " · " + pending
4090	4090		}
4091	4091		bw.modeToaster.Show(ctx, text, component.ToastInfo,
4092	4092		component.WithDuration(0),
4093	4093		component.WithPosition(component.ToastPositionBottomLeft),
4094		-	component.WithModeClass(getModeToastClass(input.ModePage)),
	4094	+	component.WithModeClass(getModeToastClass(input.ModeVim)),
4095	4095		)
4096	4096		log.Debug().
4097	4097		Str("window_id", bw.id).
4098	4098		Str("pending", pending).
4099	4099		Str("toast_text", text).
4100		-	Msg("page mode pending toaster updated")
	4100	+	Msg("vim mode pending toaster updated")
4101	4101		}
4102	4102
4103	4103		// getModeToastClass returns the CSS class for the given mode's toast styling.


@@ -1100,7 +1100,7 @@ func (a App) initBrowserWindowInput(ctx context.Context, bw browserWindow) {
1100		a.activateBrowserWindow(bw)	1100		a.activateBrowserWindow(bw)
1101		a.handleModeChange(ctx, bw, from, to)	1101		a.handleModeChange(ctx, bw, from, to)
1102		})	1102		})
1103	-	a.bindPageModeSequenceToaster(ctx, bw)	1103	+	a.bindVimModeSequenceToaster(ctx, bw)
1104		bw.keyboardHandler.SetRouteKey(func(kc input.KeyContext) input.KeyRoute {	1104		bw.keyboardHandler.SetRouteKey(func(kc input.KeyContext) input.KeyRoute {
1105		if bw.sessionManager != nil && bw.sessionManager.IsVisible() {	1105		if bw.sessionManager != nil && bw.sessionManager.IsVisible() {
1106		return input.RoutePassToWidget	1106		return input.RoutePassToWidget

@@ -4055,9 +4055,9 @@ func (a App) updateModeIndicatorToaster(ctx context.Context, bw browserWindow,
4055		)	4055		)
4056		}	4056		}
4057			4057
4058	-	// bindPageModeSequenceToaster wires pending Vim-sequence text onto this	4058	+	// bindVimModeSequenceToaster wires pending Vim-sequence text onto this
4059		// window's modeToaster only (never appToaster / pane toasters).	4059		// window's modeToaster only (never appToaster / pane toasters).
4060	-	func (a App) bindPageModeSequenceToaster(ctx context.Context, bw browserWindow) {	4060	+	func (a App) bindVimModeSequenceToaster(ctx context.Context, bw browserWindow) {
4061		if a == nil \|\| bw == nil \|\| bw.keyboardHandler == nil {	4061		if a == nil \|\| bw == nil \|\| bw.keyboardHandler == nil {
4062		return	4062		return
4063		}	4063		}

@@ -4066,7 +4066,7 @@ func (a App) bindPageModeSequenceToaster(ctx context.Context, bw browserWindow
4066		})	4066		})
4067		logging.FromContext(ctx).Debug().	4067		logging.FromContext(ctx).Debug().
4068		Str("window_id", bw.id).	4068		Str("window_id", bw.id).
4069	-	Msg("page mode pending sequence toaster bound")	4069	+	Msg("vim mode pending sequence toaster bound")
4070		}	4070		}
4071			4071
4072		// showPendingSequence shows "PAGE MODE · pending" on the per-window modeToaster	4072		// showPendingSequence shows "PAGE MODE · pending" on the per-window modeToaster

@@ -4080,24 +4080,24 @@ func (a App) showPendingSequence(ctx context.Context, bw browserWindow, pendin
4080		log := logging.FromContext(ctx)	4080		log := logging.FromContext(ctx)
4081		if !a.runtimeConfigSnapshot().UI.Workspace.Styling.ModeIndicatorToasterEnabled {	4081		if !a.runtimeConfigSnapshot().UI.Workspace.Styling.ModeIndicatorToasterEnabled {
4082		bw.modeToaster.Hide()	4082		bw.modeToaster.Hide()
4083	-	log.Debug().Str("window_id", bw.id).Msg("page mode pending toaster hidden (disabled)")	4083	+	log.Debug().Str("window_id", bw.id).Msg("vim mode pending toaster hidden (disabled)")
4084		return	4084		return
4085		}	4085		}
4086			4086
4087	-	text := input.ModePage.DisplayName()	4087	+	text := input.ModeVim.DisplayName()
4088		if pending != "" {	4088		if pending != "" {
4089		text = text + " · " + pending	4089		text = text + " · " + pending
4090		}	4090		}
4091		bw.modeToaster.Show(ctx, text, component.ToastInfo,	4091		bw.modeToaster.Show(ctx, text, component.ToastInfo,
4092		component.WithDuration(0),	4092		component.WithDuration(0),
4093		component.WithPosition(component.ToastPositionBottomLeft),	4093		component.WithPosition(component.ToastPositionBottomLeft),
4094	-	component.WithModeClass(getModeToastClass(input.ModePage)),	4094	+	component.WithModeClass(getModeToastClass(input.ModeVim)),
4095		)	4095		)
4096		log.Debug().	4096		log.Debug().
4097		Str("window_id", bw.id).	4097		Str("window_id", bw.id).
4098		Str("pending", pending).	4098		Str("pending", pending).
4099		Str("toast_text", text).	4099		Str("toast_text", text).
4100	-	Msg("page mode pending toaster updated")	4100	+	Msg("vim mode pending toaster updated")
4101		}	4101		}
4102			4102
4103		// getModeToastClass returns the CSS class for the given mode's toast styling.	4103		// getModeToastClass returns the CSS class for the given mode's toast styling.