@_nazmiforreal/flutter-ota 0.1.16 → 0.1.18

package/dart-src/packages/cli-tools/.dart_tool/package_graph.json

@@ -30,7 +30,7 @@
     },
     {
       "name": "flutter_ota_kit_pocketbase",
-      "version": "0.1.0",
+      "version": "0.1.2",
       "dependencies": [
         "flutter_ota_kit_core",
         "flutter_ota_kit_plugin_core",
@@ -39,7 +39,7 @@
     },
     {
       "name": "flutter_ota_kit_aws",
-      "version": "0.1.3",
+      "version": "0.1.5",
       "dependencies": [
         "asn1lib",
         "crypto",
@@ -52,7 +52,7 @@
     },
     {
       "name": "flutter_ota_kit_cloudflare",
-      "version": "0.1.3",
+      "version": "0.1.5",
       "dependencies": [
         "crypto",
         "flutter_ota_kit_core",
@@ -63,7 +63,7 @@
     },
     {
       "name": "flutter_ota_kit_postgres",
-      "version": "0.1.3",
+      "version": "0.1.5",
       "dependencies": [
         "flutter_ota_kit_core",
         "flutter_ota_kit_plugin_core",
@@ -72,7 +72,7 @@
     },
     {
       "name": "flutter_ota_kit_supabase",
-      "version": "0.1.4",
+      "version": "0.1.6",
       "dependencies": [
         "flutter_ota_kit_core",
         "flutter_ota_kit_plugin_core",
@@ -82,7 +82,7 @@
     },
     {
       "name": "flutter_ota_kit_plugin_core",
-      "version": "0.0.4",
+      "version": "0.0.6",
       "dependencies": [
         "flutter_ota_kit_core",
         "mime"
@@ -90,7 +90,7 @@
     },
     {
       "name": "flutter_ota_kit_core",
-      "version": "0.1.2",
+      "version": "0.1.4",
       "dependencies": []
     },
     {

package/dart-src/packages/cli-tools/lib/flutter_ota_kit_cli.dart

@@ -81,9 +81,209 @@ Future<int> run(List<String> args) async {
     final result = await runner.run(args);
     return result ?? 0;
   } on UsageException catch (e) {
+    final msg = e.message;
+
+    // Missing subcommand → show the command's own help + suggestions.
+    if (msg.startsWith('Missing subcommand')) {
+      final match = RegExp(r'"flutter-ota (\w+)"').firstMatch(msg);
+      if (match != null) {
+        final cmd = runner.commands[match.group(1)];
+        if (cmd != null) {
+          _printMissingSubcommand(cmd);
+          return 0;
+        }
+      }
+    }
+
+    // No command given → show top-level help.
+    if (msg.contains('No command specified')) {
+      runner.printUsage();
+      return 0;
+    }
+
+    // Unknown command → fuzzy-match and suggest.
+    final unknownMatch =
+        RegExp(r'Could not find a command named "?(\w+)"?').firstMatch(msg);
+    if (unknownMatch != null) {
+      final typed = unknownMatch.group(1)!;
+      _printUnknownCommand(runner, typed);
+      return 64;
+    }
+
+    // Unknown subcommand → suggest closest subcommand.
+    final subMatch = RegExp(
+      r'Could not find a subcommand named "?(\w+)"? for "?flutter-ota (\w+)"?',
+    ).firstMatch(msg);
+    if (subMatch != null) {
+      final subTyped = subMatch.group(1)!;
+      final parentName = subMatch.group(2)!;
+      final parentCmd = runner.commands[parentName];
+      if (parentCmd != null) {
+        _printUnknownSubcommand(parentCmd, subTyped);
+        return 64;
+      }
+    }
+
+    // Fallback — show the raw error + usage.
     stderr.writeln(e.message);
     stderr.writeln('');
     stderr.writeln(e.usage);
     return 64;
   }
 }
+
+/// Show a helpful "unknown command" message with fuzzy-match suggestions.
+void _printUnknownCommand(FlutterPatcherRunner runner, String typed) {
+  final commands = runner.commands.keys.toList();
+
+  // Exact prefix match (e.g. "bund" → "bundle").
+  final prefixMatches = commands.where((c) => c.startsWith(typed)).toList();
+
+  // Levenshtein-based fuzzy match for short typos.
+  final fuzzyMatches = <String>[];
+  for (final c in commands) {
+    if (prefixMatches.contains(c)) continue;
+    if (_levenshtein(typed, c) <= 2) {
+      fuzzyMatches.add(c);
+    }
+  }
+
+  // Subcommand matching (e.g. "bundle lis" → suggest "list").
+  final subMatch = RegExp(r'^(\w+)\s+(\w+)$').firstMatch(typed);
+  String? parentCmd;
+  String? subTyped;
+  if (subMatch != null) {
+    parentCmd = subMatch.group(1);
+    subTyped = subMatch.group(2);
+  }
+  // Also try if typed is just the first part.
+  if (parentCmd != null && !commands.contains(parentCmd)) {
+    // Check if parentCmd is a fuzzy match for a real command.
+    final parentFuzzy = commands.where((c) {
+      if (c == parentCmd) return true;
+      return _levenshtein(parentCmd!, c) <= 2;
+    }).toList();
+    if (parentFuzzy.isNotEmpty) {
+      parentCmd = parentFuzzy.first;
+    }
+  }
+
+  stderr.writeln('');
+  stderr.writeln('  ${_red('✗')} Unknown command: ${_red(typed)}');
+  stderr.writeln('');
+
+  if (prefixMatches.isNotEmpty || fuzzyMatches.isNotEmpty) {
+    final suggestions = [...prefixMatches, ...fuzzyMatches];
+    stderr.writeln('  ${_cyan('Did you mean?')}');
+    for (final s in suggestions.take(3)) {
+      stderr.writeln('    ${_green(s)}');
+    }
+    stderr.writeln('');
+
+    // If it looks like "parent sub" but the sub is wrong, show sub help.
+    if (parentCmd != null && subTyped != null) {
+      final cmd = runner.commands[parentCmd];
+      if (cmd != null && cmd.subcommands.isNotEmpty) {
+        // Find closest subcommand.
+        final subNames = cmd.subcommands.keys.toList();
+        final subSuggestion = subNames
+            .where((s) => s.startsWith(subTyped!) || _levenshtein(subTyped!, s) <= 2)
+            .toList();
+        if (subSuggestion.isNotEmpty) {
+          stderr.writeln('  ${_cyan('Did you mean?')} $parentCmd ${_green(subSuggestion.first)}');
+          stderr.writeln('');
+        }
+        cmd.printUsage();
+        return;
+      }
+    }
+
+    // Show top-level help.
+    runner.printUsage();
+    return;
+  }
+
+  // No close matches — show all available commands.
+  runner.printUsage();
+}
+
+/// Show a helpful "unknown subcommand" message with suggestions.
+void _printUnknownSubcommand(Command<int> parent, String typed) {
+  final subNames = parent.subcommands.keys.toList();
+
+  // Find closest subcommands.
+  final suggestions = subNames
+      .where((s) => s.startsWith(typed) || _levenshtein(typed, s) <= 2)
+      .toList();
+
+  stderr.writeln('');
+  stderr.writeln(
+    '  ${_red('✗')} Unknown subcommand: ${_red(typed)} for ${_cyan('flutter-ota ${parent.name}')}',
+  );
+  stderr.writeln('');
+
+  if (suggestions.isNotEmpty) {
+    stderr.writeln('  ${_cyan('Did you mean?')}');
+    for (final s in suggestions.take(3)) {
+      stderr.writeln('    ${_green(s)}');
+    }
+    stderr.writeln('');
+  }
+
+  parent.printUsage();
+}
+
+/// Show a helpful "missing subcommand" message with all subcommand suggestions.
+void _printMissingSubcommand(Command<int> parent) {
+  final subNames = parent.subcommands.keys.toList()..sort();
+
+  stderr.writeln('');
+  stderr.writeln(
+    '  ${_red('✗')} Missing subcommand for ${_cyan('flutter-ota ${parent.name}')}',
+  );
+  stderr.writeln('');
+
+  if (subNames.isNotEmpty) {
+    stderr.writeln('  ${_cyan('Did you mean?')}');
+    for (final s in subNames) {
+      stderr.writeln('    ${_green('${parent.name} $s')}');
+    }
+    stderr.writeln('');
+  }
+
+  parent.printUsage();
+}
+
+// ── Minimal Levenshtein distance ──────────────────────────────────────────────
+
+int _levenshtein(String a, String b) {
+  if (a.isEmpty) return b.length;
+  if (b.isEmpty) return a.length;
+  final dp = List.generate(a.length + 1, (i) => List.filled(b.length + 1, 0));
+  for (var i = 0; i <= a.length; i++) dp[i][0] = i;
+  for (var j = 0; j <= b.length; j++) dp[0][j] = j;
+  for (var i = 1; i <= a.length; i++) {
+    for (var j = 1; j <= b.length; j++) {
+      final cost = a[i - 1] == b[j - 1] ? 0 : 1;
+      dp[i][j] = [
+        dp[i - 1][j] + 1,
+        dp[i][j - 1] + 1,
+        dp[i - 1][j - 1] + cost,
+      ].reduce((a, b) => a < b ? a : b);
+    }
+  }
+  return dp[a.length][b.length];
+}
+
+// ── Minimal inline color helpers (stderr-safe, TTY-aware) ────────────────────
+
+bool get _noColor {
+  final v = Platform.environment['NO_COLOR'];
+  return v != null && v.isNotEmpty;
+}
+
+bool get _colorOn => !_noColor && stderr.hasTerminal && stderr.supportsAnsiEscapes;
+
+String _red(String s) => _colorOn ? '\x1b[31m$s\x1b[0m' : s;
+String _green(String s) => _colorOn ? '\x1b[32m$s\x1b[0m' : s;
+String _cyan(String s) => _colorOn ? '\x1b[36m$s\x1b[0m' : s;

package/dart-src/packages/cli-tools/lib/src/commands/bundle.dart

@@ -59,27 +59,6 @@ class BundleCommand extends FlutterPatcherCommand {
   @override
   String get description =>
       'Manage bundles (list / show / delete / disable / enable / force / promote).';
-
-  @override
-  Future<int> run() => runGuarded(() async {
-    print(description);
-    print('');
-    print('Subcommands:');
-    print(
-      '  list                 List bundles (filters: --channel/-c, --platform/-p, --enabled, --limit/-l)',
-    );
-    print('  show --id <id>        Show a single bundle\'s details');
-    print('  delete --id <id>      Delete a bundle');
-    print('  disable --id <id>     Disable a bundle (stop serving it)');
-    print('  enable --id <id>      Enable a bundle');
-    print(
-      '  force --id <id>       Force an update onto clients (--off to clear)',
-    );
-    print('  promote --id <id> -c  Promote a bundle to a channel');
-    print(
-      '  update --id <id> ...  Edit metadata (--message/--target-version/--enabled/--force)',
-    );
-  });
 }
 
 class BundleListCommand extends FlutterPatcherCommand {
@@ -225,19 +204,10 @@ class BundleDeleteCommand extends FlutterPatcherCommand {
     }
     final keepStorage = argResults!['keep-storage'] as bool;
     final steps = Steps('delete');
-    await spinner(
-      () => deleteBundle(backend, id),
-      'Deleting bundle $id',
-      done: 'Deleted',
-    );
-    steps.success('Deleted bundle $id');
+    await steps.run('Deleting bundle $id', () => deleteBundle(backend, id));
     if (!keepStorage && existing.storageUri.isNotEmpty) {
-      await spinner(
-        () => backend.storage.delete(existing.storageUri),
-        'Removing storage object',
-        done: 'Storage removed',
-      );
-      steps.success('Removed storage object');
+      await steps.run('Removing storage object',
+          () => backend.storage.delete(existing.storageUri));
     }
     steps.summary();
   });
@@ -265,14 +235,12 @@ class BundleDisableCommand extends FlutterPatcherCommand {
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
     final backend = requireBackend(cfg, override: backendOverride);
     banner('bundle · disable');
-    await spinner(
-      () async {
-        await backend.db.updateBundle(id!, {'enabled': false});
-        await backend.db.commitBundle();
-      },
-      'Disabling bundle $id',
-      done: 'Disabled',
-    );
+    final steps = Steps('disable');
+    await steps.run('Disabling bundle $id', () async {
+      await backend.db.updateBundle(id!, {'enabled': false});
+      await backend.db.commitBundle();
+    });
+    steps.summary();
   });
 }
 
@@ -298,14 +266,12 @@ class BundleEnableCommand extends FlutterPatcherCommand {
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
     final backend = requireBackend(cfg, override: backendOverride);
     banner('bundle · enable');
-    await spinner(
-      () async {
-        await backend.db.updateBundle(id!, {'enabled': true});
-        await backend.db.commitBundle();
-      },
-      'Enabling bundle $id',
-      done: 'Enabled',
-    );
+    final steps = Steps('enable');
+    await steps.run('Enabling bundle $id', () async {
+      await backend.db.updateBundle(id!, {'enabled': true});
+      await backend.db.commitBundle();
+    });
+    steps.summary();
   });
 }
 
@@ -336,7 +302,9 @@ class BundleForceCommand extends FlutterPatcherCommand {
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
     final backend = requireBackend(cfg, override: backendOverride);
     banner('bundle · force');
-    await spinner(
+    final steps = Steps('force');
+    await steps.run(
+      off ? 'Clearing force flag on $id' : 'Forcing update for $id',
       () async {
         await backend.db.updateBundle(id!, {
           'shouldForceUpdate': !off,
@@ -344,9 +312,8 @@ class BundleForceCommand extends FlutterPatcherCommand {
         });
         await backend.db.commitBundle();
       },
-      off ? 'Clearing force flag on $id' : 'Forcing update for $id',
-      done: off ? 'Cleared' : 'Forced',
     );
+    steps.summary();
   });
 }
 
@@ -380,11 +347,10 @@ class BundlePromoteCommand extends FlutterPatcherCommand {
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
     final backend = requireBackend(cfg, override: backendOverride);
     banner('bundle · promote');
-    await spinner(
-      () => promoteBundle(backend, id!, channel),
-      'Promoting $id to $channel',
-      done: 'Promoted',
-    );
+    final steps = Steps('promote');
+    await steps.run('Promoting $id to $channel',
+        () => promoteBundle(backend, id!, channel));
+    steps.summary();
     box('promote', [kv('bundle', cyan(id!)), kv('channel', channel)]);
   });
 }
@@ -432,15 +398,13 @@ class BundleUpdateCommand extends FlutterPatcherCommand {
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
     final backend = requireBackend(cfg, override: backendOverride);
     banner('bundle · update');
-    await spinner(
-      () async {
-        await backend.db.updateBundle(id!, patch);
-        await backend.db.commitBundle();
-      },
-      'Updating $id',
-      done: 'Updated',
-    );
+    final steps = Steps('update');
+    await steps.run('Updating $id', () async {
+      await backend.db.updateBundle(id!, patch);
+      await backend.db.commitBundle();
+    });
     final b = await backend.db.getBundleById(id!);
+    steps.summary();
     if (b != null) {
       box('bundle', [
         kv('id', cyan(b.id)),

package/dart-src/packages/cli-tools/lib/src/commands/channel.dart

@@ -24,16 +24,6 @@ class ChannelCommand extends FlutterPatcherCommand {
 
   @override
   String get description => 'Manage channels (list / get / set).';
-
-  @override
-  Future<int> run() => runGuarded(() async {
-    print(description);
-    print('');
-    print('Subcommands:');
-    print('  list              List channels');
-    print('  get <channel>     Show the live bundle for a channel');
-    print('  set <c> <id>      Promote a bundle to a channel');
-  });
 }
 
 class ChannelListCommand extends FlutterPatcherCommand {
@@ -140,11 +130,10 @@ class ChannelSetCommand extends FlutterPatcherCommand {
     }
     final backend = requireBackend(cfg, override: backendOverride);
     banner('channel · set');
-    await spinner(
-      () => promoteBundle(backend, bundleId, channel),
-      'Promoting $bundleId to $channel',
-      done: 'Channel set',
-    );
+    final steps = Steps('set');
+    await steps.run('Promoting $bundleId to $channel',
+        () => promoteBundle(backend, bundleId, channel));
+    steps.summary();
     box('channel set', [kv('channel', channel), kv('bundle', cyan(bundleId))]);
   });
 }

package/dart-src/packages/cli-tools/lib/src/commands/config_command.dart

@@ -18,17 +18,6 @@ class ConfigCommand extends FlutterPatcherCommand {
 
   @override
   String get description => 'Get, set, or list configuration values.';
-
-  @override
-  Future<int> run() => runGuarded(() async {
-    // No subcommand selected.
-    print(description);
-    print('');
-    print('Subcommands:');
-    print('  get <key>');
-    print('  set <key> <value>');
-    print('  list');
-  });
 }
 
 Map<String, dynamic> _loadProjectJson() {
@@ -59,6 +48,7 @@ class ConfigGetCommand extends FlutterPatcherCommand {
 
   @override
   Future<int> run() => runGuarded(() async {
+    ui.banner('config · get');
     final key = argResults!['key'] as String? ??
         (argResults!.rest.isNotEmpty ? argResults!.rest.first : null);
     if (key == null || key.isEmpty) {
@@ -66,7 +56,7 @@ class ConfigGetCommand extends FlutterPatcherCommand {
     }
     final value = readPath(_loadProjectJson(), key);
     if (value == null) {
-      stderr.writeln('(not set)');
+      ui.warn('(not set)');
       return;
     }
     stdout.writeln(

package/dart-src/packages/cli-tools/lib/src/commands/console.dart

@@ -39,6 +39,7 @@ class ConsoleCommand extends FlutterPatcherCommand {
       return;
     }
     if (argResults!['open'] as bool) {
+      banner('console · open');
       step('Launching console...');
       final process = await Process.start(
         'flutter',
@@ -47,7 +48,8 @@ class ConsoleCommand extends FlutterPatcherCommand {
         runInShell: true,
         mode: ProcessStartMode.inheritStdio,
       );
-      exitCode = await process.exitCode;
+      final code = await process.exitCode;
+      if (code != 0) err('flutter run exited with code $code');
       return;
     }
     banner('console');

package/dart-src/packages/cli-tools/lib/src/commands/deploy.dart

@@ -1,5 +1,7 @@
 import 'dart:io';
 
+import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
+
 import '../backend.dart';
 import '../cli_base.dart';
 import '../config.dart';
@@ -73,31 +75,13 @@ class DeployCommand extends FlutterPatcherCommand {
     final bundleId = argResults!['bundle-id'] as String?;
 
     banner('deploy');
-    stdout.writeln(
-      '  ${gray('channel')}  ${cyan(channel)}   '
-      '${gray('platform')}  ${cyan(platform)}   '
-      '${gray('source')}  ${dim(source)}',
-    );
+    info('channel ${cyan(channel)}  platform ${cyan(platform)}  source ${dim(source)}');
 
-    final bundle = await spinner(
-      () => deployBundle(
-        backend,
-        DeployOptions(
-          source: source,
-          channel: channel,
-          platform: platform,
-          message: message,
-          force: force,
-          targetAppVersion: targetAppVersion,
-          fingerprintHash: fingerprintHash,
-          signingKeyBase64: signingKey,
-          gitCommitHash: resolvedGitCommitHash,
-          bundleId: bundleId,
-        ),
-      ),
-      'Uploading & registering bundle',
-      done: 'Bundle deployed',
-    );
+    final steps = Steps('deploy');
+    final bundle = await _deployWithPhases(steps, backend, source, channel,
+        platform, message, force, targetAppVersion, fingerprintHash,
+        signingKey, resolvedGitCommitHash, bundleId);
+    steps.summary();
 
     final lines = <String>[
       kv('bundle id', cyan(bundle.id)),
@@ -122,3 +106,57 @@ class DeployCommand extends FlutterPatcherCommand {
     box('deployed', lines);
   });
 }
+
+/// Deploy with per-phase UI. Each phase reported by `DeployOptions.onPhase`
+/// is shown as an active spinner line that gets replaced in-place.
+Future<Bundle> _deployWithPhases(
+  Steps steps,
+  Backend backend,
+  String source,
+  String channel,
+  String platform,
+  String? message,
+  bool force,
+  String? targetAppVersion,
+  String? fingerprintHash,
+  String? signingKey,
+  String? resolvedGitCommitHash,
+  String? bundleId,
+) async {
+  String? activeLabel;
+  try {
+    final bundle = await deployBundle(
+      backend,
+      DeployOptions(
+        source: source,
+        channel: channel,
+        platform: platform,
+        message: message,
+        force: force,
+        targetAppVersion: targetAppVersion,
+        fingerprintHash: fingerprintHash,
+        signingKeyBase64: signingKey,
+        gitCommitHash: resolvedGitCommitHash,
+        bundleId: bundleId,
+        onPhase: (phase) {
+          if (activeLabel != null) {
+            steps.completeActive();
+          }
+          activeLabel = phase;
+          steps.startActive(phase);
+        },
+      ),
+    );
+    if (activeLabel != null) {
+      steps.completeActive();
+      activeLabel = null;
+    }
+    return bundle;
+  } catch (e) {
+    if (activeLabel != null) {
+      steps.completeActive(success: false);
+      activeLabel = null;
+    }
+    rethrow;
+  }
+}

package/dart-src/packages/cli-tools/lib/src/commands/fingerprint.dart

@@ -1,7 +1,5 @@
-import 'dart:io';
-
-
 import '../cli_base.dart';
+import '../ui/ui.dart';
 import '../util.dart';
 
 /// `flutter_ota_kit fingerprint` — compute a build-time fingerprint hash.
@@ -24,8 +22,9 @@ class FingerprintCommand extends FlutterPatcherCommand {
 
   @override
   Future<int> run() => runGuarded(() async {
+    banner(name);
     final source = argResults!['source'] as String;
     final hash = generateFingerprint(source);
-    stdout.writeln(hash);
+    box('fingerprint', [kv('source', source), kv('hash', hash)]);
   });
 }