@exodus/xqa 1.15.1 → 1.16.0

package/dist/xqa.cjs

@@ -3539,11 +3539,11 @@ var require_index_cjs = __commonJS({
         try {
           step(g3[n3](v2));
         } catch (e3) {
-          settle2(q4[0][3], e3);
+          settle(q4[0][3], e3);
         }
       }
       function step(r3) {
-        r3.value instanceof __await2 ? Promise.resolve(r3.value.v).then(fulfill, reject) : settle2(q4[0][2], r3);
+        r3.value instanceof __await2 ? Promise.resolve(r3.value.v).then(fulfill, reject) : settle(q4[0][2], r3);
       }
       function fulfill(value) {
         resume("next", value);
@@ -3551,7 +3551,7 @@ var require_index_cjs = __commonJS({
       function reject(value) {
         resume("throw", value);
       }
-      function settle2(f6, v2) {
+      function settle(f6, v2) {
         if (f6(v2), q4.shift(), q4.length) resume(q4[0][0], q4[0][1]);
       }
     }
@@ -3577,11 +3577,11 @@ var require_index_cjs = __commonJS({
       function verb(n3) {
         i3[n3] = o3[n3] && function(v2) {
           return new Promise(function(resolve, reject) {
-            v2 = o3[n3](v2), settle2(resolve, reject, v2.done, v2.value);
+            v2 = o3[n3](v2), settle(resolve, reject, v2.done, v2.value);
           });
         };
       }
-      function settle2(resolve, reject, d, v2) {
+      function settle(resolve, reject, d, v2) {
         Promise.resolve(v2).then(function(v3) {
           resolve({ value: v3, done: d });
         }, reject);
@@ -19623,8 +19623,8 @@ var require_queue = __commonJS({
       var errorHandler = null;
       var self2 = {
         push,
-        drain: noop3,
-        saturated: noop3,
+        drain: noop2,
+        saturated: noop2,
         pause,
         paused: false,
         get concurrency() {
@@ -19647,7 +19647,7 @@ var require_queue = __commonJS({
         length,
         getQueue,
         unshift,
-        empty: noop3,
+        empty: noop2,
         kill,
         killAndDrain,
         error: error48,
@@ -19699,7 +19699,7 @@ var require_queue = __commonJS({
         current.context = context;
         current.release = release;
         current.value = value;
-        current.callback = done || noop3;
+        current.callback = done || noop2;
         current.errorHandler = errorHandler;
         if (_running >= _concurrency || self2.paused) {
           if (queueTail) {
@@ -19720,7 +19720,7 @@ var require_queue = __commonJS({
         current.context = context;
         current.release = release;
         current.value = value;
-        current.callback = done || noop3;
+        current.callback = done || noop2;
         current.errorHandler = errorHandler;
         if (_running >= _concurrency || self2.paused) {
           if (queueHead) {
@@ -19762,13 +19762,13 @@ var require_queue = __commonJS({
       function kill() {
         queueHead = null;
         queueTail = null;
-        self2.drain = noop3;
+        self2.drain = noop2;
       }
       function killAndDrain() {
         queueHead = null;
         queueTail = null;
         self2.drain();
-        self2.drain = noop3;
+        self2.drain = noop2;
       }
       function abort() {
         var current = queueHead;
@@ -19781,7 +19781,7 @@ var require_queue = __commonJS({
           var val = current.value;
           var context2 = current.context;
           current.value = null;
-          current.callback = noop3;
+          current.callback = noop2;
           current.errorHandler = null;
           if (errorHandler2) {
             errorHandler2(new Error("abort"), val);
@@ -19790,19 +19790,19 @@ var require_queue = __commonJS({
           current.release(current);
           current = next;
         }
-        self2.drain = noop3;
+        self2.drain = noop2;
       }
       function error48(handler) {
         errorHandler = handler;
       }
     }
-    function noop3() {
+    function noop2() {
     }
     function Task3() {
       this.value = null;
-      this.callback = noop3;
+      this.callback = noop2;
       this.next = null;
-      this.release = noop3;
+      this.release = noop2;
       this.context = null;
       this.errorHandler = null;
       var self2 = this;
@@ -19811,7 +19811,7 @@ var require_queue = __commonJS({
         var errorHandler = self2.errorHandler;
         var val = self2.value;
         self2.value = null;
-        self2.callback = noop3;
+        self2.callback = noop2;
         if (self2.errorHandler) {
           errorHandler(err20, val);
         }
@@ -19847,7 +19847,7 @@ var require_queue = __commonJS({
             resolve(result);
           });
         });
-        p.catch(noop3);
+        p.catch(noop2);
         return p;
       }
       function unshift(value) {
@@ -19860,7 +19860,7 @@ var require_queue = __commonJS({
             resolve(result);
           });
         });
-        p.catch(noop3);
+        p.catch(noop2);
         return p;
       }
       function drained() {
@@ -52021,12 +52021,15 @@ var safeParseSimctlOutput = (0, import_neverthrow3.fromThrowable)(
     cause
   })
 );
+function findBootedDeviceUdid(devices) {
+  const booted = devices.find((device) => device.state === "Booted");
+  return booted?.udid;
+}
 function findBootedUdid(parsed) {
   for (const devices of Object.values(parsed.devices)) {
-    for (const device of devices) {
-      if (device.state === "Booted") {
-        return device.udid;
-      }
+    const udid = findBootedDeviceUdid(devices);
+    if (udid !== void 0) {
+      return udid;
     }
   }
   return {
@@ -52062,24 +52065,6 @@ var DEFAULT_SCREEN_WIDTH = 375;
 var DEFAULT_SCREEN_HEIGHT = 812;
 var STABILITY_POLL_ATTEMPTS = 10;
 var STABILITY_POLL_DELAY_MS = 500;
-function structuralSignature(elements) {
-  const lines = [];
-  const walk = (nodes) => {
-    for (const element of nodes) {
-      const frame = element.frame ?? { x: 0, y: 0, width: 0, height: 0 };
-      const type2 = element.type ?? "unknown";
-      const childCount = (element.children ?? []).length;
-      lines.push(
-        `${type2}|${String(frame.x)},${String(frame.y)},${String(frame.width)},${String(frame.height)}|${String(childCount)}`
-      );
-      if (element.children) {
-        walk(element.children);
-      }
-    }
-  };
-  walk(elements);
-  return lines.join("\n");
-}
 function isInViewport(frame, screen) {
   return frame.width > 0 && frame.height > 0 && frame.x + frame.width > 0 && frame.x < screen.width && frame.y + frame.height > 0 && frame.y < screen.height;
 }
@@ -52098,14 +52083,16 @@ function hasEnabledDescendant(element) {
   const children = element.children ?? [];
   return children.some((child) => child.enabled !== false || hasEnabledDescendant(child));
 }
+function isRicher(current, best) {
+  if (current.hasEnabled !== best.hasEnabled) {
+    return current.hasEnabled;
+  }
+  return current.count >= best.count;
+}
 function selectRichest(scores) {
   let best = scores[0];
   for (const current of scores.slice(1)) {
-    if (current.hasEnabled !== best.hasEnabled) {
-      if (current.hasEnabled) {
-        best = current;
-      }
-    } else if (current.count >= best.count) {
+    if (isRicher(current, best)) {
       best = current;
     }
   }
@@ -52179,18 +52166,6 @@ function formatElement(element, screen) {
   const clipping = resolveClippingTags(frame, screen);
   return `[${type2}] "${label}" at (${String(cx)}, ${String(cy)}) size ${String(Math.round(frame.width))}x${String(Math.round(frame.height))}${state}${clipping}`;
 }
-function formatAccessibilityElements(elements) {
-  const app = elements.find((element) => element.type === "Application");
-  const screenWidth = app?.frame?.width ?? DEFAULT_SCREEN_WIDTH;
-  const screenHeight = app?.frame?.height ?? DEFAULT_SCREEN_HEIGHT;
-  const screen = { width: screenWidth, height: screenHeight };
-  const visible = collectElements(elements, screen);
-  const elementList = visible.length === 0 ? "No elements found." : visible.map((element) => formatElement(element, screen)).join("\n");
-  const appName = app?.AXLabel;
-  return appName ? `Running app: ${appName}
-
-${elementList}` : elementList;
-}
 function fetchSnapshot(udid) {
   return runCommand("idb", ["ui", "describe-all", "--udid", udid, "--json", "--nested"]);
 }
@@ -52220,7 +52195,37 @@ async function pollUntilStable(udid) {
   return (0, import_neverthrow.ok)(previousRaw);
 }
 function waitForStableSnapshot(udid) {
-  return new import_neverthrow.ResultAsync(pollUntilStable(udid));
+  return import_neverthrow.ResultAsync.fromSafePromise(pollUntilStable(udid)).andThen((result) => result);
+}
+function structuralSignature(elements) {
+  const lines = [];
+  const walk = (nodes) => {
+    for (const element of nodes) {
+      const frame = element.frame ?? { x: 0, y: 0, width: 0, height: 0 };
+      const type2 = element.type ?? "unknown";
+      const childCount = (element.children ?? []).length;
+      lines.push(
+        `${type2}|${String(frame.x)},${String(frame.y)},${String(frame.width)},${String(frame.height)}|${String(childCount)}`
+      );
+      if (element.children) {
+        walk(element.children);
+      }
+    }
+  };
+  walk(elements);
+  return lines.join("\n");
+}
+function formatAccessibilityElements(elements) {
+  const app = elements.find((element) => element.type === "Application");
+  const screenWidth = app?.frame?.width ?? DEFAULT_SCREEN_WIDTH;
+  const screenHeight = app?.frame?.height ?? DEFAULT_SCREEN_HEIGHT;
+  const screen = { width: screenWidth, height: screenHeight };
+  const visible = collectElements(elements, screen);
+  const elementList = visible.length === 0 ? "No elements found." : visible.map((element) => formatElement(element, screen)).join("\n");
+  const appName = app?.AXLabel;
+  return appName ? `Running app: ${appName}
+
+${elementList}` : elementList;
 }
 function captureAccessibilityTree(udid = "booted") {
   return resolveUdid(udid).andThen((resolvedUdid) => waitForStableSnapshot(resolvedUdid)).andThen((raw) => parseIdbTree(raw));
@@ -52740,17 +52745,13 @@ function parseRuntime(runtimeKey) {
   }
   return match[1].replaceAll("-", ".");
 }
+function extractBootedFromDevices(devices, runtime) {
+  return devices.filter((device) => device.state === "Booted" && device.isAvailable).map((device) => ({ udid: device.udid, name: device.name, runtime }));
+}
 function extractBootedSimulators(output) {
-  const results = [];
-  for (const [runtimeKey, devices] of Object.entries(output.devices)) {
-    const runtime = parseRuntime(runtimeKey);
-    for (const device of devices) {
-      if (device.state === "Booted" && device.isAvailable) {
-        results.push({ udid: device.udid, name: device.name, runtime });
-      }
-    }
-  }
-  return results;
+  return Object.entries(output.devices).flatMap(
+    ([runtimeKey, devices]) => extractBootedFromDevices(devices, parseRuntime(runtimeKey))
+  );
 }
 function handleClose(code) {
   if (code === 0) {
@@ -53449,9 +53450,6 @@ function createInputManager(stream) {
     }
   };
 }
-function plainDecorator(frame, deps) {
-  return frame.logAppend.flatMap((entry) => renderEntry(entry, deps)).join("");
-}
 function renderEntry(entry, deps) {
   const context = { itemId: entry.itemId, deps };
   return entry.lines.flatMap((line) => renderLine(line, context));
@@ -53475,6 +53473,9 @@ function renderLine(line, context) {
     }
   }
 }
+function plainDecorator(frame, deps) {
+  return frame.logAppend.flatMap((entry) => renderEntry(entry, deps)).join("");
+}
 var TRUECOLOR_LEVEL = 3;
 var ERROR_COLOR = "#c0504d";
 var TOOL_COLOR = "#7a9e82";
@@ -53575,7 +53576,7 @@ function emitTty(frame, state) {
     previousDashboardLines: state.previousDashboardLines,
     itemName: config3.itemName
   });
-  state.previousDashboardLines = newDashboardLines;
+  state.setPreviousDashboardLines(newDashboardLines);
   if (output !== "") {
     config3.stream.write(output);
   }
@@ -53602,7 +53603,10 @@ function createWriter(config3) {
   const state = {
     config: config3,
     previousDashboardLines: 0,
-    cleaned: false
+    cleaned: false,
+    setPreviousDashboardLines(value) {
+      this.previousDashboardLines = value;
+    }
   };
   config3.stream.write(HIDE_CURSOR);
   return {
@@ -53622,30 +53626,6 @@ var OVERVIEW_HINT = "[1-9] zoom  [e] expand  [q] quit";
 var FOCUSED_HINT = "[esc] back  [q] quit";
 var SOLO_HINT = "";
 var MIN_ITEMS_FOR_ZOOM = 2;
-function buildDashboard(state) {
-  if (state.ui.role === "solo") {
-    return [];
-  }
-  if (typeof state.ui.zoomedIndex === "number") {
-    return buildZoomed(state, state.ui.zoomedIndex);
-  }
-  if (state.ui.isExpanded) {
-    return buildExpanded(state);
-  }
-  return buildOverview(state);
-}
-function buildHint(state) {
-  if (state.ui.role === "solo") {
-    return SOLO_HINT;
-  }
-  if (typeof state.ui.zoomedIndex === "number" || state.ui.isExpanded) {
-    return FOCUSED_HINT;
-  }
-  if (state.itemOrder.length < MIN_ITEMS_FOR_ZOOM) {
-    return "[q] quit";
-  }
-  return OVERVIEW_HINT;
-}
 function buildOverview(state) {
   return state.itemOrder.flatMap((id, index) => {
     const item = state.items.get(id);
@@ -53694,6 +53674,33 @@ function prefixTextLine(line, name) {
   }
   return [{ ...line, text: `[${name}] ${line.text}` }];
 }
+function buildDashboard(state) {
+  if (state.ui.role === "solo") {
+    return [];
+  }
+  if (typeof state.ui.zoomedIndex === "number") {
+    return buildZoomed(state, state.ui.zoomedIndex);
+  }
+  if (state.ui.isExpanded) {
+    return buildExpanded(state);
+  }
+  return buildOverview(state);
+}
+function buildHint(state) {
+  if (state.ui.role === "solo") {
+    return SOLO_HINT;
+  }
+  if (typeof state.ui.zoomedIndex === "number" || state.ui.isExpanded) {
+    return FOCUSED_HINT;
+  }
+  if (state.itemOrder.length < MIN_ITEMS_FOR_ZOOM) {
+    return "[q] quit";
+  }
+  return OVERVIEW_HINT;
+}
+function dashboardEqual(left, right) {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
 function render(state, previous) {
   const dashboard = buildDashboard(state);
   const logAppend = state.log.length > previous.log.length ? state.log.slice(previous.log.length) : [];
@@ -53705,9 +53712,6 @@ function render(state, previous) {
     dashboardChanged: !dashboardEqual(previousDashboard, dashboard)
   };
 }
-function dashboardEqual(left, right) {
-  return JSON.stringify(left) === JSON.stringify(right);
-}
 var MS_PER_SECOND3 = 1e3;
 function formatDuration(ms) {
   return `${String(Math.round(ms / MS_PER_SECOND3))}s`;
@@ -53789,6 +53793,22 @@ var ALL_VERBOSE_CATEGORIES = /* @__PURE__ */ new Set([
   "screen",
   "memory"
 ]);
+function parseForceColor(value) {
+  const forced = Number(value);
+  if (forced === 0 || forced === 1 || forced === 2 || forced === COLOR_LEVEL_TRUECOLOR) {
+    return forced;
+  }
+  return 1;
+}
+function isTruecolorTerm(colorterm) {
+  return colorterm === "truecolor" || colorterm === "24bit";
+}
+function detectStreamColorLevel(stream) {
+  if (stream.hasColors?.() === true) {
+    return 1;
+  }
+  return 0;
+}
 function isVerboseEnabled(config3, category) {
   return config3?.has(category) ?? false;
 }
@@ -53806,19 +53826,12 @@ function resolveColorLevel(stream) {
     return 0;
   }
   if (process.env.FORCE_COLOR !== void 0) {
-    const forced = Number(process.env.FORCE_COLOR);
-    if (forced === 0 || forced === 1 || forced === 2 || forced === COLOR_LEVEL_TRUECOLOR) {
-      return forced;
-    }
-    return 1;
+    return parseForceColor(process.env.FORCE_COLOR);
   }
-  if (process.env.COLORTERM === "truecolor" || process.env.COLORTERM === "24bit") {
+  if (isTruecolorTerm(process.env.COLORTERM)) {
     return COLOR_LEVEL_TRUECOLOR;
   }
-  if (!stream.hasColors?.()) {
-    return 0;
-  }
-  return 1;
+  return detectStreamColorLevel(stream);
 }
 var BYTES_PER_BASE64_CHAR = 0.75;
 var BYTES_PER_KB = 1024;
@@ -54504,17 +54517,6 @@ function startSpinner(config3, onEvent) {
     onEvent({ type: "TICK", at: Date.now() });
   }, SPINNER_INTERVAL_MS);
 }
-function cleanupRuntime(runtime) {
-  if (runtime.cleaned) {
-    return;
-  }
-  runtime.cleaned = true;
-  if (runtime.spinnerHandle !== void 0) {
-    clearInterval(runtime.spinnerHandle);
-  }
-  runtime.writer?.cleanup();
-  runtime.inputManager?.cleanup();
-}
 function createRuntime(role) {
   return {
     state: initialState(role),
@@ -54523,7 +54525,18 @@ function createRuntime(role) {
     writer: void 0,
     inputManager: void 0,
     spinnerHandle: void 0,
-    cleaned: false
+    cleaned: false,
+    cleanup() {
+      if (this.cleaned) {
+        return;
+      }
+      this.cleaned = true;
+      if (this.spinnerHandle !== void 0) {
+        clearInterval(this.spinnerHandle);
+      }
+      this.writer?.cleanup();
+      this.inputManager?.cleanup();
+    }
   };
 }
 function createDisplay(config3) {
@@ -54540,7 +54553,7 @@ function createDisplay(config3) {
   return {
     onEvent,
     cleanup: () => {
-      cleanupRuntime(runtime);
+      runtime.cleanup();
     }
   };
 }
@@ -54943,11 +54956,11 @@ function __asyncGenerator(thisArg, _arguments, generator) {
     try {
       step(g3[n3](v2));
     } catch (e3) {
-      settle2(q4[0][3], e3);
+      settle(q4[0][3], e3);
     }
   }
   function step(r3) {
-    r3.value instanceof __await ? Promise.resolve(r3.value.v).then(fulfill, reject) : settle2(q4[0][2], r3);
+    r3.value instanceof __await ? Promise.resolve(r3.value.v).then(fulfill, reject) : settle(q4[0][2], r3);
   }
   function fulfill(value) {
     resume("next", value);
@@ -54955,7 +54968,7 @@ function __asyncGenerator(thisArg, _arguments, generator) {
   function reject(value) {
     resume("throw", value);
   }
-  function settle2(f6, v2) {
+  function settle(f6, v2) {
     if (f6(v2), q4.shift(), q4.length) resume(q4[0][0], q4[0][1]);
   }
 }
@@ -56006,30 +56019,6 @@ async function uploadVideoFile(fileManager, videoPath) {
   });
   return uploadResponse.file.uri;
 }
-function uploadVideo(videoPath, apiKey) {
-  const fileManager = new GoogleAIFileManager(apiKey);
-  return (0, import_neverthrow11.fromAsyncThrowable)(
-    uploadVideoFile,
-    (cause) => ({ type: "UPLOAD_FAILED", cause })
-  )(fileManager, videoPath);
-}
-function pollUntilActive(fileUri, options) {
-  const fileManager = new GoogleAIFileManager(options.apiKey);
-  const fileName = extractFileName(fileUri);
-  const checkState = async () => checkFileState(fileManager, fileName);
-  return (0, import_neverthrow11.fromAsyncThrowable)(
-    runPollLoop,
-    (cause) => ({ type: "UPLOAD_FAILED", cause })
-  )(checkState, options.onTick).andThen((outcome) => {
-    if (outcome === "active") {
-      return (0, import_neverthrow11.ok)(fileUri);
-    }
-    if (outcome === "failed") {
-      return (0, import_neverthrow11.err)({ type: "PROCESSING_FAILED", fileUri });
-    }
-    return (0, import_neverthrow11.err)({ type: "POLL_TIMEOUT", fileUri });
-  });
-}
 async function generateAnalysisText({
   genModel,
   videoUri,
@@ -56063,6 +56052,30 @@ function buildGenerativeModel(apiKey, model) {
     }
   });
 }
+function uploadVideo(videoPath, apiKey) {
+  const fileManager = new GoogleAIFileManager(apiKey);
+  return (0, import_neverthrow11.fromAsyncThrowable)(
+    uploadVideoFile,
+    (cause) => ({ type: "UPLOAD_FAILED", cause })
+  )(fileManager, videoPath);
+}
+function pollUntilActive(fileUri, options) {
+  const fileManager = new GoogleAIFileManager(options.apiKey);
+  const fileName = extractFileName(fileUri);
+  const checkState = async () => checkFileState(fileManager, fileName);
+  return (0, import_neverthrow11.fromAsyncThrowable)(
+    runPollLoop,
+    (cause) => ({ type: "UPLOAD_FAILED", cause })
+  )(checkState, options.onTick).andThen((outcome) => {
+    if (outcome === "active") {
+      return (0, import_neverthrow11.ok)(fileUri);
+    }
+    if (outcome === "failed") {
+      return (0, import_neverthrow11.err)({ type: "PROCESSING_FAILED", fileUri });
+    }
+    return (0, import_neverthrow11.err)({ type: "POLL_TIMEOUT", fileUri });
+  });
+}
 function analyseArtifacts(options) {
   const { videoUri, prompt, apiKey, model } = options;
   const genModel = buildGenerativeModel(apiKey, model);
@@ -62231,7 +62244,6 @@ var import_neverthrow21 = __toESM(require_index_cjs(), 1);
 var import_promises12 = require("node:fs/promises");
 var import_node_path6 = __toESM(require("node:path"), 1);
 var import_neverthrow22 = __toESM(require_index_cjs(), 1);
-var VIEW_UI_TOOL_NAME = "mcp__mobile-ios__view_ui";
 var VIEW_UI_DESCRIPTION = `Capture current screen state: accessibility tree (element labels, positions, attributes) and screenshot in one call. Use when you need to tap an element, assert element presence or labels, check attributes, or track screen identity via <screen_id>.
 
 The result begins with a <screen_id> tag containing the current screen identifier. Use this to detect screen changes and track navigation history.
@@ -62239,14 +62251,9 @@ The result begins with a <screen_id> tag containing the current screen identifie
 Do not call \`screenshot\` immediately before or after this tool for the same state \u2014 this tool already includes the screenshot.
 
 IMPORTANT: Snapshot coordinates and screenshot pixels are in the same logical point space. Do not apply any scaling factor (no 2x retina adjustment).`;
-function deriveScreenLabel(tree, stepIndex) {
-  const match = /\[\w+\]\s+"([^"]+)"/.exec(tree);
-  if (!match?.[1]) {
-    return `step-${String(stepIndex)}`;
-  }
-  return match[1].replaceAll(/([A-Z])/g, "-$1").toLowerCase().replaceAll(/[^a-z\d]+/g, "-").replaceAll(/^-|-$/g, "");
-}
+var VIEW_UI_TOOL_NAME = "mcp__mobile-ios__view_ui";
 async function persistScreenshot(params) {
+  const targetSnapshot = params.snapshot;
   const screenshotPath = import_node_path4.default.join(params.screenshotsDirectory, `${params.screenLabel}.png`);
   const safeWriteFile = (0, import_neverthrow17.fromAsyncThrowable)(
     import_promises10.writeFile,
@@ -62258,7 +62265,7 @@ async function persistScreenshot(params) {
     () => false
   );
   if (succeeded) {
-    params.snapshot.screenshotPath = screenshotPath;
+    targetSnapshot.screenshotPath = screenshotPath;
   }
 }
 function buildTextContent(structuralHash, formatted) {
@@ -62337,13 +62344,14 @@ async function enrichContentWithScreenshot(params) {
   if (data) {
     await handleScreenshotData(data, params);
   }
-  params.lastEmittedHash.value = maybeEmitVisualStep({
+  const hashReference = params.lastEmittedHash;
+  hashReference.value = maybeEmitVisualStep({
     snapshot: params.snapshot,
     stepIndex: params.stepIndex,
     formatted: params.formatted,
     structuralHash: params.structuralHash,
     screenLabel: params.screenLabel,
-    lastEmittedHash: params.lastEmittedHash.value,
+    lastEmittedHash: hashReference.value,
     onEvent: params.context.onEvent
   });
 }
@@ -62392,11 +62400,19 @@ async function runViewUiCapture(context, state) {
 function createViewUiHandler(context) {
   const lastEmittedHash = { value: void 0 };
   const labelCounters = /* @__PURE__ */ new Map();
+  const stepCounterReference = context.stepCounter;
   return async () => {
-    const stepIndex = context.stepCounter.value++;
+    const stepIndex = stepCounterReference.value++;
     return runViewUiCapture(context, { stepIndex, lastEmittedHash, labelCounters });
   };
 }
+function deriveScreenLabel(tree, stepIndex) {
+  const match = /\[\w+\]\s+"([^"]+)"/.exec(tree);
+  if (!match?.[1]) {
+    return `step-${String(stepIndex)}`;
+  }
+  return match[1].replaceAll(/([A-Z])/g, "-$1").toLowerCase().replaceAll(/[^a-z\d]+/g, "-").replaceAll(/^-|-$/g, "");
+}
 function createViewUiTool(context) {
   return _x("view_ui", VIEW_UI_DESCRIPTION, {}, createViewUiHandler(context));
 }
@@ -62423,19 +62439,6 @@ function captureToolUse(blk, state) {
     state.closeQueue();
   }
 }
-function captureFromAssistant(content, state) {
-  for (const block of content) {
-    if (typeof block !== "object" || block === null) {
-      continue;
-    }
-    const blk = block;
-    if ((blk.type === "thinking" || blk.type === "text") && typeof blk[blk.type] === "string") {
-      captureThinkingOrText(blk, state);
-    } else if (blk.type === "tool_use") {
-      captureToolUse(blk, state);
-    }
-  }
-}
 function extractResultText(block) {
   const typed = block;
   if (typeof typed.content === "string") {
@@ -62448,27 +62451,49 @@ function extractResultText(block) {
     (item) => typeof item === "object" && item !== null && item.type === "text"
   ).map((item) => item.text).join("\n");
 }
-function captureFromUser(content, state) {
+function emitToolResultEvent(emission) {
+  const { block, toolName, blk, state } = emission;
+  if (toolName === VIEW_UI_TOOL_NAME) {
+    return;
+  }
+  const resultText = extractResultText(block);
+  if (blk.is_error === true) {
+    state.onEvent?.({ type: "TOOL_ERROR", agent: "explorer", toolName, error: resultText });
+    return;
+  }
+  state.onEvent?.({ type: "TOOL_RESULT", agent: "explorer", toolName, result: resultText });
+}
+function captureToolResult(block, state) {
+  const blk = block;
+  if (blk.type !== "tool_result" || typeof blk.tool_use_id !== "string") {
+    return;
+  }
+  const toolName = state.pendingToolCallNames.get(blk.tool_use_id);
+  if (toolName === void 0) {
+    return;
+  }
+  emitToolResultEvent({ block, toolName, blk, state });
+  state.pendingToolCallNames.delete(blk.tool_use_id);
+}
+function captureFromAssistant(content, state) {
   for (const block of content) {
     if (typeof block !== "object" || block === null) {
       continue;
     }
     const blk = block;
-    if (blk.type !== "tool_result" || typeof blk.tool_use_id !== "string") {
-      continue;
+    if ((blk.type === "thinking" || blk.type === "text") && typeof blk[blk.type] === "string") {
+      captureThinkingOrText(blk, state);
+    } else if (blk.type === "tool_use") {
+      captureToolUse(blk, state);
     }
-    const toolName = state.pendingToolCallNames.get(blk.tool_use_id);
-    if (toolName !== void 0) {
-      if (toolName !== VIEW_UI_TOOL_NAME) {
-        const resultText = extractResultText(block);
-        if (blk.is_error === true) {
-          state.onEvent?.({ type: "TOOL_ERROR", agent: "explorer", toolName, error: resultText });
-        } else {
-          state.onEvent?.({ type: "TOOL_RESULT", agent: "explorer", toolName, result: resultText });
-        }
-      }
-      state.pendingToolCallNames.delete(blk.tool_use_id);
+  }
+}
+function captureFromUser(content, state) {
+  for (const block of content) {
+    if (typeof block !== "object" || block === null) {
+      continue;
     }
+    captureToolResult(block, state);
   }
 }
 function processMessage(message, state) {
@@ -62655,8 +62680,9 @@ function buildInterruptErrorEvent(agent, error48) {
   return { type: "ERROR", agent, message, stack };
 }
 function startHardTimer(gracePeriodMs, context) {
+  const timedOutReference = context.state.timedOut;
   return setTimeout(() => {
-    context.state.timedOut.value = true;
+    timedOutReference.value = true;
     context.queryRunner.interrupt().catch((error48) => {
       context.state.onEvent?.(buildInterruptErrorEvent(context.agent, error48));
     });
@@ -62668,6 +62694,7 @@ function startSoftTimer({
   hardTimerRef,
   context
 }) {
+  const targetReference = hardTimerRef;
   return setTimeout(() => {
     context.state.onEvent?.({
       type: "TIMEOUT_GRACE_ENTERED",
@@ -62675,7 +62702,7 @@ function startSoftTimer({
       gracePeriodMs
     });
     context.state.sendMessage(SOFT_DEADLINE_MESSAGE);
-    hardTimerRef.value = startHardTimer(gracePeriodMs, context);
+    targetReference.value = startHardTimer(gracePeriodMs, context);
   }, timeoutMs);
 }
 function startActiveTimeout({
@@ -62727,8 +62754,9 @@ async function drainInterruptThenAbort(context) {
   linkedController?.abort(reason);
 }
 function registerSignalAbortListeners(config3, { queryRunner, state, linkedController }) {
+  const abortedReference = state.aborted;
   const onAbort = () => {
-    state.aborted.value = true;
+    abortedReference.value = true;
     void drainInterruptThenAbort({
       queryRunner,
       state,
@@ -62756,16 +62784,16 @@ function startQueryTimers(config3, context) {
     inputQueue.close();
   };
 }
-function awaitMessagesAndResolve({ queryRunner, state }, { cleanup: cleanup3, getOutput }) {
+function awaitMessagesAndResolve({ queryRunner, state }, { cleanup: cleanup2, getOutput }) {
   const messagesPromise = processMessages(queryRunner, state);
   return import_neverthrow15.ResultAsync.fromPromise(messagesPromise, String).andThen((innerResult) => {
-    cleanup3();
+    cleanup2();
     if (innerResult.isErr()) {
       return (0, import_neverthrow15.err)(innerResult.error);
     }
     return (0, import_neverthrow15.ok)(getOutput());
   }).orElse((sdkError) => {
-    cleanup3();
+    cleanup2();
     if (!state.timedOut.value && !state.aborted.value) {
       return (0, import_neverthrow15.err)(sdkError);
     }
@@ -62788,14 +62816,14 @@ function executeQuery({
     return (0, import_neverthrow15.errAsync)(queryRunnerResult.error);
   }
   const queryRunner = queryRunnerResult.value;
-  const cleanup3 = startQueryTimers(config3, { state, queryRunner, inputQueue, linkedController });
+  const cleanup2 = startQueryTimers(config3, { state, queryRunner, inputQueue, linkedController });
   const getOutput = () => ({
     findings: (outputTools.getOutput()?.findings ?? []).map(
       (raw) => stampExplorerAgent(raw)
     ),
     snapshots: state.snapshots
   });
-  return awaitMessagesAndResolve({ queryRunner, state }, { cleanup: cleanup3, getOutput });
+  return awaitMessagesAndResolve({ queryRunner, state }, { cleanup: cleanup2, getOutput });
 }
 function runQuery(prompt, config3) {
   const outputTools = createOutputTool({ findings: external_exports.array(EXPLORER_FINDING_SCHEMA) });
@@ -63124,15 +63152,6 @@ var FREESTYLE_TEMPLATE = (options) => {
 ${DEV_ENVIRONMENT_SECTION}` : "";
   return buildFreestyleBody({ contextBlock, environmentSection });
 };
-function generateExplorerPrompt({
-  mode,
-  specs,
-  appContext,
-  initialState: initialState2,
-  buildEnv
-}) {
-  return mode === "spec" ? buildSpecModePrompt(specs, { appContext, initialState: initialState2, buildEnv }) : FREESTYLE_TEMPLATE({ appContext, initialState: initialState2, buildEnv });
-}
 function renderStep(step, index) {
   const stepNumber = String(index + 1);
   const base = `${stepNumber}. ${step.action}`;
@@ -63160,6 +63179,15 @@ function buildSpecModePrompt(specs, options) {
   const specContent = specs.map((spec) => renderSpec(spec)).join("\n\n---\n\n");
   return SPEC_MODE_TEMPLATE(specContent, options);
 }
+function generateExplorerPrompt({
+  mode,
+  specs,
+  appContext,
+  initialState: initialState2,
+  buildEnv
+}) {
+  return mode === "spec" ? buildSpecModePrompt(specs, { appContext, initialState: initialState2, buildEnv }) : FREESTYLE_TEMPLATE({ appContext, initialState: initialState2, buildEnv });
+}
 var FRONTMATTER_FENCE = "---";
 var INLINE_ASSERTION_DELIMITER = " \u2192 ";
 var NUMBERED_STEP_PREFIX = /^\d+\.\s+/;
@@ -63283,10 +63311,6 @@ function parseTestSpec(name, content) {
     });
   });
 }
-function resolveSpecs(config3, repoRoot = process.cwd()) {
-  const source = config3.specFiles && config3.specFiles.length > 0 ? loadFromFiles(config3.specFiles) : loadFromDirectory(import_node_path6.default.join(repoRoot, "openspec", "specs"));
-  return source.map((specs) => filterByNames(specs, config3.specNames));
-}
 function loadFromFiles(paths) {
   const entries = paths.map((filePath) => ({
     path: filePath,
@@ -63357,6 +63381,10 @@ function filterByNames(specs, specNames) {
   }
   return specs.filter((spec) => specNames.includes(spec.name));
 }
+function resolveSpecs(config3, repoRoot = process.cwd()) {
+  const source = config3.specFiles && config3.specFiles.length > 0 ? loadFromFiles(config3.specFiles) : loadFromDirectory(import_node_path6.default.join(repoRoot, "openspec", "specs"));
+  return source.map((specs) => filterByNames(specs, config3.specNames));
+}
 var ISO_DATE_LENGTH = 10;
 function buildPrompt(safeConfig, specs) {
   return generateExplorerPrompt({
@@ -66105,6 +66133,19 @@ var jsYaml = {
 // ../../agents/inspector/dist/index.js
 var import_neverthrow29 = __toESM(require_index_cjs(), 1);
 var MS_PER_DAY = 864e5;
+function dequeue(context, current) {
+  if (current.remainingQueue.length === 0 || context.activeCount + current.events.length >= context.maxConcurrency) {
+    return current;
+  }
+  if (context.signal?.aborted === true) {
+    return { events: current.events, remainingQueue: [] };
+  }
+  const [event, ...rest] = current.remainingQueue;
+  if (!event) {
+    return { events: current.events, remainingQueue: rest };
+  }
+  return dequeue(context, { events: [...current.events, event], remainingQueue: rest });
+}
 function checkStaleness({ lastUpdated, thresholdDays, now }) {
   if (!lastUpdated) {
     return { isStale: false, ageDays: 0 };
@@ -66119,19 +66160,6 @@ function tryResolve(state) {
   }
   return { shouldResolve: false, result };
 }
-function dequeue(context, current) {
-  if (current.remainingQueue.length === 0 || context.activeCount + current.events.length >= context.maxConcurrency) {
-    return current;
-  }
-  if (context.signal?.aborted === true) {
-    return { events: current.events, remainingQueue: [] };
-  }
-  const [event, ...rest] = current.remainingQueue;
-  if (!event) {
-    return { events: current.events, remainingQueue: rest };
-  }
-  return dequeue(context, { events: [...current.events, event], remainingQueue: rest });
-}
 function scheduleNext(state, maxConcurrency) {
   if (state.signal?.aborted === true) {
     return { events: [], remainingQueue: [] };
@@ -66144,16 +66172,6 @@ function scheduleNext(state, maxConcurrency) {
 var CONFIDENCE_HIGH = 0.9;
 var CONFIDENCE_MEDIUM = 0.6;
 var CONFIDENCE_LOW = 0.3;
-function isValidSeverity(value) {
-  return value === "low" || value === "medium" || value === "high";
-}
-function isRawFinding(value) {
-  if (typeof value !== "object" || value === null || Array.isArray(value)) {
-    return false;
-  }
-  const object2 = value;
-  return typeof object2.type === "string" && typeof object2.element === "string" && typeof object2.description === "string" && typeof object2.severity === "string" && isValidSeverity(object2.severity);
-}
 function toTriggerType(type2) {
   return type2 === "localization-issue" ? "localization-issue" : "visual-regression";
 }
@@ -66166,6 +66184,19 @@ function toConfidence(severity) {
   }
   return CONFIDENCE_LOW;
 }
+function parseJson(raw) {
+  return JSON.parse(raw);
+}
+function isValidSeverity(value) {
+  return value === "low" || value === "medium" || value === "high";
+}
+function isRawFinding(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return false;
+  }
+  const object2 = value;
+  return typeof object2.type === "string" && typeof object2.element === "string" && typeof object2.description === "string" && typeof object2.severity === "string" && isValidSeverity(object2.severity);
+}
 function mapRawFinding(item) {
   return {
     triggerType: toTriggerType(item.type),
@@ -66177,9 +66208,6 @@ function mapRawFinding(item) {
     agent: "inspector"
   };
 }
-function parseJson(raw) {
-  return JSON.parse(raw);
-}
 var safeJsonParse3 = (0, import_neverthrow26.fromThrowable)(parseJson);
 function parseClaudeResponse(raw) {
   const parseResult = safeJsonParse3(raw);
@@ -66402,25 +66430,6 @@ var SEVERITY_CONFIDENCE = {
   low: CONFIDENCE_LOW2
 };
 var safeJsonParse22 = (0, import_neverthrow28.fromThrowable)(JSON.parse);
-function buildFindCandidatesMessages(screenshotBase64, artboardNames) {
-  return [
-    {
-      role: "user",
-      content: [
-        {
-          type: "image",
-          source: { type: "base64", media_type: "image/png", data: screenshotBase64 }
-        },
-        {
-          type: "text",
-          text: `Which of these design artboards are most visually similar to this screenshot (same app, same design system)? Reply with a JSON array of up to ${String(MAX_CANDIDATES)} artboard names from the list below, or [] if none are sufficiently similar. Only include names exactly as listed.
-
-Artboards: ${artboardNames.join(", ")}`
-        }
-      ]
-    }
-  ];
-}
 function resolveNamesFromParsed(parsed, artboardNames) {
   return parsed.filter((name) => typeof name === "string").map((name) => {
     const lower = name.toLowerCase();
@@ -66446,19 +66455,6 @@ async function fetchCandidateNames({
   }
   return resolveNamesFromParsed(parsed.value, artboardNames);
 }
-function findCandidates(screenshot, artboardNames) {
-  if (artboardNames.length === 0) {
-    return (0, import_neverthrow28.okAsync)([]);
-  }
-  const anthropic = new Anthropic();
-  return downscale(screenshot).andThen((scaled) => {
-    const screenshotBase64 = scaled.toString("base64");
-    return (0, import_neverthrow28.fromAsyncThrowable)(
-      fetchCandidateNames,
-      (cause) => ({ type: "CLAUDE_API_FAILED", cause })
-    )({ anthropic, screenshotBase64, artboardNames });
-  });
-}
 function buildArtboardTextBlock(index, total) {
   const base = {
     type: "text",
@@ -66478,24 +66474,6 @@ function buildArtboardContentBlocks(artboardBase64s) {
     buildArtboardTextBlock(index, artboardBase64s.length)
   ]);
 }
-function buildDesignContextMessages(screenshotBase64, artboardBase64s) {
-  return [
-    {
-      role: "user",
-      content: [
-        ...buildArtboardContentBlocks(artboardBase64s),
-        {
-          type: "image",
-          source: { type: "base64", media_type: "image/png", data: screenshotBase64 }
-        },
-        {
-          type: "text",
-          text: "This is the actual screenshot. List all design system violations as JSON."
-        }
-      ]
-    }
-  ];
-}
 function parseConservativeResponse(raw) {
   const parseResult = safeJsonParse22(raw);
   if (parseResult.isErr()) {
@@ -66547,6 +66525,56 @@ function toDesignContextFindings(text) {
 async function downscaleAll(buffers) {
   return Promise.all(buffers.map(async (buf) => downscaleBuffer(buf)));
 }
+function buildFindCandidatesMessages(screenshotBase64, artboardNames) {
+  return [
+    {
+      role: "user",
+      content: [
+        {
+          type: "image",
+          source: { type: "base64", media_type: "image/png", data: screenshotBase64 }
+        },
+        {
+          type: "text",
+          text: `Which of these design artboards are most visually similar to this screenshot (same app, same design system)? Reply with a JSON array of up to ${String(MAX_CANDIDATES)} artboard names from the list below, or [] if none are sufficiently similar. Only include names exactly as listed.
+
+Artboards: ${artboardNames.join(", ")}`
+        }
+      ]
+    }
+  ];
+}
+function findCandidates(screenshot, artboardNames) {
+  if (artboardNames.length === 0) {
+    return (0, import_neverthrow28.okAsync)([]);
+  }
+  const anthropic = new Anthropic();
+  return downscale(screenshot).andThen((scaled) => {
+    const screenshotBase64 = scaled.toString("base64");
+    return (0, import_neverthrow28.fromAsyncThrowable)(
+      fetchCandidateNames,
+      (cause) => ({ type: "CLAUDE_API_FAILED", cause })
+    )({ anthropic, screenshotBase64, artboardNames });
+  });
+}
+function buildDesignContextMessages(screenshotBase64, artboardBase64s) {
+  return [
+    {
+      role: "user",
+      content: [
+        ...buildArtboardContentBlocks(artboardBase64s),
+        {
+          type: "image",
+          source: { type: "base64", media_type: "image/png", data: screenshotBase64 }
+        },
+        {
+          type: "text",
+          text: "This is the actual screenshot. List all design system violations as JSON."
+        }
+      ]
+    }
+  ];
+}
 var downscaleAllBuffers = (0, import_neverthrow28.fromAsyncThrowable)(
   downscaleAll,
   (cause) => ({ type: "CLAUDE_API_FAILED", cause })
@@ -66601,6 +66629,23 @@ function resolveExactMatchOutcome({
   }
   return stepFinding ? { outcome: "fail", finding: stepFinding } : { outcome: "pass" };
 }
+async function collectDesignContextFindings(context) {
+  let stepFinding;
+  await compareWithDesignContext(context.screenshot, context.artboardBuffers).match(
+    (findings) => {
+      const mapped = findings.map((finding) => ({
+        ...finding,
+        screenshots: [context.screenshotPath]
+      }));
+      context.state.findings.push(...mapped);
+      stepFinding = mapped[0];
+    },
+    (error48) => {
+      pushClaudeError(context.state, { stepIndex: context.stepIndex, error: error48 });
+    }
+  );
+  return { stepFinding };
+}
 async function compareArtboardExact({
   screenshot,
   artboard,
@@ -66625,23 +66670,6 @@ async function compareArtboardExact({
   });
   return resolveExactMatchOutcome({ stepFinding, isStale, ageDays });
 }
-async function collectDesignContextFindings(context) {
-  let stepFinding;
-  await compareWithDesignContext(context.screenshot, context.artboardBuffers).match(
-    (findings) => {
-      const mapped = findings.map((finding) => ({
-        ...finding,
-        screenshots: [context.screenshotPath]
-      }));
-      context.state.findings.push(...mapped);
-      stepFinding = mapped[0];
-    },
-    (error48) => {
-      pushClaudeError(context.state, { stepIndex: context.stepIndex, error: error48 });
-    }
-  );
-  return { stepFinding };
-}
 async function compareWithCandidates(context) {
   const { stepFinding } = await collectDesignContextFindings(context);
   if (stepFinding) {
@@ -66775,19 +66803,20 @@ function resolveStepEvent({ stepIndex, screenLabel, outcome }) {
   return { stepIndex, screenLabel, outcome: "pass" };
 }
 async function initArtboardNames({ designStore, config: config3, state }) {
-  state.artboardNamesPromise ??= designStore.listArtboards().match(
-    (names) => {
-      if (names.length === 0) {
-        emitProgress(config3, "no artboards found in designs directory");
+  return state.getOrInitArtboardNames(
+    async () => designStore.listArtboards().match(
+      (names) => {
+        if (names.length === 0) {
+          emitProgress(config3, "no artboards found in designs directory");
+        }
+        return names;
+      },
+      (error48) => {
+        emitProgress(config3, `Failed to list artboards: ${error48.type}`);
+        return [];
       }
-      return names;
-    },
-    (error48) => {
-      emitProgress(config3, `Failed to list artboards: ${error48.type}`);
-      return [];
-    }
+    )
   );
-  return state.artboardNamesPromise;
 }
 function readScreenshot(screenshotPath, stepIndex) {
   return import_neverthrow24.ResultAsync.fromThrowable(
@@ -66812,43 +66841,40 @@ async function processStep(context) {
   });
   config3.onStepComplete?.(resolveStepEvent({ stepIndex, screenLabel, outcome }));
 }
+var StepState = class {
+  findings = [];
+  errors = [];
+  artboardNames = void 0;
+  async getOrInitArtboardNames(init) {
+    this.artboardNames ??= init();
+    return this.artboardNames;
+  }
+};
 var MAX_CONCURRENCY = 3;
 function applyTryResolve(state) {
   const { shouldResolve, result } = tryResolve(state);
   if (shouldResolve && state.resolve) {
     state.resolve(result);
-    state.resolve = void 0;
+    state.clearResolve();
   }
 }
 function applyScheduleNext(state, context) {
   const { events, remainingQueue } = scheduleNext(state, MAX_CONCURRENCY);
-  state.queue = remainingQueue;
+  state.setQueue(remainingQueue);
   for (const event of events) {
-    state.activeCount += 1;
+    state.incrementActive();
     void processStep({
       event,
       designStore: context.designStore,
       config: context.config,
       state
     }).finally(() => {
-      state.activeCount -= 1;
+      state.decrementActive();
       applyScheduleNext(state, context);
       applyTryResolve(state);
     });
   }
 }
-function createRunnerState(config3) {
-  return {
-    findings: [],
-    errors: [],
-    activeCount: 0,
-    queue: [],
-    closed: false,
-    resolve: void 0,
-    signal: config3.signal,
-    artboardNamesPromise: void 0
-  };
-}
 function buildInspector(state, context) {
   return {
     enqueue(event) {
@@ -66859,12 +66885,12 @@ function buildInspector(state, context) {
       applyScheduleNext(state, context);
     },
     close() {
-      state.closed = true;
+      state.markClosed();
       applyTryResolve(state);
     },
     drain() {
       const { promise: promise2, resolve } = Promise.withResolvers();
-      state.resolve = resolve;
+      state.setResolve(resolve);
       applyTryResolve(state);
       return (0, import_neverthrow23.fromSafePromise)(promise2);
     }
@@ -66872,9 +66898,38 @@ function buildInspector(state, context) {
 }
 function createInspector(config3, designStore) {
   const context = { designStore, config: config3 };
-  const state = createRunnerState(config3);
+  const state = new RunnerState(config3.signal);
   return buildInspector(state, context);
 }
+var RunnerState = class extends StepState {
+  activeCount = 0;
+  queue = [];
+  closed = false;
+  resolve = void 0;
+  signal;
+  constructor(signal) {
+    super();
+    this.signal = signal;
+  }
+  setQueue(queue) {
+    this.queue = queue;
+  }
+  incrementActive() {
+    this.activeCount += 1;
+  }
+  decrementActive() {
+    this.activeCount -= 1;
+  }
+  markClosed() {
+    this.closed = true;
+  }
+  setResolve(resolve) {
+    this.resolve = resolve;
+  }
+  clearResolve() {
+    this.resolve = void 0;
+  }
+};
 function parseMeta(raw) {
   const parsed = jsYaml.load(raw);
   if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
@@ -67210,7 +67265,7 @@ async function drainAfterExplorer(options) {
   return (0, import_neverthrow34.ok)({ artifacts: explorerResult.value, inspectorFindings });
 }
 function runExplorerAndDrain(options) {
-  return new import_neverthrow34.ResultAsync(drainAfterExplorer(options));
+  return import_neverthrow34.ResultAsync.fromSafePromise(drainAfterExplorer(options)).andThen((result) => result);
 }
 function createDefaultMcpServers(udid) {
   return {
@@ -67717,8 +67772,8 @@ function buildAnalyseIdentity() {
     simulatorUdid: ""
   };
 }
-function buildAnalyseEventHandler(identity, debug) {
-  const debugLogger = createDebugLogger({ enabled: debug });
+function buildAnalyseEventHandler(identity, isDebug) {
+  const debugLogger = createDebugLogger({ enabled: isDebug });
   const baseHandler = (event) => {
     identity.display.onEvent({ ...event, itemId: ITEM_ID });
   };
@@ -69370,7 +69425,7 @@ function createPrompt(view) {
         effectScheduler.clearAll();
         throw error48;
       }).finally(() => {
-        cleanups.forEach((cleanup3) => cleanup3());
+        cleanups.forEach((cleanup2) => cleanup2());
         screen.done({ clearContent: Boolean(context.clearPromptOnDone) });
         output.end();
       }).then(() => promise2), { cancel });
@@ -70664,43 +70719,6 @@ var DEFAULT_TERMINAL_WIDTH = 80;
 var CURSOR_MARGIN = 4;
 var ELLIPSIS_LENGTH = 3;
 var PAGE_SIZE = 15;
-function dismissalKey(finding) {
-  return `${finding.flow}\0${finding.description}`;
-}
-function buildChoiceName(finding, state) {
-  const suffix = state === "dismissed" ? " [dismissed]" : state === "reconsidered" ? " [reconsidered]" : "";
-  const terminalWidth = process.stdout.columns > 0 ? process.stdout.columns : DEFAULT_TERMINAL_WIDTH;
-  const maxDescWidth = terminalWidth - CURSOR_MARGIN - FIXED_COLS_WIDTH - suffix.length;
-  const flow = source_default.bold(finding.flow.padEnd(FLOW_COL_WIDTH));
-  const triggerType = source_default.dim(finding.triggerType.padEnd(TRIGGER_COL_WIDTH));
-  const confidence = `${String(Math.round(finding.confidence * CONFIDENCE_PERCENT))}%`.padEnd(
-    CONFIDENCE_COL_WIDTH
-  );
-  const rawDescription = finding.description.split(".")[0] ?? finding.description;
-  const description = rawDescription.length > maxDescWidth ? `${rawDescription.slice(0, maxDescWidth - ELLIPSIS_LENGTH)}...` : rawDescription;
-  return `${flow}  ${triggerType}  ${confidence}  ${description}${suffix ? source_default.dim(suffix) : ""}`;
-}
-function printDetail(finding) {
-  process.stdout.write(source_default.bold("\nDescription:\n"));
-  process.stdout.write(`${finding.description}
-`);
-  process.stdout.write(source_default.bold("\nSteps:\n"));
-  for (const [index, step] of finding.steps.entries()) {
-    process.stdout.write(`  ${String(index + 1)}. ${step}
-`);
-  }
-  process.stdout.write(
-    `${source_default.bold("\nConfidence: ")}${String(Math.round(finding.confidence * CONFIDENCE_PERCENT))}%
-`
-  );
-  if (finding.screenshots.length > 0) {
-    process.stdout.write(source_default.bold("\nScreenshots:\n"));
-    for (const screenshot of finding.screenshots) {
-      process.stdout.write(`  ${screenshot}
-`);
-    }
-  }
-}
 async function handleFindingDetail(finding, state) {
   printDetail(finding);
   if (state === "dismissed") {
@@ -70791,6 +70809,43 @@ async function runLoopIteration(findings, state) {
   }
   return true;
 }
+function dismissalKey(finding) {
+  return `${finding.flow}\0${finding.description}`;
+}
+function buildChoiceName(finding, state) {
+  const suffix = state === "dismissed" ? " [dismissed]" : state === "reconsidered" ? " [reconsidered]" : "";
+  const terminalWidth = process.stdout.columns > 0 ? process.stdout.columns : DEFAULT_TERMINAL_WIDTH;
+  const maxDescWidth = terminalWidth - CURSOR_MARGIN - FIXED_COLS_WIDTH - suffix.length;
+  const flow = source_default.bold(finding.flow.padEnd(FLOW_COL_WIDTH));
+  const triggerType = source_default.dim(finding.triggerType.padEnd(TRIGGER_COL_WIDTH));
+  const confidence = `${String(Math.round(finding.confidence * CONFIDENCE_PERCENT))}%`.padEnd(
+    CONFIDENCE_COL_WIDTH
+  );
+  const rawDescription = finding.description.split(".")[0] ?? finding.description;
+  const description = rawDescription.length > maxDescWidth ? `${rawDescription.slice(0, maxDescWidth - ELLIPSIS_LENGTH)}...` : rawDescription;
+  return `${flow}  ${triggerType}  ${confidence}  ${description}${suffix ? source_default.dim(suffix) : ""}`;
+}
+function printDetail(finding) {
+  process.stdout.write(source_default.bold("\nDescription:\n"));
+  process.stdout.write(`${finding.description}
+`);
+  process.stdout.write(source_default.bold("\nSteps:\n"));
+  for (const [index, step] of finding.steps.entries()) {
+    process.stdout.write(`  ${String(index + 1)}. ${step}
+`);
+  }
+  process.stdout.write(
+    `${source_default.bold("\nConfidence: ")}${String(Math.round(finding.confidence * CONFIDENCE_PERCENT))}%
+`
+  );
+  if (finding.screenshots.length > 0) {
+    process.stdout.write(source_default.bold("\nScreenshots:\n"));
+    for (const screenshot of finding.screenshots) {
+      process.stdout.write(`  ${screenshot}
+`);
+    }
+  }
+}
 async function runInteractiveLoop(findings, existing) {
   const state = {
     dismissedKeys: new Set(existing.map((dismissal) => dismissalKey(dismissal.finding))),
@@ -70981,6 +71036,9 @@ var import_node_path17 = __toESM(require("node:path"), 1);
 // src/spec-slug.ts
 var import_node_path15 = __toESM(require("node:path"), 1);
 var SPECS_DIR = "specs";
+function stripExtensions(filename) {
+  return filename.replace(/\.test\.md$/, "").replace(/\.[^.]+$/, "");
+}
 function deriveSpecSlug(specFilePath) {
   const parts = specFilePath.split(import_node_path15.default.sep);
   const specsIndex = parts.lastIndexOf(SPECS_DIR);
@@ -70992,9 +71050,6 @@ function deriveSpecSlug(specFilePath) {
   }
   return stripExtensions(import_node_path15.default.basename(specFilePath));
 }
-function stripExtensions(filename) {
-  return filename.replace(/\.test\.md$/, "").replace(/\.[^.]+$/, "");
-}
 
 // src/commands/spec-resolver.ts
 var import_node_fs8 = require("node:fs");
@@ -71027,16 +71082,6 @@ function parseTimeout(fields) {
   }
   return (0, import_neverthrow42.ok)(parsed);
 }
-function parseSpecFrontmatter(content) {
-  return extractFrontmatterBlock(content).andThen((block) => {
-    const fields = parseYamlFields(block);
-    const feature = fields.get("feature");
-    if (feature === void 0) {
-      return (0, import_neverthrow42.err)({ type: "MISSING_FIELD", field: "feature" });
-    }
-    return parseTimeout(fields).map((timeout) => ({ feature, timeout }));
-  });
-}
 function parseYamlFields(block) {
   const map3 = /* @__PURE__ */ new Map();
   for (const line of block.split("\n")) {
@@ -71052,6 +71097,16 @@ function parseYamlFields(block) {
   }
   return map3;
 }
+function parseSpecFrontmatter(content) {
+  return extractFrontmatterBlock(content).andThen((block) => {
+    const fields = parseYamlFields(block);
+    const feature = fields.get("feature");
+    if (feature === void 0) {
+      return (0, import_neverthrow42.err)({ type: "MISSING_FIELD", field: "feature" });
+    }
+    return parseTimeout(fields).map((timeout) => ({ feature, timeout }));
+  });
+}
 
 // src/commands/spec-resolver.ts
 var safeReadFile4 = (0, import_neverthrow43.fromThrowable)((filePath) => (0, import_node_fs8.readFileSync)(filePath, "utf8"));
@@ -71063,25 +71118,6 @@ var safeSelect = import_neverthrow43.ResultAsync.fromThrowable(
   esm_default11,
   (error48) => error48 instanceof Error && error48.name === "ExitPromptError" ? "cancelled" : "failed"
 );
-function readAndParseSpec(absolutePath) {
-  const readResult = safeReadFile4(absolutePath);
-  if (readResult.isErr()) {
-    const isEnoent3 = readResult.error.code === "ENOENT";
-    const message = isEnoent3 ? `Spec file not found: ${absolutePath}` : `Failed to read spec file: ${absolutePath}`;
-    process.stderr.write(`${message}
-`);
-    process.exit(1);
-    return;
-  }
-  const frontmatterResult = parseSpecFrontmatter(readResult.value);
-  if (frontmatterResult.isErr()) {
-    process.stderr.write(`Invalid spec frontmatter: ${frontmatterResult.error.type}
-`);
-    process.exit(1);
-    return;
-  }
-  return frontmatterResult.value;
-}
 function findSpecFiles(xqaDirectory) {
   const specsDirectory = import_node_path16.default.join(xqaDirectory, "specs");
   return safeReaddir(specsDirectory).unwrapOr([]).filter((file2) => file2.endsWith(".test.md")).map((file2) => import_node_path16.default.join(specsDirectory, file2));
@@ -71104,6 +71140,25 @@ async function promptForSpec(specFiles, xqaDirectory) {
   }
   return result.value;
 }
+function readAndParseSpec(absolutePath) {
+  const readResult = safeReadFile4(absolutePath);
+  if (readResult.isErr()) {
+    const isEnoent3 = readResult.error.code === "ENOENT";
+    const message = isEnoent3 ? `Spec file not found: ${absolutePath}` : `Failed to read spec file: ${absolutePath}`;
+    process.stderr.write(`${message}
+`);
+    process.exit(1);
+    return;
+  }
+  const frontmatterResult = parseSpecFrontmatter(readResult.value);
+  if (frontmatterResult.isErr()) {
+    process.stderr.write(`Invalid spec frontmatter: ${frontmatterResult.error.type}
+`);
+    process.exit(1);
+    return;
+  }
+  return frontmatterResult.value;
+}
 async function resolveSpecFile(specFile, xqaDirectory) {
   if (specFile !== void 0) {
     return specFile;
@@ -75567,17 +75622,6 @@ function deriveSpecName(filePath) {
 function deriveSpecId(name) {
   return `spec-${name.replaceAll("/", "__")}`;
 }
-function buildSpecItems(filePaths) {
-  return [...new Set(filePaths)].map((filePath) => {
-    const name = deriveSpecName(filePath);
-    return {
-      type: "spec",
-      id: deriveSpecId(name),
-      name,
-      specPath: filePath
-    };
-  });
-}
 function buildFreestyleItem(entry, index) {
   const position = String(index);
   const label = String(index + 1);
@@ -75592,6 +75636,17 @@ function buildFreestyleItem(entry, index) {
   }
   return base;
 }
+function buildSpecItems(filePaths) {
+  return [...new Set(filePaths)].map((filePath) => {
+    const name = deriveSpecName(filePath);
+    return {
+      type: "spec",
+      id: deriveSpecId(name),
+      name,
+      specPath: filePath
+    };
+  });
+}
 function buildFreestyleItems(entries) {
   return entries.map((entry, index) => buildFreestyleItem(entry, index));
 }
@@ -75649,18 +75704,18 @@ var PriorityQueue = class {
 };
 
 // src/suite/shell/item-result-builder.ts
-function getErrorMessage(cause) {
-  if (cause instanceof Error) {
-    return cause.message;
-  }
-  return String(cause);
-}
 function getSpecPath(item) {
   if (item.type === "spec") {
     return item.specPath;
   }
   return null;
 }
+function getErrorMessage(cause) {
+  if (cause instanceof Error) {
+    return cause.message;
+  }
+  return String(cause);
+}
 function buildCompletedItem(context, result) {
   return {
     id: context.item.id,
@@ -75721,14 +75776,6 @@ function buildAbortedItem(item, simulatorUdid) {
 }
 
 // src/suite/shell/item-result-recorder.ts
-function buildNotifyBase(itemContext) {
-  return {
-    itemId: itemContext.item.id,
-    itemName: itemContext.item.name,
-    durationMs: itemContext.durationMs,
-    at: Date.now()
-  };
-}
 function isTimeoutError(error48) {
   return error48.type.toUpperCase().includes("TIMEOUT");
 }
@@ -75752,6 +75799,14 @@ function notifyItemResult(context, observer) {
     error: getErrorMessage(context.result.error.cause)
   });
 }
+function buildNotifyBase(itemContext) {
+  return {
+    itemId: itemContext.item.id,
+    itemName: itemContext.item.name,
+    durationMs: itemContext.durationMs,
+    at: Date.now()
+  };
+}
 function recordItemResult(input) {
   const { context, results, observer } = input;
   const { itemContext, result } = context;
@@ -75836,96 +75891,96 @@ function buildHookEnv(input) {
 // src/suite/shell/hook-runner.ts
 var import_node_child_process6 = require("node:child_process");
 var import_neverthrow50 = __toESM(require_index_cjs(), 1);
-var noop2 = () => void 0;
-function cleanup2(context) {
-  clearTimeout(context.timeoutHandle);
-  context.signal.removeEventListener("abort", context.onAbort);
-}
-function settle(context, outcome) {
-  if (context.settled.value) {
-    return;
-  }
-  context.settled.value = true;
-  cleanup2(context);
-  context.deferred.resolve(outcome);
-}
 function makeDeferred() {
   const raw = Promise.withResolvers();
   return { promise: raw.promise, resolve: raw.resolve };
 }
-function collectStderr(child, stderrReference) {
-  if (child.stderr === null) {
-    return;
+async function spawnHook(options) {
+  const runtime = new HookRuntime(options);
+  return runtime.start();
+}
+var HookRuntime = class {
+  child;
+  signal;
+  deferred;
+  timeoutMs;
+  stderrBuffer = "";
+  settled = false;
+  timeoutHandle;
+  onAbort;
+  constructor(options) {
+    const { script, cwd, env: env2, baseEnv, nodeExecPath, timeoutMs, signal } = options;
+    this.child = (0, import_node_child_process6.spawn)(nodeExecPath, [script], {
+      cwd,
+      env: { ...baseEnv, ...env2 },
+      stdio: ["ignore", "inherit", "pipe"]
+    });
+    this.signal = signal;
+    this.timeoutMs = timeoutMs;
+    this.deferred = makeDeferred();
+    this.onAbort = () => {
+      this.child.kill("SIGTERM");
+      this.settle((0, import_neverthrow50.err)({ type: "HOOK_ABORTED" }));
+    };
   }
-  child.stderr.on("data", (chunk) => {
-    stderrReference.value += chunk.toString();
-  });
-}
-function buildOnAbort(context) {
-  return () => {
-    context.child.kill("SIGTERM");
-    settle(context, (0, import_neverthrow50.err)({ type: "HOOK_ABORTED" }));
-  };
-}
-function attachChildListeners(context) {
-  const { child, stderrReference } = context;
-  child.on("error", (cause) => {
-    settle(context, (0, import_neverthrow50.err)({ type: "HOOK_SPAWN_FAILED", cause }));
-  });
-  child.on("exit", (code) => {
-    if (code === 0) {
-      settle(context, (0, import_neverthrow50.ok)());
+  async start() {
+    this.collectStderr();
+    this.attachTimeout();
+    if (this.signal.aborted) {
+      this.onAbort();
+      return this.deferred.promise;
+    }
+    this.signal.addEventListener("abort", this.onAbort, { once: true });
+    this.attachChildListeners();
+    return this.deferred.promise;
+  }
+  collectStderr() {
+    if (this.child.stderr === null) {
       return;
     }
-    settle(
-      context,
-      (0, import_neverthrow50.err)({
-        type: "HOOK_EXIT_NONZERO",
-        code: code ?? -1,
-        stderr: stderrReference.value
-      })
-    );
-  });
-}
-function attachTimeout(context, timeoutMs) {
-  clearTimeout(context.timeoutHandle);
-  context.timeoutHandle = setTimeout(() => {
-    context.child.kill("SIGTERM");
-    settle(context, (0, import_neverthrow50.err)({ type: "HOOK_TIMEOUT", timeoutMs }));
-  }, timeoutMs);
-}
-function buildContext2(options) {
-  const { script, cwd, env: env2, baseEnv, nodeExecPath } = options;
-  const deferred = makeDeferred();
-  const stderrReference = { value: "" };
-  const child = (0, import_node_child_process6.spawn)(nodeExecPath, [script], {
-    cwd,
-    env: { ...baseEnv, ...env2 },
-    stdio: ["ignore", "inherit", "pipe"]
-  });
-  collectStderr(child, stderrReference);
-  return {
-    child,
-    signal: options.signal,
-    timeoutHandle: setTimeout(noop2, 0),
-    onAbort: noop2,
-    deferred,
-    stderrReference,
-    settled: { value: false }
-  };
-}
-async function spawnHook(options) {
-  const context = buildContext2(options);
-  attachTimeout(context, options.timeoutMs);
-  context.onAbort = buildOnAbort(context);
-  if (options.signal.aborted) {
-    context.onAbort();
-    return context.deferred.promise;
+    this.child.stderr.on("data", (chunk) => {
+      this.stderrBuffer += chunk.toString();
+    });
   }
-  options.signal.addEventListener("abort", context.onAbort, { once: true });
-  attachChildListeners(context);
-  return context.deferred.promise;
-}
+  attachTimeout() {
+    this.timeoutHandle = setTimeout(() => {
+      this.child.kill("SIGTERM");
+      this.settle((0, import_neverthrow50.err)({ type: "HOOK_TIMEOUT", timeoutMs: this.timeoutMs }));
+    }, this.timeoutMs);
+  }
+  attachChildListeners() {
+    this.child.on("error", (cause) => {
+      this.settle((0, import_neverthrow50.err)({ type: "HOOK_SPAWN_FAILED", cause }));
+    });
+    this.child.on("exit", (code) => {
+      if (code === 0) {
+        this.settle((0, import_neverthrow50.ok)());
+        return;
+      }
+      this.settle(
+        (0, import_neverthrow50.err)({
+          type: "HOOK_EXIT_NONZERO",
+          code: code ?? -1,
+          stderr: this.stderrBuffer
+        })
+      );
+    });
+  }
+  settle(outcome) {
+    if (this.settled) {
+      return;
+    }
+    this.settled = true;
+    this.cleanup();
+    this.deferred.resolve(outcome);
+  }
+  cleanup() {
+    if (this.timeoutHandle !== void 0) {
+      clearTimeout(this.timeoutHandle);
+    }
+    this.signal.removeEventListener("abort", this.onAbort);
+  }
+};
 var safeSpawn = import_neverthrow50.ResultAsync.fromThrowable(
   spawnHook,
   (cause) => ({ type: "HOOK_SPAWN_FAILED", cause })
@@ -76122,31 +76177,29 @@ function resolveFreestyleTimeout(item, config3) {
   }
   return config3.QA_EXPLORE_TIMEOUT_SECONDS ?? DEFAULT_FREESTYLE_TIMEOUT_SECONDS2;
 }
-function buildFreestyleExplorerConfig(input) {
-  const { item, context, simulatorUdid } = input;
-  const { config: config3, date: date5, appContext } = context;
-  return {
-    mode: "freestyle",
-    date: date5,
-    mcpServers: createDefaultMcpServers(simulatorUdid),
-    allowedTools: ALLOWED_TOOLS,
-    timeoutMs: resolveFreestyleTimeout(item, config3) * MS_PER_SECOND4,
-    appContext: composeAppContext([buildDeviceInstruction(simulatorUdid), appContext, item.prompt]),
-    buildEnv: config3.QA_BUILD_ENV,
-    cwd: ensureWorkerCwd(simulatorUdid),
-    record: true
-  };
-}
 function buildFreestylePipelineConfig(input) {
   const { item, context, signal, simulatorUdid, onEvent } = input;
-  const { xqaDirectory, runId } = context;
+  const { config: config3, xqaDirectory, runId, date: date5, appContext } = context;
   return {
     outputDir: import_node_path21.default.join(xqaDirectory, "output", item.id),
     runId,
     simulatorUdid,
     signal,
     onEvent,
-    explorer: buildFreestyleExplorerConfig(input)
+    explorer: {
+      mode: "freestyle",
+      date: date5,
+      mcpServers: createDefaultMcpServers(simulatorUdid),
+      allowedTools: ALLOWED_TOOLS,
+      timeoutMs: resolveFreestyleTimeout(item, config3) * MS_PER_SECOND4,
+      appContext: composeAppContext([
+        buildDeviceInstruction(simulatorUdid),
+        appContext,
+        item.prompt
+      ]),
+      buildEnv: config3.QA_BUILD_ENV,
+      cwd: ensureWorkerCwd(simulatorUdid)
+    }
   };
 }
 function executeFreestyleItem(input) {
@@ -76168,8 +76221,7 @@ function buildSpecPipelineConfig(input) {
       allowedTools: ALLOWED_TOOLS,
       appContext: composeAppContext([buildDeviceInstruction(simulatorUdid), appContext]),
       buildEnv: config3.QA_BUILD_ENV,
-      cwd: ensureWorkerCwd(simulatorUdid),
-      record: true
+      cwd: ensureWorkerCwd(simulatorUdid)
     }
   };
 }
@@ -76416,12 +76468,28 @@ async function runSuite(input) {
     aborted: input.signal.aborted
   });
 }
+async function resolveAndFilterItems(input) {
+  const resolvedRaw = await resolveWorkItems(input);
+  if (resolvedRaw === void 0) {
+    return;
+  }
+  if (input.only === void 0) {
+    return resolvedRaw;
+  }
+  const filtered = resolvedRaw.items.filter((item) => item.id === input.only);
+  if (filtered.length === 0) {
+    process.stderr.write(`No work item matched id: ${input.only}
+`);
+    return;
+  }
+  return { ...resolvedRaw, items: filtered };
+}
 async function runSuiteCommand(input) {
   const preflightExit = await runPreflightChecks();
   if (preflightExit !== void 0) {
     return preflightExit;
   }
-  const resolved = await resolveWorkItems(input);
+  const resolved = await resolveAndFilterItems(input);
   if (resolved === void 0) {
     return 1;
   }
@@ -76460,7 +76528,7 @@ function resolveXqaDirectory() {
   return result.value;
 }
 var program2 = new Command();
-program2.name("xqa").description("AI-powered QA agent CLI").version(`${"1.15.1"}${false ? ` (dev build +${"8f8a210"})` : ""}`);
+program2.name("xqa").description("AI-powered QA agent CLI").version(`${"1.16.0"}${false ? ` (dev build +${"3af4493"})` : ""}`);
 program2.command("init").description("Initialize a new xqa project in the current directory").action(() => {
   runInitCommand();
 });
@@ -76516,11 +76584,15 @@ program2.command("spec").description("Run the explorer agent against a spec file
     { config: config2, xqaDirectory }
   );
 });
-program2.command("run").description("Run a test suite or a set of spec files").option("--suite <name>", "Name of the suite to run").option("--spec <globs...>", "Glob patterns matching spec files to run").option("--debug", "Log timing and event details to stderr").action(async (options) => {
+program2.command("run").description("Run a test suite or a set of spec files").option("--suite <name>", "Name of the suite to run").option("--spec <globs...>", "Glob patterns matching spec files to run").option("--only <id>", "Run only the work item with the given id (requires --suite)").option("--debug", "Log timing and event details to stderr").action(async (options) => {
   if (options.suite === void 0 === (options.spec === void 0)) {
     process.stderr.write("Exactly one of --suite or --spec must be provided\n");
     process.exit(1);
   }
+  if (options.only !== void 0 && options.suite === void 0) {
+    process.stderr.write("--only requires --suite\n");
+    process.exit(1);
+  }
   const xqaDirectory = resolveXqaDirectory();
   const mode = options.suite === void 0 ? { type: "spec", globs: options.spec ?? [] } : { type: "suite", name: options.suite };
   const exitCode = await runSuiteCommand({
@@ -76528,7 +76600,8 @@ program2.command("run").description("Run a test suite or a set of spec files").o
     xqaDirectory,
     config: config2,
     debug: options.debug ?? false,
-    signal: controller.signal
+    signal: controller.signal,
+    only: options.only
   });
   process.exit(exitCode);
 });