@_nazmiforreal/flutter-ota 0.1.20 → 0.1.21

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

@@ -10,8 +10,11 @@ import '../ui/ui.dart';
 
 /// `flutter-ota migrate` — run backend SQL migrations.
 class MigrateCommand extends FlutterPatcherCommand {
-  MigrateCommand() {
-    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+  MigrateCommand({this.config, this.backendOverride}) {
+    final detected = config?.provider ?? loadConfig()?.provider;
+    argParser.addOption('backend', abbr: 'b', help: detected != null
+        ? 'Backend provider [detected: $detected].'
+        : 'Backend provider.');
     argParser.addOption(
       'database-url',
       help: 'Postgres connection string (or DATABASE_URL env).',
@@ -26,6 +29,34 @@ class MigrateCommand extends FlutterPatcherCommand {
       'migrations-dir',
       help: 'Directory of *.sql migration files (ordered by name).',
     );
+    argParser.addOption(
+      'account-id',
+      help: 'Cloudflare account ID (or CLOUDFLARE_ACCOUNT_ID env).',
+    );
+    argParser.addOption(
+      'api-token',
+      help: 'Cloudflare API token (or CLOUDFLARE_API_TOKEN env).',
+    );
+    argParser.addOption(
+      'd1-database-id',
+      help: 'Cloudflare D1 database ID (or CLOUDFLARE_D1_DATABASE_ID env).',
+    );
+    argParser.addOption(
+      'r2-bucket',
+      help: 'Cloudflare R2 bucket name (or R2_BUCKET env, default: bundles).',
+    );
+    argParser.addOption(
+      'pocketbase-url',
+      help: 'PocketBase URL (or POCKETBASE_URL env).',
+    );
+    argParser.addOption(
+      'pocketbase-admin-email',
+      help: 'PocketBase admin email (or POCKETBASE_ADMIN_EMAIL env).',
+    );
+    argParser.addOption(
+      'pocketbase-admin-password',
+      help: 'PocketBase admin password (or POCKETBASE_ADMIN_PASSWORD env).',
+    );
     argParser.addFlag(
       'dry-run',
       abbr: 'd',
@@ -33,12 +64,15 @@ class MigrateCommand extends FlutterPatcherCommand {
     );
   }
 
+  final FlutterPatcherConfig? config;
+  final Backend? backendOverride;
+
   @override
   String get name => 'migrate';
 
   @override
   String get description =>
-      'Run SQL migrations against the backend database (Supabase Postgres).';
+      'Run SQL migrations against the backend database (Supabase, Postgres, Cloudflare, AWS, PocketBase).';
 
   String defaultMigrationsDir(String provider) {
     final sub = switch (provider) {
@@ -79,19 +113,51 @@ class MigrateCommand extends FlutterPatcherCommand {
 
   @override
   Future<int> run() => runGuarded(() async {
-    final provider = argResults!['backend'] as String? ?? 'supabase';
+    final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
+    final provider = argResults!['backend'] as String? ?? cfg?.provider ?? 'supabase';
 
     if (provider == 'aws') {
-      final dir =
-          argResults!['migrations-dir'] as String? ??
-          defaultMigrationsDir(provider);
-      banner('migrate');
-      box('migrate', [
-        'Migrations for "$provider" do not run through this command:',
-        '  · aws  → S3 blob store, no relational SQL (see $dir/README.md)',
-        '',
-        'See the README under $dir for the intended setup.',
-      ]);
+      banner('migrate · aws');
+      step('AWS stores bundle metadata as JSON in S3 — no SQL migrations needed.');
+      step('The S3 bucket and object prefix are created automatically on first deploy.');
+      step('No action required. Run `flutter-ota deploy` to get started.');
+      return;
+    }
+
+    if (provider == 'pocketbase') {
+      final pbUrl =
+          argResults!['pocketbase-url'] as String? ??
+          Platform.environment['POCKETBASE_URL'] ??
+          cfg?.pocketbase.url;
+      final pbAdmin =
+          argResults!['pocketbase-admin-email'] as String? ??
+          Platform.environment['POCKETBASE_ADMIN_EMAIL'] ??
+          cfg?.pocketbase.adminEmail;
+      final pbPass =
+          argResults!['pocketbase-admin-password'] as String? ??
+          Platform.environment['POCKETBASE_ADMIN_PASSWORD'] ??
+          cfg?.pocketbase.adminPassword;
+      if (pbUrl == null || pbUrl.isEmpty) {
+        throw StateError(
+          'PocketBase requires a URL. Set POCKETBASE_URL env var, '
+          'or `flutter-ota init pocketbase`.',
+        );
+      }
+      banner('migrate · pocketbase');
+      final installer = PocketBaseSchemaInstaller(
+        url: pbUrl,
+        adminEmail: pbAdmin ?? '',
+        adminPassword: pbPass ?? '',
+      );
+      final res = await installer.install();
+      final steps = Steps('migrate');
+      if (res.created.isNotEmpty) {
+        steps.success('Created: ${res.created.join(', ')}');
+      }
+      if (res.skipped.isNotEmpty) {
+        steps.success('Already present: ${res.skipped.join(', ')}');
+      }
+      steps.summary();
       return;
     }
 
@@ -110,20 +176,49 @@ class MigrateCommand extends FlutterPatcherCommand {
     }
 
     if (provider == 'cloudflare') {
-      banner('migrate');
-      box('migrate', [
-        'Cloudflare (D1 SQLite) migrations run via `wrangler d1 execute`:',
-        '  wrangler d1 execute <DB> --file=$dir/0001_hot-updater_init.sql',
-        '  (apply each *.sql under $dir in filename order)',
-        '',
-        'The SQL files under $dir show the intended D1 schema.',
-      ]);
+      final cfCfg = cfg ??
+          FlutterPatcherConfig(
+            provider: 'cloudflare',
+            supabase: const SupabaseConfigJson(),
+            cloudflare: const CloudflareConfigJson(),
+          );
+      final accountId =
+          argResults!['account-id'] as String? ??
+          Platform.environment['CLOUDFLARE_ACCOUNT_ID'] ??
+          cfCfg.cloudflare.accountId;
+      final apiToken =
+          argResults!['api-token'] as String? ??
+          Platform.environment['CLOUDFLARE_API_TOKEN'] ??
+          cfCfg.cloudflare.apiToken;
+      final dbId =
+          argResults!['d1-database-id'] as String? ??
+          Platform.environment['CLOUDFLARE_D1_DATABASE_ID'] ??
+          cfCfg.cloudflare.d1DatabaseId;
+      final r2Bucket =
+          argResults!['r2-bucket'] as String? ??
+          Platform.environment['R2_BUCKET'] ??
+          cfCfg.cloudflare.r2Bucket ??
+          'bundles';
+
+      if (accountId == null || apiToken == null) {
+        throw StateError(
+          'Cloudflare requires accountId and apiToken. Set them via '
+          '--account-id/--api-token, CLOUDFLARE_* env vars, or '
+          '`flutter-ota init cloudflare`.',
+        );
+      }
+      await _runCloudflareMigration(
+        accountId: accountId,
+        apiToken: apiToken,
+        databaseId: dbId,
+        r2Bucket: r2Bucket,
+        files: files,
+      );
       return;
     }
 
     if (provider == 'supabase') {
-      final cfg =
-          loadConfig() ??
+      final sbCfg = cfg ??
           FlutterPatcherConfig(
             provider: 'supabase',
             supabase: const SupabaseConfigJson(),
@@ -131,11 +226,11 @@ class MigrateCommand extends FlutterPatcherCommand {
       final mgmtKey =
           argResults!['management-key'] as String? ??
           Platform.environment['SUPABASE_MANAGEMENT_KEY'] ??
-          cfg.supabase.managementKey;
+          sbCfg.supabase.managementKey;
       final pgUrl =
           argResults!['database-url'] as String? ??
           Platform.environment['DATABASE_URL'] ??
-          cfg.supabase.databaseUrl;
+          sbCfg.supabase.databaseUrl;
       if (mgmtKey != null && mgmtKey.isNotEmpty) {
         await _runViaManagementApi(mgmtKey, files);
         return;
@@ -306,4 +401,149 @@ class MigrateCommand extends FlutterPatcherCommand {
     }
     steps.summary();
   }
+
+  /// Auto-provision Cloudflare backend: create D1 database, run SQL, create R2.
+  ///
+  /// Called from `init` to match Supabase's fully-automated flow.
+  static Future<void> runCloudflareMigration({
+    required String accountId,
+    required String apiToken,
+    String? databaseId,
+    String? r2Bucket,
+  }) async {
+    final sub = 'cloudflare';
+    final dir = p.join(
+      p.dirname(Platform.script.path),
+      '..',
+      'migrations',
+      sub,
+    );
+    final migrationsDir = Directory(dir);
+    if (!migrationsDir.existsSync()) {
+      throw StateError('Migrations directory not found: $dir');
+    }
+    final files =
+        migrationsDir
+            .listSync()
+            .whereType<File>()
+            .where((f) => f.path.endsWith('.sql'))
+            .toList()
+          ..sort((a, b) => a.path.compareTo(b.path));
+    if (files.isEmpty) {
+      throw StateError('No *.sql files in $dir');
+    }
+    await _runCloudflareMigration(
+      accountId: accountId,
+      apiToken: apiToken,
+      databaseId: databaseId,
+      r2Bucket: r2Bucket ?? 'bundles',
+      files: files,
+    );
+  }
+
+  static Future<void> _runCloudflareMigration({
+    required String accountId,
+    required String apiToken,
+    required String? databaseId,
+    required String r2Bucket,
+    required List<File> files,
+  }) async {
+    final headers = {
+      'Authorization': 'Bearer $apiToken',
+      'Content-Type': 'application/json',
+    };
+    final baseUrl = 'https://api.cloudflare.com/client/v4';
+
+    banner('migrate · cloudflare');
+    final steps = Steps('migrate');
+
+    // --- D1 database ---
+    var dbId = databaseId;
+    if (dbId == null || dbId.isEmpty) {
+      // Create a new D1 database
+      final sw = Stopwatch()..start();
+      final res = await http.post(
+        Uri.parse('$baseUrl/accounts/$accountId/d1/database'),
+        headers: headers,
+        body: jsonEncode({'name': 'flutter-ota-kit'}),
+      );
+      sw.stop();
+      final body = jsonDecode(res.body) as Map<String, dynamic>;
+      if (res.statusCode >= 400 || body['success'] != true) {
+        final errors = body['errors'] as List? ?? [];
+        final msg = errors.isNotEmpty ? errors.first['message'] : res.body;
+        steps.fail('Could not create D1 database: $msg');
+        steps.summary();
+        return;
+      }
+      dbId = body['result']?['uuid'] as String?;
+      if (dbId == null || dbId.isEmpty) {
+        steps.fail('D1 database created but no UUID returned');
+        steps.summary();
+        return;
+      }
+      final ms = sw.elapsedMilliseconds;
+      final time =
+          ms >= 1000 ? '${(ms / 1000).toStringAsFixed(1)}s' : '${ms}ms';
+      steps.success('Created D1 database ($dbId) in $time');
+    } else {
+      steps.success('Using existing D1 database ($dbId)');
+    }
+
+    // --- Run SQL migrations against D1 ---
+    for (final file in files) {
+      final sw = Stopwatch()..start();
+      final sql = file.readAsStringSync();
+      final res = await http.post(
+        Uri.parse('$baseUrl/accounts/$accountId/d1/database/$dbId/query'),
+        headers: headers,
+        body: jsonEncode({'sql': sql}),
+      );
+      sw.stop();
+      final body = jsonDecode(res.body) as Map<String, dynamic>;
+      if (res.statusCode >= 400 || body['success'] != true) {
+        final errors = body['errors'] as List? ?? [];
+        final msg = errors.isNotEmpty ? errors.first['message'] : res.body;
+        steps.fail('${p.basename(file.path)} ($res.statusCode): $msg');
+      } 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');
+      }
+    }
+
+    // --- R2 bucket ---
+    final sw = Stopwatch()..start();
+    final r2Res = await http.put(
+      Uri.parse('$baseUrl/accounts/$accountId/s3/buckets/$r2Bucket'),
+      headers: headers,
+    );
+    sw.stop();
+    final r2Body = jsonDecode(r2Res.body) as Map<String, dynamic>;
+    if (r2Res.statusCode >= 400 || r2Body['success'] != true) {
+      final errors = r2Body['errors'] as List? ?? [];
+      final msg = errors.isNotEmpty ? errors.first['message'] : r2Res.body;
+      // Bucket already exists is not an error
+      if (!msg.toLowerCase().contains('already exists') &&
+          r2Res.statusCode != 409) {
+        steps.fail('Could not create R2 bucket "$r2Bucket": $msg');
+      } else {
+        final ms = sw.elapsedMilliseconds;
+        final time =
+            ms >= 1000 ? '${(ms / 1000).toStringAsFixed(1)}s' : '${ms}ms';
+        steps.success('Ensured R2 bucket "$r2Bucket" in $time');
+      }
+    } else {
+      final ms = sw.elapsedMilliseconds;
+      final time =
+          ms >= 1000 ? '${(ms / 1000).toStringAsFixed(1)}s' : '${ms}ms';
+      steps.success('Created R2 bucket "$r2Bucket" in $time');
+    }
+
+    steps.summary();
+    if (steps.hasErrors) {
+      throw StateError('One or more migrations failed.');
+    }
+  }
 }

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

@@ -46,7 +46,7 @@ class PocketBaseCommand extends FlutterPatcherCommand {
   String get description =>
       'Manage a local PocketBase instance (install / serve / stop / '
       'status / backup / export / import / admin / migrate / health / '
-      'logs / records / collections / settings / sql / crons).';
+      'logs / records / collections / settings / sql / crons / query / config).';
 }
 
 class PocketBaseInstallCommand extends FlutterPatcherCommand {
@@ -225,18 +225,36 @@ class PocketBaseServeCommand extends FlutterPatcherCommand {
 }
 
 class PocketBaseStopCommand extends FlutterPatcherCommand {
+  PocketBaseStopCommand() {
+    argParser.addOption('port', help: 'HTTP port.', defaultsTo: '8090');
+    argParser.addOption('host', help: 'Bind address.', defaultsTo: '127.0.0.1');
+  }
+
   @override
   String get name => 'stop';
 
   @override
-  String get description =>
-      'Hint to stop a running PocketBase (Ctrl+C in serve).';
+  String get description => 'Stop a running PocketBase instance.';
 
   @override
   Future<int> run() => runGuarded(() async {
     banner('pocketbase · stop');
-    step('Use Ctrl+C on the running serve process to stop PocketBase.');
-    return;
+    final port = int.tryParse(argResults!['port'] as String? ?? '8090') ?? 8090;
+    final host = argResults!['host'] as String? ?? '127.0.0.1';
+    final mgr = PocketBaseProcessManager(
+      binaryPath: PocketBaseInstallPaths.resolve().binaryPath,
+      dataDir: PocketBaseInstallPaths.resolve().installDir,
+      port: port,
+      host: host,
+    );
+    final pid = mgr.readPid();
+    if (pid <= 0) {
+      step('No PocketBase process found.');
+      return;
+    }
+    step('Stopping PocketBase (PID $pid)...');
+    await mgr.stop();
+    step('PocketBase stopped.');
   });
 }
 
@@ -300,6 +318,11 @@ void _addBackendOptions(ArgParser parser) {
   parser.addOption('data-dir', help: 'PB data directory.');
 }
 
+String _safeSubstring(String? s, int length) {
+  if (s == null || s.isEmpty) return '';
+  return s.length > length ? s.substring(0, length) : s;
+}
+
 (String url, String adminEmail, String adminPassword) _resolveBackend(ArgResults r) {
   final url = r['url'] as String? ?? _detectRunningUrl(r);
   if (url == null || url.isEmpty) {
@@ -500,16 +523,20 @@ class PocketBaseBackupDownloadCommand extends FlutterPatcherCommand {
     banner('pocketbase · backup · download');
     final key = argResults!['name'] as String;
     final output = argResults!['output'] as String;
-    final token = await _pbStep('Getting file token', (c) => c.getFileToken('', ''), argResults!);
-    final (url, _, _) = _resolveBackend(argResults!);
+    final (url, admin, pass) = _resolveBackend(argResults!);
     final dlClient = PocketBaseClient(url);
-    final url2 = dlClient.backupDownloadUrl(key, token);
-    final bytes = await dlClient.downloadFileUnauth(url2);
-    dlClient.close();
-    final out = File(p.join(output, key));
-    await out.parent.create(recursive: true);
-    await out.writeAsBytes(bytes);
-    step(green('Saved to ${out.path}'));
+    try {
+      await dlClient.authenticate(admin, pass);
+      final token = dlClient.authToken;
+      final dlUrl = dlClient.backupDownloadUrl(key, token);
+      final bytes = await dlClient.downloadFileUnauth(dlUrl);
+      final out = File(p.join(output, key));
+      await out.parent.create(recursive: true);
+      await out.writeAsBytes(bytes);
+      step(green('Saved to ${out.path}'));
+    } finally {
+      dlClient.close();
+    }
   });
 }
 
@@ -566,39 +593,43 @@ class PocketBaseExportCommand extends FlutterPatcherCommand {
     final collection = r['collection'] as String?;
     final output = r['output'] as String;
 
-    final client = PocketBaseClient(_resolveBackend(r).$1);
-    await client.authenticate(_resolveBackend(r).$2, _resolveBackend(r).$3);
-
-    final collections = <String>[];
-    if (collection != null && collection.isNotEmpty) {
-      collections.add(collection);
-    } else {
-      final all = await client.listCollections();
-      for (final c in all) {
-        final name = c['name'] as String? ?? '';
-        if (name.isNotEmpty && !name.startsWith('_') && c['system'] != true) {
-          collections.add(name);
+    final (url, admin, pass) = _resolveBackend(r);
+    final client = PocketBaseClient(url);
+    try {
+      await client.authenticate(admin, pass);
+
+      final collections = <String>[];
+      if (collection != null && collection.isNotEmpty) {
+        collections.add(collection);
+      } else {
+        final all = await client.listCollections();
+        for (final c in all) {
+          final name = c['name'] as String? ?? '';
+          if (name.isNotEmpty && !name.startsWith('_') && c['system'] != true) {
+            collections.add(name);
+          }
+        }
+        if (collections.isEmpty) {
+          collections.addAll(['bundles', 'channels', 'audit_log', 'bundles_patches']);
         }
       }
-      if (collections.isEmpty) {
-        collections.addAll(['bundles', 'channels', 'audit_log', 'bundles_patches']);
-      }
-    }
 
-    for (final c in collections) {
-      try {
-        final records = await client.exportCollection(c);
-        final outFile = File(p.join(output, '$c.json'));
-        await outFile.parent.create(recursive: true);
-        await outFile.writeAsString(
-          const JsonEncoder.withIndent('  ').convert(records),
-        );
-        step('${records.length} records → ${outFile.path}');
-      } catch (e) {
-        warn('Failed to export $c: $e');
+      for (final c in collections) {
+        try {
+          final records = await client.exportCollection(c);
+          final outFile = File(p.join(output, '$c.json'));
+          await outFile.parent.create(recursive: true);
+          await outFile.writeAsString(
+            const JsonEncoder.withIndent('  ').convert(records),
+          );
+          step('${records.length} records → ${outFile.path}');
+        } catch (e) {
+          warn('Failed to export $c: $e');
+        }
       }
+    } finally {
+      client.close();
     }
-    client.close();
   });
 }
 
@@ -677,7 +708,7 @@ class PocketBaseAdminCreateCommand extends FlutterPatcherCommand {
       (c) => c.createAdmin(email: email, password: password, passwordConfirm: password),
       r,
     );
-    box('admin', [kv('id', cyan(result['id'] ?? '?')), kv('email', email)]);
+    stdout.writeln('  ${dim('→')} admin ${cyan(result['id'] ?? '?')} $email');
   });
 }
 
@@ -808,11 +839,10 @@ class PocketBaseHealthCommand extends FlutterPatcherCommand {
     final code = health['code'] as int? ?? 0;
     final message = health['message'] as String? ?? '';
     final data = health['data'] as Map<String, dynamic>? ?? {};
-    box('health', [
-      kv('status', code == 200 ? green('healthy') : red('unhealthy')),
-      kv('message', message),
-      if (data.isNotEmpty) kv('canBackup', '${data['canBackup'] ?? false}'),
-    ]);
+    final status = code == 200 ? green('healthy') : red('unhealthy');
+    step('status      $status');
+    step('message     $message');
+    step('canBackup   ${data['canBackup'] ?? false}');
   });
 }
 
@@ -875,7 +905,7 @@ class PocketBaseLogsListCommand extends FlutterPatcherCommand {
       final msg = (log['message'] as String? ?? '').length > 60
           ? '${(log['message'] as String).substring(0, 57)}...'
           : log['message'] as String? ?? '';
-      return [lvl, log['created']?.toString().substring(0, 19) ?? '', msg];
+      return [lvl, _safeSubstring(log['created']?.toString(), 19), msg];
     }).toList();
     table('$total logs', ['LEVEL', 'TIME', 'MESSAGE'], rows);
   });
@@ -906,7 +936,7 @@ class PocketBaseLogsStatsCommand extends FlutterPatcherCommand {
       return;
     }
     final rows = stats.map((s) => [
-      s['date']?.toString().substring(0, 16) ?? '',
+      _safeSubstring(s['date']?.toString(), 16),
       '${s['total'] ?? 0}',
     ]).toList();
     table('${stats.length} entries', ['TIME', 'COUNT'], rows);
@@ -991,9 +1021,13 @@ class PocketBaseRecordsListCommand extends FlutterPatcherCommand {
     }
     final rows = data.items.map((r) {
       final m = r as Map<String, dynamic>;
-      return [cyan(m['id']?.toString() ?? '?'), m.values.first?.toString() ?? ''];
+      final label = m['name']?.toString() ??
+          m['updated']?.toString() ??
+          m['created']?.toString() ??
+          '';
+      return [cyan(m['id']?.toString() ?? '?'), label];
     }).toList();
-    table('${data.totalItems} records', ['ID', 'FIRST FIELD'], rows);
+    table('${data.totalItems} records', ['ID', 'LABEL'], rows);
   });
 }
 
@@ -1050,7 +1084,7 @@ class PocketBaseRecordsCreateCommand extends FlutterPatcherCommand {
       (c) => c.createRecord<dynamic>(r['collection'] as String, body, (j) => j),
       r,
     );
-    box('record', [kv('id', cyan((record as Map)['id']?.toString() ?? '?'))]);
+    stdout.writeln('  ${dim('→')} record ${cyan((record as Map)['id']?.toString() ?? '?')}');
   });
 }
 
@@ -1563,11 +1597,15 @@ class PocketBaseQueryCommand extends FlutterPatcherCommand {
     if (bodyStr != null && bodyStr.isNotEmpty) {
       body = jsonDecode(bodyStr) as Map<String, dynamic>;
     }
-    final client = PocketBaseClient(_resolveBackend(r).$1);
-    await client.authenticate(_resolveBackend(r).$2, _resolveBackend(r).$3);
-    final res = await client.rawRequest(method, path, body: body);
-    client.close();
-    stdout.writeln(const JsonEncoder.withIndent('  ').convert(jsonDecode(res.body)));
+    final (url, admin, pass) = _resolveBackend(r);
+    final client = PocketBaseClient(url);
+    try {
+      await client.authenticate(admin, pass);
+      final res = await client.rawRequest(method, path, body: body);
+      stdout.writeln(const JsonEncoder.withIndent('  ').convert(jsonDecode(res.body)));
+    } finally {
+      client.close();
+    }
   });
 }
 

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

@@ -6,7 +6,10 @@ import '../ui/ui.dart';
 /// `flutter-ota rollback` — roll a channel back to a previous bundle.
 class RollbackCommand extends FlutterPatcherCommand {
   RollbackCommand({this.config, this.backendOverride}) {
-    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    final detected = config?.provider ?? loadConfig()?.provider;
+    argParser.addOption('backend', abbr: 'b', help: detected != null
+        ? 'Backend provider [detected: $detected].'
+        : 'Backend provider.');
     argParser.addOption('channel', abbr: 'c', help: 'Channel to roll back.');
     argParser.addOption(
       'bundle-id',

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

@@ -22,12 +22,15 @@ class StorageCommand extends FlutterPatcherCommand {
 
   @override
   String get description =>
-      'Inspect and manage bundle storage objects (find / delete orphans).';
+      'Inspect and manage bundle storage objects (list / delete).';
 }
 
 class StorageListCommand extends FlutterPatcherCommand {
   StorageListCommand({this.config, this.backendOverride}) {
-    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    final detected = config?.provider ?? loadConfig()?.provider;
+    argParser.addOption('backend', abbr: 'b', help: detected != null
+        ? 'Backend provider [detected: $detected].'
+        : 'Backend provider.');
     argParser.addOption('prefix', help: 'Key prefix filter (e.g. bundles).');
   }
 
@@ -57,12 +60,7 @@ class StorageListCommand extends FlutterPatcherCommand {
     }
     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';
-      rows.add([cyan(o.key), size]);
+      rows.add([cyan(o.key), humanSize(o.size)]);
     }
     table('${objects.length} objects', ['KEY', 'SIZE'], rows);
     steps.summary();
@@ -71,7 +69,10 @@ class StorageListCommand extends FlutterPatcherCommand {
 
 class StorageDeleteCommand extends FlutterPatcherCommand {
   StorageDeleteCommand({this.config, this.backendOverride}) {
-    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    final detected = config?.provider ?? loadConfig()?.provider;
+    argParser.addOption('backend', abbr: 'b', help: detected != null
+        ? 'Backend provider [detected: $detected].'
+        : 'Backend provider.');
     argParser.addMultiOption('key', help: 'Storage key to delete (repeatable).');
     argParser.addOption('uri', help: 'Full storage URI to delete.');
   }