@_nazmiforreal/flutter-ota 0.1.12 → 0.1.14

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

@@ -7,8 +7,12 @@ import '../ui/ui.dart';
 /// directly from the CLI (no need to open the provider dashboard).
 class StorageCommand extends FlutterPatcherCommand {
   StorageCommand({this.config, this.backendOverride}) {
-    addSubcommand(StorageListCommand(config: config, backendOverride: backendOverride));
-    addSubcommand(StorageDeleteCommand(config: config, backendOverride: backendOverride));
+    addSubcommand(
+      StorageListCommand(config: config, backendOverride: backendOverride),
+    );
+    addSubcommand(
+      StorageDeleteCommand(config: config, backendOverride: backendOverride),
+    );
   }
 
   final FlutterPatcherConfig? config;
@@ -41,31 +45,31 @@ class StorageListCommand extends FlutterPatcherCommand {
 
   @override
   Future<int> run() => runGuarded(() async {
-        final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
-        final backend = requireBackend(cfg, override: backendOverride);
-        final prefix = argResults!['prefix'] as String?;
-        banner('storage · list');
-        final objects = await backend.storage.listObjects(
-          prefix == null || prefix.isEmpty ? null : prefix,
-        );
-        if (objects.isEmpty) {
-          step('(no objects)');
-          return;
-        }
-        final lines = <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('');
-        }
-        box('${objects.length} objects', lines);
-      });
+    final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
+    final backend = requireBackend(cfg, override: backendOverride);
+    final prefix = argResults!['prefix'] as String?;
+    banner('storage · list');
+    final objects = await backend.storage.listObjects(
+      prefix == null || prefix.isEmpty ? null : prefix,
+    );
+    if (objects.isEmpty) {
+      step('(no objects)');
+      return;
+    }
+    final lines = <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('');
+    }
+    box('${objects.length} objects', lines);
+  });
 }
 
 class StorageDeleteCommand extends FlutterPatcherCommand {
@@ -88,30 +92,30 @@ class StorageDeleteCommand extends FlutterPatcherCommand {
 
   @override
   Future<int> run() => runGuarded(() async {
-        final keys = (argResults!['key'] as List<String>?) ?? <String>[];
-        final uri = argResults!['uri'] as String?;
-        if (keys.isEmpty && (uri == null || uri.isEmpty)) {
-          throw PackException(
-            'Usage: flutter-ota storage delete --key <key> [--key <key>...] '
-            '| --uri <storageUri>',
-            64,
-          );
-        }
-        final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
-        final backend = requireBackend(cfg, override: backendOverride);
-        banner('storage · delete');
-        if (keys.isNotEmpty) {
-          await spinner(
-            () => backend.storage.deleteObjects(keys),
-            'Deleting ${keys.length} object(s)',
-            done: 'Deleted',
-          );
-        } else {
-          await spinner(
-            () => backend.storage.delete(uri!),
-            'Deleting $uri',
-            done: 'Deleted',
-          );
-        }
-      });
+    final keys = (argResults!['key'] as List<String>?) ?? <String>[];
+    final uri = argResults!['uri'] as String?;
+    if (keys.isEmpty && (uri == null || uri.isEmpty)) {
+      throw PackException(
+        'Usage: flutter-ota storage delete --key <key> [--key <key>...] '
+        '| --uri <storageUri>',
+        64,
+      );
+    }
+    final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
+    final backend = requireBackend(cfg, override: backendOverride);
+    banner('storage · delete');
+    if (keys.isNotEmpty) {
+      await spinner(
+        () => backend.storage.deleteObjects(keys),
+        'Deleting ${keys.length} object(s)',
+        done: 'Deleted',
+      );
+    } else {
+      await spinner(
+        () => backend.storage.delete(uri!),
+        'Deleting $uri',
+        done: 'Deleted',
+      );
+    }
+  });
 }

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

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:flutter_ota_kit_aws/flutter_ota_kit_aws.dart';
 import 'package:postgres/postgres.dart';
 import 'package:flutter_ota_kit_cloudflare/flutter_ota_kit_cloudflare.dart';
+import 'package:flutter_ota_kit_pocketbase/flutter_ota_kit_pocketbase.dart';
 import 'package:flutter_ota_kit_postgres/flutter_ota_kit_postgres.dart';
 
 import 'package:flutter_ota_kit_supabase/flutter_ota_kit_supabase.dart';
@@ -22,6 +23,7 @@ class FlutterPatcherConfig {
     this.postgres = const PostgresConfigJson(),
     this.cloudflare = const CloudflareConfigJson(),
     this.aws = const AwsConfigJson(),
+    this.pocketbase = const PocketBaseConfigJson(),
     this.channel = 'production',
     this.platform = 'android',
     this.source = './dist',
@@ -43,6 +45,9 @@ class FlutterPatcherConfig {
         aws: AwsConfigJson.fromJson(
           (json['aws'] as Map?)?.cast<String, dynamic>() ?? {},
         ),
+        pocketbase: PocketBaseConfigJson.fromJson(
+          (json['pocketbase'] as Map?)?.cast<String, dynamic>() ?? {},
+        ),
         channel: json['channel'] as String? ?? 'production',
         platform: json['platform'] as String? ?? 'android',
         source: json['source'] as String? ?? './dist',
@@ -54,22 +59,24 @@ class FlutterPatcherConfig {
   final PostgresConfigJson postgres;
   final CloudflareConfigJson cloudflare;
   final AwsConfigJson aws;
+  final PocketBaseConfigJson pocketbase;
   final String channel;
   final String platform;
   final String source;
   final String? publicKey;
 
   Map<String, dynamic> toJson() => {
-        'provider': provider,
-        'supabase': supabase.toJson(),
-        'postgres': postgres.toJson(),
-        'cloudflare': cloudflare.toJson(),
-        'aws': aws.toJson(),
-        'channel': channel,
-        'platform': platform,
-        'source': source,
-        if (publicKey != null) 'publicKey': publicKey,
-      };
+    'provider': provider,
+    'supabase': supabase.toJson(),
+    'postgres': postgres.toJson(),
+    'cloudflare': cloudflare.toJson(),
+    'aws': aws.toJson(),
+    'pocketbase': pocketbase.toJson(),
+    'channel': channel,
+    'platform': platform,
+    'source': source,
+    if (publicKey != null) 'publicKey': publicKey,
+  };
 
   FlutterPatcherConfig copyWith({
     String? provider,
@@ -77,22 +84,23 @@ class FlutterPatcherConfig {
     PostgresConfigJson? postgres,
     CloudflareConfigJson? cloudflare,
     AwsConfigJson? aws,
+    PocketBaseConfigJson? pocketbase,
     String? channel,
     String? platform,
     String? source,
     String? publicKey,
-  }) =>
-      FlutterPatcherConfig(
-        provider: provider ?? this.provider,
-        supabase: supabase ?? this.supabase,
-        postgres: postgres ?? this.postgres,
-        cloudflare: cloudflare ?? this.cloudflare,
-        aws: aws ?? this.aws,
-        channel: channel ?? this.channel,
-        platform: platform ?? this.platform,
-        source: source ?? this.source,
-        publicKey: publicKey ?? this.publicKey,
-      );
+  }) => FlutterPatcherConfig(
+    provider: provider ?? this.provider,
+    supabase: supabase ?? this.supabase,
+    postgres: postgres ?? this.postgres,
+    cloudflare: cloudflare ?? this.cloudflare,
+    aws: aws ?? this.aws,
+    pocketbase: pocketbase ?? this.pocketbase,
+    channel: channel ?? this.channel,
+    platform: platform ?? this.platform,
+    source: source ?? this.source,
+    publicKey: publicKey ?? this.publicKey,
+  );
 }
 
 /// Supabase section of [FlutterPatcherConfig].
@@ -127,24 +135,25 @@ class SupabaseConfigJson {
   final String? databaseUrl;
 
   Map<String, dynamic> toJson() => {
-        if (url != null) 'url': url,
-        if (serviceRoleKey != null) 'serviceRoleKey': serviceRoleKey,
-        if (anonKey != null) 'anonKey': anonKey,
-        if (bucket != null) 'bucket': bucket,
-        if (basePath != null) 'basePath': basePath,
-        if (managementKey != null) 'managementKey': managementKey,
-        if (databaseUrl != null) 'databaseUrl': databaseUrl,
-      };
+    if (url != null) 'url': url,
+    if (serviceRoleKey != null) 'serviceRoleKey': serviceRoleKey,
+    if (anonKey != null) 'anonKey': anonKey,
+    if (bucket != null) 'bucket': bucket,
+    if (basePath != null) 'basePath': basePath,
+    if (managementKey != null) 'managementKey': managementKey,
+    if (databaseUrl != null) 'databaseUrl': databaseUrl,
+  };
 }
 
 /// Search order for a config file on disk. Both the project config and the
 /// global config live under a `.flutter_ota_kit/` directory so all CLI state is
 /// grouped in one place (and can be git-ignored together).
 List<File> configCandidates() {
-  final cwd = File(p.join(Directory.current.path, '.flutter_ota_kit', 'config.json'));
-  final home = Platform.environment['HOME'] ??
-      Platform.environment['USERPROFILE'] ??
-      '';
+  final cwd = File(
+    p.join(Directory.current.path, '.flutter_ota_kit', 'config.json'),
+  );
+  final home =
+      Platform.environment['HOME'] ?? Platform.environment['USERPROFILE'] ?? '';
   final global = File(p.join(home, '.flutter_ota_kit', 'config.json'));
   return [cwd, global];
 }
@@ -222,7 +231,8 @@ SupabaseServiceRoleConfig resolveSupabaseConfig(
 }) {
   final env = Platform.environment;
   final resolvedUrl = url ?? env['SUPABASE_URL'] ?? config.supabase.url;
-  final resolvedService = serviceRoleKey ??
+  final resolvedService =
+      serviceRoleKey ??
       env['SUPABASE_SERVICE_ROLE_KEY'] ??
       config.supabase.serviceRoleKey;
   final resolvedAnon =
@@ -269,11 +279,12 @@ SupabaseStorageConfig resolveSupabaseStorageConfig(
     clientFactory: db.clientFactory,
     bucketName: db.supabaseServiceRoleKey != null || db.supabaseAnonKey != null
         ? (bucket ??
-            Platform.environment['SUPABASE_BUCKET'] ??
-            config.supabase.bucket ??
-            'bundles')
+              Platform.environment['SUPABASE_BUCKET'] ??
+              config.supabase.bucket ??
+              'bundles')
         : (bucket ?? config.supabase.bucket ?? 'bundles'),
-    basePath: basePath ??
+    basePath:
+        basePath ??
         Platform.environment['SUPABASE_BASE_PATH'] ??
         config.supabase.basePath,
   );
@@ -318,15 +329,15 @@ class PostgresConfigJson {
   final String? servingBaseUrl;
 
   Map<String, dynamic> toJson() => {
-        if (host != null) 'host': host,
-        if (port != null) 'port': port,
-        if (database != null) 'database': database,
-        if (username != null) 'username': username,
-        if (password != null) 'password': password,
-        if (sslMode != null) 'sslMode': sslMode,
-        if (basePath != null) 'basePath': basePath,
-        if (servingBaseUrl != null) 'servingBaseUrl': servingBaseUrl,
-      };
+    if (host != null) 'host': host,
+    if (port != null) 'port': port,
+    if (database != null) 'database': database,
+    if (username != null) 'username': username,
+    if (password != null) 'password': password,
+    if (sslMode != null) 'sslMode': sslMode,
+    if (basePath != null) 'basePath': basePath,
+    if (servingBaseUrl != null) 'servingBaseUrl': servingBaseUrl,
+  };
 }
 
 SslMode? _parseSslMode(String? value) {
@@ -358,13 +369,12 @@ PostgresConfig resolvePostgresDatabaseConfig(
   final resolvedHost = host ?? env['POSTGRES_HOST'] ?? config.postgres.host;
   final resolvedDatabase =
       database ?? env['POSTGRES_DB'] ?? config.postgres.database;
-  final resolvedUser = username ?? env['POSTGRES_USER'] ?? config.postgres.username;
+  final resolvedUser =
+      username ?? env['POSTGRES_USER'] ?? config.postgres.username;
   final resolvedPassword =
       password ?? env['POSTGRES_PASSWORD'] ?? config.postgres.password;
-  final resolvedPort = port ??
-      env['POSTGRES_PORT'] ??
-      config.postgres.port ??
-      '5432';
+  final resolvedPort =
+      port ?? env['POSTGRES_PORT'] ?? config.postgres.port ?? '5432';
   final resolvedSsl =
       sslMode ?? env['POSTGRES_SSLMODE'] ?? config.postgres.sslMode;
 
@@ -411,10 +421,12 @@ PostgresStorageConfig resolvePostgresStorageConfig(
   );
   return PostgresStorageConfig(
     db: db,
-    basePath: basePath ??
+    basePath:
+        basePath ??
         Platform.environment['POSTGRES_BASE_PATH'] ??
         config.postgres.basePath,
-    servingBaseUrl: servingBaseUrl ??
+    servingBaseUrl:
+        servingBaseUrl ??
         Platform.environment['POSTGRES_SERVING_BASE_URL'] ??
         config.postgres.servingBaseUrl,
   );
@@ -456,14 +468,14 @@ class CloudflareConfigJson {
   final String? r2BasePath;
 
   Map<String, dynamic> toJson() => {
-        if (accountId != null) 'accountId': accountId,
-        if (d1DatabaseId != null) 'd1DatabaseId': d1DatabaseId,
-        if (apiToken != null) 'apiToken': apiToken,
-        if (r2Bucket != null) 'r2Bucket': r2Bucket,
-        if (r2AccessKeyId != null) 'r2AccessKeyId': r2AccessKeyId,
-        if (r2SecretAccessKey != null) 'r2SecretAccessKey': r2SecretAccessKey,
-        if (r2BasePath != null) 'r2BasePath': r2BasePath,
-      };
+    if (accountId != null) 'accountId': accountId,
+    if (d1DatabaseId != null) 'd1DatabaseId': d1DatabaseId,
+    if (apiToken != null) 'apiToken': apiToken,
+    if (r2Bucket != null) 'r2Bucket': r2Bucket,
+    if (r2AccessKeyId != null) 'r2AccessKeyId': r2AccessKeyId,
+    if (r2SecretAccessKey != null) 'r2SecretAccessKey': r2SecretAccessKey,
+    if (r2BasePath != null) 'r2BasePath': r2BasePath,
+  };
 }
 
 /// Resolve the Cloudflare D1 database config.
@@ -477,15 +489,14 @@ D1DatabaseConfig resolveCloudflareDatabaseConfig(
   final env = Platform.environment;
   final resolvedAccount =
       accountId ?? env['CLOUDFLARE_ACCOUNT_ID'] ?? config.cloudflare.accountId;
-  final resolvedDb = d1DatabaseId ??
+  final resolvedDb =
+      d1DatabaseId ??
       env['CLOUDFLARE_D1_DATABASE_ID'] ??
       config.cloudflare.d1DatabaseId;
   final resolvedToken =
       apiToken ?? env['CLOUDFLARE_API_TOKEN'] ?? config.cloudflare.apiToken;
 
-  if (resolvedAccount == null ||
-      resolvedDb == null ||
-      resolvedToken == null) {
+  if (resolvedAccount == null || resolvedDb == null || resolvedToken == null) {
     throw StateError(
       'Cloudflare requires accountId, d1DatabaseId and apiToken. Set them via '
       'flags, CLOUDFLARE_* env vars, or `flutter_ota_kit config set cloudflare.*`.',
@@ -511,16 +522,17 @@ R2S3StorageConfig resolveCloudflareStorageConfig(
   R2S3ClientFactory? clientFactory,
 }) {
   final env = Platform.environment;
-  final resolvedAccount = accountId ??
+  final resolvedAccount =
+      accountId ??
       env['CLOUDFLARE_ACCOUNT_ID'] ??
       env['R2_ACCOUNT_ID'] ??
       config.cloudflare.accountId;
   final resolvedBucket =
       bucket ?? env['R2_BUCKET'] ?? config.cloudflare.r2Bucket ?? 'bundles';
-  final resolvedKey = accessKeyId ??
-      env['R2_ACCESS_KEY_ID'] ??
-      config.cloudflare.r2AccessKeyId;
-  final resolvedSecret = secretAccessKey ??
+  final resolvedKey =
+      accessKeyId ?? env['R2_ACCESS_KEY_ID'] ?? config.cloudflare.r2AccessKeyId;
+  final resolvedSecret =
+      secretAccessKey ??
       env['R2_SECRET_ACCESS_KEY'] ??
       config.cloudflare.r2SecretAccessKey;
 
@@ -560,14 +572,14 @@ class AwsConfigJson {
   });
 
   factory AwsConfigJson.fromJson(Map<String, dynamic> json) => AwsConfigJson(
-        bucket: json['bucket'] as String?,
-        region: json['region'] as String?,
-        accessKeyId: json['accessKeyId'] as String?,
-        secretAccessKey: json['secretAccessKey'] as String?,
-        endpoint: json['endpoint'] as String?,
-        basePath: json['basePath'] as String?,
-        sessionToken: json['sessionToken'] as String?,
-      );
+    bucket: json['bucket'] as String?,
+    region: json['region'] as String?,
+    accessKeyId: json['accessKeyId'] as String?,
+    secretAccessKey: json['secretAccessKey'] as String?,
+    endpoint: json['endpoint'] as String?,
+    basePath: json['basePath'] as String?,
+    sessionToken: json['sessionToken'] as String?,
+  );
 
   final String? bucket;
   final String? region;
@@ -578,14 +590,14 @@ class AwsConfigJson {
   final String? sessionToken;
 
   Map<String, dynamic> toJson() => {
-        if (bucket != null) 'bucket': bucket,
-        if (region != null) 'region': region,
-        if (accessKeyId != null) 'accessKeyId': accessKeyId,
-        if (secretAccessKey != null) 'secretAccessKey': secretAccessKey,
-        if (endpoint != null) 'endpoint': endpoint,
-        if (basePath != null) 'basePath': basePath,
-        if (sessionToken != null) 'sessionToken': sessionToken,
-      };
+    if (bucket != null) 'bucket': bucket,
+    if (region != null) 'region': region,
+    if (accessKeyId != null) 'accessKeyId': accessKeyId,
+    if (secretAccessKey != null) 'secretAccessKey': secretAccessKey,
+    if (endpoint != null) 'endpoint': endpoint,
+    if (basePath != null) 'basePath': basePath,
+    if (sessionToken != null) 'sessionToken': sessionToken,
+  };
 }
 
 /// Resolve the AWS S3 database config.
@@ -599,7 +611,8 @@ S3DatabaseConfig resolveAwsDatabaseConfig(
   String? endpoint,
   String? sessionToken,
   AwsS3ClientLike Function(S3DatabaseConfig config)? clientFactory,
-  AwsCloudFrontClientLike Function(S3DatabaseConfig config)? cloudfrontClientFactory,
+  AwsCloudFrontClientLike Function(S3DatabaseConfig config)?
+  cloudfrontClientFactory,
 }) {
   final env = Platform.environment;
   final resolvedBucket = bucket ?? env['AWS_BUCKET'] ?? config.aws.bucket;
@@ -607,7 +620,9 @@ S3DatabaseConfig resolveAwsDatabaseConfig(
   final resolvedKey =
       accessKeyId ?? env['AWS_ACCESS_KEY_ID'] ?? config.aws.accessKeyId;
   final resolvedSecret =
-      secretAccessKey ?? env['AWS_SECRET_ACCESS_KEY'] ?? config.aws.secretAccessKey;
+      secretAccessKey ??
+      env['AWS_SECRET_ACCESS_KEY'] ??
+      config.aws.secretAccessKey;
 
   if (resolvedBucket == null ||
       resolvedRegion == null ||
@@ -626,7 +641,8 @@ S3DatabaseConfig resolveAwsDatabaseConfig(
     secretAccessKey: resolvedSecret,
     basePath: basePath ?? env['AWS_BASE_PATH'] ?? config.aws.basePath,
     endpoint: endpoint ?? env['AWS_ENDPOINT'] ?? config.aws.endpoint,
-    sessionToken: sessionToken ?? env['AWS_SESSION_TOKEN'] ?? config.aws.sessionToken,
+    sessionToken:
+        sessionToken ?? env['AWS_SESSION_TOKEN'] ?? config.aws.sessionToken,
     clientFactory: clientFactory ?? defaultAwsS3DatabaseClientFactory,
     cloudfrontClientFactory:
         cloudfrontClientFactory ?? defaultAwsCloudFrontClientFactory,
@@ -651,7 +667,9 @@ AwsS3StorageConfig resolveAwsStorageConfig(
   final resolvedKey =
       accessKeyId ?? env['AWS_ACCESS_KEY_ID'] ?? config.aws.accessKeyId;
   final resolvedSecret =
-      secretAccessKey ?? env['AWS_SECRET_ACCESS_KEY'] ?? config.aws.secretAccessKey;
+      secretAccessKey ??
+      env['AWS_SECRET_ACCESS_KEY'] ??
+      config.aws.secretAccessKey;
 
   if (resolvedBucket == null ||
       resolvedRegion == null ||
@@ -670,7 +688,123 @@ AwsS3StorageConfig resolveAwsStorageConfig(
     secretAccessKey: resolvedSecret,
     basePath: basePath ?? env['AWS_BASE_PATH'] ?? config.aws.basePath,
     endpoint: endpoint ?? env['AWS_ENDPOINT'] ?? config.aws.endpoint,
-    sessionToken: sessionToken ?? env['AWS_SESSION_TOKEN'] ?? config.aws.sessionToken,
+    sessionToken:
+        sessionToken ?? env['AWS_SESSION_TOKEN'] ?? config.aws.sessionToken,
     clientFactory: clientFactory ?? defaultAwsS3ClientFactory,
   );
 }
+
+// ---------------------------------------------------------------------------
+// PocketBase backend config
+// ---------------------------------------------------------------------------
+
+/// PocketBase section of [FlutterPatcherConfig].
+class PocketBaseConfigJson {
+  const PocketBaseConfigJson({
+    this.url,
+    this.adminEmail,
+    this.adminPassword,
+    this.bundlesCollection = 'bundles',
+    this.channelsCollection = 'channels',
+    this.bundlesBucket = 'bundles',
+  });
+
+  factory PocketBaseConfigJson.fromJson(Map<String, dynamic> json) =>
+      PocketBaseConfigJson(
+        url: json['url'] as String?,
+        adminEmail: json['adminEmail'] as String?,
+        adminPassword: json['adminPassword'] as String?,
+        bundlesCollection: (json['bundlesCollection'] as String?) ?? 'bundles',
+        channelsCollection:
+            (json['channelsCollection'] as String?) ?? 'channels',
+        bundlesBucket: (json['bundlesBucket'] as String?) ?? 'bundles',
+      );
+
+  final String? url;
+  final String? adminEmail;
+  final String? adminPassword;
+  final String bundlesCollection;
+  final String channelsCollection;
+  final String bundlesBucket;
+
+  Map<String, dynamic> toJson() => {
+    if (url != null) 'url': url,
+    if (adminEmail != null) 'adminEmail': adminEmail,
+    if (adminPassword != null) 'adminPassword': adminPassword,
+    'bundlesCollection': bundlesCollection,
+    'channelsCollection': channelsCollection,
+    'bundlesBucket': bundlesBucket,
+  };
+}
+
+/// Resolve the PocketBase database config (flag > env > json precedence).
+PocketBaseDatabaseConfig resolvePocketBaseDatabaseConfig(
+  FlutterPatcherConfig config, {
+  String? url,
+  String? adminEmail,
+  String? adminPassword,
+  PocketBaseClientFactory? clientFactory,
+}) {
+  final env = Platform.environment;
+  final resolvedUrl = url ?? env['POCKETBASE_URL'] ?? config.pocketbase.url;
+  final resolvedEmail =
+      adminEmail ??
+      env['POCKETBASE_ADMIN_EMAIL'] ??
+      config.pocketbase.adminEmail;
+  final resolvedPassword =
+      adminPassword ??
+      env['POCKETBASE_ADMIN_PASSWORD'] ??
+      config.pocketbase.adminPassword;
+
+  if (resolvedUrl == null || resolvedUrl.isEmpty) {
+    throw StateError(
+      'PocketBase URL is required. Set --pb-url, POCKETBASE_URL, or '
+      '`flutter_ota_kit config set pocketbase.url <url>`.',
+    );
+  }
+  if (resolvedEmail == null || resolvedPassword == null) {
+    throw StateError(
+      'PocketBase admin credentials are required. Set --pb-email, '
+      '--pb-password, POCKETBASE_ADMIN_EMAIL/PASSWORD, or '
+      '`flutter_ota_kit config set pocketbase.*`.',
+    );
+  }
+
+  return PocketBaseDatabaseConfig(
+    url: resolvedUrl.replaceAll(RegExp(r'/$'), ''),
+    adminEmail: resolvedEmail,
+    adminPassword: resolvedPassword,
+    bundlesCollection: config.pocketbase.bundlesCollection,
+    channelsCollection: config.pocketbase.channelsCollection,
+    bundlesBucket: config.pocketbase.bundlesBucket,
+    clientFactory: clientFactory,
+  );
+}
+
+/// Resolve the PocketBase storage config (shares the database connection).
+PocketBaseStorageConfig resolvePocketBaseStorageConfig(
+  FlutterPatcherConfig config, {
+  String? url,
+  String? adminEmail,
+  String? adminPassword,
+  String? bundlesBucket,
+  String? basePath,
+  PocketBaseClientFactory? clientFactory,
+}) {
+  final db = resolvePocketBaseDatabaseConfig(
+    config,
+    url: url,
+    adminEmail: adminEmail,
+    adminPassword: adminPassword,
+    clientFactory: clientFactory,
+  );
+  return PocketBaseStorageConfig(
+    url: db.url,
+    adminEmail: db.adminEmail,
+    adminPassword: db.adminPassword,
+    bundlesCollection: db.bundlesCollection,
+    bundlesBucket: bundlesBucket ?? db.bundlesBucket,
+    basePath: basePath,
+    clientFactory: clientFactory,
+  );
+}

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

@@ -65,7 +65,9 @@ Future<Bundle> deployBundle(Backend backend, DeployOptions opts) async {
   // Otherwise, if the source directory contains a `patch.zip`, use that. As a
   // fallback, zip the source directory (for pre-built bundle layouts).
   final sourceFile = File(opts.source);
-  final bool sourceIsFile = sourceFile.existsSync() && sourceFile.statSync().type == FileSystemEntityType.file;
+  final bool sourceIsFile =
+      sourceFile.existsSync() &&
+      sourceFile.statSync().type == FileSystemEntityType.file;
   final String zipPath;
   final bool shouldDelete;
   if (sourceIsFile && opts.source.endsWith('.zip')) {
@@ -113,7 +115,8 @@ Future<Bundle> deployBundle(Backend backend, DeployOptions opts) async {
       targetAppVersion: opts.targetAppVersion,
       fingerprintHash: opts.fingerprintHash,
       metadata:
-          opts.metadata ?? (signature != null ? BundleMetadata(signature: signature) : null),
+          opts.metadata ??
+          (signature != null ? BundleMetadata(signature: signature) : null),
       rolloutCohortCount: defaultRolloutCohortCount,
     );
 
@@ -140,7 +143,9 @@ Future<Paginated<List<Bundle>>> listBundles(
     DatabaseBundleQueryOptions(
       where: DatabaseBundleQueryWhere(
         channel: opts.channel,
-        platform: opts.platform != null ? Platform.fromValue(opts.platform!) : null,
+        platform: opts.platform != null
+            ? Platform.fromValue(opts.platform!)
+            : null,
         enabled: opts.enabled,
       ),
       limit: opts.limit,
@@ -160,11 +165,7 @@ Future<void> deleteBundle(Backend backend, String id) async {
 }
 
 /// Promote a bundle to a channel (enable + assign channel).
-Future<void> promoteBundle(
-  Backend backend,
-  String id,
-  String channel,
-) async {
+Future<void> promoteBundle(Backend backend, String id, String channel) async {
   final existing = await backend.db.getBundleById(id);
   if (existing == null) {
     throw StateError('Bundle "$id" not found.');