fixups

Author: thymikee

src/daemon/device-ready.ts

@@ -5,7 +5,7 @@ import { promises as fs } from 'node:fs';
 import { runCmd } from '../utils/exec.ts';
 import { AppError } from '../utils/errors.ts';
 import { resolveTimeoutMs } from '../utils/timeouts.ts';
-import { resolveIosDevicectlHint } from '../platforms/ios/devicectl.ts';
+import { resolveIosDevicectlHint, IOS_DEVICECTL_DEFAULT_HINT } from '../platforms/ios/devicectl.ts';
 
 const IOS_DEVICE_READY_TIMEOUT_MS = resolveTimeoutMs(
   process.env.AGENT_DEVICE_IOS_DEVICE_READY_TIMEOUT_MS,
@@ -146,12 +146,10 @@ async function readIosReadyPayload(jsonPath: string): Promise<{ parsed: boolean;
 
 export function resolveIosReadyHint(stdout: string, stderr: string): string {
   const devicectlHint = resolveIosDevicectlHint(stdout, stderr);
-  if (devicectlHint !== 'Ensure the iOS device is unlocked, trusted, and available in Xcode > Devices, then retry.') {
-    return devicectlHint;
-  }
+  if (devicectlHint) return devicectlHint;
   const text = `${stdout}\n${stderr}`.toLowerCase();
   if (text.includes('timed out waiting for all destinations')) {
     return 'Xcode destination did not become available in time. Keep device unlocked and retry.';
   }
-  return devicectlHint;
+  return IOS_DEVICECTL_DEFAULT_HINT;
 }

src/platforms/android/index.ts

@@ -115,6 +115,7 @@ export function inferAndroidAppName(packageName: string): string {
     .flatMap((segment) => segment.split(/[_-]+/))
     .map((token) => token.trim().toLowerCase())
     .filter((token) => token.length > 0);
+  // Fallback to last token if every token is ignored (e.g. "com.android.app.services" → "Services").
   let chosen = tokens[tokens.length - 1] ?? packageName;
   for (let index = tokens.length - 1; index >= 0; index -= 1) {
     const token = tokens[index];

src/platforms/ios/devicectl.ts

@@ -41,7 +41,7 @@ export async function runIosDevicectl(
     stdout,
     stderr,
     deviceId: context.deviceId,
-    hint: resolveIosDevicectlHint(stdout, stderr),
+    hint: resolveIosDevicectlHint(stdout, stderr) ?? IOS_DEVICECTL_DEFAULT_HINT,
   });
 }
 
@@ -80,7 +80,7 @@ export async function listIosDeviceApps(
         stdout,
         stderr,
         deviceId: device.id,
-        hint: resolveIosDevicectlHint(stdout, stderr),
+        hint: resolveIosDevicectlHint(stdout, stderr) ?? IOS_DEVICECTL_DEFAULT_HINT,
       });
     }
     const jsonText = await fs.readFile(jsonPath, 'utf8');
@@ -119,13 +119,16 @@ function filterIosDeviceApps(apps: IosAppInfo[], filter: 'user-installed' | 'all
   return apps;
 }
 
-export function resolveIosDevicectlHint(stdout: string, stderr: string): string {
+export const IOS_DEVICECTL_DEFAULT_HINT =
+  'Ensure the iOS device is unlocked, trusted, and available in Xcode > Devices, then retry.';
+
+export function resolveIosDevicectlHint(stdout: string, stderr: string): string | null {
   const text = `${stdout}\n${stderr}`.toLowerCase();
   if (text.includes('device is busy') && text.includes('connecting')) {
     return 'iOS device is still connecting. Keep it unlocked and connected by cable until it is fully available in Xcode Devices, then retry.';
   }
   if (text.includes('coredeviceservice') && text.includes('timed out')) {
     return 'CoreDevice service timed out. Reconnect the device and retry; if it persists restart Xcode and the iOS device.';
   }
-  return 'Ensure the iOS device is unlocked, trusted, and available in Xcode > Devices, then retry.';
+  return null;
 }

src/utils/timeouts.ts

@@ -5,9 +5,5 @@ export function resolveTimeoutMs(raw: string | undefined, fallback: number, min:
   return Math.max(min, Math.floor(parsed));
 }
 
-export function resolveTimeoutSeconds(raw: string | undefined, fallback: number, min: number): number {
-  if (!raw) return fallback;
-  const parsed = Number(raw);
-  if (!Number.isFinite(parsed)) return fallback;
-  return Math.max(min, Math.floor(parsed));
-}
+/** Alias for `resolveTimeoutMs` — semantically marks the caller expects seconds. */
+export const resolveTimeoutSeconds = resolveTimeoutMs;