@vforsh/argus 0.2.0 → 0.3.1

package/dist/argus.js

@@ -2130,7 +2130,7 @@ var {
 // package.json
 var package_default = {
   name: "@vforsh/argus",
-  version: "0.2.0",
+  version: "0.3.1",
   repository: {
     type: "git",
     url: "git+https://github.com/vforsh/argus.git",
@@ -2156,9 +2156,10 @@ var package_default = {
     access: "public"
   },
   dependencies: {
-    "@vforsh/argus-core": "^0.2.0",
-    "@vforsh/argus-plugin-api": "^0.2.0",
-    "@vforsh/argus-watcher": "^0.2.0",
+    "@vforsh/argus-client": "^0.3.0",
+    "@vforsh/argus-core": "^0.3.0",
+    "@vforsh/argus-plugin-api": "^0.3.0",
+    "@vforsh/argus-watcher": "^0.3.1",
     commander: "14.0.2",
     esbuild: "0.25.12",
     prettier: "3.7.4"
@@ -3116,6 +3117,15 @@ var expectNullableWatcherSource = (value, source) => {
   throw new Error(`Invalid ${source}: expected "cdp", "extension", or null`);
 };
 // ../argus-core/dist/http/fetch.js
+class HttpResponseError extends Error {
+  status;
+  isHttpResponseError = true;
+  constructor(message, status) {
+    super(message);
+    this.name = "HttpResponseError";
+    this.status = status;
+  }
+}
 var fetchJson = async (url, options = {}) => {
   const controller = new AbortController;
   const timeoutMs = options.timeoutMs ?? 5000;
@@ -3133,7 +3143,7 @@ var fetchJson = async (url, options = {}) => {
         return await response.json();
       }
       const errorMessage = await extractErrorMessage(response);
-      throw new Error(errorMessage ?? `Request failed (${response.status} ${response.statusText})`);
+      throw new HttpResponseError(errorMessage ?? `Request failed (${response.status} ${response.statusText})`, response.status);
     }
     return await response.json();
   } catch (error) {
@@ -3158,7 +3168,7 @@ var fetchText = async (url, options = {}) => {
       headers: body ? { "Content-Type": "application/json" } : undefined
     });
     if (!response.ok) {
-      throw new Error(`Request failed (${response.status} ${response.statusText})`);
+      throw new HttpResponseError(`Request failed (${response.status} ${response.statusText})`, response.status);
     }
     return await response.text();
   } catch (error) {
@@ -8192,9 +8202,6 @@ var formatError3 = (error) => error instanceof Error ? error.message : String(er
 // ../argus-watcher/dist/cdp/eval.js
 var evaluateExpression = async (session, options) => {
   const args = hasEvalArgs(options.args) ? options.args : undefined;
-  if (args) {
-    await installEvalArgs(session, args, options.timeoutMs);
-  }
   let scenarioBridge;
   try {
     if (options.scenario) {
@@ -8205,12 +8212,23 @@ var evaluateExpression = async (session, options) => {
     }
     const recordResult = await evaluateAndAwaitRecord(session, {
       ...options,
-      expression: scenarioBridge?.expression ?? options.expression,
+      expression: wrapExpressionWithArgs(scenarioBridge?.expression ?? options.expression, args),
       replMode: scenarioBridge ? false : options.replMode
     });
     if (recordResult.exception)
       return recordResult.response;
     const record2 = recordResult.record;
+    if (options.jsonValue) {
+      const jsonResult = await materializeJsonValue(session, record2, options);
+      if (!jsonResult.ok)
+        return jsonResult.response;
+      return {
+        ok: true,
+        result: jsonResult.json,
+        type: record2?.type ?? null,
+        exception: null
+      };
+    }
     const value = await materializeRemoteObject(session, record2, options);
     return {
       ok: true,
@@ -8220,12 +8238,16 @@ var evaluateExpression = async (session, options) => {
     };
   } finally {
     await scenarioBridge?.dispose();
-    if (args) {
-      await restoreEvalArgs(session, options.timeoutMs);
-    }
   }
 };
 var hasEvalArgs = (args) => args != null && Object.keys(args).length > 0;
+var wrapExpressionWithArgs = (expression, args) => {
+  if (!args)
+    return expression;
+  return `{ const args = Object.freeze(${JSON.stringify(args)});
+${expression}
+}`;
+};
 var evaluateAndAwaitRecord = async (session, options) => {
   const payload = await evaluateRawExpression(session, options);
   if (payload.exceptionDetails) {
@@ -8250,42 +8272,6 @@ var formatExceptionResponse = (payload) => ({
     details: payload.exceptionDetails?.exception ?? null
   }
 });
-var EVAL_ARGS_STATE_KEY = "__argusEvalArgsPreviousDescriptor__";
-var installEvalArgs = async (session, args, timeoutMs) => {
-  const payload = JSON.stringify(args);
-  await sendInternalEval(session, `(() => {
-  const previous = Object.getOwnPropertyDescriptor(globalThis, 'args');
-  Object.defineProperty(globalThis, ${JSON.stringify(EVAL_ARGS_STATE_KEY)}, { value: previous, configurable: true });
-  Object.defineProperty(globalThis, 'args', { value: Object.freeze(${payload}), configurable: true });
-})()`, timeoutMs);
-};
-var restoreEvalArgs = async (session, timeoutMs) => {
-  await sendInternalEval(session, `(() => {
-  const stateKey = ${JSON.stringify(EVAL_ARGS_STATE_KEY)};
-  const previous = Object.getOwnPropertyDescriptor(globalThis, stateKey)?.value;
-  delete globalThis[stateKey];
-  delete globalThis.args;
-  if (previous) Object.defineProperty(globalThis, 'args', previous);
-})()`, timeoutMs);
-};
-var sendInternalEval = async (session, expression, timeoutMs) => {
-  const payload = await session.sendAndWait("Runtime.evaluate", {
-    expression,
-    replMode: false,
-    awaitPromise: true,
-    returnByValue: true
-  }, { timeoutMs });
-  if (payload.exceptionDetails) {
-    throw new Error(formatInternalEvalError(payload.exceptionDetails));
-  }
-};
-var formatInternalEvalError = (exceptionDetails) => {
-  const exception = exceptionDetails.exception;
-  if (exception != null && typeof exception === "object" && "description" in exception && typeof exception.description === "string") {
-    return exception.description;
-  }
-  return exceptionDetails.text ?? "Failed to prepare eval args";
-};
 var evaluateRawExpression = async (session, options) => await session.sendAndWait("Runtime.evaluate", {
   expression: options.expression,
   replMode: options.replMode ?? true,
@@ -8296,6 +8282,25 @@ var awaitPromiseResult = async (session, promiseObjectId, timeoutMs) => await se
   promiseObjectId,
   returnByValue: false
 }, { timeoutMs });
+var EMPTY_JSON_ENVELOPE = "{}";
+var materializeJsonValue = async (session, record2, options) => {
+  if (!record2) {
+    return { ok: true, json: EMPTY_JSON_ENVELOPE };
+  }
+  if (!record2.objectId) {
+    return { ok: true, json: JSON.stringify({ v: record2.value }) ?? EMPTY_JSON_ENVELOPE };
+  }
+  const payload = await session.sendAndWait("Runtime.callFunctionOn", {
+    objectId: record2.objectId,
+    functionDeclaration: "function () { return JSON.stringify({ v: this }) }",
+    returnByValue: true
+  }, { timeoutMs: options.timeoutMs });
+  if (payload.exceptionDetails) {
+    return { ok: false, response: formatExceptionResponse(payload) };
+  }
+  const json = payload.result?.value;
+  return { ok: true, json: typeof json === "string" ? json : EMPTY_JSON_ENVELOPE };
+};
 var materializeRemoteObject = async (session, record2, options) => {
   if (!record2) {
     return null;
@@ -8339,6 +8344,7 @@ var route18 = defineJsonRoute({
     awaitPromise: normalizeBoolean(payload.awaitPromise, true),
     replMode: normalizeBoolean(payload.replMode, true),
     returnByValue: normalizeBoolean(payload.returnByValue, true),
+    jsonValue: normalizeBoolean(payload.jsonValue, false),
     timeoutMs: normalizeTimeout(payload.timeoutMs),
     scenario: normalizeBoolean(payload.scenario, false),
     scenarioServices: {
@@ -8539,7 +8545,7 @@ var filterNodesByText = async (session, nodeIds, text) => {
 
 // ../argus-watcher/dist/cdp/dom/selector.js
 var getDomRootId = async (session) => {
-  const targetContext = session.getTargetContext?.();
+  const targetContext = session.getReadyTargetContext ? await session.getReadyTargetContext() : session.getTargetContext?.();
   if (targetContext?.kind === "frame") {
     return getFrameDomRootId(session, targetContext);
   }
@@ -8624,6 +8630,18 @@ var describeNodeByBackendId = async (session, backendNodeId) => {
   });
   return described.node ?? null;
 };
+var resolveNodeIdByBackendId = async (session, backendNodeId) => {
+  const describedNode = await describeNodeByBackendId(session, backendNodeId);
+  if (describedNode?.nodeId) {
+    return describedNode.nodeId;
+  }
+  await getDomRootId(session);
+  const pushed = await session.sendAndWait("DOM.pushNodesByBackendIdsToFrontend", {
+    backendNodeIds: [backendNodeId]
+  });
+  const nodeId = pushed.nodeIds?.[0];
+  return typeof nodeId === "number" && nodeId > 0 ? nodeId : null;
+};
 var toDomNodeDescriptor = (handle) => {
   if (handle.nodeId != null) {
     return { nodeId: handle.nodeId };
@@ -9024,7 +9042,39 @@ var locateByLabel = async (session, elementRefs, request) => {
     }
     return matchesText(element.name, request.label, request.exact ?? false);
   });
-  return buildLocateResponse(session, request.all ?? false, matches);
+  return buildLocateResponse(session, request.all ?? false, await removeCompositeLabelWrappers(session, matches));
+};
+var NATIVE_LABELABLE_TAGS = new Set(["button", "input", "select", "textarea"]);
+var removeCompositeLabelWrappers = async (session, matches) => {
+  if (matches.length < 2)
+    return matches;
+  const candidates = await Promise.all(matches.map(async (match) => {
+    const [node, nodeId] = await Promise.all([
+      describeNodeByBackendId(session, match.backendNodeId),
+      resolveNodeIdByBackendId(session, match.backendNodeId)
+    ]);
+    const tag = node ? (node.localName ?? node.nodeName).toLowerCase() : "";
+    return { match, nodeId, native: NATIVE_LABELABLE_TAGS.has(tag) };
+  }));
+  const nativeCandidates = candidates.filter((candidate) => candidate.native && candidate.nodeId != null);
+  if (nativeCandidates.length === 0)
+    return matches;
+  const kept = [];
+  for (const candidate of candidates) {
+    if (candidate.native || candidate.nodeId == null) {
+      kept.push(candidate.match);
+      continue;
+    }
+    const descendants = await session.sendAndWait("DOM.querySelectorAll", {
+      nodeId: candidate.nodeId,
+      selector: "button,input,select,textarea"
+    });
+    const descendantIds = new Set(descendants.nodeIds ?? []);
+    const wrapsMatchedNative = nativeCandidates.some((native) => native.nodeId != null && descendantIds.has(native.nodeId) && normalizeText(native.match.role) === normalizeText(candidate.match.role) && normalizeText(native.match.name) === normalizeText(candidate.match.name));
+    if (!wrapsMatchedNative)
+      kept.push(candidate.match);
+  }
+  return kept;
 };
 var buildLocateResponse = async (session, all, matches) => {
   const selected = all ? matches : matches.slice(0, 1);
@@ -9535,8 +9585,8 @@ var setFileOnResolvedNodes = async (session, nodeIds, files) => {
 // ../argus-watcher/dist/cdp/dom/fill.js
 var FILL_FUNCTION = `function(value) {
 	var el = this;
+	el.focus();
 	if (el.isContentEditable) {
-		el.focus();
 		el.textContent = value;
 		el.dispatchEvent(new Event('input', { bubbles: true }));
 		el.dispatchEvent(new Event('change', { bubbles: true }));
@@ -13842,7 +13892,7 @@ import fs7 from "node:fs/promises";
 // ../argus-watcher/dist/cdp/visualCapture.js
 var createVisualCapturePlan = async (session, pageSession, request) => {
   const subject = resolveVisualCaptureSubject(request);
-  const targetContext = session.getTargetContext?.();
+  const targetContext = session.getReadyTargetContext ? await session.getReadyTargetContext() : session.getTargetContext?.();
   if (targetContext?.kind === "frame" && pageSession) {
     return createFrameCapturePlan({
       frameSession: session,
@@ -16244,7 +16294,6 @@ var createEmptyFrameState = () => ({
   topFrameId: null,
   requestedFrameId: null,
   requestedFrameHint: null,
-  requestedFrameDetached: false,
   activeFrameId: null,
   activeAttachedAt: null,
   frames: new Map,
@@ -16373,7 +16422,7 @@ var resolveRequestedTarget = (state2) => {
   if (nextFrameId) {
     return { kind: "frame", frameId: nextFrameId };
   }
-  return state2.requestedFrameDetached ? { kind: "page" } : { kind: "pending" };
+  return { kind: "pending" };
 };
 var resolveSelectedFrameCommandState = (state2) => {
   if (state2.requestedFrameId == null) {
@@ -16414,7 +16463,7 @@ var buildFrameTargetContext = (state2, frameId) => ({
 var findSingleMatchingFrameId = (state2, predicate) => {
   let matchId = null;
   for (const frame of state2.frames.values()) {
-    if (!predicate(frame)) {
+    if (frame.frameId === state2.topFrameId || !predicate(frame)) {
       continue;
     }
     if (matchId) {
@@ -16504,7 +16553,8 @@ var createDelegatingSession = (options) => {
         subscriptions.delete(subscription);
       };
     },
-    getTargetContext: options.getTargetContext
+    getTargetContext: options.getTargetContext,
+    getReadyTargetContext: options.getReadyTargetContext
   };
   controller.rebind();
   return { session, controller };
@@ -17034,31 +17084,54 @@ var seedExtensionFrameState = (session, state2) => {
   return state2;
 };
 var getSelectedExtensionTarget = (session, state2) => {
-  if (!state2?.activeFrameId) {
+  const frameId = state2?.requestedFrameId ?? state2?.activeFrameId;
+  if (!state2 || !frameId) {
     return buildPageTarget(session, { attached: true });
   }
-  const frame = state2.frames.get(state2.activeFrameId);
+  const frame = state2.frames.get(frameId);
   if (frame) {
     return frameToTarget(session.tabId, frame, { attached: true, faviconUrl: session.faviconUrl, topFrameId: state2.topFrameId });
   }
   return buildSelectedIframeFallbackTarget(session, state2);
 };
 var setRequestedTargetSelection = (state2, frameId) => {
+  if (state2.requestedFrameId !== frameId) {
+    state2.activeAttachedAt = null;
+  }
+  const previousHint = state2.requestedFrameId === frameId ? state2.requestedFrameHint : null;
   state2.requestedFrameId = frameId;
-  state2.requestedFrameHint = frameId ? createRequestedFrameHint(state2.frames.get(frameId)) : null;
-  state2.requestedFrameDetached = false;
+  state2.requestedFrameHint = frameId ? createRequestedFrameHint(state2.frames.get(frameId)) ?? previousHint : null;
+};
+var listExtensionTargets = (session, state2) => {
+  if (!state2) {
+    return [buildPageTarget(session, { attached: true })];
+  }
+  const selected = getSelectedExtensionTarget(session, state2);
+  selected.targetReady = isSelectedTargetReady(state2);
+  const targets = [buildPageTarget(session, { attached: false }), ...buildFrameTargets(state2, session.tabId, null, session.faviconUrl)];
+  const selectedIndex = targets.findIndex((target) => target.id === selected.id);
+  if (selectedIndex < 0) {
+    targets.push(selected);
+  } else {
+    targets[selectedIndex] = selected;
+  }
+  return targets;
 };
 var reconcileExtensionTargetSelection = (session, state2, onTargetChanged) => {
   const resolution = resolveRequestedTarget(state2);
   if (resolution.kind === "page") {
-    state2.requestedFrameDetached = false;
     return activatePageTarget(state2, onTargetChanged);
   }
   if (resolution.kind === "pending") {
-    return false;
+    if (state2.activeFrameId == null && state2.activeAttachedAt != null) {
+      return false;
+    }
+    state2.activeFrameId = null;
+    state2.activeAttachedAt = Date.now();
+    onTargetChanged();
+    return true;
   }
   syncRequestedFrameSelection(state2, resolution.frameId);
-  state2.requestedFrameDetached = false;
   if (state2.activeFrameId === resolution.frameId) {
     return false;
   }
@@ -17075,7 +17148,6 @@ var removeExtensionFrame = (state2, frameId) => {
     removeExtensionFrame(state2, childId);
   }
   if (state2.activeFrameId === frameId) {
-    state2.requestedFrameDetached = state2.requestedFrameId === frameId;
     state2.activeFrameId = null;
     state2.activeAttachedAt = null;
   }
@@ -17146,7 +17218,7 @@ var syncRequestedFrameSelection = (state2, frameId) => {
 };
 var buildSelectedIframeFallbackTarget = (session, state2) => {
   const hint = state2.requestedFrameHint;
-  const frameId = state2.activeFrameId;
+  const frameId = state2.requestedFrameId ?? state2.activeFrameId;
   if (!frameId) {
     return buildPageTarget(session, { attached: true });
   }
@@ -17157,7 +17229,8 @@ var buildSelectedIframeFallbackTarget = (session, state2) => {
     type: "iframe",
     parentId: formatPageTargetId(session.tabId),
     faviconUrl: session.faviconUrl,
-    attached: true
+    attached: true,
+    targetReady: false
   };
 };
 
@@ -17223,6 +17296,10 @@ var createExtensionSource = (options) => {
     getCurrentSession: () => currentSession,
     requireCurrentSession: getCurrentExtensionSession,
     getTargetContext: () => getCurrentTargetContext() ?? { kind: "page" },
+    getReadyTargetContext: async () => {
+      const context = getCurrentTargetContext() ?? { kind: "page" };
+      return context.kind === "frame" ? targetRecovery.waitForSelectedFrameCommandTarget() : context;
+    },
     prepareCommand: async ({ method, params, targetContext }) => {
       if (targetContext.kind !== "frame") {
         return;
@@ -17268,16 +17345,7 @@ var createExtensionSource = (options) => {
     if (!session) {
       return [];
     }
-    const state2 = frameStateByTabId.get(session.tabId);
-    if (!state2 || state2.frames.size === 0) {
-      return [buildPageTarget(session, { attached: true })];
-    }
-    const activeFrameId = state2.activeFrameId;
-    const targets = [buildPageTarget(session, { attached: activeFrameId == null })];
-    for (const frame of buildFrameTargets(state2, session.tabId, activeFrameId, session.faviconUrl)) {
-      targets.push(frame);
-    }
-    return targets;
+    return listExtensionTargets(session, frameStateByTabId.get(session.tabId));
   };
   const attachTarget = async (targetId) => {
     const target = parseExtensionTargetId(targetId);
@@ -17415,10 +17483,11 @@ var createExtensionSource = (options) => {
       return null;
     }
     const state2 = frameStateByTabId.get(session.tabId);
-    if (!state2?.activeFrameId) {
+    const frameId = state2?.requestedFrameId ?? state2?.activeFrameId;
+    if (!state2 || !frameId) {
       return { kind: "page" };
     }
-    return buildFrameTargetContext(state2, state2.activeFrameId);
+    return buildFrameTargetContext(state2, frameId);
   }
   function getOrCreateFrameState(tabId) {
     const existing = frameStateByTabId.get(tabId);
@@ -21159,7 +21228,7 @@ var prepareEvalExpression = async (inline, options, output) => {
     return null;
   }
   return {
-    expression: wrapForIframeEval(wrapExpressionWithArgs(resolved.expression, args), {
+    expression: wrapForIframeEval(wrapExpressionWithArgs2(resolved.expression, args), {
       selector: options.iframe,
       namespace: options.iframeNamespace ?? "argus",
       timeoutMs: iframeTimeoutMs.value ?? 5000
@@ -21331,16 +21400,13 @@ var parseCount = (value) => {
   }
   return { value: parsed };
 };
-var wrapExpressionWithArgs = (source, args) => {
+var wrapExpressionWithArgs2 = (source, args) => {
   if (!hasEvalArgs2(args)) {
     return source;
   }
   return `const args = Object.freeze(${JSON.stringify(args)});
 ${source}`;
 };
-var sleep5 = async (durationMs) => {
-  await new Promise((resolve2) => setTimeout(resolve2, durationMs));
-};
 var formatException = (response) => {
   if (!response.exception) {
     return "";
@@ -24167,60 +24233,89 @@ var authCommands = [
     ]
   }
 ];
-
-// dist/commands/evalPolling.js
+// ../argus-client/dist/eval/pollEval.js
 var pollEval = async (input) => {
-  let running = true;
-  const stop = () => {
-    running = false;
-  };
-  process.on("SIGINT", stop);
-  process.on("SIGTERM", stop);
-  try {
-    const startTime = Date.now();
-    let iteration = 0;
-    while (running) {
-      if (input.totalTimeoutMs != null) {
-        const elapsed = Date.now() - startTime;
-        if (elapsed >= input.totalTimeoutMs) {
-          return { kind: "timeout", elapsedMs: elapsed };
-        }
-      }
-      iteration += 1;
-      const result = await evalWithRetries({
-        watcher: input.watcher,
-        expression: input.expression,
-        args: input.args,
-        awaitPromise: input.awaitPromise,
-        returnByValue: input.returnByValue,
-        timeoutMs: input.timeoutMs,
-        failOnException: input.failOnException,
-        retryCount: input.retryCount,
-        scenario: input.scenario
-      });
-      if (!result.ok) {
-        return { kind: "eval-error", failure: result };
+  const startTime = Date.now();
+  let iteration = 0;
+  while (!input.signal?.aborted) {
+    if (input.totalTimeoutMs != null) {
+      const elapsedMs = Date.now() - startTime;
+      if (elapsedMs >= input.totalTimeoutMs) {
+        return { kind: "timeout", elapsedMs };
       }
-      const context = { response: result.response, iteration, attempt: result.attempt };
-      await input.onResult?.(result.response, context);
-      const stopResult = input.shouldStop?.(context);
-      if (stopResult) {
-        if (!stopResult.ok) {
-          return { kind: "condition-error", error: stopResult.error };
-        }
-        if (stopResult.matched) {
-          return { kind: "matched", response: result.response, iteration, attempt: result.attempt };
-        }
+    }
+    iteration += 1;
+    const result = await input.runEval(iteration);
+    if (!result.ok) {
+      return { kind: "eval-error", failure: result.failure };
+    }
+    const context = { response: result.response, iteration, attempt: result.attempt };
+    await input.onResult?.(result.response, context);
+    const decision = input.shouldStop?.(context);
+    if (decision) {
+      if (!decision.ok) {
+        return { kind: "condition-error", error: decision.error };
       }
-      if (input.count != null && iteration >= input.count) {
-        return { kind: "exhausted", iterations: iteration };
+      if (decision.matched) {
+        return { kind: "matched", response: result.response, iteration, attempt: result.attempt };
       }
-      await sleep5(input.intervalMs);
     }
-    return { kind: "interrupted" };
+    if (input.count != null && iteration >= input.count) {
+      return { kind: "exhausted", iterations: iteration };
+    }
+    await sleep5(input.intervalMs, input.signal);
+  }
+  return { kind: "interrupted" };
+};
+var sleep5 = async (durationMs, signal) => {
+  if (signal?.aborted) {
+    return;
+  }
+  await new Promise((resolve2) => {
+    const finish = () => {
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", finish);
+      resolve2();
+    };
+    const timer = setTimeout(finish, durationMs);
+    signal?.addEventListener("abort", finish, { once: true });
+  });
+};
+// dist/commands/evalPolling.js
+var pollEval2 = async (input) => {
+  const controller = new AbortController;
+  const abort = () => controller.abort();
+  process.on("SIGINT", abort);
+  process.on("SIGTERM", abort);
+  try {
+    return await pollEval({
+      intervalMs: input.intervalMs,
+      count: input.count,
+      totalTimeoutMs: input.totalTimeoutMs,
+      signal: controller.signal,
+      shouldStop: input.shouldStop,
+      onResult: input.onResult,
+      runEval: async () => {
+        const result = await evalWithRetries({
+          watcher: input.watcher,
+          expression: input.expression,
+          args: input.args,
+          awaitPromise: input.awaitPromise,
+          returnByValue: input.returnByValue,
+          timeoutMs: input.timeoutMs,
+          failOnException: input.failOnException,
+          retryCount: input.retryCount,
+          scenario: input.scenario
+        });
+        if (!result.ok) {
+          return { ok: false, failure: result, attempt: result.attempt };
+        }
+        return { ok: true, response: result.response, attempt: result.attempt };
+      }
+    });
   } finally {
-    process.off("SIGINT", stop);
-    process.off("SIGTERM", stop);
+    process.off("SIGINT", abort);
+    process.off("SIGTERM", abort);
   }
 };
 
@@ -24300,7 +24395,7 @@ var runEval = async (id, rawExpression, options) => {
     await emitter.emitSuccess(singleResult.response, false);
     return;
   }
-  const pollResult = await pollEval({
+  const pollResult = await pollEval2({
     watcher,
     expression: prepared.expression,
     args: prepared.args,
@@ -24414,7 +24509,7 @@ var runEvalUntil = async (id, rawExpression, options) => {
   if (!resolved)
     return;
   const { watcher } = resolved;
-  const pollResult = await pollEval({
+  const pollResult = await pollEval2({
     watcher,
     expression: prepared.expression,
     args: prepared.args,
@@ -24537,6 +24632,7 @@ var sharedEvalHeadOptions = (timeoutDescription) => [
   { flags: "-q, --silent", description: "Suppress success output; only emit output on error" }
 ];
 var sharedEvalTailOptions = [
+  { flags: "--expression <js>", description: "Expression to evaluate (alternative to the positional expression)" },
   { flags: "-f, --file <path>", description: "Read expression from a file" },
   { flags: "--bundle", description: "Bundle --file and its resolved imports into one script before eval" },
   { flags: "--no-bundle", description: "Read --file as-is (skip bundling and auto-bundle)" },
@@ -24589,7 +24685,12 @@ var evalCommands = [
       'argus eval app "document.title" --iframe "iframe" --iframe-timeout 10000'
     ],
     action: async (id, expression, options) => {
-      await runEval(id, expression, {
+      if (expression != null && options.expression != null) {
+        console.error("Provide either a positional expression or --expression, not both.");
+        process.exitCode = 2;
+        return;
+      }
+      await runEval(id, expression ?? options.expression, {
         json: options.json,
         await: options.await,
         timeout: options.timeout,
@@ -24667,7 +24768,12 @@ var evalCommands = [
       "argus wait app --file ./ready.js --args ./args.json --out ./ready.json"
     ],
     action: async (id, expression, options) => {
-      await runEvalUntil(id, expression, {
+      if (expression != null && options.expression != null) {
+        console.error("Provide either a positional expression or --expression, not both.");
+        process.exitCode = 2;
+        return;
+      }
+      await runEvalUntil(id, expression ?? options.expression, {
         json: options.json,
         await: options.await,
         timeout: options.timeout,
@@ -48325,6 +48431,7 @@ var fillCommand = {
     { flags: "--testid <id>", description: `Shorthand for --selector "[data-testid='<id>']"` },
     { flags: "--ref <elementRef>", description: "Stable element ref from snapshot/locate output" },
     { flags: "--name <attr>", description: 'Shorthand for --selector "[name=<attr>]"' },
+    { flags: "--value <text>", description: "Value to fill (alternative to the positional value)" },
     { flags: "--value-file <path>", description: "Read value from a file" },
     { flags: "--value-stdin", description: 'Read value from stdin (also triggered by "-" as value arg)' },
     { flags: "--all", description: "Allow multiple matches (default: error if >1 match)" },
@@ -48337,6 +48444,7 @@ var fillCommand = {
     'argus fill app --testid "username" "Bob"',
     'argus fill app --ref e7 "Bob"',
     'argus fill app --name "title" "Hello"',
+    'argus fill app --selector "#username" --value "Bob"',
     'argus fill app --selector "textarea" "New content"',
     'argus fill app --selector "input[type=text]" --all "reset"',
     'argus fill app --selector "#desc" --value-file ./description.txt',
@@ -48344,6 +48452,11 @@ var fillCommand = {
     'argus fill app --selector "#input" - < value.txt'
   ],
   action: async (id, value, options) => {
+    if (value != null && options.value != null) {
+      console.error("Provide either a positional value or --value, not both.");
+      process.exitCode = 2;
+      return;
+    }
     if (options.name && (options.testid || options.ref)) {
       console.error("Cannot use --name with --testid or --ref.");
       process.exitCode = 2;
@@ -48351,7 +48464,7 @@ var fillCommand = {
     }
     if (!resolveTestId(options))
       return;
-    await runDomFill(id, value, options);
+    await runDomFill(id, value ?? options.value, options);
   }
 };
 
@@ -51244,7 +51357,7 @@ var resolveExtensionTarget = (targets, options) => {
 };
 var hasExtensionTargetSelector = (options) => Boolean(options.page === true || options.iframe || options.iframeUrl || options.iframeTitle);
 var formatExtensionTargetLine = (target) => {
-  const state2 = target.attached ? "attached" : "available";
+  const state2 = target.targetReady === false ? "pending" : target.attached ? "attached" : "available";
   const type = target.type ?? "target";
   const title = target.title || "(untitled)";
   const parent = target.parentId ? ` [parent: ${shortenId(target.parentId)}]` : "";
@@ -51317,7 +51430,7 @@ var scoreIframeTarget = (target, page) => {
 var renderTargetNode = (target, prefix, isLast, childrenByParent, output, isRoot = false) => {
   const connector = targetTreeConnector(isRoot, isLast);
   const childPrefix = targetTreeChildPrefix(prefix, isRoot, isLast);
-  const state2 = target.attached ? " attached" : "";
+  const state2 = target.targetReady === false ? " pending" : target.attached ? " attached" : "";
   output.writeHuman(`${prefix}${connector}${target.title || "(untitled)"} (${target.type ?? "target"}, ${shortenId(target.id)}${state2})`);
   output.writeHuman(`${childPrefix}${target.url}`);
   const children = childrenByParent.get(target.id) ?? [];
@@ -51574,6 +51687,14 @@ var inspectWatcher = async (id, diagnostics) => {
   }
   if (!bridge) {
     issues.push(`Watcher ${resolved.watcher.id} is not present in extension diagnostics.`);
+  } else if (!bridge.connected) {
+    issues.push(`Watcher ${resolved.watcher.id} native bridge is disconnected.`);
+  }
+  if (status.ok && !status.status.attached) {
+    issues.push(`Watcher ${resolved.watcher.id} has no debugger-attached target.`);
+  }
+  if (status.ok && status.status.targetReady === false) {
+    issues.push(`Watcher ${resolved.watcher.id} selected target is not ready for commands.`);
   }
   if (status.ok && status.status.attached && !selectedTarget) {
     issues.push(`Watcher ${resolved.watcher.id} is attached, but no selected target was reported by /targets.`);