@yoqa/runner 0.3.19 → 0.3.20

package/dist/index.js

@@ -16801,7 +16801,7 @@ function getCatalogDb() {
 // package.json
 var package_default = {
   name: "@yoqa/runner",
-  version: "0.3.19",
+  version: "0.3.20",
   description: "Yoqa local runner \u2014 Appium + catalog HTTP API (Bun). Start with yoqa serve or the yoqa-runner bin.",
   license: "UNLICENSED",
   type: "module",
@@ -17353,10 +17353,6 @@ var MJPEG_SETTINGS_BASE = {
   mjpegScalingFactor: 50
 };
 var openByDeviceId = new Map;
-var exclusiveReleaseListener = null;
-function onDeviceSessionExclusiveRelease(listener) {
-  exclusiveReleaseListener = listener;
-}
 var DEAD_SESSION_RE = /session does not exist|invalid session id|no such session|terminated or not started|session is either terminated/i;
 
 class DeadSessionError extends Error {
@@ -17441,7 +17437,6 @@ async function releaseExistingSession(deviceId) {
   if (!existing)
     return;
   openByDeviceId.delete(deviceId);
-  exclusiveReleaseListener?.(deviceId);
   try {
     await existing.quit();
   } catch (error) {
@@ -17975,21 +17970,32 @@ async function createDeviceSession(options) {
 
 // src/domains/devices/active-session.ts
 var active = null;
+
+class SessionBusyError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "SessionBusyError";
+  }
+}
 var isMissingAppiumSessionError = isDeadSessionError;
+function toInfo(current) {
+  return {
+    deviceId: current.deviceId,
+    platform: current.platform,
+    connectedAt: current.connectedAt,
+    mjpegPort: current.mjpegPort,
+    streamReady: current.streamReady,
+    streamUrl: current.streamUrl,
+    heldByRun: current.heldByRunId != null
+  };
+}
 function getActiveSession() {
   return active;
 }
 function getActiveSessionInfo() {
   if (!active)
     return null;
-  return {
-    deviceId: active.deviceId,
-    platform: active.platform,
-    connectedAt: active.connectedAt,
-    mjpegPort: active.mjpegPort,
-    streamReady: active.streamReady,
-    streamUrl: active.streamUrl
-  };
+  return toInfo(active);
 }
 function requireActiveSession() {
   if (!active) {
@@ -17997,6 +18003,9 @@ function requireActiveSession() {
   }
   return active;
 }
+function isActiveSessionHeldByRun() {
+  return active?.heldByRunId != null;
+}
 function abandonActiveSession() {
   if (!active)
     return null;
@@ -18006,20 +18015,12 @@ function abandonActiveSession() {
   console.warn(`[yoqa-runner] abandoned dead Appium session for ${info?.platform} ${info?.deviceId}`);
   return info;
 }
-onDeviceSessionExclusiveRelease((deviceId) => {
-  if (active?.deviceId === deviceId) {
-    abandonActiveSession();
-  }
-});
-async function connectDevice(options) {
-  if (active) {
-    await disconnectDevice();
-  }
+async function createAndRegister(options) {
   const session = await createDeviceSession({
     platform: options.platform,
     deviceId: options.deviceId,
-    appCaps: [],
-    caseCaps: [],
+    appCaps: options.appCaps ?? [],
+    caseCaps: options.caseCaps ?? [],
     bundleId: options.bundleId,
     appPackage: options.appPackage,
     onSessionDead: () => {
@@ -18033,8 +18034,19 @@ async function connectDevice(options) {
     mjpegPort: session.mjpegPort,
     streamReady: session.streamReady,
     streamUrl: "/stream.mjpeg",
-    session
+    session,
+    heldByRunId: options.heldByRunId
   };
+  return session;
+}
+async function connectDevice(options) {
+  if (isActiveSessionHeldByRun()) {
+    throw new SessionBusyError("A run is using the device session. Cancel the run before connecting another device.");
+  }
+  if (active) {
+    await disconnectDevice();
+  }
+  await createAndRegister({ ...options, heldByRunId: null });
   const info = getActiveSessionInfo();
   if (!info) {
     throw new Error("Failed to read active session after connect");
@@ -18044,6 +18056,9 @@ async function connectDevice(options) {
 async function disconnectDevice() {
   if (!active)
     return null;
+  if (isActiveSessionHeldByRun()) {
+    throw new SessionBusyError("A run is using the device session. Cancel the run first.");
+  }
   const info = getActiveSessionInfo();
   const session = active.session;
   active = null;
@@ -18053,6 +18068,58 @@ async function disconnectDevice() {
   } catch {}
   return info;
 }
+async function acquireSessionForRun(options) {
+  const current = active;
+  if (current?.heldByRunId && current.heldByRunId !== options.runId) {
+    const session2 = await createDeviceSession({
+      platform: options.platform,
+      deviceId: options.deviceId,
+      appCaps: options.appCaps ?? [],
+      caseCaps: options.caseCaps ?? [],
+      bundleId: options.bundleId,
+      appPackage: options.appPackage,
+      onSessionDead: () => {
+        return;
+      }
+    });
+    return { session: session2, shared: false };
+  }
+  if (current && current.deviceId === options.deviceId) {
+    const healthy = await current.session.getWindowSize().then(() => true).catch(() => false);
+    if (healthy) {
+      current.heldByRunId = options.runId;
+      return { session: current.session, shared: true };
+    }
+    console.warn(`[yoqa-runner] active session for ${options.deviceId} is dead \u2014 creating a fresh one for the run`);
+    await disconnectDevice().catch(() => {
+      return;
+    });
+  }
+  if (current) {
+    await disconnectDevice();
+  }
+  const session = await createAndRegister({
+    deviceId: options.deviceId,
+    platform: options.platform,
+    appCaps: options.appCaps,
+    caseCaps: options.caseCaps,
+    bundleId: options.bundleId,
+    appPackage: options.appPackage,
+    heldByRunId: options.runId
+  });
+  return { session, shared: true };
+}
+async function releaseSessionFromRun(runId, session, shared) {
+  if (!shared) {
+    await session.quit().catch(() => {
+      return;
+    });
+    return;
+  }
+  if (active && active.heldByRunId === runId) {
+    active.heldByRunId = null;
+  }
+}
 
 // src/domains/servers/application.ts
 function appiumLabel(info) {
@@ -24351,7 +24418,8 @@ var activeDeviceResponseSchema = exports_external.object({
   connectedAt: exports_external.number().int().nonnegative(),
   mjpegPort: exports_external.number().int().positive().optional(),
   streamReady: exports_external.boolean().optional(),
-  streamUrl: exports_external.string().min(1).optional()
+  streamUrl: exports_external.string().min(1).optional(),
+  heldByRun: exports_external.boolean().optional()
 });
 var controlPointerMessageSchema = exports_external.object({
   type: exports_external.literal("pointer"),
@@ -98329,6 +98397,7 @@ async function executeRun(runId) {
     return;
   registerControl(runId);
   let session = null;
+  let sharedSession = true;
   try {
     if (isAborted2(runId)) {
       await persistCancelled(runId);
@@ -98369,14 +98438,17 @@ async function executeRun(runId) {
       }
     }
     const firstCase = run.tests[0] ? await getCase(run.tests[0].caseId) : null;
-    session = await createDeviceSession({
-      platform: run.platform,
+    const acquired = await acquireSessionForRun({
+      runId,
       deviceId: run.deviceId,
+      platform: run.platform,
       appCaps: app.capabilities,
       caseCaps: firstCase?.capabilities ?? [],
       bundleId: app.iosBundleId || undefined,
       appPackage: app.androidApplicationId || undefined
     });
+    session = acquired.session;
+    sharedSession = acquired.shared;
     if (isAborted2(runId)) {
       await persistCancelled(runId);
       return;
@@ -98451,14 +98523,15 @@ async function executeRun(runId) {
     }
   } finally {
     if (session) {
-      await session.quit().catch(() => {
-        return;
-      });
+      await releaseSessionFromRun(runId, session, sharedSession);
     }
     clearControl(runId);
   }
 }
 async function createRun(input) {
+  if (runControls.size > 0) {
+    throw new RunValidationError("A run is already in progress. Cancel it before starting another.");
+  }
   const uniqueCaseIds = [...new Set(input.caseIds)];
   if (uniqueCaseIds.length === 0) {
     throw new RunValidationError("At least one case id is required");
@@ -98816,6 +98889,12 @@ import { mkdir as mkdir4, rename as rename2 } from "fs/promises";
 import { dirname as dirname4 } from "path";
 function sessionErrorResponse(error40) {
   const message = error40 instanceof Error ? error40.message : String(error40);
+  if (error40 instanceof SessionBusyError) {
+    return {
+      status: 409,
+      body: { error: error40.message }
+    };
+  }
   if (isMissingAppiumSessionError(error40)) {
     abandonActiveSession();
     return {
@@ -98845,6 +98924,9 @@ function createSessionRoutes() {
       const info = await connectDevice(parsed.data);
       return c.json(activeDeviceResponseSchema.parse(info));
     } catch (error40) {
+      const mapped = sessionErrorResponse(error40);
+      if (mapped)
+        return c.json(mapped.body, mapped.status);
       const message = error40 instanceof Error ? error40.message : String(error40);
       return c.json({ error: "Failed to connect device", detail: message }, 500);
     }
@@ -98857,11 +98939,19 @@ function createSessionRoutes() {
     return c.json(activeDeviceResponseSchema.parse(info));
   });
   app.post("/devices/disconnect", async (c) => {
-    const info = await disconnectDevice();
-    if (!info) {
-      return c.json({ error: "No active device session" }, 404);
+    try {
+      const info = await disconnectDevice();
+      if (!info) {
+        return c.json({ error: "No active device session" }, 404);
+      }
+      return c.json(activeDeviceResponseSchema.parse(info));
+    } catch (error40) {
+      const mapped = sessionErrorResponse(error40);
+      if (mapped)
+        return c.json(mapped.body, mapped.status);
+      const message = error40 instanceof Error ? error40.message : String(error40);
+      return c.json({ error: "Failed to disconnect device", detail: message }, 500);
     }
-    return c.json(activeDeviceResponseSchema.parse(info));
   });
   app.get("/screen", async (c) => {
     try {
@@ -98982,6 +99072,11 @@ function createSessionRoutes() {
     }
     try {
       const { session } = requireActiveSession();
+      if (isActiveSessionHeldByRun()) {
+        return c.json({
+          error: "A run is using this device session. Cancel the run to interact manually."
+        }, 409);
+      }
       const result = await performAction(session, parsed.data);
       return c.json(actionResponseSchema.parse(result));
     } catch (error40) {
@@ -99110,6 +99205,13 @@ var controlWebSocket = {
       return;
     }
     const msg = result.data;
+    if (isActiveSessionHeldByRun()) {
+      ws.send(JSON.stringify({
+        ok: false,
+        error: "A run is using this device session. Cancel the run to interact manually."
+      }));
+      return;
+    }
     try {
       await active2.session.pointerEvent(msg.phase, msg.x, msg.y, msg.seq);
       if (msg.phase === "end" || msg.phase === "begin") {

package/package.json

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