opensteer 0.9.4 → 0.9.6

package/dist/{chunk-GEUHKPC2.js → chunk-BVRIPCWA.js}

@@ -1,5 +1,5 @@
-import { resolveFilesystemWorkspacePath, createFilesystemOpensteerWorkspace, DEFAULT_OPENSTEER_ENGINE, assertSupportedEngineOptions, OpensteerBrowserManager, normalizeObservabilityConfig, manifestToExternalBinaryLocation, normalizeObservationContext } from './chunk-GSCQQKZZ.js';
-import { canonicalJsonString, toCanonicalJsonValue, readPersistedCloudSessionRecord, writePersistedSessionRecord, clearPersistedSessionRecord, sha256Hex, resolveBrandUserDataDir, getBrowserBrand, detectInstalledBrowserBrands, __require } from './chunk-T5P2QGZ3.js';
+import { objectSchema, stringSchema, literalSchema, JSON_SCHEMA_DRAFT_2020_12, integerSchema, enumSchema, oneOfSchema, numberSchema, arraySchema, recordSchema, defineSchema, opensteerCapabilitySetSchema, opensteerErrorSchema, OpensteerProtocolError, resolveFilesystemWorkspacePath, createFilesystemOpensteerWorkspace, DEFAULT_OPENSTEER_ENGINE, createOpensteerError, assertSupportedEngineOptions, normalizeObservabilityConfig, manifestToExternalBinaryLocation, normalizeObservationContext, OpensteerBrowserManager, isOpensteerProtocolError, toOpensteerError } from './chunk-3XBQRZZC.js';
+import { canonicalJsonString, toCanonicalJsonValue, readPersistedCloudSessionRecord, writePersistedSessionRecord, clearPersistedSessionRecord, resolveBrandUserDataDir, sha256Hex, getBrowserBrand, detectInstalledBrowserBrands, __require } from './chunk-T5P2QGZ3.js';
 import { selectAll } from 'css-select';
 import { createHash, randomUUID, pbkdf2Sync, createDecipheriv } from 'crypto';
 import { existsSync, readFileSync } from 'fs';
@@ -7,7 +7,7 @@ import path2, { join } from 'path';
 import { promisify } from 'util';
 import { gzip as gzip$1 } from 'zlib';
 import { execFile as execFile$1, spawn } from 'child_process';
-import { rm, mkdtemp, writeFile, readFile, copyFile } from 'fs/promises';
+import { rm, mkdtemp, copyFile, writeFile, readFile } from 'fs/promises';
 import { tmpdir } from 'os';
 import { AsyncLocalStorage } from 'async_hooks';
 import sharp from 'sharp';
@@ -208,9 +208,6 @@ function isBrowserCoreError(value) {
   return value instanceof BrowserCoreError;
 }
 
-// ../browser-core/src/cdp-visual-stability.ts
-var DEFAULT_VISUAL_STABILITY_SETTLE_MS = 750;
-
 // ../browser-core/src/post-load-tracker.ts
 var DEFAULT_POST_LOAD_TRACKER_QUIET_WINDOW_MS = 400;
 
@@ -240,21 +237,6 @@ var DEFAULT_SETTLE_DELAYS = {
   "dom-action": 100,
   snapshot: 0
 };
-var defaultSnapshotSettleObserver = {
-  async settle(input) {
-    if (input.trigger !== "snapshot") {
-      return false;
-    }
-    await input.engine.waitForVisualStability({
-      pageRef: input.pageRef,
-      ...input.remainingMs === void 0 ? {} : { timeoutMs: input.remainingMs },
-      settleMs: DEFAULT_VISUAL_STABILITY_SETTLE_MS,
-      scope: "visible-frames"
-    });
-    return true;
-  }
-};
-Object.freeze(defaultSnapshotSettleObserver);
 var DOM_ACTION_VISUAL_STABILITY_PROFILES = {
   "dom.click": { settleMs: 750, scope: "visible-frames", timeoutMs: 7e3 },
   "dom.input": { settleMs: 750, scope: "visible-frames", timeoutMs: 7e3 },
@@ -307,6 +289,7 @@ var defaultNavigationSettleObserver = {
       return false;
     }
     try {
+      const startedAt = Date.now();
       await input.engine.waitForPostLoadQuiet({
         pageRef: input.pageRef,
         timeoutMs: effectiveTimeout,
@@ -314,9 +297,13 @@ var defaultNavigationSettleObserver = {
         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
       });
@@ -328,7 +315,6 @@ var defaultNavigationSettleObserver = {
 };
 Object.freeze(defaultNavigationSettleObserver);
 var DEFAULT_SETTLE_OBSERVERS = Object.freeze([
-  defaultSnapshotSettleObserver,
   defaultDomActionSettleObserver,
   defaultNavigationSettleObserver
 ]);
@@ -407,72 +393,6 @@ function abortError() {
   return error;
 }
 
-// ../protocol/src/json.ts
-var JSON_SCHEMA_DRAFT_2020_12 = "https://json-schema.org/draft/2020-12/schema";
-function defineSchema(schema) {
-  return schema;
-}
-function stringSchema(options = {}) {
-  return defineSchema({
-    type: "string",
-    ...options
-  });
-}
-function numberSchema(options = {}) {
-  return defineSchema({
-    type: "number",
-    ...options
-  });
-}
-function integerSchema(options = {}) {
-  return defineSchema({
-    type: "integer",
-    ...options
-  });
-}
-function literalSchema(value, options = {}) {
-  return defineSchema({
-    const: value,
-    ...options
-  });
-}
-function enumSchema(values, options = {}) {
-  return defineSchema({
-    enum: values,
-    ...options
-  });
-}
-function arraySchema(items, options = {}) {
-  return defineSchema({
-    type: "array",
-    items,
-    ...options
-  });
-}
-function objectSchema(properties, options = {}) {
-  const { required, additionalProperties, ...rest } = options;
-  return defineSchema({
-    type: "object",
-    properties,
-    ...rest,
-    ...required === void 0 ? {} : { required },
-    ...additionalProperties === void 0 ? { additionalProperties: false } : { additionalProperties }
-  });
-}
-function recordSchema(valueSchema, options = {}) {
-  return defineSchema({
-    type: "object",
-    additionalProperties: valueSchema,
-    ...options
-  });
-}
-function oneOfSchema(members, options = {}) {
-  return defineSchema({
-    oneOf: members,
-    ...options
-  });
-}
-
 // ../protocol/src/validation.ts
 function validateJsonSchema(schema, value, path6 = "$") {
   return validateSchemaNode(schema, value, path6);
@@ -2382,152 +2302,6 @@ var hitTestResultSchema = objectSchema(
   }
 );
 
-// ../protocol/src/capabilities.ts
-var opensteerCapabilities = [
-  "sessions.manage",
-  "pages.manage",
-  "pages.navigate",
-  "input.pointer",
-  "input.keyboard",
-  "input.touch",
-  "artifacts.screenshot",
-  "execution.pause",
-  "execution.resume",
-  "execution.freeze",
-  "inspect.pages",
-  "inspect.frames",
-  "inspect.html",
-  "inspect.domSnapshot",
-  "inspect.text",
-  "inspect.attributes",
-  "inspect.hitTest",
-  "inspect.viewportMetrics",
-  "inspect.network",
-  "inspect.networkBodies",
-  "inspect.cookies",
-  "inspect.localStorage",
-  "inspect.sessionStorage",
-  "inspect.indexedDb",
-  "transport.sessionHttp",
-  "instrumentation.initScripts",
-  "instrumentation.routing",
-  "events.pageLifecycle",
-  "events.dialog",
-  "events.download",
-  "events.chooser",
-  "events.worker",
-  "events.console",
-  "events.pageError",
-  "events.websocket",
-  "events.eventStream",
-  "events.executionState",
-  "surface.rest",
-  "surface.mcp"
-];
-var opensteerCapabilitySchema = enumSchema(opensteerCapabilities, {
-  title: "OpensteerCapability"
-});
-var opensteerCapabilitySetSchema = arraySchema(opensteerCapabilitySchema, {
-  title: "OpensteerCapabilitySet",
-  uniqueItems: true
-});
-var opensteerCapabilityDescriptorSchema = objectSchema(
-  {
-    key: opensteerCapabilitySchema,
-    description: stringSchema(),
-    stability: enumSchema(["stable", "experimental"])
-  },
-  {
-    title: "OpensteerCapabilityDescriptor",
-    required: ["key", "description", "stability"]
-  }
-);
-arraySchema(
-  opensteerCapabilityDescriptorSchema,
-  {
-    title: "OpensteerCapabilityDescriptorList",
-    uniqueItems: true
-  }
-);
-
-// ../protocol/src/errors.ts
-var opensteerErrorCodes = [
-  "invalid-request",
-  "invalid-argument",
-  "invalid-ref",
-  "unsupported-version",
-  "unsupported-operation",
-  "unsupported-capability",
-  "not-found",
-  "stale-node-ref",
-  "session-closed",
-  "page-closed",
-  "frame-detached",
-  "timeout",
-  "navigation-failed",
-  "permission-denied",
-  "conflict",
-  "profile-unavailable",
-  "auth-failure",
-  "auth-recovery-failed",
-  "browser-required",
-  "rate-limited",
-  "operation-failed",
-  "internal"
-];
-var OpensteerProtocolError = class extends Error {
-  code;
-  retriable;
-  capability;
-  details;
-  constructor(code, message, options = {}) {
-    super(message, { cause: options.cause });
-    this.name = "OpensteerProtocolError";
-    this.code = code;
-    this.retriable = options.retriable ?? false;
-    this.capability = options.capability;
-    this.details = options.details;
-  }
-};
-function createOpensteerError(code, message, options = {}) {
-  return {
-    code,
-    message,
-    retriable: options.retriable ?? false,
-    ...options.capability === void 0 ? {} : { capability: options.capability },
-    ...options.details === void 0 ? {} : { details: options.details }
-  };
-}
-function isOpensteerProtocolError(value) {
-  return value instanceof OpensteerProtocolError;
-}
-function toOpensteerError(error) {
-  return createOpensteerError(error.code, error.message, {
-    retriable: error.retriable,
-    ...error.capability === void 0 ? {} : { capability: error.capability },
-    ...error.details === void 0 ? {} : { details: error.details }
-  });
-}
-var opensteerErrorCodeSchema = {
-  title: "OpensteerErrorCode",
-  enum: opensteerErrorCodes
-};
-var opensteerErrorSchema = objectSchema(
-  {
-    code: opensteerErrorCodeSchema,
-    message: stringSchema(),
-    retriable: {
-      type: "boolean"
-    },
-    capability: opensteerCapabilitySchema,
-    details: recordSchema({})
-  },
-  {
-    title: "OpensteerError",
-    required: ["code", "message", "retriable"]
-  }
-);
-
 // ../protocol/src/events.ts
 function eventBaseSchema(kind) {
   return {
@@ -4149,10 +3923,10 @@ var opensteerDomScrollInputSchema = objectSchema(
     required: ["target", "direction", "amount"]
   }
 );
-var opensteerExtractSchemaSchema = objectSchema(
+var opensteerExtractTemplateSchema = objectSchema(
   {},
   {
-    title: "OpensteerExtractSchema",
+    title: "OpensteerExtractTemplate",
     additionalProperties: true
   }
 );
@@ -4160,13 +3934,13 @@ var opensteerDomExtractInputSchema = defineSchema({
   ...objectSchema(
     {
       persist: stringSchema(),
-      schema: opensteerExtractSchemaSchema
+      template: opensteerExtractTemplateSchema
     },
     {
       title: "OpensteerDomExtractInput"
     }
   ),
-  anyOf: [defineSchema({ required: ["persist"] }), defineSchema({ required: ["schema"] })]
+  anyOf: [defineSchema({ required: ["persist"] }), defineSchema({ required: ["template"] })]
 });
 var jsonValueSchema2 = recordSchema({}, { title: "JsonValueRecord" });
 var opensteerDomExtractOutputSchema = objectSchema(
@@ -5105,6 +4879,9 @@ function buildClauseSelector(node, clause) {
   if (!clause || typeof clause !== "object") {
     return "";
   }
+  if (clause.kind === "text") {
+    return "";
+  }
   if (clause.kind === "position") {
     if (clause.axis === "nthOfType") {
       return `:nth-of-type(${Math.max(1, Number(node.position?.nthOfType || 1))})`;
@@ -5229,7 +5006,7 @@ function resolveExtractedValueInContext(normalizedValue, options) {
 function stripPositionClauses(nodes) {
   return (nodes || []).map((node) => ({
     ...node,
-    match: (node.match || []).filter((clause) => clause.kind !== "position")
+    match: (node.match || []).filter((clause) => clause.kind !== "position" && clause.kind !== "text")
   }));
 }
 function dedupeSelectors(selectors) {
@@ -5806,9 +5583,17 @@ function resolveDomPathInScope(index, domPath, scope) {
   if (!candidates.length) {
     return null;
   }
+  const lastNode = domPath[domPath.length - 1];
+  const textClauses = lastNode?.match.filter((c) => c.kind === "text") ?? [];
   let fallback = null;
   for (const selector of candidates) {
-    const matches = querySelectorAllInScope(index, selector, scope);
+    let matches = querySelectorAllInScope(index, selector, scope);
+    if (textClauses.length > 0 && matches.length > 1) {
+      const filtered = matches.filter((node) => matchesTextClauses(node, textClauses));
+      if (filtered.length > 0) {
+        matches = filtered;
+      }
+    }
     if (matches.length === 1) {
       return {
         node: matches[0],
@@ -5828,6 +5613,10 @@ function resolveDomPathInScope(index, domPath, scope) {
   }
   return fallback;
 }
+function matchesTextClauses(node, clauses) {
+  const text = (node.textContent ?? "").replace(/\s+/g, " ").trim();
+  return clauses.every((clause) => text.includes(clause.value));
+}
 function queryAllDomPathInScope(index, domPath, scope) {
   const selectors = buildPathCandidates(domPath);
   for (const selector of selectors) {
@@ -5986,7 +5775,13 @@ function clonePathNode(node) {
   };
 }
 function cloneMatchClause(clause) {
-  return clause.kind === "position" ? { kind: "position", axis: clause.axis } : {
+  if (clause.kind === "position") {
+    return { kind: "position", axis: clause.axis };
+  }
+  if (clause.kind === "text") {
+    return { kind: "text", value: clause.value };
+  }
+  return {
     kind: "attr",
     key: clause.key,
     ...clause.op === void 0 ? {} : { op: clause.op },
@@ -6041,6 +5836,13 @@ function normalizeMatch(rawMatch, attrs, position, tag) {
           op,
           ...value === void 0 ? {} : { value }
         });
+        continue;
+      }
+      if (record.kind === "text") {
+        const textValue = typeof record.value === "string" ? record.value.trim() : "";
+        if (textValue) {
+          push({ kind: "text", value: textValue.slice(0, 80) });
+        }
       }
     }
   }
@@ -6406,7 +6208,7 @@ function isTimeoutError(error) {
 }
 
 // ../runtime-core/src/runtimes/dom/executor.ts
-var MAX_DOM_ACTION_ATTEMPTS = 3;
+var MAX_DOM_ACTION_ATTEMPTS = 2;
 var DEFAULT_SCROLL_OPTIONS = {
   block: "center",
   inline: "center"
@@ -6893,11 +6695,12 @@ var DomActionExecutor = class {
     throw this.createActionabilityError(
       operation,
       "obscured",
-      `hit test resolved ${hit.nodeRef} outside the target subtree rooted at ${resolved.nodeRef}`,
+      `target is obscured by ${assessment.blockingDescription ?? "another element"} at the click point`,
       {
         ...details,
         hitRelation: assessment.relation,
         ...assessment.ambiguous === void 0 ? {} : { hitAmbiguous: assessment.ambiguous },
+        ...assessment.blockingDescription === void 0 ? {} : { blockingDescription: assessment.blockingDescription },
         ...assessment.canonicalTarget === void 0 ? {} : {
           canonicalNodeRef: assessment.canonicalTarget.nodeRef,
           canonicalDocumentRef: assessment.canonicalTarget.documentRef,
@@ -6911,8 +6714,7 @@ var DomActionExecutor = class {
         hitMissingFromSnapshot: !resolved.snapshot.nodes.some(
           (node) => node.nodeRef === hit.nodeRef
         )
-      },
-      true
+      }
     );
   }
   async resolveActionablePointerTarget(session, operation, resolved) {
@@ -7124,7 +6926,12 @@ var DefaultDomRuntime = class {
     });
   }
   async buildPath(input) {
-    return sanitizeReplayElementPath(await this.requireBridge().buildReplayPath(input.locator));
+    return sanitizeReplayElementPath(
+      await this.requireBridge().buildReplayPath(
+        input.locator,
+        input.enableTextMatch ? { enableTextMatch: true } : void 0
+      )
+    );
   }
   async resolveTarget(input) {
     return this.withSnapshotSession((session) => this.resolveTargetWithSession(session, input));
@@ -7344,7 +7151,7 @@ var DefaultDomRuntime = class {
     if (resolvedByLocator) {
       const { snapshot, node } = resolvedByLocator;
       const anchor = await this.buildAnchorFromSnapshotNode(session, snapshot, node);
-      const replayPath = await this.tryBuildPathFromNode(snapshot, node);
+      const replayPath = await this.tryBuildPathFromNode(snapshot, node, { enableTextMatch: true });
       return this.createResolvedTarget("live", snapshot, node, anchor, {
         ...target.persist === void 0 ? {} : { persist: target.persist },
         ...replayPath === void 0 ? {} : { replayPath }
@@ -7362,11 +7169,12 @@ var DefaultDomRuntime = class {
     const { snapshot, node } = resolved;
     const anchor = await this.buildAnchorFromSnapshotNode(session, snapshot, node);
     const writeDescriptor = descriptorWriter ?? ((input) => this.descriptors.write(input));
-    const replayPath = await this.tryBuildPathFromNode(snapshot, node);
+    const enableTextMatch = method !== "extract";
+    const replayPath = await this.tryBuildPathFromNode(snapshot, node, { enableTextMatch });
     const descriptor = target.persist === void 0 ? void 0 : await writeDescriptor({
       method,
       persist: target.persist,
-      path: replayPath ?? await this.buildPathForNode(snapshot, node),
+      path: replayPath ?? await this.buildPathForNode(snapshot, node, { enableTextMatch }),
       sourceUrl: snapshot.url
     });
     return this.createResolvedTarget("selector", snapshot, node, anchor, {
@@ -7466,7 +7274,7 @@ var DefaultDomRuntime = class {
         `Unable to resolve structural anchor "${buildPathSelectorHint(anchor)}" in the current session`
       );
     }
-    const replayPath = await this.tryBuildPathFromNode(context.snapshot, target.node);
+    const replayPath = await this.tryBuildPathFromNode(context.snapshot, target.node, { enableTextMatch: true });
     return this.createResolvedTarget(source, context.snapshot, target.node, anchor, {
       ...persist === void 0 ? {} : { persist },
       ...replayPath === void 0 ? {} : { replayPath }
@@ -7637,19 +7445,20 @@ var DefaultDomRuntime = class {
     }
     return this.bridge;
   }
-  async buildPathForNode(snapshot, node) {
+  async buildPathForNode(snapshot, node, options) {
     if (node.nodeRef === void 0) {
       throw new Error(
         `snapshot node ${String(node.snapshotNodeId)} does not expose a live node reference`
       );
     }
     return this.buildPath({
-      locator: createNodeLocator(snapshot.documentRef, snapshot.documentEpoch, node.nodeRef)
+      locator: createNodeLocator(snapshot.documentRef, snapshot.documentEpoch, node.nodeRef),
+      ...options?.enableTextMatch ? { enableTextMatch: true } : {}
     });
   }
-  async tryBuildPathFromNode(snapshot, node) {
+  async tryBuildPathFromNode(snapshot, node, options) {
     try {
-      return await this.buildPathForNode(snapshot, node);
+      return await this.buildPathForNode(snapshot, node, options);
     } catch {
       return void 0;
     }
@@ -8263,6 +8072,9 @@ function relaxPathForSingleSample(path6, mode) {
         }
         return !isLast;
       }
+      if (clause.kind === "text") {
+        return false;
+      }
       const key = String(clause.key || "").trim().toLowerCase();
       if (!key || !shouldKeepAttrForSingleSample(key)) {
         return false;
@@ -8365,9 +8177,11 @@ function buildNodeStructure(node) {
     }
     structuralAttrs[key] = value;
   }
-  const matchClauses = (node.match || []).map(
-    (clause) => clause.kind === "position" ? `position:${clause.axis}` : `attr:${String(clause.key || "").trim().toLowerCase()}`
-  ).sort();
+  const matchClauses = (node.match || []).map((clause) => {
+    if (clause.kind === "position") return `position:${clause.axis}`;
+    if (clause.kind === "text") return `text:${clause.value}`;
+    return `attr:${String(clause.key || "").trim().toLowerCase()}`;
+  }).sort();
   return {
     tag,
     attrs: structuralAttrs,
@@ -8773,6 +8587,9 @@ function mergeMatchByMajority(matchLists, attrs, threshold, positionFlags = {
       });
       continue;
     }
+    if (clause.kind === "text") {
+      continue;
+    }
     if (clause.axis === "nthOfType") {
       if (positionFlags.hasNthOfType) {
         merged.push({ kind: "position", axis: "nthOfType" });
@@ -8917,9 +8734,9 @@ function isPersistedObjectNode(node) {
 }
 
 // ../runtime-core/src/sdk/extraction.ts
-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) {
@@ -8941,12 +8758,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
@@ -8998,13 +8815,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,
@@ -9014,8 +8831,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({
@@ -9030,12 +8847,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) {
@@ -9046,7 +8863,7 @@ async function collectFieldTargetsFromSchemaValue(options) {
         );
       }
       const fieldCountBeforeItem = options.fields.length;
-      await collectFieldTargetsFromSchemaObject({
+      await collectFieldTargetsFromTemplateObject({
         dom: options.dom,
         pageRef: options.pageRef,
         value: itemValue,
@@ -9057,7 +8874,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.`
         );
       }
     }
@@ -9065,10 +8882,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,
@@ -9100,7 +8917,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 }
   };
@@ -9401,24 +9218,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 : normalizeNonEmptyString("attribute", raw.attribute);
+  const attribute = raw.attr !== void 0 ? normalizeNonEmptyString("attr", raw.attr) : raw.attribute === void 0 ? void 0 : normalizeNonEmptyString("attribute", raw.attribute);
   if (hasSource) {
     if (raw.source !== "current_url") {
       throw new Error(`Unsupported extraction source "${String(raw.source)}".`);
@@ -9433,17 +9255,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;
@@ -9474,7 +9299,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 } : {}
     }
   };
@@ -9560,7 +9385,7 @@ var FilesystemOpensteerExtractionDescriptorStore = class {
       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);
@@ -9609,7 +9434,7 @@ var MemoryOpensteerExtractionDescriptorStore = class {
       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);
@@ -9760,7 +9585,8 @@ function assertProviderSupportsEngine(provider, engine) {
     return;
   }
   if (provider === "cloud") {
-    throw new Error(
+    throw new OpensteerProtocolError(
+      "invalid-argument",
       "ABP is not supported for provider=cloud. Cloud provider currently requires Playwright."
     );
   }
@@ -9770,7 +9596,8 @@ function normalizeOpensteerProviderMode(value, source = "OPENSTEER_PROVIDER") {
   if (normalized === OPENSTEER_PROVIDER_MODES[0] || normalized === OPENSTEER_PROVIDER_MODES[1]) {
     return normalized;
   }
-  throw new Error(
+  throw new OpensteerProtocolError(
+    "invalid-argument",
     `${source} must be one of ${OPENSTEER_PROVIDER_MODES.join(", ")}; received "${value}".`
   );
 }
@@ -10210,6 +10037,24 @@ async function sleep(ms) {
 // src/cloud/client.ts
 var CLOUD_CLOSE_TIMEOUT_MS = 6e4;
 var CLOUD_CLOSE_POLL_INTERVAL_MS = 250;
+var OpensteerCloudRequestError = class extends Error {
+  statusCode;
+  code;
+  details;
+  method;
+  pathname;
+  url;
+  constructor(args) {
+    super(args.message);
+    this.name = "OpensteerCloudRequestError";
+    this.statusCode = args.statusCode;
+    this.code = args.code;
+    this.details = args.details;
+    this.method = args.method;
+    this.pathname = args.pathname;
+    this.url = args.url;
+  }
+};
 var OpensteerCloudClient = class {
   constructor(config) {
     this.config = config;
@@ -10385,7 +10230,11 @@ var OpensteerCloudClient = class {
       });
     }
     if (!response.ok) {
-      throw new Error(`${init.method} ${pathname} failed with ${String(response.status)}.`);
+      throw await createCloudRequestError(response, {
+        method: init.method,
+        pathname,
+        url
+      });
     }
     return response;
   }
@@ -10433,6 +10282,36 @@ function wrapCloudFetchError(error, input) {
   wrapped.name = error.name;
   return wrapped;
 }
+async function createCloudRequestError(response, input) {
+  const payload = await readCloudErrorPayload(response);
+  return new OpensteerCloudRequestError({
+    statusCode: response.status,
+    method: input.method,
+    pathname: input.pathname,
+    url: input.url,
+    message: payload?.error ?? `${input.method} ${input.pathname} failed with ${String(response.status)}.`,
+    ...payload?.code === void 0 ? {} : { code: payload.code },
+    ...payload?.details === void 0 ? {} : { details: payload.details }
+  });
+}
+async function readCloudErrorPayload(response) {
+  try {
+    return asCloudErrorPayload(await response.json());
+  } catch {
+    return void 0;
+  }
+}
+function asCloudErrorPayload(value) {
+  if (value === null || typeof value !== "object") {
+    return void 0;
+  }
+  const payload = value;
+  return {
+    ...typeof payload.error === "string" ? { error: payload.error } : {},
+    ...typeof payload.code === "string" ? { code: payload.code } : {},
+    ..."details" in payload ? { details: payload.details } : {}
+  };
+}
 
 // src/cloud/config.ts
 function resolveCloudConfig(input = {}) {
@@ -10608,7 +10487,7 @@ async function dispatchSemanticOperation(runtime, operation, input, options = {}
 
 // ../runtime-core/package.json
 var package_default = {
-  version: "0.2.3"};
+  version: "0.2.5"};
 
 // ../runtime-core/src/version.ts
 var OPENSTEER_RUNTIME_CORE_VERSION = package_default.version;
@@ -11654,10 +11533,19 @@ var VOID_TAGS = /* @__PURE__ */ new Set([
 // ../runtime-core/src/sdk/snapshot/cleaner.ts
 var STRIP_TAGS = /* @__PURE__ */ new Set(["script", "style", "noscript", "meta", "link", "template"]);
 var TEXT_ATTR_MAX = 150;
-var URL_ATTR_MAX = 500;
-var URL_ATTRS = /* @__PURE__ */ new Set(["href", "src", "srcset"]);
+var SRCSET_ATTR_MAX = 160;
+var MIDDLE_TRUNCATED_URL_ATTRS = /* @__PURE__ */ new Set(["href", "src"]);
 var TEXT_ATTRS = /* @__PURE__ */ new Set(["alt", "title", "aria-label", "placeholder", "value"]);
-var TRUNCATION_SUFFIX = " [truncated]";
+var TRUNCATION_SUFFIX = "...";
+var MIDDLE_TRUNCATION_MARKER = "...";
+var MIDDLE_TRUNCATION_HEAD_MAX = 40;
+var MIDDLE_TRUNCATION_TAIL_MAX = 20;
+var SRCSET_CANDIDATE_HEAD_MAX = 36;
+var SRCSET_CANDIDATE_TAIL_MAX = 12;
+var SRCSET_COMPACT_CANDIDATE_HEAD_MAX = 20;
+var SRCSET_COMPACT_CANDIDATE_TAIL_MAX = 8;
+var SRCSET_FALLBACK_HEAD_MAX = 56;
+var SRCSET_FALLBACK_TAIL_MAX = 20;
 var NOISE_SELECTORS = [
   `[${OPENSTEER_HIDDEN_ATTR}]`,
   "[hidden]",
@@ -11720,184 +11608,554 @@ 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 removeNoise($) {
-  for (const tag of STRIP_TAGS) {
-    $(tag).remove();
+function truncateSrcsetValue(value, max) {
+  if (getSerializedLength(value) <= max) {
+    return value;
   }
-  $(NOISE_SELECTORS.join(", ")).remove();
-}
-function removeComments($) {
-  $("*").contents().each(function removeComment() {
-    if (this.type === "comment") {
-      $(this).remove();
-    }
-  });
-}
-function markInlineSelfHiddenFallback($) {
-  $(
-    "[style*='visibility: hidden'], [style*='visibility:hidden'], [style*='visibility: collapse'], [style*='visibility:collapse']"
-  ).each(function markInlineVisibilityHidden() {
-    const el = $(this);
-    if (el.attr(OPENSTEER_HIDDEN_ATTR) === void 0) {
-      el.attr(OPENSTEER_SELF_HIDDEN_ATTR, "1");
-    }
-  });
-}
-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]) {
-      continue;
-    }
-    el.contents().each(function removeSelfHiddenText() {
-      if (this.type === "text") {
-        $(this).remove();
-      }
-    });
-    if (el.children().length === 0) {
-      el.remove();
-    }
+  const candidates = parseSrcsetCandidates2(value);
+  if (candidates.length === 0) {
+    return truncateValueInMiddle(value, SRCSET_FALLBACK_HEAD_MAX, SRCSET_FALLBACK_TAIL_MAX);
   }
-}
-function hasDirectText($, el) {
-  return el.contents().filter(function hasDirectNodeText() {
-    return this.type === "text" && $(this).text().trim() !== "";
-  }).length > 0;
-}
-function hasTextDeep(el) {
-  return el.text().trim().length > 0;
-}
-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 (el.prev().length > 0) {
-      el.before(" ");
-    }
-    if (el.next().length > 0) {
-      el.after(" ");
+  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;
     }
   }
-  el.replaceWith(el.contents());
+  return truncateValueInMiddle(value, SRCSET_FALLBACK_HEAD_MAX, SRCSET_FALLBACK_TAIL_MAX);
 }
-function stripToAttrs(el, keep) {
-  const attrs = el.attr() || {};
-  for (const attr of Object.keys(attrs)) {
-    if (!keep.has(attr)) {
-      el.removeAttr(attr);
-      continue;
-    }
-    const value = el.attr(attr);
-    if (typeof value !== "string") {
-      continue;
-    }
-    if (getAttrLimit(attr) !== void 0) {
-      setBoundedAttr(el, attr, value);
+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 restoreBoundedAttr(el, attr, value) {
-  if (typeof value !== "string") {
-    return;
+function getPreferredSrcsetCandidateIndices(candidates, includeBest) {
+  if (candidates.length === 0) {
+    return [];
   }
-  const trimmed = value.trim();
-  if (trimmed === "") {
-    return;
+  const kept = /* @__PURE__ */ new Set([0, candidates.length - 1]);
+  if (includeBest) {
+    kept.add(pickBestSrcsetCandidateIndex(candidates));
   }
-  setBoundedAttr(el, attr, value);
+  return [...kept].filter((index) => index >= 0 && index < candidates.length).sort((a, b) => a - b);
 }
-function deduplicateImages(html) {
-  const seen = /* @__PURE__ */ new Set();
-  return html.replace(/<img\b([^>]*)>/gi, (full, attrContent) => {
-    const srcMatch = attrContent.match(/\bsrc\s*=\s*(["']?)(.*?)\1/);
-    const srcsetMatch = attrContent.match(/\bsrcset\s*=\s*(["'])(.*?)\1/);
-    let src = null;
-    if (srcMatch && srcMatch[2]) {
-      src = srcMatch[2].trim();
-    } else if (srcsetMatch && srcsetMatch[2]) {
-      src = srcsetMatch[2].split(",")[0]?.trim().split(" ")[0] ?? null;
-    }
-    if (!src) {
-      return full;
+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 (seen.has(src)) {
-      return "";
+    if (typeof candidate.density === "number" && Number.isFinite(candidate.density) && candidate.density > bestDensity) {
+      bestDensity = candidate.density;
+      bestDensityIndex = index;
     }
-    seen.add(src);
-    return full;
-  });
-}
-function isPreservedImageElement($, el) {
-  const tag = (el[0]?.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;
+  if (bestWidthIndex >= 0) {
+    return bestWidthIndex;
   }
-  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() !== "";
-    return inPicture && hasSrc;
+  if (bestDensityIndex >= 0) {
+    return bestDensityIndex;
   }
-  return false;
+  return candidates.length - 1;
 }
-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;
+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;
       }
-      if (isPreservedImageElement($, el)) {
-        return;
+      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;
       }
-      if (tag === "a") {
-        el.children().each(function flattenAnchorChild() {
-          flatten($(this));
-        });
-        return;
+      const widthMatch = token.match(/^(\d+)w$/);
+      if (widthMatch) {
+        const parsed = Number.parseInt(widthMatch[1], 10);
+        if (Number.isFinite(parsed)) {
+          width = parsed;
+        }
+        continue;
       }
-      const hasText = hasDirectText($, el);
-      if (hasText) {
-        return;
+      const densityMatch = token.match(/^(\d*\.?\d+)x$/);
+      if (densityMatch) {
+        const parsed = Number.parseFloat(densityMatch[1]);
+        if (Number.isFinite(parsed)) {
+          density = parsed;
+        }
       }
-      if (el.children().length === 0) {
-        el.remove();
-        return;
+    }
+    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();
+  }
+  $(NOISE_SELECTORS.join(", ")).remove();
+}
+function removeComments($) {
+  $("*").contents().each(function removeComment() {
+    if (this.type === "comment") {
+      $(this).remove();
+    }
+  });
+}
+function markInlineSelfHiddenFallback($) {
+  $(
+    "[style*='visibility: hidden'], [style*='visibility:hidden'], [style*='visibility: collapse'], [style*='visibility:collapse']"
+  ).each(function markInlineVisibilityHidden() {
+    const el = $(this);
+    if (el.attr(OPENSTEER_HIDDEN_ATTR) === void 0) {
+      el.attr(OPENSTEER_SELF_HIDDEN_ATTR, "1");
+    }
+  });
+}
+function pruneSelfHiddenNodes($) {
+  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();
       }
-      el.children().each(function flattenChild() {
-        flatten($(this));
-      });
-      el.replaceWith(el.contents());
     });
+    if (!hasElementChildren(node)) {
+      el.remove();
+    }
+  }
+}
+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 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 (hasTextDeepNode(el[0])) {
+    if (el.prev().length > 0) {
+      el.before(" ");
+    }
+    if (el.next().length > 0) {
+      el.after(" ");
+    }
+  }
+  el.replaceWith(el.contents());
+}
+function stripToAttrs(el, keep) {
+  const attrs = el.attr() || {};
+  for (const attr of Object.keys(attrs)) {
+    if (!keep.has(attr)) {
+      el.removeAttr(attr);
+      continue;
+    }
+    const value = el.attr(attr);
+    if (typeof value !== "string") {
+      continue;
+    }
+    if (shouldBoundAttr(attr)) {
+      setBoundedAttr(el, attr, value);
+    }
+  }
+}
+function restoreBoundedAttr(el, attr, value) {
+  if (typeof value !== "string") {
+    return;
+  }
+  const trimmed = value.trim();
+  if (trimmed === "") {
+    return;
+  }
+  setBoundedAttr(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;
+    if (srcMatch && srcMatch[2]) {
+      src = srcMatch[2].trim();
+    } else if (srcsetMatch && srcsetMatch[2]) {
+      src = srcsetMatch[2].split(",")[0]?.trim().split(" ")[0] ?? null;
+    }
+    if (!src) {
+      return full;
+    }
+    if (seen.has(src)) {
+      return "";
+    }
+    seen.add(src);
+    return full;
+  });
+}
+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") {
+    return pictureHasPreservedDescendant(node);
+  }
+  if (tag === "source") {
+    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($) {
+  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;
+      }
+    }
+    return false;
   };
-  flatten($.root());
+  for (const child of getChildNodes(root)) {
+    if (visit(child)) {
+      return firstImage;
+    }
+  }
+  return firstImage ?? firstSource ?? firstSemantic;
 }
 function serializeForExtraction($, root) {
   const lines = [];
@@ -11966,7 +12224,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) {
@@ -12058,7 +12316,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()) {
@@ -12084,22 +12346,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() {
@@ -12109,7 +12361,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() || {};
@@ -12135,46 +12387,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") {
@@ -12254,21 +12491,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);
       }
     }
@@ -12888,9 +13111,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" });
   }
@@ -13208,7 +13431,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);
 }
@@ -15169,12 +15392,12 @@ var OpensteerSessionRuntime = class {
         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()
               })
             );
@@ -15206,7 +15429,7 @@ var OpensteerSessionRuntime = class {
                 () => descriptors.write({
                   persist,
                   root: payload,
-                  schemaHash: canonicalJsonString(input.schema),
+                  templateHash: canonicalJsonString(input.template),
                   sourceUrl: pageInfo.url
                 })
               );
@@ -15266,7 +15489,7 @@ var OpensteerSessionRuntime = class {
         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({
@@ -21867,6 +22090,7 @@ function payloadByteLength(value) {
 
 // src/cloud/session-proxy.ts
 var TEMPORARY_CLOUD_WORKSPACE_PREFIX = "opensteer-cloud-workspace-";
+var CLOUD_SESSION_REUSE_EXPIRY_SKEW_MS = 1e4;
 var CloudSessionProxy = class {
   rootPath;
   workspace;
@@ -21880,6 +22104,8 @@ var CloudSessionProxy = class {
   automation;
   workspaceStore;
   syncWorkspaceOnClose = false;
+  liveSessionStateEstablished = false;
+  storedInstrumentation = [];
   constructor(cloud, options = {}) {
     this.cloud = cloud;
     this.workspace = options.workspace;
@@ -21909,15 +22135,12 @@ var CloudSessionProxy = class {
     if (this.client === void 0 && this.sessionId === void 0 && persisted !== void 0 && await this.isReusableCloudSession(persisted.sessionId)) {
       this.bindClient(persisted);
     }
-    if (this.automation) {
-      try {
-        const sessionInfo = await this.automation.getSessionInfo();
-        return {
-          ...sessionInfo,
-          ...this.workspace === void 0 ? {} : { workspace: this.workspace }
-        };
-      } catch {
-      }
+    const sessionInfo = this.automation ? await this.automation.getSessionInfo().catch(() => void 0) : void 0;
+    if (sessionInfo !== void 0) {
+      return {
+        ...sessionInfo,
+        ...this.workspace === void 0 ? {} : { workspace: this.workspace }
+      };
     }
     return {
       provider: {
@@ -22029,12 +22252,26 @@ var CloudSessionProxy = class {
     return this.invokeSemanticOperation("session.cookies", input);
   }
   async route(input) {
-    await this.ensureSession();
-    return this.requireAutomation().route(input);
+    const registration = await this.invokeBootstrapInstrumentationOperation(
+      "instrumentation.route",
+      (automation) => automation.route(input)
+    );
+    this.storedInstrumentation.push({
+      kind: "route",
+      input
+    });
+    return registration;
   }
   async interceptScript(input) {
-    await this.ensureSession();
-    return this.requireAutomation().interceptScript(input);
+    const registration = await this.invokeBootstrapInstrumentationOperation(
+      "instrumentation.intercept-script",
+      (automation) => automation.interceptScript(input)
+    );
+    this.storedInstrumentation.push({
+      kind: "intercept-script",
+      input
+    });
+    return registration;
   }
   async getStorageSnapshot(input = {}) {
     return this.invokeSemanticOperation("session.storage", input);
@@ -22082,6 +22319,8 @@ var CloudSessionProxy = class {
       this.client = void 0;
       this.sessionId = void 0;
       this.semanticGrant = void 0;
+      this.liveSessionStateEstablished = false;
+      this.storedInstrumentation.length = 0;
       if (this.cleanupRootOnClose) {
         await rm(this.rootPath, { recursive: true, force: true }).catch(() => void 0);
       }
@@ -22109,6 +22348,8 @@ var CloudSessionProxy = class {
     this.automation = void 0;
     this.sessionId = void 0;
     this.semanticGrant = void 0;
+    this.liveSessionStateEstablished = false;
+    this.storedInstrumentation.length = 0;
     if (syncError !== void 0) {
       throw syncError;
     }
@@ -22156,6 +22397,7 @@ var CloudSessionProxy = class {
     };
     await this.writePersistedSession(record);
     this.bindClient(record, session.initialGrants?.semantic);
+    await this.restoreStoredInstrumentation();
   }
   async syncWorkspaceToCloud() {
     if (this.workspace === void 0) {
@@ -22167,6 +22409,7 @@ var CloudSessionProxy = class {
   bindClient(record, initialSemanticGrant) {
     this.sessionId = record.sessionId;
     this.semanticGrant = initialSemanticGrant?.kind === "semantic" ? initialSemanticGrant : void 0;
+    this.liveSessionStateEstablished = false;
     this.client = new OpensteerSemanticRestClient({
       getBaseUrl: async () => (await this.ensureSemanticGrant()).url,
       getAuthorizationHeader: async () => `Bearer ${(await this.ensureSemanticGrant()).token}`,
@@ -22174,6 +22417,19 @@ var CloudSessionProxy = class {
     });
     this.automation = new OpensteerCloudAutomationClient(this.cloud, record.sessionId);
   }
+  async restoreStoredInstrumentation() {
+    if (this.storedInstrumentation.length === 0) {
+      return;
+    }
+    const automation = this.requireAutomation();
+    for (const registration of this.storedInstrumentation) {
+      if (registration.kind === "route") {
+        await automation.route(registration.input);
+      } else {
+        await automation.interceptScript(registration.input);
+      }
+    }
+  }
   async ensureWorkspaceStore() {
     if (this.workspaceStore !== void 0) {
       return this.workspaceStore;
@@ -22196,13 +22452,22 @@ var CloudSessionProxy = class {
   async clearPersistedSession() {
     await clearPersistedSessionRecord(this.rootPath, "cloud").catch(() => void 0);
   }
+  async invalidateSession() {
+    await this.automation?.close().catch(() => void 0);
+    this.automation = void 0;
+    this.client = void 0;
+    this.sessionId = void 0;
+    this.semanticGrant = void 0;
+    this.liveSessionStateEstablished = false;
+    await this.clearPersistedSession();
+  }
   async isReusableCloudSession(sessionId, timeout) {
     try {
       const session = await this.cloud.getSession(sessionId, {
         signal: timeout?.signal,
         timeoutMs: timeout?.remainingMs()
       });
-      return session.status !== "closed" && session.status !== "failed";
+      return isReusableCloudSessionState(session);
     } catch (error) {
       if (isMissingCloudSessionError(error)) {
         return false;
@@ -22251,26 +22516,79 @@ var CloudSessionProxy = class {
     try {
       await this.ensureSemanticGrant(true);
       return true;
-    } catch {
+    } catch (refreshError) {
+      if (await this.resetStaleSession(refreshError)) {
+        throw refreshError;
+      }
       return false;
     }
   }
   async invokeSemanticOperation(operation, input, sessionInit = {}) {
-    return this.runOperationWithPolicy(operation, async (timeout) => {
+    return this.runOperationWithSessionRecovery(operation, async (timeout) => {
       await this.ensureSession(sessionInit, timeout);
       await this.ensureSemanticGrant(false, timeout);
-      return this.requireClient().invoke(operation, input, {
+      const output = await this.requireClient().invoke(operation, input, {
         signal: timeout.signal,
         timeoutMs: timeout.remainingMs()
       });
+      this.noteSuccessfulLiveOperation(operation);
+      return output;
     });
   }
   async invokeAutomationOperation(operation, invoke, sessionInit = {}) {
-    return this.runOperationWithPolicy(operation, async (timeout) => {
+    return this.runOperationWithSessionRecovery(operation, async (timeout) => {
       await this.ensureSession(sessionInit, timeout);
-      return invoke(this.requireAutomation());
+      const output = await invoke(this.requireAutomation());
+      this.noteSuccessfulLiveOperation(operation);
+      return output;
     });
   }
+  async invokeBootstrapInstrumentationOperation(operation, invoke) {
+    let recovered = false;
+    while (true) {
+      try {
+        await this.ensureSession();
+        return await invoke(this.requireAutomation());
+      } catch (error) {
+        const stale = await this.resetStaleSession(error);
+        if (!stale || recovered || !this.canRecoverWithFreshSession(operation)) {
+          throw error;
+        }
+        recovered = true;
+      }
+    }
+  }
+  async runOperationWithSessionRecovery(operation, invoke) {
+    return this.runOperationWithPolicy(operation, async (timeout) => {
+      let recovered = false;
+      while (true) {
+        try {
+          return await invoke(timeout);
+        } catch (error) {
+          const stale = await this.resetStaleSession(error);
+          if (!stale || recovered || !this.canRecoverWithFreshSession(operation)) {
+            throw error;
+          }
+          recovered = true;
+        }
+      }
+    });
+  }
+  async resetStaleSession(error) {
+    if (!isRecoverableCloudSessionError(error)) {
+      return false;
+    }
+    await this.invalidateSession();
+    return true;
+  }
+  canRecoverWithFreshSession(operation) {
+    return !this.liveSessionStateEstablished && isBootstrapRecoveryOperation(operation);
+  }
+  noteSuccessfulLiveOperation(operation) {
+    if (operation === "session.open" || operation === "page.list" || operation === "page.new" || operation === "page.activate" || operation === "page.close" || operation === "page.goto" || operation === "page.evaluate" || operation === "page.add-init-script" || operation === "page.snapshot" || operation === "dom.click" || operation === "dom.hover" || operation === "dom.input" || operation === "dom.scroll" || operation === "dom.extract" || operation === "network.query" || operation === "network.detail" || operation === "interaction.capture" || operation === "interaction.get" || operation === "interaction.diff" || operation === "interaction.replay" || operation === "scripts.capture" || operation === "artifact.read" || operation === "scripts.beautify" || operation === "scripts.deobfuscate" || operation === "scripts.sandbox" || operation === "captcha.solve" || operation === "session.cookies" || operation === "session.storage" || operation === "session.state" || operation === "session.fetch" || operation === "computer.execute") {
+      this.liveSessionStateEstablished = true;
+    }
+  }
   async runOperationWithPolicy(operation, invoke) {
     return runWithPolicyTimeout(this.policy.timeout, { operation }, invoke);
   }
@@ -22294,8 +22612,29 @@ function assertSupportedCloudBrowserMode(browser) {
   }
 }
 function isMissingCloudSessionError(error) {
+  if (error instanceof OpensteerCloudRequestError) {
+    return error.statusCode === 404 && (error.code === void 0 || error.code === "CLOUD_SESSION_NOT_FOUND");
+  }
   return error instanceof Error && /\b404\b/.test(error.message);
 }
+function isRecoverableCloudSessionError(error) {
+  if (!(error instanceof OpensteerCloudRequestError)) {
+    return false;
+  }
+  if (error.statusCode === 404) {
+    return error.code === void 0 || error.code === "CLOUD_SESSION_NOT_FOUND";
+  }
+  return error.statusCode === 409 && error.code === "CLOUD_SESSION_STALE";
+}
+function isBootstrapRecoveryOperation(operation) {
+  return operation === "session.open" || operation === "instrumentation.route" || operation === "instrumentation.intercept-script";
+}
+function isReusableCloudSessionState(session) {
+  if (session.status === "closing" || session.status === "closed" || session.status === "failed") {
+    return false;
+  }
+  return !(typeof session.expiresAt === "number" && session.expiresAt <= Date.now() + CLOUD_SESSION_REUSE_EXPIRY_SKEW_MS);
+}
 function isLoopbackBaseUrl(baseUrl) {
   let url;
   try {
@@ -22343,39 +22682,6 @@ var OpensteerRuntime = class extends OpensteerSessionRuntime {
     );
   }
 };
-var OpensteerSessionRuntime2 = class extends OpensteerSessionRuntime {
-  constructor(options) {
-    const rootPath = options.rootPath ?? path2.resolve(options.rootDir ?? process.cwd());
-    const cleanupRootOnClose = options.cleanupRootOnClose ?? false;
-    const engineName = options.engineName ?? DEFAULT_OPENSTEER_ENGINE;
-    assertSupportedEngineOptions({
-      engineName,
-      ...options.browser === void 0 ? {} : { browser: options.browser },
-      ...options.context === void 0 ? {} : { context: options.context }
-    });
-    super(
-      buildSharedRuntimeOptions({
-        name: options.name,
-        ...options.rootDir === void 0 ? {} : { rootDir: options.rootDir },
-        rootPath,
-        ...options.environment === void 0 ? {} : { environment: options.environment },
-        ...options.browser === void 0 ? {} : { browser: options.browser },
-        ...options.launch === void 0 ? {} : { launch: options.launch },
-        ...options.context === void 0 ? {} : { context: options.context },
-        engineName,
-        ...options.engine === void 0 ? {} : { engine: options.engine },
-        ...options.engineFactory === void 0 ? {} : { engineFactory: options.engineFactory },
-        ...options.policy === void 0 ? {} : { policy: options.policy },
-        ...options.descriptorStore === void 0 ? {} : { descriptorStore: options.descriptorStore },
-        ...options.extractionDescriptorStore === void 0 ? {} : { extractionDescriptorStore: options.extractionDescriptorStore },
-        cleanupRootOnClose,
-        ...options.observability === void 0 ? {} : { observability: options.observability },
-        ...options.observationSessionId === void 0 ? {} : { observationSessionId: options.observationSessionId },
-        ...options.observationSink === void 0 ? {} : { observationSink: options.observationSink }
-      })
-    );
-  }
-};
 function buildSharedRuntimeOptions(input) {
   const ownership = resolveOwnership(input.browser);
   const engineFactory = input.engineFactory ?? ((factoryOptions) => new OpensteerBrowserManager({
@@ -22467,6 +22773,6 @@ function createOpensteerSemanticRuntime(input = {}) {
   });
 }
 
-export { CloudSessionProxy, DEFERRED_MATCH_ATTR_KEYS, ElementPathError, FlowRecorderCollector, MATCH_ATTRIBUTE_PRIORITY, OPENSTEER_DOM_ACTION_BRIDGE_SYMBOL, OpensteerCloudClient, OpensteerRuntime, OpensteerSessionRuntime2 as OpensteerSessionRuntime, STABLE_PRIMARY_ATTR_KEYS, assertProviderSupportsEngine, buildArrayFieldPathCandidates, buildDomDescriptorKey, buildDomDescriptorPayload, buildDomDescriptorVersion, buildPathCandidates, buildPathSelectorHint, buildSegmentSelector, cloneElementPath, cloneReplayElementPath, cloneStructuralElementAnchor, createDomDescriptorStore, createDomRuntime, createOpensteerExtractionDescriptorStore, createOpensteerSemanticRuntime, defaultFallbackPolicy, defaultPolicy, defaultRetryPolicy, defaultSettlePolicy, defaultTimeoutPolicy, delayWithSignal, dispatchSemanticOperation, generateReplayScript, hashDomDescriptorPersist, isCurrentUrlField, isValidCssAttributeKey, loadEnvironment, normalizeExtractedValue, normalizeOpensteerProviderMode, parseDomDescriptorRecord, parseExtractionDescriptorRecord, requireCloudAppBaseUrl, resolveCloudConfig, resolveDomActionBridge, resolveExtractedValueInContext, resolveOpensteerEnvironment, resolveOpensteerProvider, resolveOpensteerRuntimeConfig, runWithPolicyTimeout, sanitizeElementPath, sanitizeReplayElementPath, sanitizeStructuralElementAnchor, settleWithPolicy, shouldKeepAttributeForPath };
-//# sourceMappingURL=chunk-GEUHKPC2.js.map
-//# sourceMappingURL=chunk-GEUHKPC2.js.map
+export { CloudSessionProxy, DEFERRED_MATCH_ATTR_KEYS, ElementPathError, FlowRecorderCollector, MATCH_ATTRIBUTE_PRIORITY, OPENSTEER_DOM_ACTION_BRIDGE_SYMBOL, OpensteerCloudClient, STABLE_PRIMARY_ATTR_KEYS, assertProviderSupportsEngine, buildArrayFieldPathCandidates, buildDomDescriptorKey, buildDomDescriptorPayload, buildDomDescriptorVersion, buildPathCandidates, buildPathSelectorHint, buildSegmentSelector, cloneElementPath, cloneReplayElementPath, cloneStructuralElementAnchor, createDomDescriptorStore, createDomRuntime, createOpensteerExtractionDescriptorStore, createOpensteerSemanticRuntime, defaultFallbackPolicy, defaultPolicy, defaultRetryPolicy, defaultSettlePolicy, defaultTimeoutPolicy, delayWithSignal, dispatchSemanticOperation, generateReplayScript, hashDomDescriptorPersist, isBrowserCoreError, isCurrentUrlField, isValidCssAttributeKey, loadEnvironment, normalizeExtractedValue, normalizeOpensteerProviderMode, parseDomDescriptorRecord, parseExtractionDescriptorRecord, requireCloudAppBaseUrl, resolveCloudConfig, resolveDomActionBridge, resolveExtractedValueInContext, resolveOpensteerEnvironment, resolveOpensteerProvider, resolveOpensteerRuntimeConfig, runWithPolicyTimeout, sanitizeElementPath, sanitizeReplayElementPath, sanitizeStructuralElementAnchor, settleWithPolicy, shouldKeepAttributeForPath };
+//# sourceMappingURL=chunk-BVRIPCWA.js.map
+//# sourceMappingURL=chunk-BVRIPCWA.js.map