opensteer 0.9.4 → 0.9.5

package/dist/cli/bin.cjs

@@ -6679,7 +6679,7 @@ function assertValidSemanticOperationInput(name, input) {
     }
   );
 }
-var opensteerComputerAnnotationNames, opensteerExposedSemanticOperationNames, opensteerPackageRunnableSemanticOperationNames, snapshotModeSchema, viewportSchema, opensteerBrowserLaunchOptionsSchema, attachBrowserOptionsSchema, opensteerBrowserOptionsSchema, opensteerBrowserContextOptionsSchema, targetByElementSchema2, targetByPersistSchema2, targetBySelectorSchema2, opensteerTargetInputSchema, opensteerResolvedTargetSchema, opensteerActionResultSchema, opensteerSnapshotCounterSchema, opensteerSessionStateSchema, opensteerOpenInputSchema, opensteerPageListInputSchema, opensteerPageListOutputSchema, opensteerPageNewInputSchema, opensteerPageActivateInputSchema, opensteerPageCloseInputSchema, opensteerPageCloseOutputSchema, opensteerPageGotoInputSchema, opensteerPageEvaluateInputSchema, opensteerPageEvaluateOutputSchema, opensteerAddInitScriptInputSchema, opensteerAddInitScriptOutputSchema, opensteerCapturedScriptSchema, opensteerCaptureScriptsInputSchema, opensteerCaptureScriptsOutputSchema, opensteerPageSnapshotInputSchema, opensteerPageSnapshotOutputSchema, opensteerComputerMouseButtonSchema, opensteerComputerKeyModifierSchema, opensteerDomClickInputSchema, opensteerDomHoverInputSchema, opensteerDomInputInputSchema, opensteerDomScrollInputSchema, opensteerExtractSchemaSchema, opensteerDomExtractInputSchema, jsonValueSchema2, opensteerDomExtractOutputSchema, opensteerSessionCloseInputSchema, opensteerSessionCloseOutputSchema, opensteerComputerAnnotationSchema, opensteerComputerClickActionSchema, opensteerComputerMoveActionSchema, opensteerComputerScrollActionSchema, opensteerComputerTypeActionSchema, opensteerComputerKeyActionSchema, opensteerComputerDragActionSchema, opensteerComputerScreenshotActionSchema, opensteerComputerWaitActionSchema, opensteerComputerActionSchema, opensteerComputerScreenshotOptionsSchema, opensteerComputerExecuteInputSchema, opensteerComputerTracePointSchema, opensteerComputerTraceEnrichmentSchema, opensteerComputerExecuteTimingSchema, opensteerComputerDisplayScaleSchema, opensteerComputerExecuteOutputSchema, opensteerSemanticOperationSpecificationsBase, exposedSemanticOperationNameSet, opensteerSemanticOperationSpecificationsInternal, opensteerSemanticOperationSpecifications, opensteerSemanticOperationSpecificationMap, semanticRestBasePath, opensteerSemanticRestEndpoints;
+var opensteerComputerAnnotationNames, opensteerExposedSemanticOperationNames, opensteerPackageRunnableSemanticOperationNames, snapshotModeSchema, viewportSchema, opensteerBrowserLaunchOptionsSchema, attachBrowserOptionsSchema, opensteerBrowserOptionsSchema, opensteerBrowserContextOptionsSchema, targetByElementSchema2, targetByPersistSchema2, targetBySelectorSchema2, opensteerTargetInputSchema, opensteerResolvedTargetSchema, opensteerActionResultSchema, opensteerSnapshotCounterSchema, opensteerSessionStateSchema, opensteerOpenInputSchema, opensteerPageListInputSchema, opensteerPageListOutputSchema, opensteerPageNewInputSchema, opensteerPageActivateInputSchema, opensteerPageCloseInputSchema, opensteerPageCloseOutputSchema, opensteerPageGotoInputSchema, opensteerPageEvaluateInputSchema, opensteerPageEvaluateOutputSchema, opensteerAddInitScriptInputSchema, opensteerAddInitScriptOutputSchema, opensteerCapturedScriptSchema, opensteerCaptureScriptsInputSchema, opensteerCaptureScriptsOutputSchema, opensteerPageSnapshotInputSchema, opensteerPageSnapshotOutputSchema, opensteerComputerMouseButtonSchema, opensteerComputerKeyModifierSchema, opensteerDomClickInputSchema, opensteerDomHoverInputSchema, opensteerDomInputInputSchema, opensteerDomScrollInputSchema, opensteerExtractTemplateSchema, opensteerDomExtractInputSchema, jsonValueSchema2, opensteerDomExtractOutputSchema, opensteerSessionCloseInputSchema, opensteerSessionCloseOutputSchema, opensteerComputerAnnotationSchema, opensteerComputerClickActionSchema, opensteerComputerMoveActionSchema, opensteerComputerScrollActionSchema, opensteerComputerTypeActionSchema, opensteerComputerKeyActionSchema, opensteerComputerDragActionSchema, opensteerComputerScreenshotActionSchema, opensteerComputerWaitActionSchema, opensteerComputerActionSchema, opensteerComputerScreenshotOptionsSchema, opensteerComputerExecuteInputSchema, opensteerComputerTracePointSchema, opensteerComputerTraceEnrichmentSchema, opensteerComputerExecuteTimingSchema, opensteerComputerDisplayScaleSchema, opensteerComputerExecuteOutputSchema, opensteerSemanticOperationSpecificationsBase, exposedSemanticOperationNameSet, opensteerSemanticOperationSpecificationsInternal, opensteerSemanticOperationSpecifications, opensteerSemanticOperationSpecificationMap, semanticRestBasePath, opensteerSemanticRestEndpoints;
 var init_semantic = __esm({
   "../protocol/src/semantic.ts"() {
     init_json2();
@@ -7261,10 +7261,10 @@ var init_semantic = __esm({
         required: ["target", "direction", "amount"]
       }
     );
-    opensteerExtractSchemaSchema = objectSchema(
+    opensteerExtractTemplateSchema = objectSchema(
       {},
       {
-        title: "OpensteerExtractSchema",
+        title: "OpensteerExtractTemplate",
         additionalProperties: true
       }
     );
@@ -7272,13 +7272,13 @@ var init_semantic = __esm({
       ...objectSchema(
         {
           persist: stringSchema(),
-          schema: opensteerExtractSchemaSchema
+          template: opensteerExtractTemplateSchema
         },
         {
           title: "OpensteerDomExtractInput"
         }
       ),
-      anyOf: [defineSchema({ required: ["persist"] }), defineSchema({ required: ["schema"] })]
+      anyOf: [defineSchema({ required: ["persist"] }), defineSchema({ required: ["template"] })]
     });
     jsonValueSchema2 = recordSchema({}, { title: "JsonValueRecord" });
     opensteerDomExtractOutputSchema = objectSchema(
@@ -12220,7 +12220,7 @@ var init_package = __esm({
   "../runtime-core/package.json"() {
     package_default2 = {
       name: "@opensteer/runtime-core",
-      version: "0.2.3",
+      version: "0.2.4",
       description: "Shared semantic runtime for Opensteer local and cloud execution.",
       license: "MIT",
       type: "module",
@@ -12468,6 +12468,7 @@ var init_defaults = __esm({
           return false;
         }
         try {
+          const startedAt = Date.now();
           await input.engine.waitForPostLoadQuiet({
             pageRef: input.pageRef,
             timeoutMs: effectiveTimeout,
@@ -12475,9 +12476,13 @@ var init_defaults = __esm({
             captureWindowMs: Math.min(NAVIGATION_POST_LOAD_CAPTURE_WINDOW_MS, effectiveTimeout),
             signal: input.signal
           });
+          const visualTimeout = Math.max(0, effectiveTimeout - (Date.now() - startedAt));
+          if (visualTimeout <= 0) {
+            return true;
+          }
           await input.engine.waitForVisualStability({
             pageRef: input.pageRef,
-            timeoutMs: effectiveTimeout,
+            timeoutMs: visualTimeout,
             settleMs: profile.settleMs,
             scope: profile.scope
           });
@@ -17809,9 +17814,9 @@ var init_extraction_consolidation = __esm({
     CLUSTER_FALLBACK_PREFIX = "variant";
   }
 });
-function assertValidOpensteerExtractionSchemaRoot(schema) {
-  if (!schema || typeof schema !== "object" || Array.isArray(schema)) {
-    throw new Error("Invalid extraction schema: expected a JSON object at the top level.");
+function assertValidOpensteerExtractionTemplateRoot(template) {
+  if (!template || typeof template !== "object" || Array.isArray(template)) {
+    throw new Error("Invalid extraction template: expected a JSON object at the top level.");
   }
 }
 function isPersistedOpensteerExtractionValueNode2(value) {
@@ -17833,12 +17838,12 @@ function isPersistedOpensteerExtractionArrayNode2(value) {
   return "$array" in value;
 }
 async function compileOpensteerExtractionFieldTargets(options) {
-  assertValidOpensteerExtractionSchemaRoot(options.schema);
+  assertValidOpensteerExtractionTemplateRoot(options.template);
   const fields = [];
-  await collectFieldTargetsFromSchemaObject({
+  await collectFieldTargetsFromTemplateObject({
     dom: options.dom,
     pageRef: options.pageRef,
-    value: options.schema,
+    value: options.template,
     path: "",
     fields,
     insideArray: false
@@ -17890,13 +17895,13 @@ function createOpensteerExtractionDescriptorStore(options) {
   }
   return new MemoryOpensteerExtractionDescriptorStore(namespace);
 }
-async function collectFieldTargetsFromSchemaObject(options) {
+async function collectFieldTargetsFromTemplateObject(options) {
   for (const [key, childValue] of Object.entries(options.value)) {
     const normalizedKey = normalizeKey(key);
     if (!normalizedKey) {
       continue;
     }
-    await collectFieldTargetsFromSchemaValue({
+    await collectFieldTargetsFromTemplateValue({
       dom: options.dom,
       pageRef: options.pageRef,
       value: childValue,
@@ -17906,8 +17911,8 @@ async function collectFieldTargetsFromSchemaObject(options) {
     });
   }
 }
-async function collectFieldTargetsFromSchemaValue(options) {
-  const normalizedField = normalizeSchemaField(options.value);
+async function collectFieldTargetsFromTemplateValue(options) {
+  const normalizedField = normalizeTemplateField(options.value);
   if (normalizedField !== null) {
     options.fields.push(
       await compileFieldTarget({
@@ -17922,12 +17927,12 @@ async function collectFieldTargetsFromSchemaValue(options) {
   if (Array.isArray(options.value)) {
     if (options.insideArray) {
       throw new Error(
-        `Nested arrays are not supported in extraction schema at "${labelForPath(options.path)}".`
+        `Nested arrays are not supported in extraction template at "${labelForPath(options.path)}".`
       );
     }
     if (options.value.length === 0) {
       throw new Error(
-        `Extraction array "${labelForPath(options.path)}" must include at least one representative item.`
+        `Extraction array "${labelForPath(options.path)}" must include at least one representative template item.`
       );
     }
     for (let index = 0; index < options.value.length; index += 1) {
@@ -17938,7 +17943,7 @@ async function collectFieldTargetsFromSchemaValue(options) {
         );
       }
       const fieldCountBeforeItem = options.fields.length;
-      await collectFieldTargetsFromSchemaObject({
+      await collectFieldTargetsFromTemplateObject({
         dom: options.dom,
         pageRef: options.pageRef,
         value: itemValue,
@@ -17949,7 +17954,7 @@ async function collectFieldTargetsFromSchemaValue(options) {
       const itemFields = options.fields.slice(fieldCountBeforeItem);
       if (!itemFields.some((field) => !("source" in field))) {
         throw new Error(
-          `Extraction array "${labelForPath(options.path)}" item ${String(index)} must include at least one element- or selector-backed field.`
+          `Extraction array "${labelForPath(options.path)}" item ${String(index)} must include at least one element number or selector field.`
         );
       }
     }
@@ -17957,10 +17962,10 @@ async function collectFieldTargetsFromSchemaValue(options) {
   }
   if (!options.value || typeof options.value !== "object") {
     throw new Error(
-      `Invalid extraction schema value at "${labelForPath(options.path)}": expected an object, array, or field descriptor.`
+      `Invalid extraction template value at "${labelForPath(options.path)}": expected an object, array, or field descriptor.`
     );
   }
-  await collectFieldTargetsFromSchemaObject({
+  await collectFieldTargetsFromTemplateObject({
     dom: options.dom,
     pageRef: options.pageRef,
     value: options.value,
@@ -17992,7 +17997,7 @@ async function compileFieldTarget(options) {
     path: await resolveSelectorFieldPath({
       dom: options.dom,
       pageRef: options.pageRef,
-      selector: `[c="${String(options.field.element)}"]`
+      selector: `[c="${String(options.field.c)}"]`
     }),
     ...options.field.attribute === void 0 ? {} : { attribute: options.field.attribute }
   };
@@ -18293,24 +18298,29 @@ function countNonNullLeaves(value) {
   }
   return Object.values(value).reduce((sum, item) => sum + countNonNullLeaves(item), 0);
 }
-function normalizeSchemaField(value) {
+function normalizeTemplateField(value) {
+  if (typeof value === "number") {
+    return {
+      c: normalizeExtractionCounter(value)
+    };
+  }
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     return null;
   }
   const raw = value;
-  const hasElement = raw.element !== void 0;
+  const hasCounter = raw.c !== void 0 || raw.element !== void 0;
   const hasSelector = raw.selector !== void 0;
   const hasSource = raw.source !== void 0;
-  const targetCount = Number(hasElement) + Number(hasSelector) + Number(hasSource);
+  const targetCount = Number(hasCounter) + Number(hasSelector) + Number(hasSource);
   if (targetCount === 0) {
     return null;
   }
   if (targetCount !== 1) {
     throw new Error(
-      "Extraction field descriptors must specify exactly one of element, selector, or source."
+      "Extraction field descriptors must specify exactly one of c/element, selector, or source."
     );
   }
-  const attribute = raw.attribute === void 0 ? void 0 : normalizeNonEmptyString2("attribute", raw.attribute);
+  const attribute = raw.attr !== void 0 ? normalizeNonEmptyString2("attr", raw.attr) : raw.attribute === void 0 ? void 0 : normalizeNonEmptyString2("attribute", raw.attribute);
   if (hasSource) {
     if (raw.source !== "current_url") {
       throw new Error(`Unsupported extraction source "${String(raw.source)}".`);
@@ -18325,17 +18335,20 @@ function normalizeSchemaField(value) {
       ...attribute === void 0 ? {} : { attribute }
     };
   }
-  const element = Number(raw.element);
-  if (!Number.isInteger(element) || element < 1) {
-    throw new Error(
-      `Extraction field element must be a positive integer, received ${String(raw.element)}.`
-    );
-  }
   return {
-    element,
+    c: normalizeExtractionCounter(raw.c ?? raw.element),
     ...attribute === void 0 ? {} : { attribute }
   };
 }
+function normalizeExtractionCounter(value) {
+  const counter = Number(value);
+  if (!Number.isInteger(counter) || counter < 1) {
+    throw new Error(
+      `Extraction element number must be a positive integer, received ${String(value)}.`
+    );
+  }
+  return counter;
+}
 function normalizeNamespace(namespace) {
   const normalized = String(namespace ?? "default").trim();
   return normalized.length === 0 ? "default" : normalized;
@@ -18366,7 +18379,7 @@ function parseExtractionDescriptorRecord(record) {
       kind: "dom-extraction",
       persist: raw.persist,
       root,
-      ...typeof raw.schemaHash === "string" ? { schemaHash: raw.schemaHash } : {},
+      ...typeof raw.templateHash === "string" ? { templateHash: raw.templateHash } : typeof raw.schemaHash === "string" ? { templateHash: raw.schemaHash } : {},
       ...typeof raw.sourceUrl === "string" ? { sourceUrl: raw.sourceUrl } : {}
     }
   };
@@ -18475,7 +18488,7 @@ var init_extraction2 = __esm({
           kind: "dom-extraction",
           persist: input.persist,
           root: input.root,
-          ...input.schemaHash === void 0 ? {} : { schemaHash: input.schemaHash },
+          ...input.templateHash === void 0 ? {} : { templateHash: input.templateHash },
           ...input.sourceUrl === void 0 ? {} : { sourceUrl: input.sourceUrl }
         };
         const key = persistKey(this.namespace, input.persist);
@@ -18524,7 +18537,7 @@ var init_extraction2 = __esm({
           kind: "dom-extraction",
           persist: input.persist,
           root: input.root,
-          ...input.schemaHash === void 0 ? {} : { schemaHash: input.schemaHash },
+          ...input.templateHash === void 0 ? {} : { templateHash: input.templateHash },
           ...input.sourceUrl === void 0 ? {} : { sourceUrl: input.sourceUrl }
         };
         const key = persistKey(this.namespace, input.persist);
@@ -18701,19 +18714,260 @@ function truncateValue(value, max) {
   }
   return `${head}${TRUNCATION_SUFFIX}`;
 }
+function takeValueWithinSerializedLengthFromEnd(value, max) {
+  let serializedLength = 0;
+  const chars = [];
+  for (let index = value.length - 1; index >= 0; index -= 1) {
+    const char = value[index];
+    let nextLength = 1;
+    if (char === "&") {
+      nextLength = 5;
+    } else if (char === "<" || char === ">") {
+      nextLength = 4;
+    } else if (char === '"') {
+      nextLength = 6;
+    }
+    if (serializedLength + nextLength > max) {
+      break;
+    }
+    chars.push(char);
+    serializedLength += nextLength;
+  }
+  return chars.reverse().join("");
+}
+function truncateValueInMiddle(value, headMax, tailMax, marker = MIDDLE_TRUNCATION_MARKER) {
+  const markerLength = getSerializedLength(marker);
+  const max = headMax + markerLength + tailMax;
+  if (getSerializedLength(value) <= max) {
+    return value;
+  }
+  const head = takeValueWithinSerializedLength(value, headMax).replace(/\s+$/u, "");
+  const tail = takeValueWithinSerializedLengthFromEnd(value, tailMax).replace(/^\s+/u, "");
+  if (head.length === 0) {
+    return tail.length === 0 ? marker : `${marker}${tail}`;
+  }
+  if (tail.length === 0) {
+    return `${head}${marker}`;
+  }
+  return `${head}${marker}${tail}`;
+}
 function getAttrLimit(attr) {
-  if (URL_ATTRS.has(attr)) {
-    return URL_ATTR_MAX;
+  if (attr === "srcset") {
+    return SRCSET_ATTR_MAX;
   }
   if (TEXT_ATTRS.has(attr)) {
     return TEXT_ATTR_MAX;
   }
   return void 0;
 }
+function shouldBoundAttr(attr) {
+  return MIDDLE_TRUNCATED_URL_ATTRS.has(attr) || getAttrLimit(attr) !== void 0;
+}
 function setBoundedAttr(el, attr, value) {
+  if (MIDDLE_TRUNCATED_URL_ATTRS.has(attr)) {
+    el.attr(
+      attr,
+      truncateValueInMiddle(value, MIDDLE_TRUNCATION_HEAD_MAX, MIDDLE_TRUNCATION_TAIL_MAX)
+    );
+    return;
+  }
   const limit = getAttrLimit(attr);
+  if (attr === "srcset" && limit !== void 0) {
+    el.attr(attr, truncateSrcsetValue(value, limit));
+    return;
+  }
   el.attr(attr, limit === void 0 ? value : truncateValue(value, limit));
 }
+function truncateSrcsetValue(value, max) {
+  if (getSerializedLength(value) <= max) {
+    return value;
+  }
+  const candidates = parseSrcsetCandidates2(value);
+  if (candidates.length === 0) {
+    return truncateValueInMiddle(value, SRCSET_FALLBACK_HEAD_MAX, SRCSET_FALLBACK_TAIL_MAX);
+  }
+  for (const [headMax, tailMax, includeBest] of [
+    [SRCSET_CANDIDATE_HEAD_MAX, SRCSET_CANDIDATE_TAIL_MAX, true],
+    [SRCSET_COMPACT_CANDIDATE_HEAD_MAX, SRCSET_COMPACT_CANDIDATE_TAIL_MAX, true],
+    [SRCSET_COMPACT_CANDIDATE_HEAD_MAX, SRCSET_COMPACT_CANDIDATE_TAIL_MAX, false]
+  ]) {
+    const compact = buildTruncatedSrcsetValue(candidates, headMax, tailMax, includeBest);
+    if (getSerializedLength(compact) <= max) {
+      return compact;
+    }
+  }
+  return truncateValueInMiddle(value, SRCSET_FALLBACK_HEAD_MAX, SRCSET_FALLBACK_TAIL_MAX);
+}
+function buildTruncatedSrcsetValue(candidates, headMax, tailMax, includeBest) {
+  const kept = getPreferredSrcsetCandidateIndices(candidates, includeBest);
+  const parts = [];
+  let previousIndex;
+  for (const candidateIndex of kept) {
+    if (previousIndex !== void 0 && candidateIndex - previousIndex > 1) {
+      parts.push(MIDDLE_TRUNCATION_MARKER);
+    }
+    parts.push(formatSrcsetCandidate(candidates[candidateIndex], headMax, tailMax));
+    previousIndex = candidateIndex;
+  }
+  return parts.join(", ");
+}
+function getPreferredSrcsetCandidateIndices(candidates, includeBest) {
+  if (candidates.length === 0) {
+    return [];
+  }
+  const kept = /* @__PURE__ */ new Set([0, candidates.length - 1]);
+  if (includeBest) {
+    kept.add(pickBestSrcsetCandidateIndex(candidates));
+  }
+  return [...kept].filter((index) => index >= 0 && index < candidates.length).sort((a, b) => a - b);
+}
+function pickBestSrcsetCandidateIndex(candidates) {
+  let bestWidthIndex = -1;
+  let bestWidth = -1;
+  let bestDensityIndex = -1;
+  let bestDensity = -1;
+  for (let index = 0; index < candidates.length; index += 1) {
+    const candidate = candidates[index];
+    if (typeof candidate.width === "number" && Number.isFinite(candidate.width) && candidate.width > bestWidth) {
+      bestWidth = candidate.width;
+      bestWidthIndex = index;
+    }
+    if (typeof candidate.density === "number" && Number.isFinite(candidate.density) && candidate.density > bestDensity) {
+      bestDensity = candidate.density;
+      bestDensityIndex = index;
+    }
+  }
+  if (bestWidthIndex >= 0) {
+    return bestWidthIndex;
+  }
+  if (bestDensityIndex >= 0) {
+    return bestDensityIndex;
+  }
+  return candidates.length - 1;
+}
+function formatSrcsetCandidate(candidate, headMax, tailMax) {
+  const url = truncateValueInMiddle(candidate.url, headMax, tailMax);
+  return candidate.descriptorText ? `${url} ${candidate.descriptorText}` : url;
+}
+function parseSrcsetCandidates2(raw) {
+  const text = raw.trim();
+  if (!text) {
+    return [];
+  }
+  const out = [];
+  let index = 0;
+  while (index < text.length) {
+    index = skipSrcsetSeparators(text, index);
+    if (index >= text.length) {
+      break;
+    }
+    const urlToken = readSrcsetUrlToken(text, index);
+    index = urlToken.nextIndex;
+    const url = urlToken.value.trim();
+    if (!url) {
+      continue;
+    }
+    index = skipSrcsetWhitespace(text, index);
+    const descriptors = [];
+    while (index < text.length && text[index] !== ",") {
+      const descriptorToken = readSrcsetDescriptorToken(text, index);
+      if (!descriptorToken.value) {
+        index = descriptorToken.nextIndex;
+        continue;
+      }
+      descriptors.push(descriptorToken.value);
+      index = descriptorToken.nextIndex;
+      index = skipSrcsetWhitespace(text, index);
+    }
+    if (index < text.length && text[index] === ",") {
+      index += 1;
+    }
+    let width = null;
+    let density = null;
+    for (const descriptor of descriptors) {
+      const token = descriptor.trim().toLowerCase();
+      if (!token) {
+        continue;
+      }
+      const widthMatch = token.match(/^(\d+)w$/);
+      if (widthMatch) {
+        const parsed = Number.parseInt(widthMatch[1], 10);
+        if (Number.isFinite(parsed)) {
+          width = parsed;
+        }
+        continue;
+      }
+      const densityMatch = token.match(/^(\d*\.?\d+)x$/);
+      if (densityMatch) {
+        const parsed = Number.parseFloat(densityMatch[1]);
+        if (Number.isFinite(parsed)) {
+          density = parsed;
+        }
+      }
+    }
+    out.push({
+      url,
+      descriptorText: descriptors.join(" "),
+      width,
+      density
+    });
+  }
+  return out;
+}
+function skipSrcsetWhitespace(value, index) {
+  let cursor = index;
+  while (cursor < value.length && /\s/u.test(value[cursor])) {
+    cursor += 1;
+  }
+  return cursor;
+}
+function skipSrcsetSeparators(value, index) {
+  let cursor = skipSrcsetWhitespace(value, index);
+  while (cursor < value.length && value[cursor] === ",") {
+    cursor += 1;
+    cursor = skipSrcsetWhitespace(value, cursor);
+  }
+  return cursor;
+}
+function readSrcsetUrlToken(value, index) {
+  let cursor = index;
+  let out = "";
+  const isDataUrl = value.slice(index, index + 5).toLowerCase().startsWith("data:");
+  while (cursor < value.length) {
+    const char = value[cursor];
+    if (/\s/u.test(char)) {
+      break;
+    }
+    if (char === "," && !isDataUrl) {
+      break;
+    }
+    out += char;
+    cursor += 1;
+  }
+  if (isDataUrl && out.endsWith(",") && cursor < value.length) {
+    out = out.slice(0, -1);
+  }
+  return {
+    value: out,
+    nextIndex: cursor
+  };
+}
+function readSrcsetDescriptorToken(value, index) {
+  let cursor = skipSrcsetWhitespace(value, index);
+  let out = "";
+  while (cursor < value.length) {
+    const char = value[cursor];
+    if (char === "," || /\s/u.test(char)) {
+      break;
+    }
+    out += char;
+    cursor += 1;
+  }
+  return {
+    value: out.trim(),
+    nextIndex: cursor
+  };
+}
 function removeNoise($) {
   for (const tag of STRIP_TAGS) {
     $(tag).remove();
@@ -18738,38 +18992,68 @@ function markInlineSelfHiddenFallback($) {
   });
 }
 function pruneSelfHiddenNodes($) {
-  const nodes = [];
-  $(`[${OPENSTEER_SELF_HIDDEN_ATTR}]`).each(function collectSelfHiddenNodes() {
-    nodes.push($(this));
-  });
-  nodes.sort((left, right) => right.parents().length - left.parents().length);
-  for (const el of nodes) {
-    if (!el[0]) {
+  for (const node of getElementsInReverseDocumentOrder($)) {
+    if (node.attribs?.[OPENSTEER_SELF_HIDDEN_ATTR] === void 0) {
       continue;
     }
+    const el = $(node);
     el.contents().each(function removeSelfHiddenText() {
       if (this.type === "text") {
         $(this).remove();
       }
     });
-    if (el.children().length === 0) {
+    if (!hasElementChildren(node)) {
       el.remove();
     }
   }
 }
-function hasDirectText($, el) {
-  return el.contents().filter(function hasDirectNodeText() {
-    return this.type === "text" && $(this).text().trim() !== "";
-  }).length > 0;
+function getChildNodes(node) {
+  return node?.children ?? [];
+}
+function isElementLikeNode(node) {
+  return node?.type === "tag" || node?.type === "script" || node?.type === "style";
+}
+function hasDirectText(node) {
+  if (!node) {
+    return false;
+  }
+  for (const child of getChildNodes(node)) {
+    if (child.type === "text" && (child.data || "").trim() !== "") {
+      return true;
+    }
+  }
+  return false;
+}
+function hasElementChildren(node) {
+  if (!node) {
+    return false;
+  }
+  for (const child of getChildNodes(node)) {
+    if (isElementLikeNode(child)) {
+      return true;
+    }
+  }
+  return false;
 }
-function hasTextDeep(el) {
-  return el.text().trim().length > 0;
+function hasTextDeepNode(node) {
+  if (!node) {
+    return false;
+  }
+  if (node.type === "text") {
+    return (node.data || "").trim() !== "";
+  }
+  for (const child of getChildNodes(node)) {
+    if (hasTextDeepNode(child)) {
+      return true;
+    }
+  }
+  return false;
 }
 function hasActionLabel(attrs) {
   return typeof attrs["aria-label"] === "string" && attrs["aria-label"].trim() !== "" || typeof attrs["aria-labelledby"] === "string" && attrs["aria-labelledby"].trim() !== "" || typeof attrs["aria-describedby"] === "string" && attrs["aria-describedby"].trim() !== "" || typeof attrs.title === "string" && attrs.title.trim() !== "" || typeof attrs.placeholder === "string" && attrs.placeholder.trim() !== "" || typeof attrs.value === "string" && attrs.value.trim() !== "";
 }
 function unwrapActionNode($, el) {
-  if (hasTextDeep(el)) {
+  if (hasTextDeepNode(el[0])) {
     if (el.prev().length > 0) {
       el.before(" ");
     }
@@ -18790,7 +19074,7 @@ function stripToAttrs(el, keep) {
     if (typeof value !== "string") {
       continue;
     }
-    if (getAttrLimit(attr) !== void 0) {
+    if (shouldBoundAttr(attr)) {
       setBoundedAttr(el, attr, value);
     }
   }
@@ -18808,6 +19092,9 @@ function restoreBoundedAttr(el, attr, value) {
 function deduplicateImages(html) {
   const seen = /* @__PURE__ */ new Set();
   return html.replace(/<img\b([^>]*)>/gi, (full, attrContent) => {
+    if (/\bc\s*=/.test(attrContent)) {
+      return full;
+    }
     const srcMatch = attrContent.match(/\bsrc\s*=\s*(["']?)(.*?)\1/);
     const srcsetMatch = attrContent.match(/\bsrcset\s*=\s*(["'])(.*?)\1/);
     let src = null;
@@ -18826,59 +19113,155 @@ function deduplicateImages(html) {
     return full;
   });
 }
-function isPreservedImageElement($, el) {
-  const tag = (el[0]?.tagName || "").toLowerCase();
+function hasAttribute2(node, attr) {
+  return node?.attribs?.[attr] !== void 0;
+}
+function hasPictureAncestor(node) {
+  let current = node?.parent;
+  while (current) {
+    if (isElementLikeNode(current) && (current.tagName || "").toLowerCase() === "picture") {
+      return true;
+    }
+    current = current.parent;
+  }
+  return false;
+}
+function pictureHasPreservedDescendant(node) {
+  if (!node) {
+    return false;
+  }
+  for (const child of getChildNodes(node)) {
+    if (!isElementLikeNode(child)) {
+      continue;
+    }
+    const tag = (child.tagName || "").toLowerCase();
+    if (tag === "img") {
+      return true;
+    }
+    if (tag === "source" && typeof child.attribs?.src === "string" && child.attribs.src.trim() !== "") {
+      return true;
+    }
+    if (tag === "source" && typeof child.attribs?.srcset === "string" && child.attribs.srcset.trim() !== "") {
+      return true;
+    }
+    if (pictureHasPreservedDescendant(child)) {
+      return true;
+    }
+  }
+  return false;
+}
+function isPreservedImageElement(node) {
+  const tag = (node?.tagName || "").toLowerCase();
   if (tag === "img") {
     return true;
   }
   if (tag === "picture") {
-    const hasImg = el.find("img").length > 0;
-    const hasSource = el.find("source[src], source[srcset]").length > 0;
-    return hasImg || hasSource;
+    return pictureHasPreservedDescendant(node);
   }
   if (tag === "source") {
-    const inPicture = el.parents("picture").length > 0;
-    const hasSrc = el.attr("src") != null && el.attr("src").trim() !== "" || el.attr("srcset") != null && el.attr("srcset").trim() !== "";
+    const inPicture = hasPictureAncestor(node);
+    const hasSrc = typeof node?.attribs?.src === "string" && node.attribs.src.trim() !== "" || typeof node?.attribs?.srcset === "string" && node.attribs.srcset.trim() !== "";
     return inPicture && hasSrc;
   }
   return false;
 }
+function getElementsInReverseDocumentOrder($) {
+  return $.root().find("*").toArray().reverse().filter((node) => node.type === "tag");
+}
+function getNodeDepth(node) {
+  let depth = 0;
+  let current = node.parent;
+  while (current) {
+    depth++;
+    current = current.parent;
+  }
+  return depth;
+}
+function getElementsByDepthDescending($) {
+  const elements = $.root().find("*").toArray().filter((node) => node.type === "tag");
+  const depths = /* @__PURE__ */ new Map();
+  for (const el of elements) {
+    depths.set(el, getNodeDepth(el));
+  }
+  return elements.sort((a, b) => (depths.get(b) ?? 0) - (depths.get(a) ?? 0));
+}
 function flattenExtractionTree($) {
-  const flatten = (root) => {
-    root.find("*").each(function flattenNode() {
-      const el = $(this);
-      const node = el[0];
-      if (!node) {
-        return;
-      }
-      const tag = (node.tagName || "").toLowerCase();
-      if (ROOT_TAGS.has(tag) || isBoundaryTag(tag)) {
-        return;
-      }
-      if (isPreservedImageElement($, el)) {
-        return;
-      }
-      if (tag === "a") {
-        el.children().each(function flattenAnchorChild() {
-          flatten($(this));
-        });
-        return;
-      }
-      const hasText = hasDirectText($, el);
-      if (hasText) {
-        return;
-      }
-      if (el.children().length === 0) {
-        el.remove();
-        return;
+  for (const node of getElementsInReverseDocumentOrder($)) {
+    const el = $(node);
+    const tag = (node.tagName || "").toLowerCase();
+    if (ROOT_TAGS.has(tag) || isBoundaryTag(tag) || isPreservedImageElement(node)) {
+      continue;
+    }
+    if (tag === "a" || hasDirectText(node)) {
+      continue;
+    }
+    if (!hasElementChildren(node)) {
+      el.remove();
+      continue;
+    }
+    el.replaceWith(el.contents());
+  }
+}
+function hasMarkedAncestor(el, attr) {
+  let current = el[0]?.parent;
+  while (current) {
+    if (!isElementLikeNode(current)) {
+      return false;
+    }
+    if (current.attribs?.[attr] !== void 0) {
+      return true;
+    }
+    current = current.parent;
+  }
+  return false;
+}
+function isIndicatorImage(node) {
+  return (node?.tagName || "").toLowerCase() === "img" && (hasAttribute2(node, "alt") || hasAttribute2(node, "src") || hasAttribute2(node, "srcset"));
+}
+function isIndicatorPictureSource(node) {
+  return (node?.tagName || "").toLowerCase() === "source" && hasPictureAncestor(node) && (hasAttribute2(node, "src") || hasAttribute2(node, "srcset"));
+}
+function isSemanticIndicator(node) {
+  const tag = (node?.tagName || "").toLowerCase();
+  if (tag === "svg") {
+    return true;
+  }
+  return hasAttribute2(node, "aria-label") || hasAttribute2(node, "title") || hasAttribute2(node, "data-icon") || node?.attribs?.role === "img";
+}
+function findIndicatorDescendant(root) {
+  if (!root) {
+    return void 0;
+  }
+  let firstImage;
+  let firstSource;
+  let firstSemantic;
+  const visit = (node) => {
+    if (!isElementLikeNode(node)) {
+      return false;
+    }
+    if (isIndicatorImage(node)) {
+      firstImage = node;
+      return true;
+    }
+    if (firstSource === void 0 && isIndicatorPictureSource(node)) {
+      firstSource = node;
+    }
+    if (firstSemantic === void 0 && isSemanticIndicator(node)) {
+      firstSemantic = node;
+    }
+    for (const child of getChildNodes(node)) {
+      if (visit(child)) {
+        return true;
       }
-      el.children().each(function flattenChild() {
-        flatten($(this));
-      });
-      el.replaceWith(el.contents());
-    });
+    }
+    return false;
   };
-  flatten($.root());
+  for (const child of getChildNodes(root)) {
+    if (visit(child)) {
+      return firstImage;
+    }
+  }
+  return firstImage ?? firstSource ?? firstSemantic;
 }
 function serializeForExtraction($, root) {
   const lines = [];
@@ -18947,7 +19330,7 @@ function serializeForExtraction($, root) {
     lines.push(`${"  ".repeat(depth)}</${tagName}>`);
   }
   traverse(root, 0);
-  return lines.join("\n");
+  return lines.map((l) => l.trim()).filter((l) => l.length > 0).join("");
 }
 function isClickable($, el, context) {
   if (context.hasPreMarked) {
@@ -19039,7 +19422,11 @@ function cleanForExtraction(html) {
     }
   });
   flattenExtractionTree($clean);
-  return deduplicateImages(serializeForExtraction($clean, $clean.root()[0]));
+  const root = $clean.root()[0];
+  if (root === void 0) {
+    return "";
+  }
+  return deduplicateImages(serializeForExtraction($clean, root));
 }
 function cleanForAction(html) {
   if (!html.trim()) {
@@ -19065,22 +19452,12 @@ function cleanForAction(html) {
   $(`[${clickableMark}]`).each(function markIndicators() {
     const el = $(this);
     const wrapperAttrs = el.attr() || {};
-    if (hasTextDeep(el) || hasActionLabel(wrapperAttrs)) {
+    if (hasTextDeepNode(el[0]) || hasActionLabel(wrapperAttrs)) {
       return;
     }
-    const imageIndicator = el.find("img[alt], img[src], img[srcset]").first();
-    if (imageIndicator.length) {
-      imageIndicator.attr(indicatorMark, "1");
-      return;
-    }
-    const pictureSourceIndicator = el.find("picture source[src], picture source[srcset]").first();
-    if (pictureSourceIndicator.length) {
-      pictureSourceIndicator.attr(indicatorMark, "1");
-      return;
-    }
-    const semanticIndicator = el.find('[aria-label], [title], [data-icon], [role="img"], svg').first();
-    if (semanticIndicator.length) {
-      semanticIndicator.attr(indicatorMark, "1");
+    const indicatorNode = findIndicatorDescendant(el[0]);
+    if (indicatorNode !== void 0) {
+      $(indicatorNode).attr(indicatorMark, "1");
     }
   });
   $(`[${clickableMark}]`).each(function removeEmptyClickable() {
@@ -19090,7 +19467,7 @@ function cleanForAction(html) {
     if (NATIVE_INTERACTIVE_TAGS.has(tag) || tag === "a") {
       return;
     }
-    if (el.children().length > 0 || hasDirectText($, el)) {
+    if (hasElementChildren(node) || hasDirectText(node)) {
       return;
     }
     const wrapperAttrs = el.attr() || {};
@@ -19116,46 +19493,31 @@ function cleanForAction(html) {
       current = ancestor.parent();
     }
   });
-  let changed = true;
-  while (changed) {
-    changed = false;
-    const nodes = [];
-    $("*").each(function collectNodes() {
-      nodes.push($(this));
-    });
-    nodes.sort((left, right) => right.parents().length - left.parents().length);
-    for (const el of nodes) {
-      const node = el[0];
-      if (!node) {
-        continue;
-      }
-      const tag = (node.tagName || "").toLowerCase();
-      if (ROOT_TAGS.has(tag) || isBoundaryTag(tag)) {
-        continue;
-      }
-      if (el.attr(clickableMark) !== void 0 || el.attr(indicatorMark) !== void 0) {
-        continue;
-      }
-      const insideClickable = el.parents(`[${clickableMark}]`).length > 0;
-      const preserveBranch = el.attr(branchMark) !== void 0;
-      const hasContent = el.children().length > 0 || hasDirectText($, el);
-      if (insideClickable || preserveBranch) {
-        if (!hasContent) {
-          el.remove();
-        } else {
-          unwrapActionNode($, el);
-        }
-        changed = true;
-        continue;
-      }
+  for (const node of getElementsByDepthDescending($)) {
+    const el = $(node);
+    const tag = (node.tagName || "").toLowerCase();
+    if (ROOT_TAGS.has(tag) || isBoundaryTag(tag)) {
+      continue;
+    }
+    if (el.attr(clickableMark) !== void 0 || el.attr(indicatorMark) !== void 0) {
+      continue;
+    }
+    const insideClickable = hasMarkedAncestor(el, clickableMark);
+    const preserveBranch = el.attr(branchMark) !== void 0;
+    const hasContent = hasElementChildren(node) || hasDirectText(node);
+    if (insideClickable || preserveBranch) {
       if (!hasContent) {
         el.remove();
-        changed = true;
-        continue;
+      } else {
+        unwrapActionNode($, el);
       }
-      unwrapActionNode($, el);
-      changed = true;
+      continue;
+    }
+    if (!hasContent) {
+      el.remove();
+      continue;
     }
+    unwrapActionNode($, el);
   }
   $.root().find("*").contents().each(function normalizeActionTextNodes() {
     if (this.type !== "text") {
@@ -19235,21 +19597,7 @@ function cleanForAction(html) {
       OPENSTEER_SPARSE_COUNTER_ATTR
     ]);
     if (clickable) {
-      for (const attr of [
-        "href",
-        "role",
-        "type",
-        "title",
-        "placeholder",
-        "value",
-        "aria-label",
-        "aria-labelledby",
-        "aria-describedby",
-        "aria-expanded",
-        "aria-pressed",
-        "aria-selected",
-        "aria-haspopup"
-      ]) {
+      for (const attr of ["href", "role", "type", "title", "placeholder", "value", "aria-label"]) {
         keep.add(attr);
       }
     }
@@ -19273,16 +19621,25 @@ function cleanForAction(html) {
   });
   return compactHtml(deduplicateImages($.html()));
 }
-var STRIP_TAGS, TEXT_ATTR_MAX, URL_ATTR_MAX, URL_ATTRS, TEXT_ATTRS, TRUNCATION_SUFFIX, NOISE_SELECTORS, VOID_TAGS2;
+var STRIP_TAGS, TEXT_ATTR_MAX, SRCSET_ATTR_MAX, MIDDLE_TRUNCATED_URL_ATTRS, TEXT_ATTRS, TRUNCATION_SUFFIX, MIDDLE_TRUNCATION_MARKER, MIDDLE_TRUNCATION_HEAD_MAX, MIDDLE_TRUNCATION_TAIL_MAX, SRCSET_CANDIDATE_HEAD_MAX, SRCSET_CANDIDATE_TAIL_MAX, SRCSET_COMPACT_CANDIDATE_HEAD_MAX, SRCSET_COMPACT_CANDIDATE_TAIL_MAX, SRCSET_FALLBACK_HEAD_MAX, SRCSET_FALLBACK_TAIL_MAX, NOISE_SELECTORS, VOID_TAGS2;
 var init_cleaner = __esm({
   "../runtime-core/src/sdk/snapshot/cleaner.ts"() {
     init_constants();
     STRIP_TAGS = /* @__PURE__ */ new Set(["script", "style", "noscript", "meta", "link", "template"]);
     TEXT_ATTR_MAX = 150;
-    URL_ATTR_MAX = 500;
-    URL_ATTRS = /* @__PURE__ */ new Set(["href", "src", "srcset"]);
+    SRCSET_ATTR_MAX = 160;
+    MIDDLE_TRUNCATED_URL_ATTRS = /* @__PURE__ */ new Set(["href", "src"]);
     TEXT_ATTRS = /* @__PURE__ */ new Set(["alt", "title", "aria-label", "placeholder", "value"]);
-    TRUNCATION_SUFFIX = " [truncated]";
+    TRUNCATION_SUFFIX = "...";
+    MIDDLE_TRUNCATION_MARKER = "...";
+    MIDDLE_TRUNCATION_HEAD_MAX = 40;
+    MIDDLE_TRUNCATION_TAIL_MAX = 20;
+    SRCSET_CANDIDATE_HEAD_MAX = 36;
+    SRCSET_CANDIDATE_TAIL_MAX = 12;
+    SRCSET_COMPACT_CANDIDATE_HEAD_MAX = 20;
+    SRCSET_COMPACT_CANDIDATE_TAIL_MAX = 8;
+    SRCSET_FALLBACK_HEAD_MAX = 56;
+    SRCSET_FALLBACK_TAIL_MAX = 20;
     NOISE_SELECTORS = [
       `[${OPENSTEER_HIDDEN_ATTR}]`,
       "[hidden]",
@@ -19821,9 +20178,9 @@ function renderNode(snapshot, node, nodesById, snapshotsByDocumentRef, snapshotI
   const snapshotAttributes = normalizeNodeAttributes(node.attributes);
   const authoredAttributes = stripInternalSnapshotAttributes(snapshotAttributes);
   const attributes = [...authoredAttributes];
-  const subtreeHidden = hasAttribute2(snapshotAttributes, OPENSTEER_HIDDEN_ATTR) || isLikelySubtreeHidden(node);
-  const selfHidden = !subtreeHidden && (hasAttribute2(snapshotAttributes, OPENSTEER_SELF_HIDDEN_ATTR) || isLikelySelfHidden(node, nodesById));
-  const interactive = !subtreeHidden && !selfHidden && (hasAttribute2(snapshotAttributes, OPENSTEER_INTERACTIVE_ATTR) || isLikelyInteractive(tagName, node, authoredAttributes));
+  const subtreeHidden = hasAttribute3(snapshotAttributes, OPENSTEER_HIDDEN_ATTR) || isLikelySubtreeHidden(node);
+  const selfHidden = !subtreeHidden && (hasAttribute3(snapshotAttributes, OPENSTEER_SELF_HIDDEN_ATTR) || isLikelySelfHidden(node, nodesById));
+  const interactive = !subtreeHidden && !selfHidden && (hasAttribute3(snapshotAttributes, OPENSTEER_INTERACTIVE_ATTR) || isLikelyInteractive(tagName, node, authoredAttributes));
   if (interactive) {
     attributes.push({ name: OPENSTEER_INTERACTIVE_ATTR, value: "1" });
   }
@@ -20141,7 +20498,7 @@ function parseOpacity(value) {
   const parsed = Number.parseFloat(value);
   return Number.isFinite(parsed) ? parsed : Number.NaN;
 }
-function hasAttribute2(attributes, name) {
+function hasAttribute3(attributes, name) {
   const normalizedName = name.toLowerCase();
   return attributes.some((attribute) => attribute.name.toLowerCase() === normalizedName);
 }
@@ -23471,12 +23828,12 @@ var init_runtime3 = __esm({
             async (timeout) => {
               let descriptor2;
               let data;
-              if (input.schema !== void 0) {
-                assertValidOpensteerExtractionSchemaRoot(input.schema);
+              if (input.template !== void 0) {
+                assertValidOpensteerExtractionTemplateRoot(input.template);
                 const fieldTargets = await timeout.runStep(
                   () => compileOpensteerExtractionFieldTargets({
                     pageRef,
-                    schema: input.schema,
+                    template: input.template,
                     dom: this.requireDom()
                   })
                 );
@@ -23508,7 +23865,7 @@ var init_runtime3 = __esm({
                     () => descriptors.write({
                       persist,
                       root: payload,
-                      schemaHash: canonicalJsonString(input.schema),
+                      templateHash: canonicalJsonString(input.template),
                       sourceUrl: pageInfo.url
                     })
                   );
@@ -23568,7 +23925,7 @@ var init_runtime3 = __esm({
             artifacts,
             data: {
               ...input.persist === void 0 ? {} : { persist: input.persist },
-              ...descriptor?.payload.schemaHash === void 0 ? {} : { schemaHash: descriptor.payload.schemaHash },
+              ...descriptor?.payload.templateHash === void 0 ? {} : { templateHash: descriptor.payload.templateHash },
               data: output.data
             },
             context: buildRuntimeTraceContext({
@@ -30195,9 +30552,6 @@ var init_opensteer = __esm({
           await delay5(pollIntervalMs);
         }
       }
-      async snapshot(mode = "action") {
-        return (await this.runtime.snapshot({ mode })).html;
-      }
       async cookies(domain) {
         return new SessionCookieJar(
           await this.runtime.getCookies(domain === void 0 ? {} : { domain })
@@ -30255,7 +30609,7 @@ var init_opensteer = __esm({
 
 // package.json
 var package_default = {
-  version: "0.9.4"};
+  version: "0.9.5"};
 
 // src/cli/bin.ts
 init_browser_manager();
@@ -30288,11 +30642,11 @@ Navigation:
 
 DOM:
   snapshot [action|extraction]
-  click <element> [--button left|middle|right] [--persist <key>] [--capture-network <label>]
-  hover <element> [--persist <key>] [--capture-network <label>]
-  input <element> <text> [--press-enter] [--persist <key>] [--capture-network <label>]
-  scroll <direction> <amount> [--element <n>] [--persist <key>] [--capture-network <label>]
-  extract <schema> [--persist <key>]
+  click <element> --persist <key> [--button left|middle|right] [--capture-network <label>]
+  hover <element> --persist <key> [--capture-network <label>]
+  input <element> <text> --persist <key> [--press-enter] [--capture-network <label>]
+  scroll <direction> <amount> --persist <key> [--element <n>] [--capture-network <label>]
+  extract <template> --persist <key>
   evaluate <script>
   init-script <script>
 
@@ -30842,18 +31196,18 @@ async function buildOperationInput(operation, parsed, runtime) {
         },
         direction,
         amount,
-        ...persist === void 0 ? {} : { persist },
+        persist,
         ...captureNetwork === void 0 ? {} : { captureNetwork }
       };
     }
     case "dom.extract": {
       if (parsed.rest[0] === void 0) {
-        throw new Error("extract requires a schema.");
+        throw new Error("extract requires a template.");
       }
-      const persist = readExtractPersistKey(parsed);
+      const persist = readPersistKey(parsed, "extract");
       return {
-        schema: parseRequiredJsonObjectArgument(joinRest(parsed.rest, 0), "extract schema"),
-        ...persist === void 0 ? {} : { persist }
+        persist,
+        template: parseRequiredJsonObjectArgument(joinRest(parsed.rest, 0), "extract template")
       };
     }
     case "network.query": {
@@ -31063,7 +31417,7 @@ function buildElementTargetInput(parsed, verb) {
       kind: "element",
       element
     },
-    ...persist === void 0 ? {} : { persist },
+    persist,
     ...captureNetwork === void 0 ? {} : { captureNetwork }
   };
 }
@@ -31268,23 +31622,10 @@ function readKeyModifiers(value) {
 function readPersistKey(parsed, verb) {
   const value = readSingle(parsed.rawOptions, "persist");
   if (value === void 0) {
-    return void 0;
-  }
-  if (value === "true" || value === "false") {
-    throw new Error(`${verb} requires "--persist <key>" when using --persist.`);
-  }
-  if (verb === "scroll" && readOptionalNumber(parsed.rawOptions, "element") === void 0) {
-    throw new Error('scroll requires "--element <n>" when using "--persist <key>".');
-  }
-  return value;
-}
-function readExtractPersistKey(parsed) {
-  const value = readSingle(parsed.rawOptions, "persist");
-  if (value === void 0) {
-    return void 0;
+    throw new Error(`${verb} requires "--persist <key>".`);
   }
   if (value === "true" || value === "false") {
-    throw new Error('extract requires "--persist <key>" when using --persist.');
+    throw new Error(`${verb} requires "--persist <key>".`);
   }
   return value;
 }