@_nazmiforreal/flutter-ota 0.1.6 → 0.1.7

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

@@ -2,14 +2,14 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:flutter_patcher_cli/flutter_patcher_cli.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;
 import 'package:postgres/postgres.dart';
 
 import '../ui/ui.dart';
 
-/// `flutter_patcher migrate` — run backend SQL migrations.
+/// `flutter_ota_kit migrate` — run backend SQL migrations.
 class MigrateCommand extends FlutterPatcherCommand {
   @override
   String get name => 'migrate';
@@ -28,13 +28,17 @@ class MigrateCommand extends FlutterPatcherCommand {
             'runs migrations without a separate Postgres connection.')
     ..addOption('migrations-dir',
         help: 'Directory of *.sql migration files (ordered by name).')
-    ..addFlag('dry-run', help: 'Print migrations instead of applying them.');
+    ..addFlag('dry-run', abbr: 'd', help: 'Print migrations instead of applying them.');
 
-  /// Default migrations dir lives next to the CLI entrypoint; the backend
-  /// selects which dialect's migrations are used (cloudflare = D1 SQLite).
+  /// 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',
+      'postgres' => 'postgres',
       'cloudflare' => 'cloudflare',
+      'aws' => 'aws',
       _ => 'supabase',
     };
     return p.join(p.dirname(Platform.script.path), '..', 'migrations', sub);
@@ -68,6 +72,23 @@ class MigrateCommand extends FlutterPatcherCommand {
   @override
   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? ??
+              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.',
+          ]);
+          return;
+        }
+
         final dir = argResults!['migrations-dir'] as String? ??
             defaultMigrationsDir(provider);
         final files = _listMigrations(dir);
@@ -81,23 +102,30 @@ class MigrateCommand extends FlutterPatcherCommand {
           return;
         }
 
-        if (provider == 'cloudflare' || provider == 'aws') {
+        if (provider == 'cloudflare') {
           banner('migrate');
           box('migrate', [
-            'Migrations for "$provider" are applied via its platform tooling:',
-            '  • cloudflare → `wrangler d1 execute`',
-            '  • aws         → AWS console (S3/DynamoDB)',
+            '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 schema.',
+            'The SQL files under $dir show the intended D1 schema.',
           ]);
           return;
         }
 
         if (provider == 'supabase') {
+          final cfg = loadConfig() ??
+          FlutterPatcherConfig(
+            provider: 'supabase',
+            supabase: const SupabaseConfigJson(),
+          );
           final mgmtKey = argResults!['management-key'] as String? ??
-              Platform.environment['SUPABASE_MANAGEMENT_KEY'];
+              Platform.environment['SUPABASE_MANAGEMENT_KEY'] ??
+              cfg.supabase.managementKey;
           final pgUrl = argResults!['database-url'] as String? ??
-              Platform.environment['DATABASE_URL'];
+              Platform.environment['DATABASE_URL'] ??
+              cfg.supabase.databaseUrl;
           if (mgmtKey != null && mgmtKey.isNotEmpty) {
             await _runViaManagementApi(mgmtKey, files);
             return;
@@ -108,19 +136,26 @@ class MigrateCommand extends FlutterPatcherCommand {
           }
           throw StateError(
             'For the supabase backend, provide either:\n'
-            '  • --management-key (or SUPABASE_MANAGEMENT_KEY) — a Supabase '
-            'Management API key, OR\n'
-            '  • --database-url (or DATABASE_URL) — a Postgres connection string.',
+            '  • --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 '
+            'Postgres connection string.',
           );
         }
 
-        // Any other provider (e.g. postgres) requires a Postgres connection.
-        final pgUrl = argResults!['database-url'] as String? ??
-            Platform.environment['DATABASE_URL'];
-        if (pgUrl == null || pgUrl.isEmpty) {
-          throw StateError('Provide --database-url or set DATABASE_URL.');
+        if (provider == 'postgres') {
+          final pgUrl = argResults!['database-url'] as String? ??
+              Platform.environment['DATABASE_URL'];
+          if (pgUrl == null || pgUrl.isEmpty) {
+            throw StateError(
+              'For the postgres backend, provide --database-url or set DATABASE_URL.',
+            );
+          }
+          await _runViaPostgres(pgUrl, files);
+          return;
         }
-        await _runViaPostgres(pgUrl, files);
+
+        throw StateError('Unknown backend provider: "$provider".');
       });
 
   /// Run migrations through the Supabase Management API (no Postgres creds
@@ -220,7 +255,7 @@ class MigrateCommand extends FlutterPatcherCommand {
     );
     try {
       await conn.execute(
-        'CREATE TABLE IF NOT EXISTS _flutter_patcher_migrations '
+        'CREATE TABLE IF NOT EXISTS _flutter_ota_kit_migrations '
         '(name text primary key, applied_at timestamptz default now())',
         queryMode: QueryMode.simple,
       );
@@ -228,7 +263,7 @@ class MigrateCommand extends FlutterPatcherCommand {
         final name = p.basename(file.path);
         final escaped = name.replaceAll("'", "''");
         final existing = await conn.execute(
-          "SELECT 1 FROM _flutter_patcher_migrations WHERE name = '$escaped'",
+          "SELECT 1 FROM _flutter_ota_kit_migrations WHERE name = '$escaped'",
           queryMode: QueryMode.simple,
         );
         if (existing.isNotEmpty) {
@@ -239,7 +274,7 @@ class MigrateCommand extends FlutterPatcherCommand {
           await conn.execute(stmt, queryMode: QueryMode.simple);
         }
         await conn.execute(
-          "INSERT INTO _flutter_patcher_migrations(name) VALUES ('$escaped')",
+          "INSERT INTO _flutter_ota_kit_migrations(name) VALUES ('$escaped')",
           queryMode: QueryMode.simple,
         );
         step('applied $name');

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

@@ -1,10 +1,10 @@
 import 'package:args/args.dart';
-import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
-import 'package:flutter_patcher_core/flutter_patcher_core.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_patcher rollback` — roll a channel back to a previous bundle.
+/// `flutter_ota_kit rollback` — roll a channel back to a previous bundle.
 class RollbackCommand extends FlutterPatcherCommand {
   RollbackCommand({this.config, this.backendOverride});
 
@@ -22,7 +22,7 @@ class RollbackCommand extends FlutterPatcherCommand {
   ArgParser get argParser => ArgParser()
     ..addOption('backend', abbr: 'b', help: 'Backend provider.')
     ..addOption('channel', abbr: 'c', help: 'Channel to roll back.')
-    ..addOption('bundle-id', help: 'Roll back to this specific bundle id.')
+    ..addOption('bundle-id', abbr: 'i', help: 'Roll back to this specific bundle id.')
     ..addOption('platform', abbr: 'p', help: 'Platform filter (e.g. android).');
 
   @override
@@ -30,7 +30,7 @@ class RollbackCommand extends FlutterPatcherCommand {
         final channel = argResults!['channel'] as String?;
         if (channel == null || channel.isEmpty) {
           throw PackException(
-            'Usage: flutter_patcher rollback --channel <channel> [--bundle-id <id>]',
+            'Usage: flutter_ota_kit rollback --channel <channel> [--bundle-id <id>]',
             64,
           );
         }

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

@@ -0,0 +1,117 @@
+import 'package:args/args.dart';
+import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
+
+import '../ui/ui.dart';
+
+/// `flutter_ota_kit storage` — inspect and clean the blob storage bucket
+/// 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));
+  }
+
+  final FlutterPatcherConfig? config;
+  final Backend? backendOverride;
+
+  @override
+  String get name => 'storage';
+
+  @override
+  String get description =>
+      'Inspect and manage bundle storage objects (find / delete orphans).';
+}
+
+class StorageListCommand extends FlutterPatcherCommand {
+  StorageListCommand({this.config, this.backendOverride});
+
+  final FlutterPatcherConfig? config;
+  final Backend? backendOverride;
+
+  @override
+  String get name => 'list';
+
+  @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!);
+        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 {
+  StorageDeleteCommand({this.config, this.backendOverride});
+
+  final FlutterPatcherConfig? config;
+  final Backend? backendOverride;
+
+  @override
+  String get name => 'delete';
+
+  @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>[];
+        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

@@ -1,19 +1,20 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:flutter_patcher_aws/flutter_patcher_aws.dart';
+import 'package:flutter_ota_kit_aws/flutter_ota_kit_aws.dart';
 import 'package:postgres/postgres.dart';
-import 'package:flutter_patcher_cloudflare/flutter_patcher_cloudflare.dart';
-import 'package:flutter_patcher_postgres/flutter_patcher_postgres.dart';
-import 'package:flutter_patcher_standalone/flutter_patcher_standalone.dart';
-import 'package:flutter_patcher_supabase/flutter_patcher_supabase.dart';
+import 'package:flutter_ota_kit_cloudflare/flutter_ota_kit_cloudflare.dart';
+import 'package:flutter_ota_kit_postgres/flutter_ota_kit_postgres.dart';
+
+import 'package:flutter_ota_kit_supabase/flutter_ota_kit_supabase.dart';
 import 'package:path/path.dart' as p;
 
-/// Resolved configuration for the flutter_patcher CLI.
+/// Resolved configuration for the flutter_ota_kit CLI.
 ///
 /// Mirrors hot-updater's config precedence: explicit flags > environment
-/// variables > the project `.flutter_patcher.json` (falling back to the global
-/// `~/.flutter_patcher/config.json`).
+/// variables > the project `.otat/config.json` (falling back to the global
+/// `~/.otat/config.json`). All CLI working state lives under `.otat/` so it can
+/// be git-ignored as a single unit.
 class FlutterPatcherConfig {
   FlutterPatcherConfig({
     required this.provider,
@@ -21,7 +22,6 @@ class FlutterPatcherConfig {
     this.postgres = const PostgresConfigJson(),
     this.cloudflare = const CloudflareConfigJson(),
     this.aws = const AwsConfigJson(),
-    this.standalone = const StandaloneConfigJson(),
     this.channel = 'production',
     this.platform = 'android',
     this.source = './dist',
@@ -43,9 +43,6 @@ class FlutterPatcherConfig {
         aws: AwsConfigJson.fromJson(
           (json['aws'] as Map?)?.cast<String, dynamic>() ?? {},
         ),
-        standalone: StandaloneConfigJson.fromJson(
-          (json['standalone'] as Map?)?.cast<String, dynamic>() ?? {},
-        ),
         channel: json['channel'] as String? ?? 'production',
         platform: json['platform'] as String? ?? 'android',
         source: json['source'] as String? ?? './dist',
@@ -57,7 +54,6 @@ class FlutterPatcherConfig {
   final PostgresConfigJson postgres;
   final CloudflareConfigJson cloudflare;
   final AwsConfigJson aws;
-  final StandaloneConfigJson standalone;
   final String channel;
   final String platform;
   final String source;
@@ -69,7 +65,6 @@ class FlutterPatcherConfig {
         'postgres': postgres.toJson(),
         'cloudflare': cloudflare.toJson(),
         'aws': aws.toJson(),
-        'standalone': standalone.toJson(),
         'channel': channel,
         'platform': platform,
         'source': source,
@@ -82,7 +77,6 @@ class FlutterPatcherConfig {
     PostgresConfigJson? postgres,
     CloudflareConfigJson? cloudflare,
     AwsConfigJson? aws,
-    StandaloneConfigJson? standalone,
     String? channel,
     String? platform,
     String? source,
@@ -94,7 +88,6 @@ class FlutterPatcherConfig {
         postgres: postgres ?? this.postgres,
         cloudflare: cloudflare ?? this.cloudflare,
         aws: aws ?? this.aws,
-        standalone: standalone ?? this.standalone,
         channel: channel ?? this.channel,
         platform: platform ?? this.platform,
         source: source ?? this.source,
@@ -110,6 +103,8 @@ class SupabaseConfigJson {
     this.anonKey,
     this.bucket,
     this.basePath,
+    this.managementKey,
+    this.databaseUrl,
   });
 
   factory SupabaseConfigJson.fromJson(Map<String, dynamic> json) =>
@@ -119,6 +114,8 @@ class SupabaseConfigJson {
         anonKey: json['anonKey'] as String?,
         bucket: json['bucket'] as String?,
         basePath: json['basePath'] as String?,
+        managementKey: json['managementKey'] as String?,
+        databaseUrl: json['databaseUrl'] as String?,
       );
 
   final String? url;
@@ -126,6 +123,8 @@ class SupabaseConfigJson {
   final String? anonKey;
   final String? bucket;
   final String? basePath;
+  final String? managementKey;
+  final String? databaseUrl;
 
   Map<String, dynamic> toJson() => {
         if (url != null) 'url': url,
@@ -133,16 +132,20 @@ class SupabaseConfigJson {
         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.
+/// Search order for a config file on disk. Both the project config and the
+/// global config live under a `.otat/` 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_patcher.json'));
+  final cwd = File(p.join(Directory.current.path, '.otat', 'config.json'));
   final home = Platform.environment['HOME'] ??
       Platform.environment['USERPROFILE'] ??
       '';
-  final global = File(p.join(home, '.flutter_patcher', 'config.json'));
+  final global = File(p.join(home, '.otat', 'config.json'));
   return [cwd, global];
 }
 
@@ -162,7 +165,7 @@ FlutterPatcherConfig? loadConfig() {
 }
 
 /// Persist a config. By default writes the project file (cwd); pass
-/// [global: true] to write the global `~/.flutter_patcher/config.json`.
+/// [global: true] to write the global `~/.flutter_ota_kit/config.json`.
 void saveConfig(FlutterPatcherConfig config, {bool global = false}) {
   final file = global ? configCandidates().last : configCandidates().first;
   file.parent.createSync(recursive: true);
@@ -228,7 +231,7 @@ SupabaseServiceRoleConfig resolveSupabaseConfig(
   if (resolvedUrl == null || resolvedUrl.isEmpty) {
     throw StateError(
       'Supabase URL is required. Set it via --url, SUPABASE_URL, or '
-      '`flutter_patcher config set supabase.url <url>`.',
+      '`flutter_ota_kit config set supabase.url <url>`.',
     );
   }
 
@@ -368,7 +371,7 @@ PostgresConfig resolvePostgresDatabaseConfig(
   if (resolvedHost == null || resolvedHost.isEmpty) {
     throw StateError(
       'Postgres host is required. Set --pg-host, POSTGRES_HOST, or '
-      '`flutter_patcher config set postgres.host <host>`.',
+      '`flutter_ota_kit config set postgres.host <host>`.',
     );
   }
 
@@ -485,7 +488,7 @@ D1DatabaseConfig resolveCloudflareDatabaseConfig(
       resolvedToken == null) {
     throw StateError(
       'Cloudflare requires accountId, d1DatabaseId and apiToken. Set them via '
-      'flags, CLOUDFLARE_* env vars, or `flutter_patcher config set cloudflare.*`.',
+      'flags, CLOUDFLARE_* env vars, or `flutter_ota_kit config set cloudflare.*`.',
     );
   }
 
@@ -526,7 +529,7 @@ R2S3StorageConfig resolveCloudflareStorageConfig(
       resolvedSecret == null) {
     throw StateError(
       'Cloudflare R2 requires accountId, accessKeyId and secretAccessKey. Set '
-      'them via flags, R2_* env vars, or `flutter_patcher config set cloudflare.*`.',
+      'them via flags, R2_* env vars, or `flutter_ota_kit config set cloudflare.*`.',
     );
   }
 
@@ -612,7 +615,7 @@ S3DatabaseConfig resolveAwsDatabaseConfig(
       resolvedSecret == null) {
     throw StateError(
       'AWS requires bucket, region, accessKeyId and secretAccessKey. Set them '
-      'via flags, AWS_* env vars, or `flutter_patcher config set aws.*`.',
+      'via flags, AWS_* env vars, or `flutter_ota_kit config set aws.*`.',
     );
   }
 
@@ -656,7 +659,7 @@ AwsS3StorageConfig resolveAwsStorageConfig(
       resolvedSecret == null) {
     throw StateError(
       'AWS requires bucket, region, accessKeyId and secretAccessKey. Set them '
-      'via flags, AWS_* env vars, or `flutter_patcher config set aws.*`.',
+      'via flags, AWS_* env vars, or `flutter_ota_kit config set aws.*`.',
     );
   }
 
@@ -671,55 +674,3 @@ AwsS3StorageConfig resolveAwsStorageConfig(
     clientFactory: clientFactory ?? defaultAwsS3ClientFactory,
   );
 }
-
-/// Standalone (self-hosted) section of [FlutterPatcherConfig].
-class StandaloneConfigJson {
-  const StandaloneConfigJson({this.baseUrl});
-
-  factory StandaloneConfigJson.fromJson(Map<String, dynamic> json) =>
-      StandaloneConfigJson(baseUrl: json['baseUrl'] as String?);
-
-  final String? baseUrl;
-
-  Map<String, dynamic> toJson() =>
-      {if (baseUrl != null) 'baseUrl': baseUrl};
-}
-
-/// Resolve the standalone repository (database) config.
-StandaloneRepositoryConfig resolveStandaloneDatabaseConfig(
-  FlutterPatcherConfig config, {
-  String? baseUrl,
-  StandaloneClientFactory? clientFactory,
-}) {
-  final env = Platform.environment;
-  final resolvedBaseUrl =
-      baseUrl ?? env['STANDALONE_BASE_URL'] ?? config.standalone.baseUrl;
-  if (resolvedBaseUrl == null || resolvedBaseUrl.isEmpty) {
-    throw StateError(
-      'Standalone baseUrl is required. Set --base-url, STANDALONE_BASE_URL, '
-      'or `flutter_patcher config set standalone.baseUrl <url>`.',
-    );
-  }
-  return StandaloneRepositoryConfig(
-    baseUrl: resolvedBaseUrl,
-    clientFactory: clientFactory,
-  );
-}
-
-/// Resolve the standalone storage config (shares the same self-hosted base).
-StandaloneStorageConfig resolveStandaloneStorageConfig(
-  FlutterPatcherConfig config, {
-  String? baseUrl,
-  StandaloneClientFactory? clientFactory,
-}) {
-  final db = resolveStandaloneDatabaseConfig(
-    config,
-    baseUrl: baseUrl,
-    clientFactory: clientFactory,
-  );
-  return StandaloneStorageConfig(
-    baseUrl: db.baseUrl,
-    commonHeaders: db.commonHeaders,
-    clientFactory: clientFactory,
-  );
-}

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

@@ -2,8 +2,8 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:crypto/crypto.dart';
-import 'package:flutter_patcher_core/flutter_patcher_core.dart';
-import 'package:flutter_patcher_plugin_core/flutter_patcher_plugin_core.dart';
+import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
+import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart';
 
 import 'backend.dart';
 import 'sign.dart';
@@ -61,7 +61,7 @@ Future<Bundle> deployBundle(Backend backend, DeployOptions opts) async {
     );
   }
   // Resolve the artifact to upload. If the source is already a zip (e.g. the
-  // `patch.zip` produced by `flutter_patcher build`/`pack`), upload it directly.
+  // `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
   // fallback, zip the source directory (for pre-built bundle layouts).
   final sourceFile = File(opts.source);
@@ -93,7 +93,7 @@ Future<Bundle> deployBundle(Backend backend, DeployOptions opts) async {
         : null;
 
     final bundleId = opts.bundleId ?? uuidV7();
-    final key = backend.storageKeyFor(bundleId, 'patch.zip');
+    final key = bundleId;
     final uploaded = await backend.storage.upload(key, zipPath);
     final storageUri = uploaded['storageUri'];
     if (storageUri == null || storageUri.isEmpty) {

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

@@ -33,7 +33,7 @@ class PackResult {
 /// Pack a release APK into a device-compatible OTA patch (`patch.zip`).
 ///
 /// Mirrors the standalone `bin/pack.dart` CLI, but as a library usable by the
-/// `flutter_patcher build` command. Includes **every** ABI found in the APK so
+/// `flutter_ota_kit build` command. Includes **every** ABI found in the APK so
 /// a single bundle serves all device ABIs (the device SDK picks its ABI).
 Future<PackResult> packPatch({
   required String apkPath,
@@ -73,6 +73,7 @@ Future<PackResult> packPatch({
     version: version,
     targetVersionCode: targetVersionCode,
     requestedAssets: requestedAssets,
+    abi: abi,
     onProgress: onProgress,
   );
   return result;
@@ -85,8 +86,13 @@ PackResult _writePatchPackage({
   required String version,
   required int targetVersionCode,
   required List<String> requestedAssets,
+  String? abi,
   void Function(int done, int total, String label)? onProgress,
 }) {
+  // When an ABI is requested, restrict the patch to only that ABI instead of
+  // shipping every architecture found in the APK.
+  final effectiveLibs =
+      abi == null ? libs : libs.where((e) => e.$1 == abi).toList();
   final patchFiles = <String, _PatchAssetFile>{};
   final operations = <Map<String, dynamic>>[];
   var baseManifestSize = 0;
@@ -144,7 +150,7 @@ PackResult _writePatchPackage({
   }
 
   final libManifest = <String, dynamic>{
-    for (final (currentAbi, soBytes) in libs) currentAbi: {
+    for (final (currentAbi, soBytes) in effectiveLibs) currentAbi: {
       'path': 'lib/$currentAbi/libapp.so',
       'md5': md5.convert(soBytes).toString(),
     },
@@ -172,10 +178,10 @@ PackResult _writePatchPackage({
 
   final package = Archive()
     ..addFile(_jsonArchiveFile('manifest.json', zipManifest));
-  final progressTotal = libs.length + 1;
+  final progressTotal = effectiveLibs.length + 1;
   onProgress?.call(0, progressTotal, 'libapp.so');
   var progressDone = 0;
-  for (final (currentAbi, soBytes) in libs) {
+  for (final (currentAbi, soBytes) in effectiveLibs) {
     package.addFile(
         ArchiveFile('lib/$currentAbi/libapp.so', soBytes.length, soBytes));
     progressDone++;
@@ -210,7 +216,7 @@ PackResult _writePatchPackage({
     'version': version,
     'md5': payloadMd5,
     'targetVersionCode': targetVersionCode,
-    'abis': libs.map((e) => e.$1).toList(),
+    'abis': effectiveLibs.map((e) => e.$1).toList(),
     'payload': 'patch.zip',
   };
   _writeJson(File('${outDir.path}/manifest.json'), outerManifest);
@@ -218,7 +224,7 @@ PackResult _writePatchPackage({
   return PackResult(
     payloadPath: outZip.path,
     manifestPath: '${outDir.path}/manifest.json',
-    abis: libs.map((e) => e.$1).toList(),
+    abis: effectiveLibs.map((e) => e.$1).toList(),
     md5: payloadMd5,
     version: version,
     targetVersionCode: targetVersionCode,