@_nazmiforreal/flutter-ota 0.1.26 → 0.1.28

package/README.md

@@ -1,37 +1,131 @@
-# flutter-ota (flutter-ota CLI)
+# flutter-ota
 
-Command-line interface for [flutter_ota_kit](https://github.com/HYPER12755/flutter-ota-kit) — a multi-backend OTA ("code push") toolkit for Flutter Android, hot-updater compatible.
+[![npm](https://img.shields.io/npm/v/@_nazmiforreal/flutter-ota.svg)](https://www.npmjs.com/package/@_nazmiforreal/flutter-ota)
+[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/HYPER12755/flutter-ota-kit/blob/main/LICENSE)
+
+### The command line for [flutter_ota_kit](https://pub.dev/packages/flutter_ota_kit) — build patches, deploy them to your backend, and manage rollouts.
+
+`flutter-ota` is the companion CLI for **flutter_ota_kit**, open-source OTA code
+push for Flutter Android. Pack a release APK into a signed patch, upload it to
+the backend **you** own (Supabase / Postgres / Cloudflare / AWS / PocketBase),
+and manage channels, staged rollouts, and instant rollback — no store review, no
+monthly bill.
+
+> The runtime SDK your app depends on is the separate
+> [`flutter_ota_kit`](https://pub.dev/packages/flutter_ota_kit) pub package.
+
+---
 
 ## Install
 
 ```bash
 npm i -g @_nazmiforreal/flutter-ota
+flutter-ota --help
+```
+
+A prebuilt `linux-x64` binary ships in the package. On other platforms the CLI
+compiles from bundled Dart source on first install, which needs the
+[**Flutter SDK**](https://flutter.dev) (the CLI shares the `flutter_ota_kit`
+Flutter package). If Flutter isn't available, build a binary once yourself:
+
+```bash
+cd $(npm root -g)/@_nazmiforreal/flutter-ota/dart-src/packages/cli-tools
+flutter pub get && dart compile exe bin/flutter_ota_kit.dart -o ../../bin/flutter-ota-<os>-<arch>
 ```
 
-This installs the `flutter-ota` command. A prebuilt Linux binary ships with the package; on other platforms it falls back to `dart compile exe` (requires the [Dart SDK](https://dart.dev)).
+---
 
-## Usage
+## The 60-second workflow
 
 ```bash
-flutter-ota --help
-flutter-ota keys                                              # generate an Ed25519 keypair
-flutter-ota build -a app-release.apk \
-  --version 1.0.0 --target-version-code 1                        # -> dist/patch.zip (all ABIs)
-flutter-ota deploy --source dist \
-  --channel production --backend supabase \
-  --key <PRIVATE_KEY_BASE64>                                      # upload + sign a bundle
+# 1. Scaffold config + a setup helper for your backend
+#    (adds the latest flutter_ota_kit to your pubspec automatically)
+flutter-ota init supabase        # or: postgres | cloudflare | aws | pocketbase
+
+# 2. Provision the backend (Supabase & PocketBase are fully automated)
+flutter-ota migrate supabase
+
+# 3. Build the release APK, then pack it into a device-ready patch
+flutter build apk --release
+flutter-ota build \
+  --apk build/app/outputs/flutter-apk/app-release.apk \
+  --version 1.0.1 \
+  --target-version-code 100
+
+# 4. Sign + deploy it to a channel
+flutter-ota deploy --source dist --channel production \
+  --target-app-version 1.0.0 --force -m "hotfix: crash on login"
+```
+
+Devices pick up the patch on their next launch. Pull it back with:
+
+```bash
+flutter-ota rollback --channel production
+```
+
+---
+
+## Commands
+
+| Command | What it does |
+|---------|--------------|
+| `init <backend>` | Scaffold config, `.env`, and `lib/flutter_ota_kit_setup.dart`; add the SDK dependency + `INTERNET` permission |
+| `build` | Pack a release APK into `dist/patch.zip` (all ABIs by default) |
+| `deploy` | Upload + register a bundle; sign it with `--key` |
+| `bundle` | `list` / `show` / `delete` / `disable` / `enable` / `force` / `promote` / `update` |
+| `channel` | `list` / `get` / `set` the live bundle per channel |
+| `rollback` | Disable the latest enabled bundle (or roll back to a specific one) |
+| `storage` | `list` / `delete` stored bundle objects |
+| `migrate` | Provision the backend schema |
+| `keys` | Generate an Ed25519 signing keypair |
+| `fingerprint` | Compute a deterministic build fingerprint |
+| `doctor` | Diagnose the environment + backend connectivity |
+| `config` | `get` / `set` / `list` config values |
+| `console` | Open the web console |
+| `pocketbase` | Manage a local single-binary PocketBase backend |
+
+Help works at every level, including nested subcommands:
+
+```bash
+flutter-ota deploy --help
+flutter-ota bundle list --help
+flutter-ota pocketbase records list --help
 ```
 
-### Backends
+---
+
+## Backends
+
+Select one with `--backend supabase|postgres|cloudflare|aws|pocketbase` (or set
+`provider` in `.flutter_ota_kit/config.json`). Settings resolve with a clear
+precedence:
+
+```
+explicit flag  >  environment variable  >  .flutter_ota_kit/config.json  >  default
+```
+
+Config search order: `./.flutter_ota_kit/config.json`, then
+`~/.flutter_ota_kit/config.json`. Secrets belong in your shell env or `.env`,
+never in committed config.
+
+| Backend | Provisioning |
+|---------|--------------|
+| **Supabase** | `migrate supabase` — SQL + storage bucket, fully automated |
+| **PocketBase** | `pocketbase install` + `pocketbase serve` — single binary, schema auto-installed |
+| **Postgres** | `migrate postgres` applies SQL migrations |
+| **Cloudflare** | `migrate cloudflare` creates D1 + R2, runs SQL |
+| **AWS** | No SQL — S3 bucket/prefix created on first `deploy` |
+
+---
 
-`--backend supabase|postgres|cloudflare|aws`.
-Each resolves its own env / `.flutter_ota_kit/config.json` (global: `~/.flutter_ota_kit/config.json`).
+## Documentation
 
-### Commands
+- [CLI Reference](https://github.com/HYPER12755/flutter-ota-kit/blob/main/doc/cli-reference.md)
+- [Getting Started](https://github.com/HYPER12755/flutter-ota-kit/blob/main/doc/getting-started.md)
+- [Backends](https://github.com/HYPER12755/flutter-ota-kit/blob/main/doc/backends.md)
+- [Production Playbook](https://github.com/HYPER12755/flutter-ota-kit/blob/main/doc/production-playbook.md)
 
-`init`, `build`, `deploy`, `bundle` (list/show/delete/disable/enable/force/promote/update),
-`rollback`, `channel` (list/get/set), `fingerprint`, `doctor`, `migrate`, `config`
-(get/set/list), `keys`, `console`, `storage` (list/delete).
+---
 
 ## License
 

package/bin/flutter-ota.js

@@ -55,31 +55,32 @@ if (fs.existsSync(binPath)) {
   chmodIfNeeded(binPath);
   run(binPath, process.argv.slice(2));
 } else if (
-  spawnSync('dart', ['--version'], { stdio: 'ignore' }).status === 0 &&
+  spawnSync('flutter', ['--version'], { stdio: 'ignore' }).status === 0 &&
   fs.existsSync(sourceEntry)
 ) {
-  // Ensure dependencies are resolved before running from source. We only run
-  // `dart pub get` when the package config is missing, so repeated invocations
-  // don't re-resolve dependencies on every command.
+  // Fallback for platforms/arches without a shipped prebuilt binary.
+  // Since v0.2.0 the CLI depends on the `flutter_ota_kit` Flutter package, so
+  // dependency resolution needs `flutter pub get` (not `dart pub get`). The CLI
+  // entrypoint itself only touches pure-Dart backend code, so `dart run` of the
+  // resolved package still works.
   const configPath = path.join(cliDir, '.dart_tool', 'package_config.json');
   if (!fs.existsSync(configPath)) {
-    const getRes = spawnSync('dart', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
+    const getRes = spawnSync('flutter', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
     if (getRes.status !== 0) {
       console.error(
-        'flutter-ota: `dart pub get` failed. Install dependencies or build ' +
-          `a prebuilt manually:\n  cd ${cliDir} && dart compile exe ` +
-          `bin/flutter_ota_kit.dart -o ${binPath}`,
+        'flutter-ota: `flutter pub get` failed. Install the Flutter SDK or ' +
+          `build a prebuilt manually:\n  cd ${cliDir} && flutter pub get && ` +
+          `dart compile exe bin/flutter_ota_kit.dart -o ${binPath}`,
       );
       process.exit(1);
     }
   }
-  chmodIfNeeded(binPath);
   run('dart', [sourceEntry, ...process.argv.slice(2)]);
 } else {
   console.error(
     `flutter-ota: no prebuilt binary for ${platformName}-${archName} and ` +
-      'the Dart SDK was not found. Install Dart (https://dart.dev) or use a ' +
-      'platform/arch with a shipped prebuilt binary.',
+      'the Flutter SDK was not found. Install Flutter (https://flutter.dev) or ' +
+      'use a platform/arch with a shipped prebuilt binary.',
   );
   process.exit(1);
 }

package/dart-src/packages/cli-tools/README.md

@@ -1,5 +1,149 @@
 # flutter_ota_kit_cli
 
-Part of the [flutter_ota_kit](https://github.com/HYPER12755/flutter-ota-kit) OTA (over-the-air) update toolkit for Flutter Android.
+[![npm](https://img.shields.io/npm/v/@_nazmiforreal/flutter-ota.svg)](https://www.npmjs.com/package/@_nazmiforreal/flutter-ota)
+[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](../../LICENSE)
 
-See the project README for usage, backend setup, and the architecture overview.
+### The command line for [flutter_ota_kit](https://pub.dev/packages/flutter_ota_kit) — build patches, deploy them to your backend, and manage rollouts.
+
+`flutter-ota` is the companion CLI for **flutter_ota_kit**, open-source OTA code
+push for Flutter Android. It packs a release APK into a signed patch, uploads it
+to the backend **you** own (Supabase / Postgres / Cloudflare / AWS / PocketBase),
+and gives you first-class commands for channels, staged rollouts, and instant
+rollback.
+
+> This tool ships via npm as `@_nazmiforreal/flutter-ota`. The runtime SDK your
+> app depends on is the separate [`flutter_ota_kit`](https://pub.dev/packages/flutter_ota_kit)
+> pub package.
+
+---
+
+## Install
+
+```bash
+npm i -g @_nazmiforreal/flutter-ota
+flutter-ota --help
+```
+
+A prebuilt `linux-x64` binary ships in the package. On other platforms the CLI
+compiles from bundled Dart source on first install, which needs the
+[**Flutter SDK**](https://flutter.dev) (the CLI shares the `flutter_ota_kit`
+package). No Flutter? Point `flutter-ota` at a prebuilt binary you build once
+with `dart compile exe`.
+
+---
+
+## The 60-second workflow
+
+```bash
+# 1. Scaffold config + a setup helper for your backend (adds the latest
+#    flutter_ota_kit to your pubspec automatically)
+flutter-ota init supabase        # or: postgres | cloudflare | aws | pocketbase
+
+# 2. Provision the backend (Supabase & PocketBase are fully automated)
+flutter-ota migrate supabase
+
+# 3. Build the release APK, then pack it into a device-ready patch
+flutter build apk --release
+flutter-ota build \
+  --apk build/app/outputs/flutter-apk/app-release.apk \
+  --version 1.0.1 \
+  --target-version-code 100
+
+# 4. Sign + deploy it to a channel
+flutter-ota deploy --source dist --channel production \
+  --target-app-version 1.0.0 --force -m "hotfix: crash on login"
+```
+
+Devices pick up the patch on their next launch. To pull it back:
+
+```bash
+flutter-ota rollback --channel production
+```
+
+---
+
+## Commands
+
+| Command | What it does |
+|---------|--------------|
+| `init <backend>` | Scaffold `.flutter_ota_kit/config.json`, `.env`, and `lib/flutter_ota_kit_setup.dart`; add the SDK dependency + `INTERNET` permission |
+| `build` | Pack a release APK into a device-ready `dist/patch.zip` (all ABIs by default) |
+| `deploy` | Upload + register a bundle; sign it with `--key` |
+| `bundle` | `list` / `show` / `delete` / `disable` / `enable` / `force` / `promote` / `update` |
+| `channel` | `list` / `get` / `set` the live bundle per channel |
+| `rollback` | Disable the latest enabled bundle on a channel (or roll back to a specific one) |
+| `storage` | `list` / `delete` stored bundle objects |
+| `migrate` | Provision the backend schema (Supabase / Postgres / Cloudflare / AWS / PocketBase) |
+| `keys` | Generate an Ed25519 signing keypair |
+| `fingerprint` | Compute a deterministic build fingerprint for fingerprint-targeted rollouts |
+| `doctor` | Diagnose the environment + backend connectivity |
+| `config` | `get` / `set` / `list` config values |
+| `console` | Open the web console |
+| `pocketbase` | Manage a local single-binary PocketBase backend (install / serve / …) |
+
+Every command has help, including nested subcommands:
+
+```bash
+flutter-ota deploy --help
+flutter-ota bundle list --help
+flutter-ota pocketbase records list --help
+```
+
+Meaningful short flags map to the option's own name — e.g. on `deploy`:
+`-s`ource, `-c`hannel, `-m`essage, `-f`orce, `-t`arget-app-version,
+`-k`ey, `-b`ackend.
+
+---
+
+## Backends
+
+Select one with `--backend supabase|postgres|cloudflare|aws|pocketbase` (or set
+`provider` in `.flutter_ota_kit/config.json`). Each resolves settings with a
+clear precedence:
+
+```
+explicit flag  >  environment variable  >  .flutter_ota_kit/config.json  >  default
+```
+
+Config file search order: `./.flutter_ota_kit/config.json`, then the global
+`~/.flutter_ota_kit/config.json`. Secrets (service-role keys, DB passwords,
+tokens) belong in your shell environment or `.env` — never in committed config.
+
+| Backend | Provisioning |
+|---------|--------------|
+| **Supabase** | `migrate supabase` runs SQL + creates the storage bucket — fully automated |
+| **PocketBase** | `pocketbase install` + `pocketbase serve` — single binary, schema auto-installed |
+| **Postgres** | `migrate postgres` applies the SQL migrations |
+| **Cloudflare** | `migrate cloudflare` creates D1 + R2 and runs SQL |
+| **AWS** | No SQL — the S3 bucket/prefix is created on first `deploy` |
+
+See the [Backends guide](https://github.com/HYPER12755/flutter-ota-kit/blob/main/doc/backends.md)
+for per-backend env vars and setup.
+
+---
+
+## Signing
+
+```bash
+flutter-ota keys --save                 # generate a keypair, save the public half
+flutter-ota deploy --key <private-file> # sign the bundle (Ed25519 over the MD5)
+```
+
+Put the public key in your app via `FlutterPatcher.init(publicKeyBase64: '…')`;
+keep the private key on your CI/build machine, never in the app bundle.
+
+---
+
+## Documentation
+
+- [CLI Reference](https://github.com/HYPER12755/flutter-ota-kit/blob/main/doc/cli-reference.md) — every command + flag
+- [Getting Started](https://github.com/HYPER12755/flutter-ota-kit/blob/main/doc/getting-started.md)
+- [Backends](https://github.com/HYPER12755/flutter-ota-kit/blob/main/doc/backends.md)
+- [Configuration](https://github.com/HYPER12755/flutter-ota-kit/blob/main/doc/configuration.md)
+- [Production Playbook](https://github.com/HYPER12755/flutter-ota-kit/blob/main/doc/production-playbook.md)
+
+---
+
+## License
+
+MIT

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

@@ -22,7 +22,7 @@ export 'src/util.dart';
 
 // Re-export the PocketBase client so CLI commands can probe PB health
 // without pulling the plugin in separately.
-export 'package:flutter_ota_kit_pocketbase/flutter_ota_kit_pocketbase.dart'
+export 'package:flutter_ota_kit/src/pkg/pocketbase/flutter_ota_kit_pocketbase.dart'
     show PocketBaseClient;
 
 export 'src/commands/init.dart';
@@ -85,13 +85,15 @@ Future<int> run(List<String> args) async {
     final msg = e.message;
 
     // Missing subcommand → show the command's own help + suggestions.
+    // Handles nested paths too (e.g. "flutter-ota pocketbase records"), not
+    // just single-word commands.
     if (msg.startsWith('Missing subcommand')) {
-      final match = RegExp(r'"flutter-ota (\w+)"').firstMatch(msg);
+      final match = RegExp(r'"flutter-ota ([^"]+)"').firstMatch(msg);
       if (match != null) {
-        final cmd = runner.commands[match.group(1)];
+        final cmd = _resolveCommandPath(runner, match.group(1)!.split(' '));
         if (cmd != null) {
           _printMissingSubcommand(cmd);
-          return 0;
+          return 64;
         }
       }
     }
@@ -103,7 +105,7 @@ Future<int> run(List<String> args) async {
     }
 
     // Unknown command → fuzzy-match and suggest.
-    final unknownMatch = RegExp(r'Could not find a command named "?(\w+)"?')
+    final unknownMatch = RegExp(r'Could not find a command named "?([\w-]+)"?')
         .firstMatch(msg);
     if (unknownMatch != null) {
       final typed = unknownMatch.group(1)!;
@@ -111,14 +113,15 @@ Future<int> run(List<String> args) async {
       return 64;
     }
 
-    // Unknown subcommand → suggest closest subcommand.
+    // Unknown subcommand → suggest closest subcommand. Handles nested parents
+    // (e.g. "... named "nope" for "flutter-ota pocketbase records"").
     final subMatch = RegExp(
-      r'Could not find a subcommand named "?(\w+)"? for "?flutter-ota (\w+)"?',
+      r'Could not find a subcommand named "?([\w-]+)"? for "?flutter-ota ([^"]+)"?',
     ).firstMatch(msg);
     if (subMatch != null) {
       final subTyped = subMatch.group(1)!;
-      final parentName = subMatch.group(2)!;
-      final parentCmd = runner.commands[parentName];
+      final parentPath = subMatch.group(2)!.trim().split(' ');
+      final parentCmd = _resolveCommandPath(runner, parentPath);
       if (parentCmd != null) {
         _printUnknownSubcommand(parentCmd, subTyped);
         return 64;
@@ -133,6 +136,22 @@ Future<int> run(List<String> args) async {
   }
 }
 
+/// Walk a space-separated command path (e.g. `["pocketbase", "records"]`)
+/// from the runner down through nested subcommands. Returns the resolved
+/// [Command], or null if any segment is unknown.
+Command<int>? _resolveCommandPath(
+  FlutterPatcherRunner runner,
+  List<String> path,
+) {
+  if (path.isEmpty) return null;
+  Command<int>? cmd = runner.commands[path.first];
+  for (final segment in path.skip(1)) {
+    if (cmd == null) return null;
+    cmd = cmd.subcommands[segment];
+  }
+  return cmd;
+}
+
 /// Show a helpful "unknown command" message with fuzzy-match suggestions.
 void _printUnknownCommand(FlutterPatcherRunner runner, String typed) {
   final commands = runner.commands.keys.toList();
@@ -213,6 +232,7 @@ void _printUnknownCommand(FlutterPatcherRunner runner, String typed) {
 /// Show a helpful "unknown subcommand" message with suggestions.
 void _printUnknownSubcommand(Command<int> parent, String typed) {
   final subNames = parent.subcommands.keys.toList();
+  final parentPath = _commandPath(parent);
 
   // Find closest subcommands.
   final suggestions = subNames
@@ -221,14 +241,14 @@ void _printUnknownSubcommand(Command<int> parent, String typed) {
 
   stderr.writeln('');
   stderr.writeln(
-    '  ${_red('✗')} Unknown subcommand: ${_red(typed)} for ${_cyan('flutter-ota ${parent.name}')}',
+    '  ${_red('✗')} Unknown subcommand: ${_red(typed)} for ${_cyan('flutter-ota $parentPath')}',
   );
   stderr.writeln('');
 
   if (suggestions.isNotEmpty) {
     stderr.writeln('  ${_cyan('Did you mean?')}');
     for (final s in suggestions.take(3)) {
-      stderr.writeln('    ${_green(s)}');
+      stderr.writeln('    ${_green('$parentPath $s')}');
     }
     stderr.writeln('');
   }
@@ -239,17 +259,18 @@ void _printUnknownSubcommand(Command<int> parent, String typed) {
 /// Show a helpful "missing subcommand" message with all subcommand suggestions.
 void _printMissingSubcommand(Command<int> parent) {
   final subNames = parent.subcommands.keys.toList()..sort();
+  final parentPath = _commandPath(parent);
 
   stderr.writeln('');
   stderr.writeln(
-    '  ${_red('✗')} Missing subcommand for ${_cyan('flutter-ota ${parent.name}')}',
+    '  ${_red('✗')} Missing subcommand for ${_cyan('flutter-ota $parentPath')}',
   );
   stderr.writeln('');
 
   if (subNames.isNotEmpty) {
     stderr.writeln('  ${_cyan('Available subcommands:')}');
     for (final s in subNames) {
-      stderr.writeln('    ${_green('${parent.name} $s')}');
+      stderr.writeln('    ${_green('$parentPath $s')}');
     }
     stderr.writeln('');
   }
@@ -257,6 +278,18 @@ void _printMissingSubcommand(Command<int> parent) {
   parent.printUsage();
 }
 
+/// Full space-separated path of a command (e.g. `pocketbase records`),
+/// walking up the `parent` chain. The runner itself has no name in the chain.
+String _commandPath(Command<int> command) {
+  final parts = <String>[command.name];
+  var p = command.parent;
+  while (p != null) {
+    parts.insert(0, p.name);
+    p = p.parent;
+  }
+  return parts.join(' ');
+}
+
 // ── Minimal Levenshtein distance ──────────────────────────────────────────────
 
 int _levenshtein(String a, String b) {

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

@@ -1,9 +1,9 @@
-import 'package:flutter_ota_kit_aws/flutter_ota_kit_aws.dart';
-import 'package:flutter_ota_kit_cloudflare/flutter_ota_kit_cloudflare.dart';
-import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.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';
+import 'package:flutter_ota_kit/src/pkg/aws/flutter_ota_kit_aws.dart';
+import 'package:flutter_ota_kit/src/pkg/cloudflare/flutter_ota_kit_cloudflare.dart';
+import 'package:flutter_ota_kit/src/pkg/plugin_core/flutter_ota_kit_plugin_core.dart';
+import 'package:flutter_ota_kit/src/pkg/pocketbase/flutter_ota_kit_pocketbase.dart';
+import 'package:flutter_ota_kit/src/pkg/postgres/flutter_ota_kit_postgres.dart';
+import 'package:flutter_ota_kit/src/pkg/supabase/flutter_ota_kit_supabase.dart';
 
 import 'config.dart';
 

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

@@ -17,10 +17,12 @@ class BuildCommand extends FlutterPatcherCommand {
       )
       ..addMultiOption(
         'assets',
+        abbr: 'A',
         help: 'Asset keys to include as overlay updates (repeatable).',
       )
       ..addOption(
         'version',
+        abbr: 'V',
         help: 'Patch version string (stored in manifest.version).',
       )
       ..addOption(

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

@@ -151,7 +151,7 @@ class BundleShowCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
   }
 
   final FlutterPatcherConfig? config;
@@ -201,7 +201,7 @@ class BundleDeleteCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
     argParser.addFlag(
       'keep-storage',
       help: 'Do not delete the storage object.',
@@ -252,7 +252,7 @@ class BundleDisableCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
   }
 
   final FlutterPatcherConfig? config;
@@ -290,7 +290,7 @@ class BundleEnableCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
   }
 
   final FlutterPatcherConfig? config;
@@ -328,7 +328,7 @@ class BundleForceCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
     argParser.addFlag(
       'off',
       help: 'Clear the force-update flag instead of setting it.',
@@ -377,7 +377,7 @@ class BundlePromoteCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
     argParser.addOption('channel', abbr: 'c', help: 'Target channel.');
   }
 
@@ -426,7 +426,7 @@ class BundleUpdateCommand extends FlutterPatcherCommand {
           ? 'Backend provider [detected: $detected].'
           : 'Backend provider.',
     );
-    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('id', abbr: 'i', help: 'Bundle id.');
     argParser.addOption('message', abbr: 'm', help: 'New release message.');
     argParser.addOption(
       'target-version',

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

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
+import 'package:flutter_ota_kit/src/pkg/core/flutter_ota_kit_core.dart';
 
 import '../backend.dart';
 import '../cli_base.dart';
@@ -37,10 +37,12 @@ class DeployCommand extends FlutterPatcherCommand {
     argParser.addFlag('force', abbr: 'f', help: 'Force the update on clients.');
     argParser.addOption(
       'target-app-version',
+      abbr: 't',
       help: 'Semver range target (XOR with fingerprint-hash).',
     );
     argParser.addOption(
       'fingerprint-hash',
+      abbr: 'F',
       help: 'Fingerprint hash target (XOR with target-app-version).',
     );
     argParser.addOption(
@@ -50,6 +52,7 @@ class DeployCommand extends FlutterPatcherCommand {
     );
     argParser.addOption(
       'git-commit-hash',
+      abbr: 'g',
       help: 'Git commit hash (auto-detected).',
     );
     argParser.addOption(