@yoqa/runner 0.3.15 → 0.3.17

package/dist/index.js

@@ -16801,7 +16801,7 @@ function getCatalogDb() {
 // package.json
 var package_default = {
   name: "@yoqa/runner",
-  version: "0.3.15",
+  version: "0.3.17",
   description: "Yoqa local runner \u2014 Appium + catalog HTTP API (Bun). Start with yoqa serve or the yoqa-runner bin.",
   license: "UNLICENSED",
   type: "module",
@@ -17020,6 +17020,12 @@ function mergeCapabilities(appCaps, caseCaps) {
 function looksLikePhysicalIosUdid(udid) {
   return /^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{16}$/.test(udid.trim());
 }
+var PHYSICAL_IOS_SESSION_TIMEOUT_MS = 60000;
+var SIMULATOR_WDA_SESSION_TIMEOUT_MS = 600000;
+var SIMULATOR_WDA_DERIVED_DATA = join6(YOQA_ROOT4, "wda-sim");
+function iosSessionCreateTimeoutMs(deviceId) {
+  return looksLikePhysicalIosUdid(deviceId) ? PHYSICAL_IOS_SESSION_TIMEOUT_MS : SIMULATOR_WDA_SESSION_TIMEOUT_MS;
+}
 async function buildW3cCapabilities(options, mjpegPort) {
   const merged = mergeCapabilities(options.appCaps, options.caseCaps);
   const platformName = options.platform === "ios" ? "iOS" : "Android";
@@ -17038,32 +17044,40 @@ async function buildW3cCapabilities(options, mjpegPort) {
   if (options.platform === "android" && options.appPackage && !caps["appium:appPackage"]) {
     caps["appium:appPackage"] = options.appPackage;
   }
-  if (options.platform === "ios" && looksLikePhysicalIosUdid(options.deviceId)) {
-    const prep = await loadDevicePrep(options.deviceId);
-    if (!prep) {
-      throw new Error(`iOS device ${options.deviceId} is not prepared. Run device setup so WebDriverAgent is installed before starting a run.`);
-    }
-    if (caps["appium:usePreinstalledWDA"] === undefined) {
-      caps["appium:usePreinstalledWDA"] = true;
-    }
-    if (!caps["appium:updatedWDABundleId"]) {
-      caps["appium:updatedWDABundleId"] = prep.bundleId;
-    }
-    if (!caps["appium:xcodeOrgId"]) {
-      caps["appium:xcodeOrgId"] = prep.developmentTeam;
-    }
-    if (!caps["appium:xcodeSigningId"]) {
-      caps["appium:xcodeSigningId"] = "Apple Development";
+  if (options.platform === "ios") {
+    const physical = looksLikePhysicalIosUdid(options.deviceId);
+    if (physical) {
+      const prep = await loadDevicePrep(options.deviceId);
+      if (!prep) {
+        throw new Error(`iOS device ${options.deviceId} is not prepared. Run device setup so WebDriverAgent is installed before starting a run.`);
+      }
+      if (caps["appium:usePreinstalledWDA"] === undefined) {
+        caps["appium:usePreinstalledWDA"] = true;
+      }
+      if (!caps["appium:updatedWDABundleId"]) {
+        caps["appium:updatedWDABundleId"] = prep.bundleId;
+      }
+      if (!caps["appium:xcodeOrgId"]) {
+        caps["appium:xcodeOrgId"] = prep.developmentTeam;
+      }
+      if (!caps["appium:xcodeSigningId"]) {
+        caps["appium:xcodeSigningId"] = "Apple Development";
+      }
     }
+    const wdaTimeoutMs = iosSessionCreateTimeoutMs(options.deviceId);
     if (caps["appium:wdaLaunchTimeout"] === undefined) {
-      caps["appium:wdaLaunchTimeout"] = 60000;
+      caps["appium:wdaLaunchTimeout"] = wdaTimeoutMs;
     }
     if (caps["appium:wdaConnectionTimeout"] === undefined) {
-      caps["appium:wdaConnectionTimeout"] = 60000;
+      caps["appium:wdaConnectionTimeout"] = wdaTimeoutMs;
     }
     if (caps["appium:waitForIdleTimeout"] === undefined) {
       caps["appium:waitForIdleTimeout"] = 0;
     }
+    if (!physical && caps["appium:derivedDataPath"] === undefined) {
+      await mkdir3(SIMULATOR_WDA_DERIVED_DATA, { recursive: true });
+      caps["appium:derivedDataPath"] = SIMULATOR_WDA_DERIVED_DATA;
+    }
   }
   return caps;
 }
@@ -17285,14 +17299,16 @@ async function createDeviceSession(options) {
   const port = await ensureAppiumServer();
   const mjpegPort = await pickMjpegPort();
   const capabilities = await buildW3cCapabilities(options, mjpegPort);
+  const simulatorIos = options.platform === "ios" && !looksLikePhysicalIosUdid(options.deviceId);
+  const sessionCreateTimeoutMs = simulatorIos ? iosSessionCreateTimeoutMs(options.deviceId) : 60000;
   const browser = await remote({
     hostname: APPIUM_HOST,
     port,
     path: "/",
     capabilities,
     logLevel: "silent",
-    connectionRetryCount: 2,
-    connectionRetryTimeout: 60000
+    connectionRetryCount: simulatorIos ? 0 : 2,
+    connectionRetryTimeout: sessionCreateTimeoutMs
   });
   await applyMjpegSettings(browser, {
     platform: options.platform,
@@ -23542,13 +23558,24 @@ var caseFlowStepSchema = exports_external.object({
   flowId: exports_external.string().min(1).nullable().optional()
 });
 var caseRunStatusSchema = exports_external.union([exports_external.literal("passed"), exports_external.literal("errored")]);
-var caseScriptActionSchema = exports_external.discriminatedUnion("type", [
-  exports_external.object({
-    type: exports_external.literal("tap"),
-    x: exports_external.number().min(0).max(1000),
-    y: exports_external.number().min(0).max(1000),
-    reason: exports_external.string().optional()
-  }),
+var caseScriptTapSchema = exports_external.object({
+  type: exports_external.literal("tap"),
+  x: exports_external.number().min(0).max(1000).optional(),
+  y: exports_external.number().min(0).max(1000).optional(),
+  label: exports_external.string().min(1).optional(),
+  id: exports_external.string().min(1).optional(),
+  reason: exports_external.string().optional()
+}).superRefine((value, ctx) => {
+  const hasCoords = value.x != null && value.y != null;
+  if (!hasCoords && !value.label && !value.id) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      message: "tap requires x/y or label or id"
+    });
+  }
+});
+var caseScriptActionSchema = exports_external.union([
+  caseScriptTapSchema,
   exports_external.object({
     type: exports_external.literal("type"),
     text: exports_external.string(),
@@ -23558,6 +23585,13 @@ var caseScriptActionSchema = exports_external.discriminatedUnion("type", [
     type: exports_external.literal("wait"),
     ms: exports_external.number().min(0).max(1e4),
     reason: exports_external.string().optional()
+  }),
+  exports_external.object({
+    type: exports_external.literal("assert"),
+    assertion: exports_external.union([exports_external.literal("visible"), exports_external.literal("not-visible")]).default("visible"),
+    text: exports_external.string().min(1),
+    timeoutMs: exports_external.number().min(0).max(120000).optional(),
+    reason: exports_external.string().optional()
   })
 ]);
 var caseScriptSchema = exports_external.object({
@@ -23966,6 +24000,9 @@ var createBuildRequestSchema = exports_external.object({
 var listBuildsResponseSchema = exports_external.object({
   builds: exports_external.array(buildSchema)
 });
+
+// ../../packages/runner-client/src/wait-for-run.ts
+var DEFAULT_WAIT_FOR_RUN_TIMEOUT_MS = 30 * 60 * 1000;
 // ../../packages/runner-client/src/shell-script.ts
 var DEFAULT_SHELL_SCRIPT_HEADER = [
   "#!/usr/bin/env bash",
@@ -23975,6 +24012,16 @@ var DEFAULT_SHELL_SCRIPT_HEADER = [
   ""
 ].join(`
 `);
+function screenHasText(elements, text2) {
+  const needle = text2.trim().toLowerCase();
+  if (!needle)
+    return false;
+  return (elements ?? []).some((el) => {
+    const label = el.label?.toLowerCase() ?? "";
+    const type = el.type?.toLowerCase() ?? "";
+    return label.includes(needle) || type.includes(needle);
+  });
+}
 function findElementByLabel(elements, label) {
   const needle = label.trim().toLowerCase();
   if (!needle)
@@ -97420,6 +97467,10 @@ var defaultClock = {
 };
 async function executeScriptCase(deps) {
   const perform = deps.performAction ?? performAction;
+  const readScreen = deps.readScreen ?? (async (session) => {
+    const screen = await getScreen(session, { full: false });
+    return { elements: screen.elements };
+  });
   const clock = deps.clock ?? defaultClock;
   const settleMs = deps.settleMs ?? POST_ACTION_SETTLE_MS;
   let stepIdx = 0;
@@ -97437,7 +97488,16 @@ async function executeScriptCase(deps) {
         return "cancelled";
       }
       if (action.type === "tap") {
-        await perform(deps.session, { kind: "tap", x: action.x, y: action.y });
+        const tapBody = { kind: "tap" };
+        if (action.label)
+          tapBody.label = action.label;
+        if (action.id)
+          tapBody.id = action.id;
+        if (action.x != null)
+          tapBody.x = action.x;
+        if (action.y != null)
+          tapBody.y = action.y;
+        await perform(deps.session, tapBody);
         await clock.sleep(settleMs);
         await deps.appendStep({
           idx: stepIdx,
@@ -97445,13 +97505,15 @@ async function executeScriptCase(deps) {
             type: "tap",
             x: action.x,
             y: action.y,
+            label: action.label,
+            id: action.id,
             reason: action.reason ?? "Replayed saved script tap",
             thoughts: "Replaying the saved script without calling the AI agent."
           },
           screenshotUri: shot.path,
           ok: true,
           latencyMs,
-          detail: action.reason ?? null
+          detail: action.reason ?? action.label ?? action.id ?? null
         });
       } else if (action.type === "type") {
         await perform(deps.session, { kind: "input", text: action.text });
@@ -97469,6 +97531,40 @@ async function executeScriptCase(deps) {
           latencyMs,
           detail: action.reason ?? null
         });
+      } else if (action.type === "assert") {
+        const timeoutMs = action.timeoutMs ?? 5000;
+        const assertion = action.assertion;
+        const deadline = clock.now() + timeoutMs;
+        for (;; ) {
+          if (deps.isAborted()) {
+            return "cancelled";
+          }
+          const screen = await readScreen(deps.session);
+          const found = screenHasText(screen.elements, action.text);
+          if (assertion === "visible" && found)
+            break;
+          if (assertion === "not-visible" && !found)
+            break;
+          if (clock.now() >= deadline) {
+            throw new Error(assertion === "visible" ? `Expected visible text not found within ${Math.round(timeoutMs / 1000)}s: ${action.text}` : `Unexpected text still visible after ${Math.round(timeoutMs / 1000)}s: ${action.text}`);
+          }
+          await clock.sleep(400);
+        }
+        await deps.appendStep({
+          idx: stepIdx,
+          action: {
+            type: "assert",
+            assertion,
+            text: action.text,
+            timeoutMs,
+            reason: action.reason ?? `Assert ${assertion}: ${action.text}`,
+            thoughts: "Replaying the saved script without calling the AI agent."
+          },
+          screenshotUri: shot.path,
+          ok: true,
+          latencyMs,
+          detail: action.reason ?? `${assertion}: ${action.text}`
+        });
       } else {
         const waitMs = Math.min(3000, Math.max(500, action.ms));
         await clock.sleep(waitMs);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@yoqa/runner",
-	"version": "0.3.15",
+	"version": "0.3.17",
 	"description": "Yoqa local runner — Appium + catalog HTTP API (Bun). Start with yoqa serve or the yoqa-runner bin.",
 	"license": "UNLICENSED",
 	"type": "module",