fix: old aot_tools binaries do not work

packages/shorebird_cli/lib/src/cache.dart

@@ -29,7 +29,7 @@ class CacheUpdateFailure implements Exception {
   String toString() => 'CacheUpdateFailure: $message';
 }
 
-typedef ArchiveExtracter = Future<void> Function(
+typedef ArchiveExtractor = Future<void> Function(
   String archivePath,
   String outputPath,
 );
@@ -62,7 +62,7 @@ class Cache {
     registerArtifact(AotToolsArtifact(cache: this, platform: platform));
   }
 
-  final ArchiveExtracter extractArchive;
+  final ArchiveExtractor extractArchive;
 
   void registerArtifact(CachedArtifact artifact) => _artifacts.add(artifact);
 
@@ -133,19 +133,21 @@ abstract class CachedArtifact {
   final Cache cache;
   final Platform platform;
 
+  /// The on-disk name of the artifact.
   String get name;
 
-  String get storageUrl;
-
-  String get fileName;
-
+  /// Should the artifact be marked executable.
   bool get isExecutable;
 
+  /// The URL from which the artifact can be downloaded.
+  String get storageUrl;
+
+  /// Whether the artifact is required for Shorebird to function.
+  /// If we fail to fetch it we will exit with an error.
   bool get required => true;
 
   Future<void> extractArtifact(http.ByteStream stream, String outputPath) {
-    final file = File(p.join(outputPath, fileName))
-      ..createSync(recursive: true);
+    final file = File(p.join(outputPath, name))..createSync(recursive: true);
     return stream.pipe(file.openWrite());
   }
 
@@ -185,7 +187,7 @@ allowed to access $storageUrl.''',
     if (!platform.isWindows && isExecutable) {
       final result = await process.start(
         'chmod',
-        ['+x', p.join(location.path, fileName)],
+        ['+x', p.join(location.path, name)],
       );
       await result.exitCode;
     }
@@ -196,10 +198,7 @@ class AotToolsArtifact extends CachedArtifact {
   AotToolsArtifact({required super.cache, required super.platform});
 
   @override
-  String get name => 'aot-tools';
-
-  @override
-  String get fileName => 'aot-tools.dill';
+  String get name => 'aot-tools.dill';
 
   @override
   bool get isExecutable => false;
@@ -218,7 +217,7 @@ class AotToolsArtifact extends CachedArtifact {
 
   @override
   String get storageUrl =>
-      '${cache.storageBaseUrl}/${cache.storageBucket}/shorebird/${shorebirdEnv.shorebirdEngineRevision}/aot-tools.dill';
+      '${cache.storageBaseUrl}/${cache.storageBucket}/shorebird/${shorebirdEnv.shorebirdEngineRevision}/$name';
 }
 
 class PatchArtifact extends CachedArtifact {
@@ -227,9 +226,6 @@ class PatchArtifact extends CachedArtifact {
   @override
   String get name => 'patch';
 
-  @override
-  String get fileName => 'patch';
-
   @override
   bool get isExecutable => true;
 
@@ -265,9 +261,6 @@ class BundleToolArtifact extends CachedArtifact {
   @override
   String get name => 'bundletool.jar';
 
-  @override
-  String get fileName => 'bundletool.jar';
-
   @override
   bool get isExecutable => false;
 

packages/shorebird_cli/lib/src/executables/aot_tools.dart

@@ -28,9 +28,21 @@ class AotTools {
       artifact: ShorebirdArtifact.aotTools,
     );
 
+    // Fallback behavior for older versions of shorebird where aot-tools was
+    // distributed as an executable.
+    final extension = p.extension(artifactPath);
+    if (extension != '.dill' && extension != '.dart') {
+      return process.run(
+        artifactPath,
+        command,
+        workingDirectory: workingDirectory,
+      );
+    }
+
+    // local engine versions use .dart and we distribute aot-tools as a .dill
     return process.run(
       shorebirdEnv.dartBinaryFile.path,
-      [artifactPath, ...command],
+      ['run', artifactPath, ...command],
       workingDirectory: workingDirectory,
     );
   }

packages/shorebird_cli/pubspec.lock

@@ -293,10 +293,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
+      sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.0"
   http_multi_server:
     dependency: transitive
     description:

packages/shorebird_cli/test/src/cache_test.dart

@@ -24,9 +24,6 @@ class TestCachedArtifact extends CachedArtifact {
   @override
   String get name => 'test';
 
-  @override
-  String get fileName => 'test';
-
   @override
   bool get isExecutable => true;
 
@@ -230,7 +227,7 @@ void main() {
           );
           verify(
             () => logger.detail(
-              '''[cache] optional artifact: "aot-tools" was not found, skipping...''',
+              '''[cache] optional artifact: "aot-tools.dill" was not found, skipping...''',
             ),
           ).called(1);
         });

packages/shorebird_cli/test/src/executables/aot_tools_test.dart

@@ -62,7 +62,7 @@ void main() {
           () => shorebirdArtifacts.getArtifactPath(
             artifact: ShorebirdArtifact.aotTools,
           ),
-        ).thenReturn('aot-tools');
+        ).thenReturn('aot-tools.dill');
         when(
           () => process.run(
             dartBinaryFile.path,
@@ -136,6 +136,7 @@ void main() {
             () => process.run(
               dartBinaryFile.path,
               [
+                'run',
                 aotToolsPath,
                 'link',
                 '--base=$base',
@@ -190,6 +191,7 @@ void main() {
             () => process.run(
               dartBinaryFile.path,
               [
+                'run',
                 aotToolsPath,
                 'link',
                 '--base=$base',