refactor: fold limrun preinstall into allocation

Author: thymikee

packages/provider-limrun/src/app-preinstall.ts

@@ -234,10 +234,12 @@ class LimrunRuntimeImplementation implements ProviderDeviceRuntime {
     const existing = this.sessions.get(lease.leaseId);
     if (existing) return { limrunInstanceId: existing.instanceId, device: existing.device };
 
-    const { resolvePreinstalledAppId, resolveRequestedLimrunAppAsset } =
-      await import('./app-preinstall.ts');
-    const { allocateLimrunAndroidSession, allocateLimrunIosSession } =
-      await import('./session-allocation.ts');
+    const {
+      allocateLimrunAndroidSession,
+      allocateLimrunIosSession,
+      resolvePreinstalledAppId,
+      resolveRequestedLimrunAppAsset,
+    } = await import('./session-allocation.ts');
     const requestedAsset = await resolveRequestedLimrunAppAsset(this.limrun, platform, context);
     const session =
       platform === 'ios'

packages/provider-limrun/src/runtime.ts

@@ -1,10 +1,15 @@
 import type Limrun from '@limrun/api';
-import type { DeviceLease } from '@agent-device/contracts/device';
+import type { DeviceLease, LeaseLifecycleContext } from '@agent-device/contracts/device';
 import { AppError } from '@agent-device/kernel/errors';
 import { createLimrunAndroidSession, type LimrunAndroidSession } from './android.ts';
 import { buildLimrunDevice } from './device.ts';
 import { createLimrunIosSession, type LimrunIosSession } from './ios.ts';
-import type { LimrunAppAsset } from './app-catalog.ts';
+import {
+  resolveInstalledAppIdForAsset,
+  resolveLimrunAppAsset,
+  type LimrunAppAsset,
+} from './app-catalog.ts';
+import { createLimrunDeviceSession } from './device-session.ts';
 import type { LimrunRuntimeDependencies } from './runtime-dependencies.ts';
 
 type LimrunInstance = {
@@ -28,6 +33,31 @@ type SessionAllocationParams = Readonly<{
   dependencies: LimrunRuntimeDependencies;
 }>;
 
+export async function resolveRequestedLimrunAppAsset(
+  limrun: Limrun,
+  platform: 'android' | 'ios',
+  context?: LeaseLifecycleContext,
+): Promise<LimrunAppAsset | undefined> {
+  const value = context?.flags?.providerApp;
+  const name = typeof value === 'string' ? value.trim() : '';
+  if (!name) return undefined;
+  return await resolveLimrunAppAsset(limrun, platform, name, context?.signal);
+}
+
+export async function resolvePreinstalledAppId(
+  session: LimrunAndroidSession | LimrunIosSession,
+  asset: LimrunAppAsset,
+): Promise<string> {
+  const apps = await createLimrunDeviceSession(session).listApps('user-installed');
+  const matchedAppId = resolveInstalledAppIdForAsset(asset.name, apps);
+  if (matchedAppId) return matchedAppId;
+  throw new AppError(
+    'COMMAND_FAILED',
+    `Limrun installed ${asset.name}, but its application identifier could not be resolved unambiguously.`,
+    { asset: asset.name, installedApps: apps.map((app) => app.id) },
+  );
+}
+
 export async function allocateLimrunIosSession(
   params: SessionAllocationParams,
 ): Promise<LimrunIosSession> {