@_nazmiforreal/flutter-ota 0.1.26 → 0.1.28

package/dart-src/root/lib/src/shared_update_check.dart

@@ -0,0 +1,131 @@
+import 'dart:async';
+
+import 'package:flutter_ota_kit/src/pkg/core/flutter_ota_kit_core.dart'
+    show
+        AppUpdateStatus,
+        AppVersionGetBundlesArgs,
+        FingerprintGetBundlesArgs,
+        GetBundlesArgs,
+        nilUuid,
+        Platform,
+        UpdateInfo,
+        UpdateStrategy;
+import 'package:flutter_ota_kit/src/pkg/client/flutter_ota_kit_client.dart'
+    show ServerUpdateResult;
+import 'package:flutter_ota_kit/src/pkg/plugin_core/flutter_ota_kit_plugin_core.dart'
+    show DatabasePlugin, StoragePlugin;
+
+import 'patch_info.dart' show PatchInfo;
+import 'app_version_resolver.dart';
+
+final _uuidRe = RegExp(
+  r'^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$',
+);
+
+/// Backend-agnostic update-check orchestration shared by every hosted source
+/// (Supabase / Postgres / Cloudflare / AWS / PocketBase).
+///
+/// The only backend-specific pieces are the already-constructed [DatabasePlugin]
+/// and [StoragePlugin] plus the targeting fields pulled from each source config.
+/// Everything else — bundle-id normalization, `appVersion`/fingerprint argument
+/// building (with runtime `appVersion` auto-detection), the `getUpdateInfo` call,
+/// download-URL resolution and the `ServerUpdateResult` mapping — is identical
+/// across backends and lives here exactly once.
+///
+/// [timeout] bounds the two HTTP round-trips (DB query + signed-URL mint).
+/// When the timeout fires, the in-flight HTTP request is cancelled via
+/// `Future.timeout`, which propagates a `TimeoutException` that callers can
+/// catch and surface to the user (e.g. "no internet — try again later").
+Future<ServerUpdateResult> performSharedUpdateCheck({
+  required DatabasePlugin db,
+  required StoragePlugin storage,
+  required String channel,
+  required Platform platform,
+  required UpdateStrategy updateStrategy,
+  required String? appVersion,
+  required String? fingerprintHash,
+  required String minBundleId,
+  String? currentBundleId,
+  Duration timeout = const Duration(seconds: 10),
+}) async {
+  final bundleId =
+      (currentBundleId != null && _uuidRe.hasMatch(currentBundleId))
+      ? currentBundleId
+      : nilUuid;
+
+  final GetBundlesArgs args;
+  if (updateStrategy == UpdateStrategy.fingerprint) {
+    args = FingerprintGetBundlesArgs(
+      channel: channel,
+      platform: platform,
+      bundleId: bundleId,
+      minBundleId: minBundleId,
+      fingerprintHash: fingerprintHash ?? '',
+    );
+  } else {
+    final resolvedAppVersion = await resolveAppVersion(appVersion);
+    args = AppVersionGetBundlesArgs(
+      channel: channel,
+      platform: platform,
+      bundleId: bundleId,
+      minBundleId: minBundleId,
+      appVersion: resolvedAppVersion,
+    );
+  }
+
+  final UpdateInfo? info = await db
+      .getUpdateInfo(args)
+      .timeout(
+        timeout,
+        onTimeout: () => throw TimeoutException(
+          'update check timed out after ${timeout.inSeconds}s while querying the backend',
+        ),
+      );
+  if (info == null) return ServerUpdateResult.upToDate();
+
+  final storageUri = info.storageUri;
+  // Server signals rollback with ROLLBACK status and null/empty storageUri
+  if (info.status == 'ROLLBACK') {
+    return ServerUpdateResult(
+      isUpToDate: false,
+      patch: null,
+      status: AppUpdateStatus.rollback,
+      shouldForceUpdate: info.shouldForceUpdate,
+      id: info.id,
+      message: info.message,
+    );
+  }
+  if (storageUri == null || storageUri.isEmpty) {
+    return ServerUpdateResult.upToDate();
+  }
+
+  final runtime = storage.profiles.runtime;
+  if (runtime == null) return ServerUpdateResult.upToDate();
+  final dl = await runtime
+      .getDownloadUrl(storageUri)
+      .timeout(
+        timeout,
+        onTimeout: () => throw TimeoutException(
+          'update check timed out after ${timeout.inSeconds}s while minting the download URL',
+        ),
+      );
+  final fileUrl = dl['fileUrl'];
+  if (fileUrl == null || fileUrl.isEmpty) {
+    return ServerUpdateResult.upToDate();
+  }
+
+  final patch = PatchInfo(
+    version: info.id,
+    patchUrl: fileUrl,
+    md5: info.fileHash ?? '',
+  );
+  return ServerUpdateResult(
+    isUpToDate: false,
+    patch: patch,
+    status: AppUpdateStatus.update,
+    shouldForceUpdate: info.shouldForceUpdate,
+    id: info.id,
+    message: info.message,
+    gitCommitHash: info.gitCommitHash,
+  );
+}

package/dart-src/root/lib/src/supabase_update_source.dart

@@ -0,0 +1,93 @@
+import 'package:flutter_ota_kit/src/pkg/core/flutter_ota_kit_core.dart'
+    show nilUuid, Platform, UpdateStrategy;
+import 'package:flutter_ota_kit/src/pkg/client/flutter_ota_kit_client.dart'
+    show ServerUpdateResult;
+import 'package:flutter_ota_kit/src/pkg/supabase/flutter_ota_kit_supabase.dart'
+    show
+        supabaseDatabase,
+        supabaseStorage,
+        SupabaseServiceRoleConfig,
+        SupabaseStorageConfig;
+
+import 'shared_update_check.dart';
+
+/// Configuration for a hosted **Supabase** update source.
+///
+/// Talks to the Supabase project directly over its REST API
+/// (PostgREST `bundles` table + Storage signed URLs). No separate server is
+/// required — Supabase *is* the backend.
+class SupabaseUpdateConfig {
+  const SupabaseUpdateConfig({
+    required this.supabaseUrl,
+    this.anonKey,
+    this.serviceRoleKey,
+    required this.bucket,
+    required this.channel,
+    required this.platform,
+    required this.updateStrategy,
+    this.appVersion,
+    this.fingerprintHash,
+    this.sdkVersion = '1.0.0',
+    this.cohort,
+    this.minBundleId = nilUuid,
+  });
+
+  final String supabaseUrl;
+  final String? anonKey;
+  final String? serviceRoleKey;
+  final String bucket;
+  final String channel;
+  final Platform platform;
+  final UpdateStrategy updateStrategy;
+  final String? appVersion;
+  final String? fingerprintHash;
+  final String sdkVersion;
+  final String? cohort;
+
+  /// Build-time scan floor (mirrors hot-updater's `getMinBundleId()`). Bundles
+  /// with an id older than this are never served.
+  final String minBundleId;
+}
+
+/// Device-side update source backed by a hosted Supabase project. Performs the
+/// update check directly against PostgREST and resolves the patch download URL
+/// from Supabase Storage (signed URL). Mirrors hot-updater's `createSupabaseSource`.
+class SupabaseUpdateSource {
+  const SupabaseUpdateSource();
+
+  /// Reads the latest enabled bundle for the configured channel/platform/target
+  /// and resolves its download URL.
+  Future<ServerUpdateResult> check(
+    SupabaseUpdateConfig config, {
+    String? currentBundleId,
+    Duration timeout = const Duration(seconds: 10),
+  }) async {
+    final dbConfig = SupabaseServiceRoleConfig(
+      supabaseUrl: config.supabaseUrl,
+      supabaseServiceRoleKey: config.serviceRoleKey,
+      supabaseAnonKey: config.anonKey,
+    );
+    final storageConfig = SupabaseStorageConfig(
+      supabaseUrl: config.supabaseUrl,
+      supabaseServiceRoleKey: config.serviceRoleKey,
+      supabaseAnonKey: config.anonKey,
+      bucketName: config.bucket,
+    );
+
+    final db = supabaseDatabase(dbConfig)();
+    final storage = supabaseStorage(storageConfig);
+
+    return performSharedUpdateCheck(
+      db: db,
+      storage: storage,
+      channel: config.channel,
+      platform: config.platform,
+      updateStrategy: config.updateStrategy,
+      appVersion: config.appVersion,
+      fingerprintHash: config.fingerprintHash,
+      minBundleId: config.minBundleId,
+      currentBundleId: currentBundleId,
+      timeout: timeout,
+    );
+  }
+}

package/dart-src/root/pubspec.yaml

@@ -0,0 +1,54 @@
+name: flutter_ota_kit
+description: Open-source, self-hosted code push (OTA updates) for Flutter Android. Patches Dart AOT libapp.so and assets on cold start with integrity checks and crash rollback.
+version: 0.2.1
+homepage: https://github.com/HYPER12755/flutter-ota-kit
+repository: https://github.com/HYPER12755/flutter-ota-kit
+issue_tracker: https://github.com/HYPER12755/flutter-ota-kit/issues
+documentation: https://github.com/HYPER12755/flutter-ota-kit#readme
+license: MIT
+
+topics:
+  - flutter
+  - android
+  - code-push
+  - hot-update
+  - ota-update
+
+environment:
+  sdk: '>=3.13.2 <4.0.0'
+  flutter: '>=3.47.2'
+
+dependencies:
+  flutter:
+    sdk: flutter
+  plugin_platform_interface: '>=2.0.2 <3.0.0'
+  package_info_plus: ^10.0.0
+  restart_app: ^1.9.1
+  # The npm `flutter-ota` CLI (`flutter_ota_kit_cli`) is intentionally NOT a pub
+  # dependency; `dart run flutter_ota_kit:pack` is implemented in `lib/src/pack`.
+  archive: ^4.0.0
+  args: '>=2.4.0 <3.0.0'
+  crypto: '>=3.0.3 <4.0.0'
+  # Merged from the former sub-packages (core, plugin-core, client, and the
+  # supabase/postgres/cloudflare/aws/pocketbase backends), now bundled directly
+  # under lib/src/pkg/. Their external dependencies are unioned here.
+  http: ^1.2.0
+  path: ^1.9.0
+  mime: ^2.0.0
+  supabase: ^2.14.0
+  postgres: ^3.4.0
+  pointycastle: ^4.0.0
+  asn1lib: ^1.5.4
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  flutter_lints: ^6.0.0
+  test: ^1.25.0
+
+flutter:
+  plugin:
+    platforms:
+      android:
+        package: com.flutter_patcher.flutter_patcher
+        pluginClass: FlutterPatcherPlugin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_nazmiforreal/flutter-ota",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "Command-line interface for flutter_ota_kit — an OTA code-push tool for Flutter, hot-updater compatible.",
   "bin": {
     "flutter-ota": "./bin/flutter-ota.js"

package/scripts/postinstall.js

@@ -4,13 +4,15 @@
 // Post-install: ensure a runnable flutter-ota binary exists next to the
 // launcher for the current platform+arch. If a prebuilt
 // `flutter-ota-<os>-<arch>` binary ships in `bin/`, use it. Otherwise, when
-// the Dart SDK is present, compile one from the bundled Dart source so the
+// the Flutter SDK is present, compile one from the bundled Dart source so the
 // package works on architectures we did not prebuild (e.g. arm64).
 //
-// We explicitly run `dart pub get` first so dependency resolution is reliable
-// (a stale/locked tree would otherwise fail to fetch packages). If compilation
-// cannot be performed we warn (and exit 0) rather than failing the whole npm
-// install — the launcher prints a clear "how to build" message at runtime.
+// NOTE (v0.2.0+): the CLI now depends on the merged `flutter_ota_kit` package,
+// which is a Flutter plugin. Dependency resolution therefore needs the Flutter
+// SDK (`flutter pub get`), not just the Dart SDK. The compiled executable
+// itself is still a plain Dart binary (the CLI only touches the pure-Dart
+// backend code, not Flutter widgets). If Flutter is unavailable we warn and
+// exit 0 rather than failing the whole npm install.
 
 const { spawnSync } = require('child_process');
 const fs = require('fs');
@@ -50,11 +52,13 @@ if (fs.existsSync(target)) {
 }
 
 const dartCheck = spawnSync('dart', ['--version'], { stdio: 'ignore' });
-if (dartCheck.status !== 0) {
+const flutterCheck = spawnSync('flutter', ['--version'], { stdio: 'ignore' });
+if (dartCheck.status !== 0 || flutterCheck.status !== 0) {
   console.warn(
-    `flutter-ota: Dart SDK not found; skipping build. Provide a prebuilt ` +
+    `flutter-ota: Flutter SDK not found; skipping build. Provide a prebuilt ` +
       `binary (bin/flutter-ota-${platformName}-${archName}${ext}) or install ` +
-      'the Dart SDK (https://dart.dev).',
+      'the Flutter SDK (https://flutter.dev). The CLI depends on the ' +
+      '`flutter_ota_kit` Flutter package, so `flutter pub get` is required.',
   );
   process.exit(0);
 }
@@ -64,13 +68,13 @@ if (!fs.existsSync(path.join(cliDir, 'pubspec.yaml'))) {
   process.exit(0);
 }
 
-console.log('flutter-ota: resolving Dart dependencies (dart pub get)...');
-const getRes = spawnSync('dart', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
+console.log('flutter-ota: resolving dependencies (flutter pub get)...');
+const getRes = spawnSync('flutter', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
 if (getRes.status !== 0) {
   console.error(
-    'flutter-ota: `dart pub get` failed (check your network / Dart version). ' +
-      `To build manually:\n  cd ${cliDir} && dart compile exe bin/flutter_ota_kit.dart ` +
-      `-o ${target}`,
+    'flutter-ota: `flutter pub get` failed (check your network / Flutter version). ' +
+      `To build manually:\n  cd ${cliDir} && flutter pub get && dart compile exe ` +
+      `bin/flutter_ota_kit.dart -o ${target}`,
   );
   process.exit(0);
 }

package/scripts/vendor.sh

@@ -10,14 +10,28 @@ SRC="$ROOT"
 echo "Vendoring Dart source from $SRC into $DST"
 
 rm -rf "$DST"
-mkdir -p "$DST/packages" "$DST/plugins"
+mkdir -p "$DST/packages"
 
-for p in packages/core packages/cli-tools; do
-  cp -R "$SRC/$p" "$DST/$p"
-done
-for p in plugins/cloudflare plugins/plugin-core plugins/postgres plugins/aws plugins/supabase plugins/pocketbase; do
-  cp -R "$SRC/$p" "$DST/$p"
+# Single-package layout (v0.2.0+): the former sub-packages (core, plugin-core,
+# client, and the supabase/postgres/cloudflare/aws/pocketbase backends) now live
+# INSIDE the root `flutter_ota_kit` package under lib/src/pkg/. So we only vendor
+# the root package + the CLI. The CLI depends on the root via a path override.
+#
+# We copy the root package's publishable pieces (lib, android, pubspec, etc.)
+# and the CLI. `example/` and build artifacts are dropped.
+mkdir -p "$DST/root"
+for item in lib android bin pubspec.yaml analysis_options.yaml LICENSE README.md; do
+  [ -e "$SRC/$item" ] && cp -R "$SRC/$item" "$DST/root/$item"
 done
+cp -R "$SRC/packages/cli-tools" "$DST/packages/cli-tools"
+
+# Repoint the CLI's `flutter_ota_kit` path override at the vendored root copy.
+CLI_PUBSPEC="$DST/packages/cli-tools/pubspec.yaml"
+if [ -f "$CLI_PUBSPEC" ]; then
+  # dependency_overrides -> flutter_ota_kit -> path: ../.. becomes ../../root
+  perl -0pi -e 's{(flutter_ota_kit:\s*\n\s*path:\s*)\.\.\/\.\.}{${1}../../root}g' "$CLI_PUBSPEC" 2>/dev/null || \
+    sed -i 's|path: \.\./\.\.|path: ../../root|' "$CLI_PUBSPEC"
+fi
 
 # Drop tooling/lock artifacts so `dart pub get` resolves fresh on install.
 find "$DST" -name pubspec.lock -delete
@@ -26,7 +40,8 @@ find "$DST" -name build -type d -prune -exec rm -rf {} +
 find "$DST" -name .git -type d -prune -exec rm -rf {} +
 find "$DST" -name coverage -type d -prune -exec rm -rf {} +
 
-# Sync migration SQL files so the binary can find them at ../migrations/<backend>/
+# Sync migration SQL files so the binary can find them at ../migrations/<backend>/.
+# The SQL/DDL data still lives in the (non-Dart) plugins/* data dirs in the repo.
 MIG_DST="$(cd "$(dirname "$0")/.." && pwd)/migrations"
 rm -rf "$MIG_DST"
 

package/dart-src/packages/core/CHANGELOG.md

@@ -1,21 +0,0 @@
-## 0.1.8
-
-- Release 2026-09-10
-
-## 0.1.8
-
-- Automated release 2026-09-10
-
-## 0.1.7
-
-- Added comprehensive documentation for all public APIs.
-- Improved `Bundle` equality and hashCode implementation.
-- Fixed `toSqlJson()` nullable field handling.
-- Added `semver` exports to barrel file.
-
-## 0.1.6
-
-- Added `gitCommitHash` field to `UpdateInfo` for commit tracking.
-- General maintenance.
-
-## 0.1.5

package/dart-src/packages/core/README.md

@@ -1,23 +0,0 @@
-# flutter_ota_kit_core
-
-Pure-Dart core of the [flutter_ota_kit](https://github.com/HYPER12755/flutter-ota-kit) OTA toolkit. It has **no Flutter dependency** and is shared by every other package (client, plugin-core, and all four backends).
-
-## What's inside
-
-- **Data model** — `Bundle`, `PatchInfo`, `AppUpdateInfo`, and the `Platform` / `UpdateStrategy` / status enums that describe an over-the-air update.
-- **Rollout math** — deterministic staged-rollout cohort helpers (`rollout.dart`).
-- **Semver** — `semverSatisfies(target, range)` for matching a device's app version against a bundle's rollout rule.
-- **Identifiers** — `uuidv7` generation plus a `NIL` sentinel (`uuid.dart`).
-- **Bundle artifacts** — helpers to describe and address content-addressed patch artifacts.
-
-## Usage
-
-```dart
-import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
-
-final ok = semverSatisfies('1.0.0', '>=1.0.0 <2.0.0'); // true
-```
-
-## License
-
-MIT — see the [project LICENSE](https://github.com/HYPER12755/flutter-ota-kit/blob/main/LICENSE).

package/dart-src/packages/core/example/lib/main.dart

@@ -1,69 +0,0 @@
-// flutter_ota_kit_core example
-//
-// `flutter_ota_kit_core` is the framework-agnostic data model shared by every
-// backend plugin in the `flutter_ota_kit` family. It defines the canonical
-// shapes for bundles, patches, and rollouts.
-//
-// Most apps don't import this package directly — they use `flutter_ota_kit`
-// (the umbrella package) which re-exports it. This file shows the types you
-// might encounter in API responses, in `flutter_ota_kit_cli` tool output, or
-// while writing a custom backend.
-//
-// Run: `dart run example/main.dart`
-
-import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
-
-void main() {
-  // ── 1. Bundle: the central database row / manifest object. ─────────
-  // Every backend stores this shape (Postgres, Supabase, Cloudflare D1,
-  // AWS DynamoDB, PocketBase). The wire format is camelCase, the SQL
-  // format is snake_case — `fromJson` tolerates both.
-  final bundle = Bundle(
-    id: '01a059a6-7d3c-4f3e-8a2c-9c2e3a4b5d6e',
-    platform: Platform.android,
-    shouldForceUpdate: false,
-    enabled: true,
-    fileHash: '7c4a8d09ca3762af61e59520943dc26494f8941b',
-    storageUri: 'supabase-storage://flutter-ota-bundles/01a059a6/patch.zip',
-    channel: 'production',
-    targetAppVersion: '1.0.0',
-    metadata: const BundleMetadata(
-      appVersion: '1.0.1',
-      signature: 'ed25519:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08',
-    ),
-    rolloutCohortCount: 100, // 10% of devices (per-mille 0..1000).
-  );
-
-  print('Bundle ${bundle.id} on ${bundle.platform.value}:');
-  print('  storageUri          = ${bundle.storageUri}');
-  print('  targetAppVersion    = ${bundle.targetAppVersion}');
-  print('  metadata.appVersion = ${bundle.metadata?.appVersion}');
-
-  // ── 2. Wire format conversion. ─────────────────────────────────────
-  // `toJson()` produces the camelCase wire payload sent over the
-  // hot-updater-compatible update-check HTTP contract.
-  final wire = bundle.toJson();
-  print('Wire payload keys: ${wire.keys.toList()}');
-
-  // `toSqlJson()` produces the snake_case row format used by SQL
-  // backends (Postgres / Supabase / D1 / DynamoDB).
-  final sql = bundle.toSqlJson();
-  print('SQL row keys: ${sql.keys.toList()}');
-
-  // ── 3. Rollout: per-mille 0..1000 cohort bucketing. ────────────────
-  // The same device fingerprint always lands in the same bucket across
-  // cold starts, so a 10% rollout stays at 10% even as users churn.
-  const bundleId = '01a059a6-7d3c-4f3e-8a2c-9c2e3a4b5d6e';
-  const rolloutCohortCount = 100; // 10% (per-mille).
-
-  for (final userId in const ['alice', 'bob', 'carol', 'dave', 'eve']) {
-    final cohort = getDefaultNumericCohort(userId);
-    final eligible = isCohortEligibleForUpdate(
-      bundleId,
-      cohort,
-      rolloutCohortCount,
-      null, // targetCohorts (null = percentage rollout)
-    );
-    print('user=$userId  cohort=$cohort  in 10% rollout? $eligible');
-  }
-}

package/dart-src/packages/core/pubspec.yaml

@@ -1,13 +0,0 @@
-name: flutter_ota_kit_core
-description: Core data model, rollout cohorts, and shared utilities for flutter_ota_kit — Dart translation of hot-updater's packages/core.
-version: 0.1.8
-homepage: https://github.com/HYPER12755/flutter-ota-kit
-repository: https://github.com/HYPER12755/flutter-ota-kit
-issue_tracker: https://github.com/HYPER12755/flutter-ota-kit/issues
-documentation: https://github.com/HYPER12755/flutter-ota-kit#readme
-license: MIT
-
-environment:
-  sdk: '>=3.13.2 <4.0.0'
-dev_dependencies:
-  test: ^1.31.2

package/dart-src/packages/core/test/rollout_test.dart

@@ -1,135 +0,0 @@
-import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
-import 'package:test/test.dart';
-
-/// Ground-truth values generated by executing hot-updater's actual
-/// rollout.ts logic under node (see scripts/verify_rollout.mjs).
-void main() {
-  group('ground-truth vectors (TS-verified)', () {
-    test('getDefaultNumericCohort matches TS', () {
-      expect(getDefaultNumericCohort('device-abc-123'), '809');
-      expect(getDefaultNumericCohort('ANDROID_ID_SAMPLE_42'), '64');
-      expect(getDefaultNumericCohort('8f2a1b6c'), '996');
-    });
-
-    test('shuffle parameters match TS', () {
-      expect(getNumericCohortRolloutPosition('bundle-a', 1), 309);
-      expect(getNumericCohortRolloutPosition('bundle-a', 500), 228);
-      expect(getNumericCohortRolloutPosition('bundle-b', 999), 816);
-    });
-
-    test('rolled-out cohort sets match TS', () {
-      final a137 = getRolledOutNumericCohorts('bundle-a', 137);
-      expect(a137.take(3), [4, 11, 16]);
-      expect(a137.skip(a137.length - 3), [980, 985, 992]);
-      expect(a137.length, 137);
-
-      final b100 = getRolledOutNumericCohorts('bundle-b', 100);
-      expect(b100.take(3), [1, 14, 22]);
-    });
-  });
-
-  group('getRolledOutNumericCohorts (spec cases)', () {
-    test('ascending unique set matching eligibility', () {
-      final cohorts = getRolledOutNumericCohorts('x-bundle', 137);
-      expect(cohorts.length, 137);
-      expect(cohorts, [...cohorts]..sort());
-      expect(cohorts.toSet().length, 137);
-      for (final c in cohorts) {
-        expect(isCohortEligibleForUpdate('x-bundle', '$c', 137, null), isTrue);
-      }
-      final excluded = List.generate(
-        1000,
-        (i) => i + 1,
-      ).firstWhere((c) => !cohorts.contains(c));
-      expect(
-        isCohortEligibleForUpdate('x-bundle', '$excluded', 137, null),
-        isFalse,
-      );
-    });
-
-    test('expanding rollout keeps existing cohorts', () {
-      final small = getRolledOutNumericCohorts('y-bundle', 100).toSet();
-      final large = getRolledOutNumericCohorts('y-bundle', 400);
-      expect(large.length, 400);
-      expect(large.toSet().containsAll(small), isTrue);
-    });
-
-    test('boundaries', () {
-      expect(getRolledOutNumericCohorts('z-bundle', 0), isEmpty);
-      expect(getRolledOutNumericCohorts('z-bundle', 1000).length, 1000);
-      expect(getRolledOutNumericCohorts('z-bundle', -5), isEmpty);
-    });
-  });
-
-  group('isCohortEligibleForUpdate (spec cases)', () {
-    test('numeric rollout stays active with target cohorts configured', () {
-      const bundleId = 'd-bundle';
-      final cohorts = getRolledOutNumericCohorts(bundleId, 137);
-      expect(
-        isCohortEligibleForUpdate(bundleId, '${cohorts.first}', 137, [
-          'qa-group',
-        ]),
-        isTrue,
-      );
-    });
-
-    test('targeted custom cohort included beyond percentage', () {
-      expect(
-        isCohortEligibleForUpdate('e-bundle', 'qa-group', 137, ['qa-group']),
-        isTrue,
-      );
-    });
-
-    test('targeted numeric cohort wins even when excluded by rollout', () {
-      const bundleId = 'f-bundle';
-      final rolledOut = getRolledOutNumericCohorts(bundleId, 10).toSet();
-      final excluded = List.generate(
-        1000,
-        (i) => i + 1,
-      ).firstWhere((c) => !rolledOut.contains(c));
-      expect(
-        isCohortEligibleForUpdate(bundleId, '$excluded', 10, ['$excluded']),
-        isTrue,
-      );
-    });
-
-    test('null cohort: eligible only at full rollout', () {
-      expect(isCohortEligibleForUpdate('g-bundle', null, 500, null), isFalse);
-      expect(isCohortEligibleForUpdate('g-bundle', null, null, null), isTrue);
-      expect(isCohortEligibleForUpdate('g-bundle', null, 0, null), isFalse);
-    });
-
-    test('custom cohorts never match percentage rollouts', () {
-      expect(
-        isCohortEligibleForUpdate('h-bundle', 'qa-team', 999, null),
-        isFalse,
-      );
-      expect(
-        isCohortEligibleForUpdate('h-bundle', 'qa-team', 999, ['qa-team']),
-        isTrue,
-      );
-    });
-  });
-
-  group('cohort validation (spec cases)', () {
-    test('rejects empty and out-of-range numeric strings', () {
-      expect(isValidCohort(''), isFalse);
-      expect(isValidCohort('1001'), isFalse);
-      expect(isCustomCohort('1001'), isFalse);
-    });
-
-    test('enforces max custom length', () {
-      expect(isValidCohort('a' * maxCohortLength), isTrue);
-      expect(isValidCohort('a' * (maxCohortLength + 1)), isFalse);
-    });
-
-    test('message mentions limit', () {
-      expect(invalidCohortErrorMessage.contains('$maxCohortLength'), isTrue);
-    });
-
-    test('normalization trims and lowercases', () {
-      expect(normalizeCohortValue('  QA-Group '), 'qa-group');
-      expect(normalizeCohortValue('007'), '7');
-    });
-  });
-}