@@ -4,7 +4,7 @@ import { dirname, join } from 'node:path';
 import { test as base } from '@e2e-dev/mobile';
 import { expect } from 'e2e';
 import { ASSERTION_TIMEOUT_MS, loadRunContext } from '../src/core/e2e-config.ts';
-import { describeState, parseVerifyState } from '../src/core/state.ts';
+import { appStart, describeState, parseVerifyState } from '../src/core/state.ts';
 import { agentDeviceStateDir } from '../src/core/workspace.ts';
 import type { host as hostAdapter } from '../src/host.ts';
 
@@ -33,6 +33,16 @@ const POLL_MS = 400;
 
 const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
+function adb(target: RunTarget, args: readonly string[]): Promise<void> {
+  const lease = JSON.parse(readFileSync(target.leaseFile, 'utf8')) as { deviceId: string };
+  return new Promise((resolve, reject) => {
+    execFile('adb', ['-s', lease.deviceId, ...args], (error, _stdout, stderr) => {
+      if (error === null) resolve();
+      else reject(new Error(`adb ${args[0]} failed: ${stderr.trim() || error.message}`));
+    });
+  });
+}
+
 /** e2e names the worker's agent-device session `<session>-<slot>`, and verify runs one worker, so slot 0. */
 function typeIntoFocused(context: RunContext, target: RunTarget, text: string): Promise<void> {
   const lease = JSON.parse(readFileSync(target.leaseFile, 'utf8')) as { deviceId?: string };
@@ -122,7 +132,9 @@ export const test = base.extend<{ host: HostFixture<HostScreen> }>({
         };
         const launch = await call<BrokerLaunchResponse>('/launch', request);
         lastScope = launch.storageScope;
-        await device.openApp(target.appId, { relaunch: true, launchArguments: launch.launchArguments });
+        const start = appStart(target.platform, target.appId, target.entry, launch.launchArguments);
+        if (start.kind === 'open-app') await device.openApp(target.appId, { relaunch: true, launchArguments: start.launchArguments });
+        else for (const command of start.commands) await adb(target, command);
         const ready = (s: VerifyState) =>
           s.launchId === launch.launchId &&
           (s.lastError !== null || (s.environmentLoaded && (user === null || s.ticket === 'succeeded' || s.ticket === 'failed')));
 
@@ -1,8 +1,8 @@
 cdc1b4456e81d87286a1a595b7fd51ab5270ac789c279312ffece57456a0bce6  broker.ts
 b04c0026c6ff1ef3d73fb1cddd6c39fcd423022abcba2b268b6c7d5bf13f6bc3  claims.ts
-e831b55c97eca37565cfe16cd4b747148c7559ef2e84cca650c5e0a0ead13547  clerk.ts
-fa75dc6271efe589c1bc448d59ec989247b5bb2d730f0aa444656562fba9ab6d  cli.ts
-167b6ad5bb8e658676cdec880d1392b67b284788d34074f93f1a54decf621ea2  devices.ts
+8869a4c586ad03f57ba2087b6a8f32a5db315b43c3147a5205b646d845d09077  clerk.ts
+9180c6e543e7d2d0189e13762a86f9f80ed446bb5175736f10f8612c8548ef39  cli.ts
+bc31efb0cf2dec598e0d74fc4b5d533a7e54b42a017031b76ebe5a9a3dcc8c7d  devices.ts
 1958ae5fde67836aef8dcdbcda6780d6d2c671c28bf238e7336fa2725dc7e042  e2e-config.ts
 5d18969f5131082474d1af2542b0f7524f32efe8dd9393765d0b8455319a8102  e2e.ts
 af6ce3c27d93f6f50d833c43095c8bc3ff4a54f9cfda12b9f7e73d7d627cc405  evidence.ts
@@ -13,7 +13,7 @@ d3ee90fa760f73d1816eabb907f723431747a71cdad1f966ae31200f828ba6e5  ledgers.ts
 4436a99ad3c0c9b159aa22114b7794c9f808c802ec6c8ad52680f6f5c29dc8a5  publish.ts
 c5e65966dfbb8fe63c5471deed10d68f962eba32048b3367c6944f58dd490b74  secret.ts
 685eabf010c7f63d076cfd3da1a681b5cc8024720538c1bf3a99792b563d8b60  slot.ts
-598f40161b0442e91aff3298b158f8d1fbef81bf3f89a69281ea9f27904c9493  state.ts
-c004692ecd90a88c17c9317c64866141d7d68c5ce43b7cf9f2a2b6f7de7b0171  types.ts
-403426b9276dfc8c7a200621650e30861930e2f0b440503d16173f4a9059caca  verbs.ts
-4675e3d330c4610bbde6b9ad44de57a2aca7fe5fd63e12868a8f157638a2cfe5  workspace.ts
+4fb28a1cfcdc0fe88834d63319d64671406cab5a10abf9ab50462919f82873e4  state.ts
+b68aae1847a0a6e57b2c07f0c4e1d5c82ad4b3524ff67dd0d423f972a7f2aabf  types.ts
+fe401a6040202daecf255f4d6291b4454af3fefc3457df6f010977552a31bb7a  verbs.ts
+ac1d82dfe84b7f635d1f229f4ce1f57458aa6eb00f0ab589fd9a1ea8def1241b  workspace.ts
@@ -2,6 +2,7 @@ import { Secret } from './secret.ts';
 import type { InstanceKeys } from './keys.ts';
 import {
   VerifyFailure,
+  type DeletionTarget,
   type InstanceName,
   type PublishableKey,
   type RunId,
@@ -52,7 +53,7 @@ export interface ClerkBackend {
   createUser(instance: InstanceName, email: TestEmail, phone: TestPhone | null): Promise<SeededUser>;
   mintTicket(user: SeededUser, expiresInSeconds: number): Promise<Secret<'ticket'>>;
   deleteByEmail(instance: InstanceName, email: TestEmail): Promise<{ readonly users: number; readonly organizations: number }>;
-  previewDeleteByEmail(instance: InstanceName, email: TestEmail): Promise<{ readonly users: number; readonly organizations: number }>;
+  previewDeleteByEmail(instance: InstanceName, email: TestEmail): Promise<readonly DeletionTarget[]>;
   findUserId(instance: InstanceName, email: TestEmail): Promise<string | null>;
   settings(instance: InstanceName): Promise<InstanceSettings>;
 }
@@ -88,12 +89,14 @@ export function createClerkBackend(keysFor: (instance: InstanceName) => Instance
     return json;
   }
 
-  async function ownedOrganizations(instance: InstanceName, userId: string): Promise<readonly string[]> {
+  async function ownedOrganizations(instance: InstanceName, userId: string): Promise<readonly { readonly id: string; readonly name: string }[]> {
     const memberships = (await bapi(instance, 'GET', `/users/${userId}/organization_memberships?limit=100`).catch((error: unknown) => {
       if (error instanceof ClerkHttpError && error.codes.includes('organization_not_enabled_in_instance')) return { data: [] };
       throw error;
-    })) as { data?: { organization?: { id?: string; created_by?: string } }[] };
-    return (memberships.data ?? []).flatMap((m) => (typeof m.organization?.id === 'string' && m.organization.created_by === userId ? [m.organization.id] : []));
+    })) as { data?: { organization?: { id?: string; name?: string; created_by?: string } }[] };
+    return (memberships.data ?? []).flatMap(({ organization: org }) =>
+      typeof org?.id === 'string' && org.created_by === userId ? [{ id: org.id, name: org.name ?? '' }] : [],
+    );
   }
 
   async function usersByEmail(instance: InstanceName, email: TestEmail): Promise<readonly { id: string }[]> {
@@ -120,18 +123,20 @@ export function createClerkBackend(keysFor: (instance: InstanceName) => Instance
       return (await usersByEmail(instance, email))[0]?.id ?? null;
     },
     async previewDeleteByEmail(instance, email) {
-      let organizations = 0;
-      const users = await usersByEmail(instance, email);
-      for (const user of users) organizations += (await ownedOrganizations(instance, user.id)).length;
-      return { users: users.length, organizations };
+      const targets: DeletionTarget[] = [];
+      for (const user of await usersByEmail(instance, email)) {
+        targets.push({ kind: 'user', instance, id: user.id, email });
+        for (const org of await ownedOrganizations(instance, user.id)) targets.push({ kind: 'organization', instance, ...org });
+      }
+      return targets;
     },
     async deleteByEmail(instance, email) {
       let users = 0;
       let organizations = 0;
       for (const user of await usersByEmail(instance, email)) {
         for (const org of await ownedOrganizations(instance, user.id)) {
           try {
-            await bapi(instance, 'DELETE', `/organizations/${org}`);
+            await bapi(instance, 'DELETE', `/organizations/${org.id}`);
             organizations += 1;
           } catch (error) {
             if (!(error instanceof ClerkHttpError && error.status === 404)) throw error;
 
@@ -40,7 +40,7 @@ type FlagSpec = Readonly<Record<string, 'value' | 'bool' | 'list'>>;
 const FLAGS: Readonly<Record<Verb, FlagSpec>> = {
   doctor: { platform: 'value', backend: 'value' },
   up: { platform: 'value', backend: 'value', wait: 'value' },
-  run: { platform: 'value', backend: 'value', all: 'bool', skip: 'list', grep: 'value', 'no-video': 'bool' },
+  run: { platform: 'value', backend: 'value', all: 'bool', skip: 'list', grep: 'value', 'no-video': 'bool', wait: 'value' },
   screen: { platform: 'value', png: 'bool' },
   attach: { pr: 'value', screenshot: 'list' },
   down: { platform: 'value', stale: 'bool', 'dry-run': 'bool' },
@@ -193,7 +193,7 @@ function renderRun(result: RunResult, skillDir: string): string[] {
   lines.push(`evidence  ${rel(process.cwd(), result.dir)}`);
   if (r.videos.length > 0) lines.push(`  video        ${r.videos.map((v) => basename(v)).join(', ')}`);
   if (r.screenshots.length > 0) lines.push(`  screenshots  ${r.screenshots.map((s) => basename(s.path)).join(', ')}`);
-  if (r.lastState !== null) lines.push(`  last state   ${describeState(r.lastState)}`);
+  if (r.lastState !== null) lines.push(`  last state   ${describeState(r.lastState)}  (the last test only; every state is in states.jsonl)`);
   if (r.appLog !== null) lines.push(`  app log      ${basename(r.appLog)}`);
   if (r.tainted.length > 0) lines.push(`  TAINTED      ${r.tainted.map((t) => rel(result.dir, t)).join(', ')} (attach is blocked)`);
   lines.push(`next  ${result.next.startsWith('bin/verify ') ? result.next : rel(process.cwd(), result.next)}`);
@@ -208,7 +208,6 @@ function render(value: VerbResult, skillDir: string): string[] {
     }
     case 'up':
       return [
-        ...value.builds.map((b) => `build   ${b.key}  ${b.source}  ${b.reused ? 'reused' : `${b.seconds}s`}`),
         ...value.leases.map((l) => `device  ${l.device}  ${l.backend}  ${l.renewed ? 'renewed' : 'leased by this worktree'}  installed ${l.installedBuild ?? 'nothing'}`),
       ];
     case 'run':
@@ -233,7 +232,8 @@ function render(value: VerbResult, skillDir: string): string[] {
         ...(value.dryRun ? ['dry run: nothing was changed'] : []),
         `${value.dryRun ? 'would release' : 'released'}  ${value.released.map((l) => l.device).join(', ') || 'nothing'}`,
         `${value.dryRun ? 'would delete' : 'deleted'}   ${value.deletedUsers} users, ${value.deletedOrganizations} organizations`,
-        ...(value.stoppedProcesses.length > 0 ? [`${value.dryRun ? 'would stop' : 'stopped'}   ${value.stoppedProcesses.join(', ')}`] : []),
+        ...(value.dryRun ? value.wouldDelete : []).map((t) => (t.kind === 'user' ? `  user          ${t.instance}  ${t.id}  ${t.email}` : `  organization  ${t.instance}  ${t.id}  ${t.name}`)),
+        `${value.dryRun ? 'would stop' : 'stopped'}   ${value.stoppedProcesses.join(', ') || 'nothing'}${value.stoppedProcesses.some((p) => p.startsWith('agent-device ')) ? '' : '; no agent-device daemon running'}`,
         `kept      ${value.keptRuns.length} runs in .verify/runs/`,
       ];
     default: {
 
@@ -31,7 +31,8 @@ export interface LeaseOutcome {
 export function backendFor(host: HostAdapter, platform: Platform, kind: BackendKind): DeviceBackend {
   const backend = host.backends.find((b) => b.platform === platform && b.kind === kind);
   if (backend === undefined) {
-    const fix = kind === 'eas' ? 'run locally on a Mac; the EAS backend arrives with CLOUD-IOS' : `use --backend ${host.backends.find((b) => b.platform === platform)?.kind ?? 'local'}`;
+    const others = host.backends.filter((b) => b.platform === platform);
+    const fix = others.length === 0 ? `${host.repo} has no ${platform} backend` : `use ${others.map((b) => `--backend ${b.kind} (needs ${b.requirement})`).join(' or ')}`;
     throw new VerifyFailure('UNSUPPORTED', `${host.repo} has no ${kind} backend for ${platform}`, fix);
   }
   return backend;
@@ -42,7 +43,8 @@ export function selectBackend(host: HostAdapter, platform: Platform, requested:
   if (held !== null) return backendFor(host, platform, held.backend);
   const backend = host.backends.find((b) => b.platform === platform && b.supports(os));
   if (backend === undefined) {
-    throw new VerifyFailure('UNSUPPORTED', `no ${platform} backend runs on ${os}`, 'run on a Mac with Xcode; the EAS backend arrives with CLOUD-IOS');
+    const needs = host.backends.filter((b) => b.platform === platform).map((b) => b.requirement);
+    throw new VerifyFailure('UNSUPPORTED', `no ${platform} backend runs on ${os}`, needs.length === 0 ? `${host.repo} has no ${platform} backend` : `run on ${needs.join(' or ')}`);
   }
   return backend;
 }
@@ -90,7 +92,7 @@ async function ensureBuild(host: HostAdapter, platform: Platform, workspace: Wor
   if (existing !== null) return { app: existing, view: { platform, key, source: existing.source, reused: true, seconds: 0 } };
   const source = host.buildSources(platform, process.platform)[0];
   if (source !== 'local') {
-    throw new VerifyFailure('UNSUPPORTED', `${host.repo} cannot build ${platform} on ${process.platform} yet`, 'run bin/verify up on a Mac with Xcode; remote builds arrive with CLOUD-IOS');
+    throw new VerifyFailure('UNSUPPORTED', `${host.repo} cannot build ${platform} on ${process.platform} yet (build sources here: ${host.buildSources(platform, process.platform).join(', ') || 'none'})`, `run bin/verify up on a machine where ${host.repo} builds ${platform} locally`);
   }
   const started = Date.now();
   progress(`build   ${key}  ${source}  building...`);
@@ -133,6 +135,7 @@ export async function ensureLease(
   await finishOrphanLedgers(workspace.home, resolve(workspace.worktree), options.clerk, options.progress);
 
   const { app, view: build } = await ensureBuild(host, platform, workspace, options.progress);
+  options.progress(`build   ${build.key}  ${build.source}  ${build.reused ? 'reused' : `built in ${build.seconds}s`}`);
 
   let lease: Lease | null = held;
   let renewed = false;
 
@@ -3,6 +3,7 @@ import {
   HOST_CONTRACT_VERSION,
   STATE_TEXT_PREFIX,
   VerifyFailure,
+  type HostEntry,
   type HostLaunch,
   type LaunchId,
   type Platform,
@@ -102,6 +103,7 @@ export function parseVerifyState(text: string): VerifyState {
 export function describeState(state: VerifyState): string {
   const parts = [`screen=${state.screen}`, `signedIn=${state.signedIn}`];
   if (state.sessionStatus) parts.push(`session=${state.sessionStatus}`);
+  parts.push(`orgId=${state.orgId ?? 'null'}`);
   if (state.pendingTasks.length > 0) parts.push(`tasks=${state.pendingTasks.join(',')}`);
   if (state.signInStatus) parts.push(`signInStatus=${state.signInStatus}`);
   if (state.signUpStatus) parts.push(`signUpStatus=${state.signUpStatus}`);
@@ -153,3 +155,28 @@ export function encodeLaunchArguments(platform: Platform, launch: HostLaunch<str
     }
   });
 }
+
+export type AppStart =
+  | { readonly kind: 'open-app'; readonly launchArguments: readonly string[] }
+  | { readonly kind: 'adb'; readonly commands: readonly (readonly string[])[] };
+
+function shellQuote(value: string): string {
+  return `'${value.replaceAll("'", `'\\''`)}'`;
+}
+
+export function appStart(platform: Platform, appId: string, entry: HostEntry, launchArguments: readonly string[]): AppStart {
+  if (entry.kind === 'binary') return { kind: 'open-app', launchArguments };
+  const all = [...entry.launchArguments, ...launchArguments];
+  if (platform === 'ios') return { kind: 'open-app', launchArguments: all };
+  if (entry.androidActivity === null) {
+    throw new VerifyFailure('NOT_READY', 'a dev-client entry on Android needs androidActivity', 'set androidActivity in the entry src/host.ts returns');
+  }
+  const start = ['am', 'start', '-W', '-n', `${appId}/${entry.androidActivity}`, ...(entry.openLink === null ? [] : ['-d', entry.openLink]), ...all];
+  return {
+    kind: 'adb',
+    commands: [
+      ['shell', `am force-stop ${shellQuote(appId)}`],
+      ['shell', start.map(shellQuote).join(' ')],
+    ],
+  };
+}