@_nazmiforreal/flutter-ota 0.1.14 → 0.1.16

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

@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:args/args.dart';
 
 import '../backend.dart';
 import '../cli_base.dart';
@@ -10,7 +9,9 @@ import '../ui/ui.dart';
 
 /// `flutter_ota_kit keys` — generate an Ed25519 keypair for bundle signing.
 class KeysCommand extends FlutterPatcherCommand {
-  KeysCommand({this.config, this.backendOverride});
+  KeysCommand({this.config, this.backendOverride}) {
+    argParser.addFlag('save', help: 'Persist the public key into the project config.');
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -22,10 +23,6 @@ class KeysCommand extends FlutterPatcherCommand {
   String get description =>
       'Generate an Ed25519 keypair used to sign deployed bundles.';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addFlag('save', help: 'Persist the public key into the project config.');
-
   @override
   Future<int> run() => runGuarded(() async {
     banner('keys');

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

@@ -1,7 +1,6 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:args/args.dart';
 import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
 import 'package:http/http.dart' as http;
 import 'package:path/path.dart' as p;
@@ -9,41 +8,38 @@ import 'package:postgres/postgres.dart';
 
 import '../ui/ui.dart';
 
-/// `flutter_ota_kit migrate` — run backend SQL migrations.
+/// `flutter-ota migrate` — run backend SQL migrations.
 class MigrateCommand extends FlutterPatcherCommand {
-  @override
-  String get name => 'migrate';
-
-  @override
-  String get description =>
-      'Run SQL migrations against the backend database (Supabase Postgres).';
-
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption(
+  MigrateCommand() {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addOption(
       'database-url',
       help: 'Postgres connection string (or DATABASE_URL env).',
-    )
-    ..addOption(
+    );
+    argParser.addOption(
       'management-key',
       help:
           'Supabase Management API key (or SUPABASE_MANAGEMENT_KEY env) — '
           'runs migrations without a separate Postgres connection.',
-    )
-    ..addOption(
+    );
+    argParser.addOption(
       'migrations-dir',
       help: 'Directory of *.sql migration files (ordered by name).',
-    )
-    ..addFlag(
+    );
+    argParser.addFlag(
       'dry-run',
       abbr: 'd',
       help: 'Print migrations instead of applying them.',
     );
+  }
+
+  @override
+  String get name => 'migrate';
+
+  @override
+  String get description =>
+      'Run SQL migrations against the backend database (Supabase Postgres).';
 
-  /// Default migrations dir lives next to the CLI entrypoint; each backend has
-  /// its own dialect's migrations (cloudflare = D1 SQLite, postgres = plain
-  /// Postgres, supabase = PostgREST, aws = no relational SQL).
   String defaultMigrationsDir(String provider) {
     final sub = switch (provider) {
       'supabase' => 'supabase',
@@ -85,9 +81,6 @@ class MigrateCommand extends FlutterPatcherCommand {
   Future<int> run() => runGuarded(() async {
     final provider = argResults!['backend'] as String? ?? 'supabase';
 
-    // Backends with no relational SQL handled out-of-band (S3 blob store).
-    // Short-circuit before any SQL discovery so a missing or empty
-    // (README-only) migrations dir does not abort.
     if (provider == 'aws') {
       final dir =
           argResults!['migrations-dir'] as String? ??
@@ -95,7 +88,7 @@ class MigrateCommand extends FlutterPatcherCommand {
       banner('migrate');
       box('migrate', [
         'Migrations for "$provider" do not run through this command:',
-        '  • aws  → S3 blob store, no relational SQL (see $dir/README.md)',
+        '  · aws  → S3 blob store, no relational SQL (see $dir/README.md)',
         '',
         'See the README under $dir for the intended setup.',
       ]);
@@ -153,9 +146,9 @@ class MigrateCommand extends FlutterPatcherCommand {
       }
       throw StateError(
         'For the supabase backend, provide either:\n'
-        '  • --management-key (or SUPABASE_MANAGEMENT_KEY, or set it via '
+        '  · --management-key (or SUPABASE_MANAGEMENT_KEY, or set it via '
         '`flutter-ota init`) — a Supabase Management API key, OR\n'
-        '  • --database-url (or DATABASE_URL, or set it via `init`) — a '
+        '  · --database-url (or DATABASE_URL, or set it via `init`) — a '
         'Postgres connection string.',
       );
     }
@@ -176,8 +169,6 @@ class MigrateCommand extends FlutterPatcherCommand {
     throw StateError('Unknown backend provider: "$provider".');
   });
 
-  /// Run migrations through the Supabase Management API (no Postgres creds
-  /// needed). Derived from the Supabase project ref in the configured URL.
   Future<void> _runViaManagementApi(String mgmtKey, List<File> files) async {
     final cfg = resolveSupabaseConfig(
       loadConfig() ??
@@ -189,7 +180,9 @@ class MigrateCommand extends FlutterPatcherCommand {
     final ref = Uri.parse(cfg.supabaseUrl).host.split('.').first;
     final endpoint = 'https://api.supabase.com/v1/projects/$ref/database/query';
     banner('migrate · supabase (management api)');
+    final steps = Steps('migrate');
     for (final file in files) {
+      final sw = Stopwatch()..start();
       final sql = file.readAsStringSync();
       final res = await http.post(
         Uri.parse(endpoint),
@@ -199,20 +192,27 @@ class MigrateCommand extends FlutterPatcherCommand {
         },
         body: jsonEncode({'query': sql}),
       );
+      sw.stop();
       if (res.statusCode >= 400) {
-        throw StateError(
-          'Migration ${p.basename(file.path)} failed '
-          '(${res.statusCode}): ${res.body}',
+        steps.fail(
+          '${p.basename(file.path)} (${res.statusCode}): ${res.body}',
         );
+      } else {
+        final ms = sw.elapsedMilliseconds;
+        final time = ms >= 1000
+            ? '${(ms / 1000).toStringAsFixed(1)}s'
+            : '${ms}ms';
+        steps.success('Applied ${p.basename(file.path)} in $time');
       }
-      step('applied ${p.basename(file.path)}');
     }
-    await _ensureSupabaseBucket();
+    await _ensureSupabaseBucket(steps);
+    steps.summary();
+    if (steps.hasErrors) {
+      throw StateError('One or more migrations failed.');
+    }
   }
 
-  /// Create the Supabase Storage bucket (public) if it doesn't exist, so
-  /// `deploy` can upload artifacts without a manual setup step.
-  Future<void> _ensureSupabaseBucket() async {
+  Future<void> _ensureSupabaseBucket(Steps steps) async {
     final storage = resolveSupabaseStorageConfig(
       loadConfig() ??
           FlutterPatcherConfig(
@@ -221,13 +221,12 @@ class MigrateCommand extends FlutterPatcherCommand {
           ),
     );
     if (storage.supabaseServiceRoleKey == null) {
-      box('migrate', [
-        'Skipped storage bucket creation — set supabase.serviceRoleKey '
-            '(or SUPABASE_SERVICE_ROLE_KEY) to auto-create the '
-            '"${storage.bucketName}" bucket.',
-      ]);
+      steps.skip(
+        'Skipped storage bucket creation — set supabase.serviceRoleKey',
+      );
       return;
     }
+    final sw = Stopwatch()..start();
     final res = await http.post(
       Uri.parse('${storage.supabaseUrl}/storage/v1/bucket'),
       headers: {
@@ -237,20 +236,22 @@ class MigrateCommand extends FlutterPatcherCommand {
       },
       body: jsonEncode({'name': storage.bucketName, 'public': true}),
     );
+    sw.stop();
     if (res.statusCode >= 400) {
       final body = jsonDecode(res.body) as Map<String, dynamic>;
       final msg = (body['message'] ?? body['error'] ?? '').toString();
       if (!msg.contains('already exists') && res.statusCode != 409) {
-        box('migrate', [
-          'Warning: could not create bucket "${storage.bucketName}": $msg',
-        ]);
+        steps.fail('Could not create bucket "${storage.bucketName}": $msg');
         return;
       }
     }
-    step('ensured storage bucket "${storage.bucketName}"');
+    final ms = sw.elapsedMilliseconds;
+    final time = ms >= 1000
+        ? '${(ms / 1000).toStringAsFixed(1)}s'
+        : '${ms}ms';
+    steps.success('Ensured storage bucket "${storage.bucketName}" in $time');
   }
 
-  /// Original path: connect directly to Postgres and execute each statement.
   Future<void> _runViaPostgres(String url, List<File> files) async {
     final uri = Uri.parse(url);
     final endpoint = Endpoint(
@@ -263,6 +264,7 @@ class MigrateCommand extends FlutterPatcherCommand {
           : null,
     );
     banner('migrate · postgres');
+    final steps = Steps('migrate');
     final conn = await Connection.open(
       endpoint,
       settings: ConnectionSettings(sslMode: SslMode.disable),
@@ -281,9 +283,10 @@ class MigrateCommand extends FlutterPatcherCommand {
           queryMode: QueryMode.simple,
         );
         if (existing.isNotEmpty) {
-          stdout.writeln('  ${dim('skip')}    $name (already applied)');
+          steps.skip('Skipped $name (already applied)');
           continue;
         }
+        final sw = Stopwatch()..start();
         for (final stmt in _splitStatements(file.readAsStringSync())) {
           await conn.execute(stmt, queryMode: QueryMode.simple);
         }
@@ -291,10 +294,16 @@ class MigrateCommand extends FlutterPatcherCommand {
           "INSERT INTO _flutter_ota_kit_migrations(name) VALUES ('$escaped')",
           queryMode: QueryMode.simple,
         );
-        step('applied $name');
+        sw.stop();
+        final ms = sw.elapsedMilliseconds;
+        final time = ms >= 1000
+            ? '${(ms / 1000).toStringAsFixed(1)}s'
+            : '${ms}ms';
+        steps.success('Applied $name in $time');
       }
     } finally {
       await conn.close();
     }
+    steps.summary();
   }
 }

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

@@ -4,7 +4,6 @@ library;
 import 'dart:async';
 import 'dart:io';
 
-import 'package:args/args.dart';
 import 'package:path/path.dart' as p;
 
 import '../cli_base.dart';
@@ -28,42 +27,34 @@ class PocketBaseCommand extends FlutterPatcherCommand {
   @override
   String get description =>
       'Manage a local PocketBase instance (install / serve / stop / status).';
-
-  @override
-  ArgParser get argParser => ArgParser();
-
-  @override
-  Future<int> run() => runGuarded(() async {
-    err('Missing subcommand. Use: install | serve | stop | status');
-    return;
-  });
 }
 
 class PocketBaseInstallCommand extends FlutterPatcherCommand {
+  PocketBaseInstallCommand() {
+    argParser.addOption('version', help: 'PocketBase version to install.');
+  }
+
   @override
   String get name => 'install';
 
   @override
   String get description => 'Download + extract the PocketBase binary.';
 
-  @override
-  ArgParser get argParser =>
-      ArgParser()..addOption('version', help: 'PocketBase version to install.');
-
   @override
   Future<int> run() => runGuarded(() async {
     final version =
         argResults!['version'] as String? ?? kDefaultPocketBaseVersion;
     final installer = PocketBaseInstaller(version: version);
     final paths = installer.paths();
-    step('Installing PocketBase v$version to ${paths.installDir.path}...');
+    banner('pocketbase · install');
+    final bar = ProgressBar(1, 'Downloading PocketBase v$version');
     final result = await installer.ensureInstalled(
       paths: paths,
       onProgress: (p) {
-        stdout.write('\r  ${(p * 100).toStringAsFixed(0)}%   ');
+        bar.update((p * 100).round());
       },
     );
-    stdout.writeln();
+    bar.close();
     if (result.alreadyInstalled) {
       step('Already installed at ${paths.binaryPath.path}');
     } else {
@@ -77,26 +68,26 @@ class PocketBaseInstallCommand extends FlutterPatcherCommand {
 }
 
 class PocketBaseServeCommand extends FlutterPatcherCommand {
+  PocketBaseServeCommand() {
+    argParser.addOption('version', help: 'PocketBase version.');
+    argParser.addOption('port', help: 'PB HTTP port.', defaultsTo: '8090');
+    argParser.addOption('host', help: 'PB bind address.', defaultsTo: '127.0.0.1');
+    argParser.addOption('data-dir', help: 'PB data directory.');
+    argParser.addOption('admin-email', help: 'Bootstrap admin email.');
+    argParser.addOption('admin-password', help: 'Bootstrap admin password.');
+    argParser.addFlag(
+      'install-hooks',
+      help: 'Copy bundled JS hooks into the data dir on start.',
+      defaultsTo: true,
+    );
+  }
+
   @override
   String get name => 'serve';
 
   @override
   String get description =>
-      'Start a local PocketBase + install the flutter_ota_kit schema.';
-
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('version', help: 'PocketBase version.')
-    ..addOption('port', help: 'PB HTTP port.', defaultsTo: '8090')
-    ..addOption('host', help: 'PB bind address.', defaultsTo: '127.0.0.1')
-    ..addOption('data-dir', help: 'PB data directory.')
-    ..addOption('admin-email', help: 'Bootstrap admin email.')
-    ..addOption('admin-password', help: 'Bootstrap admin password.')
-    ..addFlag(
-      'install-hooks',
-      help: 'Copy bundled JS hooks into the data dir on start.',
-      defaultsTo: true,
-    );
+      'Start a local PocketBase + install the flutter-ota schema.';
 
   @override
   Future<int> run() => runGuarded(() async {
@@ -146,7 +137,7 @@ class PocketBaseServeCommand extends FlutterPatcherCommand {
     step('PocketBase is running (pid ${manager.process!.pid}).');
 
     if (adminEmail != null && adminPassword != null) {
-      step('Installing flutter_ota_kit schema...');
+      step('Installing flutter-ota schema...');
       final schemaInstaller = PocketBaseSchemaInstaller(
         url: 'http://$host:$port',
         adminEmail: adminEmail,
@@ -168,7 +159,7 @@ class PocketBaseServeCommand extends FlutterPatcherCommand {
     }
 
     banner('pocketbase');
-    box('flutter_ota_kit pocketbase serve', [
+    box('flutter-ota pocketbase serve', [
       'Local PocketBase is running:',
       '',
       kv('url', 'http://$host:$port'),
@@ -179,9 +170,13 @@ class PocketBaseServeCommand extends FlutterPatcherCommand {
 
     // Wait for SIGINT/SIGTERM.
     final done = Completer<void>();
-    ProcessSignal.sigint.watch().listen((_) => done.complete());
+    ProcessSignal.sigint.watch().listen((_) {
+      if (!done.isCompleted) done.complete();
+    });
     if (!Platform.isWindows) {
-      ProcessSignal.sigterm.watch().listen((_) => done.complete());
+      ProcessSignal.sigterm.watch().listen((_) {
+        if (!done.isCompleted) done.complete();
+      });
     }
     await done.future;
     step('Shutting down PocketBase...');
@@ -229,7 +224,7 @@ class PocketBaseStatusCommand extends FlutterPatcherCommand {
       );
     } else {
       step(
-        'PocketBase: not installed. Run `flutter_ota_kit pocketbase install`.',
+        'PocketBase: not installed. Run `flutter-ota pocketbase install`.',
       );
     }
     return;

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

@@ -1,12 +1,20 @@
-import 'package:args/args.dart';
 import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
 import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
 
 import '../ui/ui.dart';
 
-/// `flutter_ota_kit rollback` — roll a channel back to a previous bundle.
+/// `flutter-ota rollback` — roll a channel back to a previous bundle.
 class RollbackCommand extends FlutterPatcherCommand {
-  RollbackCommand({this.config, this.backendOverride});
+  RollbackCommand({this.config, this.backendOverride}) {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addOption('channel', abbr: 'c', help: 'Channel to roll back.');
+    argParser.addOption(
+      'bundle-id',
+      abbr: 'i',
+      help: 'Roll back to this specific bundle id.',
+    );
+    argParser.addOption('platform', abbr: 'p', help: 'Platform filter (e.g. android).');
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -18,23 +26,12 @@ class RollbackCommand extends FlutterPatcherCommand {
   String get description =>
       'Roll a channel back: disable the latest enabled bundle (or a specific --bundle-id).';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption('channel', abbr: 'c', help: 'Channel to roll back.')
-    ..addOption(
-      'bundle-id',
-      abbr: 'i',
-      help: 'Roll back to this specific bundle id.',
-    )
-    ..addOption('platform', abbr: 'p', help: 'Platform filter (e.g. android).');
-
   @override
   Future<int> run() => runGuarded(() async {
     final channel = argResults!['channel'] as String?;
     if (channel == null || channel.isEmpty) {
       throw PackException(
-        'Usage: flutter_ota_kit rollback --channel <channel> [--bundle-id <id>]',
+        'Usage: flutter-ota rollback --channel <channel> [--bundle-id <id>]',
         64,
       );
     }
@@ -67,7 +64,7 @@ class RollbackCommand extends FlutterPatcherCommand {
     );
     box('rollback', [
       kv('channel', channel),
-      kv('now live', cyan(live)),
+      kv('now live', live.isEmpty ? dim('(none)') : cyan(live)),
       kv('disabled', disabled.isEmpty ? dim('(none)') : disabled.join(', ')),
     ]);
   });

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

@@ -1,4 +1,3 @@
-import 'package:args/args.dart';
 import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
 
 import '../ui/ui.dart';
@@ -27,7 +26,10 @@ class StorageCommand extends FlutterPatcherCommand {
 }
 
 class StorageListCommand extends FlutterPatcherCommand {
-  StorageListCommand({this.config, this.backendOverride});
+  StorageListCommand({this.config, this.backendOverride}) {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addOption('prefix', help: 'Key prefix filter (e.g. bundles).');
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -38,11 +40,6 @@ class StorageListCommand extends FlutterPatcherCommand {
   @override
   String get description => 'List storage objects.';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption('prefix', help: 'Key prefix filter (e.g. bundles).');
-
   @override
   Future<int> run() => runGuarded(() async {
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
@@ -56,24 +53,25 @@ class StorageListCommand extends FlutterPatcherCommand {
       step('(no objects)');
       return;
     }
-    final lines = <String>[];
+    final rows = <List<String>>[];
     for (final o in objects) {
       final size = o.size >= 1024 * 1024
           ? '${(o.size / (1024 * 1024)).toStringAsFixed(2)} MB'
           : o.size >= 1024
           ? '${(o.size / 1024).toStringAsFixed(1)} KB'
           : '${o.size} B';
-      lines
-        ..add(kv('key', cyan(o.key)))
-        ..add(kv('size', size))
-        ..add('');
+      rows.add([cyan(o.key), size]);
     }
-    box('${objects.length} objects', lines);
+    table('${objects.length} objects', ['KEY', 'SIZE'], rows);
   });
 }
 
 class StorageDeleteCommand extends FlutterPatcherCommand {
-  StorageDeleteCommand({this.config, this.backendOverride});
+  StorageDeleteCommand({this.config, this.backendOverride}) {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addMultiOption('key', help: 'Storage key to delete (repeatable).');
+    argParser.addOption('uri', help: 'Full storage URI to delete.');
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -84,12 +82,6 @@ class StorageDeleteCommand extends FlutterPatcherCommand {
   @override
   String get description => 'Delete storage object(s) by key or full URI.';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addMultiOption('key', help: 'Storage key to delete (repeatable).')
-    ..addOption('uri', help: 'Full storage URI to delete.');
-
   @override
   Future<int> run() => runGuarded(() async {
     final keys = (argResults!['key'] as List<String>?) ?? <String>[];

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

@@ -165,9 +165,16 @@ FlutterPatcherConfig? loadConfig() {
     if (file.existsSync()) {
       final raw = file.readAsStringSync();
       if (raw.trim().isEmpty) continue;
-      return FlutterPatcherConfig.fromJson(
-        jsonDecode(raw) as Map<String, dynamic>,
-      );
+      try {
+        return FlutterPatcherConfig.fromJson(
+          jsonDecode(raw) as Map<String, dynamic>,
+        );
+      } on FormatException {
+        stderr.writeln(
+          'Warning: invalid config at ${file.path} — ignoring.',
+        );
+        return null;
+      }
     }
   }
   return null;

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

@@ -60,6 +60,11 @@ Future<Bundle> deployBundle(Backend backend, DeployOptions opts) async {
       'Use only one of target-app-version / fingerprint-hash (DB CHECK).',
     );
   }
+  if (opts.targetAppVersion == null && opts.fingerprintHash == null) {
+    throw StateError(
+      'Provide either --target-app-version or --fingerprint-hash.',
+    );
+  }
   // Resolve the artifact to upload. If the source is already a zip (e.g. the
   // `patch.zip` produced by `flutter_ota_kit build`/`pack`), upload it directly.
   // Otherwise, if the source directory contains a `patch.zip`, use that. As a