feat: improve console controls and navigation

Author: joanroig

lib/controllers/connection_controller.dart

@@ -6,6 +6,7 @@ import 'package:admincraft/models/model.dart';
 import 'package:admincraft/services/connection_failure.dart';
 import 'package:admincraft/services/connection_platform_capabilities.dart';
 import 'package:admincraft/services/connection_service.dart';
+import 'package:admincraft/services/console_output_formatter.dart';
 import 'package:admincraft/services/retry_policy.dart';
 import 'package:admincraft/utils/toast_utils.dart';
 import 'package:flutter/material.dart';
@@ -314,6 +315,10 @@ class ConnectionController with ChangeNotifier, WidgetsBindingObserver {
     String command, {
     String source = 'terminal',
   }) async {
+    // User commands carry a private marker while stored in the transcript.
+    // Never allow that presentation metadata to cross the command boundary,
+    // even if a saved transcript row or pasted value reaches this method.
+    command = ConsoleOutputFormatter.stripUserCommandMarker(command);
     final bridgeDiagnostic = command.toLowerCase().startsWith('admincraft ');
     if (!bridgeDiagnostic &&
         !model.connectionSecurity.isDirectRcon &&
@@ -330,7 +335,7 @@ class ConnectionController with ChangeNotifier, WidgetsBindingObserver {
     }
     await model.addUserCommand(command);
     await model.recordCommandUsage(command);
-    model.appendOutputCommand(command);
+    model.appendOutputCommand(command, isUserCommand: true);
     final sent = connectionService.executeCommand(command);
     await model.recordCommandAudit(
       command,

lib/data/minecraft_commands.dart

@@ -26,17 +26,9 @@ class MinecraftCommands {
               .toList();
     return BedrockCommand(
       'admincraft',
-      'Inspect and manage the Admincraft bridge and Minecraft server',
+      'Inspect and manage the bridge; logs accepts an optional line count',
       'Server',
-      args: [
-        CommandArg('action', ArgType.literal, options: actions),
-        const CommandArg(
-          'count',
-          ArgType.number,
-          required: false,
-          options: ['50', '100', '250', '500', '1000'],
-        ),
-      ],
+      args: [CommandArg('action', ArgType.literal, options: actions)],
     );
   }
 

lib/models/model.dart

@@ -7,6 +7,7 @@ import 'package:admincraft/models/minecraft_edition.dart';
 import 'package:admincraft/models/server_profile.dart';
 import 'package:admincraft/models/world_state.dart';
 import 'package:admincraft/services/console_parser.dart';
+import 'package:admincraft/services/console_output_formatter.dart';
 import 'package:admincraft/services/android_widget_service.dart';
 import 'package:admincraft/services/persistence_service.dart';
 import 'package:flutter/material.dart';
@@ -16,6 +17,8 @@ class Model with ChangeNotifier {
   String _output = '';
   final Set<String> _seenConsoleEventIds = {};
   bool _consoleHistoryLoading = false;
+  int _gameruleRefreshDepth = 0;
+  bool _gameruleRefreshDirty = false;
   List<CommandAuditEntry> _commandAudit = [];
   final Set<String> _bridgeCapabilities = {};
   int? _bridgeProtocol;
@@ -130,13 +133,15 @@ class Model with ChangeNotifier {
     int? playersOnline,
     int? playerLimit,
     Iterable<String>? onlinePlayers,
+    String? difficulty,
   }) {
     _serverRuntimeState = state;
     _lastServerStateAt = observedAt ?? DateTime.now();
     _world = _world.copyWith(
       daytime: daytime,
       playersOnline: playersOnline,
       playerLimit: playerLimit,
+      lastDifficulty: difficulty,
     );
     if (onlinePlayers != null) {
       _onlinePlayers
@@ -166,9 +171,40 @@ class Model with ChangeNotifier {
   void completeConsoleHistoryLoad() {
     if (!_consoleHistoryLoading) return;
     _consoleHistoryLoading = false;
+    _gameruleRefreshDirty = false;
     notifyListeners();
   }
 
+  /// Keeps automatic gamerule discovery out of the user-facing console and
+  /// coalesces its many state updates into one rebuild at the end.
+  void beginGameruleRefresh() {
+    _gameruleRefreshDepth++;
+    if (_gameruleRefreshDepth != 1) return;
+
+    final lines = _output.split('\n');
+    final cleaned = lines
+        .where(
+          (line) =>
+              !ConsoleParser.isGameruleReply(line, edition: minecraftEdition),
+        )
+        .join('\n');
+    if (cleaned == _output) return;
+    _output = cleaned;
+    _gameruleRefreshDirty = true;
+    unawaited(
+      _persistenceService.saveConsoleOutput(_selectedServerId, _output),
+    );
+  }
+
+  void completeGameruleRefresh() {
+    if (_gameruleRefreshDepth == 0) return;
+    _gameruleRefreshDepth--;
+    if (_gameruleRefreshDepth == 0 && _gameruleRefreshDirty) {
+      _gameruleRefreshDirty = false;
+      if (!_consoleHistoryLoading) notifyListeners();
+    }
+  }
+
   List<ServerProfile> get servers => List.unmodifiable(_servers);
   DateTime? get serversUpdatedAt => _persistenceService.serversUpdatedAt;
   int get serverRevision => _serverRevision;
@@ -207,6 +243,7 @@ class Model with ChangeNotifier {
   String get consoleTimestampMode => _persistenceService.consoleTimestampMode;
   String get consoleFilterPattern => _persistenceService.consoleFilterPattern;
   bool get hideCommonConsoleNoise => _persistenceService.hideCommonConsoleNoise;
+  String get workspaceDestination => _persistenceService.workspaceDestination;
 
   // Provide read-only access to collections
   Set<String> get userCommands =>
@@ -271,14 +308,25 @@ class Model with ChangeNotifier {
     return created;
   }
 
-  /// Removes a server. The last one is kept: with none left there would be
-  /// nothing for the connection getters to read.
+  /// Removes a server. The model keeps an internal blank profile when the last
+  /// real server is removed so connection getters remain safe while the UI
+  /// returns to onboarding.
   Future<void> deleteServer(String id) async {
-    if (_servers.length <= 1) return;
-    _servers = _servers.where((server) => server.id != id).toList();
+    if (!_servers.any((server) => server.id == id)) return;
     await _persistenceService.forgetServerSecrets(id);
     await _persistenceService.forgetConsoleOutput(id);
-    if (_selectedServerId == id) {
+
+    if (_servers.length == 1) {
+      final blank = ServerProfile.empty(_newId());
+      _servers = [blank];
+      _selectedServerId = blank.id;
+      _resetSession();
+      await _persistenceService.saveSelectedServerId(_selectedServerId);
+      await _persistenceService.resetOnboarding();
+    } else {
+      _servers = _servers.where((server) => server.id != id).toList();
+    }
+    if (!_servers.any((server) => server.id == _selectedServerId)) {
       _selectedServerId = _servers.first.id;
       _resetSession();
       await _persistenceService.saveSelectedServerId(_selectedServerId);
@@ -453,6 +501,13 @@ class Model with ChangeNotifier {
     notifyListeners();
   }
 
+  /// Applies a time selected in Controls immediately. The server's later
+  /// state event remains authoritative and will correct this if necessary.
+  void recordDaytime(int daytime) {
+    _world = _world.copyWith(daytime: daytime % 24000);
+    notifyListeners();
+  }
+
   /// Resets live state when the selected server changes. Each profile keeps
   /// its own transcript, so locally echoed commands do not disappear between
   /// app launches or server switches.
@@ -560,6 +615,7 @@ class Model with ChangeNotifier {
     String command, {
     bool visible = true,
     String? eventId,
+    bool isUserCommand = false,
   }) {
     if (eventId != null && !_seenConsoleEventIds.add(eventId)) return;
     while (_seenConsoleEventIds.length > 2000) {
@@ -573,8 +629,15 @@ class Model with ChangeNotifier {
         _world.playerLimit != previousLimit) {
       unawaited(AndroidWidgetService.update(selectedServer, _world));
     }
-    if (visible) {
-      _output += "$command\n";
+    final showInConsole =
+        visible &&
+        !(_gameruleRefreshDepth > 0 &&
+            ConsoleParser.isGameruleReply(command, edition: minecraftEdition));
+    if (showInConsole) {
+      final stored = isUserCommand
+          ? ConsoleOutputFormatter.markUserCommand(command)
+          : command;
+      _output += "$stored\n";
       final lines = _output.split('\n');
       if (lines.length > _persistenceService.maxOutLines) {
         _output = lines
@@ -593,7 +656,15 @@ class Model with ChangeNotifier {
         ),
       );
     }
-    notifyListeners();
+    // Protocol-v2 history can contain hundreds of lines. Rebuilding the
+    // terminal for every one paints it repeatedly at intermediate heights and
+    // produces the visible top-to-bottom bounce. The completion event emits
+    // one notification after the bounded snapshot has arrived.
+    if (_consoleHistoryLoading || _gameruleRefreshDepth > 0) {
+      _gameruleRefreshDirty = true;
+    } else {
+      notifyListeners();
+    }
   }
 
   Future<void> addCommandToHistory(String command) async {
@@ -656,6 +727,9 @@ class Model with ChangeNotifier {
     );
   }
 
+  Future<void> setWorkspaceDestination(String value) =>
+      _persistenceService.saveWorkspaceDestination(value);
+
   Future<void> addFavoriteCommand(String command) async {
     final normalized = command.trim();
     if (normalized.isEmpty || favoriteCommands.contains(normalized)) return;
@@ -674,4 +748,19 @@ class Model with ChangeNotifier {
       ),
     );
   }
+
+  Future<void> updateFavoriteCommand(String previous, String command) async {
+    final normalized = command.trim();
+    if (normalized.isEmpty) return;
+    final favorites = favoriteCommands.toList();
+    final index = favorites.indexOf(previous);
+    if (index < 0) return;
+    if (favorites.any((value) => value == normalized && value != previous)) {
+      return;
+    }
+    favorites[index] = normalized;
+    await _updatePersistenceService(
+      () => _persistenceService.saveFavoriteCommands(favorites),
+    );
+  }
 }

lib/services/browser_unload_guard.dart

@@ -0,0 +1,2 @@
+export 'browser_unload_guard_stub.dart'
+    if (dart.library.js_interop) 'browser_unload_guard_web.dart';

lib/services/browser_unload_guard_stub.dart

@@ -0,0 +1 @@
+void setBrowserUnloadGuard(bool enabled) {}

lib/services/browser_unload_guard_web.dart

@@ -0,0 +1,25 @@
+import 'dart:js_interop';
+
+import 'package:web/web.dart' as web;
+
+web.EventListener? _beforeUnloadListener;
+
+/// Uses the browser's own leave-page confirmation because a Flutter dialog
+/// cannot run after a tab reload or close has already started.
+void setBrowserUnloadGuard(bool enabled) {
+  if (enabled && _beforeUnloadListener == null) {
+    void warnBeforeUnload(web.Event event) {
+      event.preventDefault();
+      (event as web.BeforeUnloadEvent).returnValue = '';
+    }
+
+    _beforeUnloadListener = warnBeforeUnload.toJS;
+    web.window.addEventListener('beforeunload', _beforeUnloadListener);
+    return;
+  }
+
+  if (!enabled && _beforeUnloadListener != null) {
+    web.window.removeEventListener('beforeunload', _beforeUnloadListener);
+    _beforeUnloadListener = null;
+  }
+}

lib/services/connection_service.dart

@@ -238,6 +238,7 @@ class ConnectionService {
                         (player) => player.toString(),
                       )
                     : null,
+                difficulty: decoded['difficulty']?.toString(),
               );
             }
             return;

lib/services/console_output_formatter.dart

@@ -3,6 +3,18 @@ import 'package:admincraft/services/console_parser.dart';
 /// Applies the user's console presentation settings consistently everywhere
 /// server output is shown.
 class ConsoleOutputFormatter {
+  /// Stored before locally echoed commands so identical text returned by the
+  /// server is not mistaken for something the user typed. A private-use
+  /// character survives persistence but is removed before anything renders.
+  static const String userCommandMarker = '\uE000';
+
+  static String markUserCommand(String line) => '$userCommandMarker$line';
+
+  static bool isUserCommand(String line) => line.startsWith(userCommandMarker);
+
+  static String stripUserCommandMarker(String line) =>
+      isUserCommand(line) ? line.substring(userCommandMarker.length) : line;
+
   /// Removes terminal decoration emitted by container supervisors and shell
   /// wrappers before text reaches Flutter. Minecraft's output is plain text,
   /// so rendering raw ANSI escape bytes only exposes fragments such as
@@ -28,9 +40,10 @@ class ConsoleOutputFormatter {
 
   static bool isCommonNoise(String line) {
     final message = ConsoleParser.stripPrefix(
-      sanitize(line),
+      stripUserCommandMarker(sanitize(line)),
     ).trim().toLowerCase();
     return commonNoiseFragments.any(message.contains) ||
+        ConsoleParser.isGameruleReply(message) ||
         RegExp(r'^daytime is \d+$').hasMatch(message) ||
         RegExp(r'^the time is \d+$').hasMatch(message) ||
         RegExp(
@@ -52,7 +65,7 @@ class ConsoleOutputFormatter {
   }
 
   static String formatLine(String line, String timestampMode) {
-    line = sanitize(line);
+    line = stripUserCommandMarker(sanitize(line));
     if (timestampMode == 'hidden') return ConsoleParser.stripPrefix(line);
     if (timestampMode != 'short') return line;
 

lib/services/console_parser.dart

@@ -54,6 +54,15 @@ class ConsoleParser {
     return line;
   }
 
+  static bool isGameruleReply(
+    String line, {
+    MinecraftEdition edition = MinecraftEdition.bedrock,
+  }) {
+    final normalized = stripPrefix(line).trim();
+    return (edition == MinecraftEdition.java ? _javaGamerule : _gamerule)
+        .hasMatch(normalized);
+  }
+
   /// Applies everything [chunk] says about the world to [state].
   static WorldState apply(
     WorldState state,

lib/services/persistence_service.dart

@@ -34,6 +34,7 @@ class PersistenceService {
   static const _consoleTimestampModeKey = 'consoleTimestampMode';
   static const _consoleFilterPatternKey = 'consoleFilterPattern';
   static const _hideCommonConsoleNoiseKey = 'hideCommonConsoleNoise';
+  static const _workspaceDestinationKey = 'workspaceDestination';
   static const _consoleOutputKeyPrefix = 'consoleOutput.';
   static const _consoleEventIdsKeyPrefix = 'consoleEventIds.';
   static const _commandAuditKeyPrefix = 'commandAudit.';
@@ -284,6 +285,10 @@ class PersistenceService {
     await _set(_onboardedKey, true);
   }
 
+  Future<void> resetOnboarding() async {
+    await _set(_onboardedKey, false);
+  }
+
   String? get selectedServerId => _prefs.getString(_selectedServerKey);
 
   Future<void> saveSelectedServerId(String id) async {
@@ -312,6 +317,8 @@ class PersistenceService {
       _prefs.getString(_consoleFilterPatternKey) ?? '';
   bool get hideCommonConsoleNoise =>
       _prefs.getBool(_hideCommonConsoleNoiseKey) ?? true;
+  String get workspaceDestination =>
+      _prefs.getString(_workspaceDestinationKey) ?? 'overview';
 
   Future<void> saveTerminalFont(String value) => _set(_terminalFontKey, value);
   Future<void> saveTerminalFontSize(double value) =>
@@ -324,6 +331,8 @@ class PersistenceService {
       _set(_consoleFilterPatternKey, value);
   Future<void> saveHideCommonConsoleNoise(bool value) =>
       _set(_hideCommonConsoleNoiseKey, value);
+  Future<void> saveWorkspaceDestination(String value) =>
+      _set(_workspaceDestinationKey, value);
 
   List<String> get commandHistory =>
       _prefs.getStringList(_commandHistoryKey) ?? [];