@yoqa/runner 0.3.21 → 0.3.22

package/dist/index.js

@@ -16801,7 +16801,7 @@ function getCatalogDb() {
 // package.json
 var package_default = {
   name: "@yoqa/runner",
-  version: "0.3.21",
+  version: "0.3.22",
   description: "Yoqa local runner \u2014 Appium + catalog HTTP API (Bun). Start with yoqa serve or the yoqa-runner bin.",
   license: "UNLICENSED",
   type: "module",
@@ -57546,6 +57546,195 @@ var originalGenerateCallId6 = createIdGenerator3({
 });
 var defaultDownload2 = createDownload();
 
+// src/domains/providers/json-salvage.ts
+function charAt(raw2, index) {
+  return raw2[index];
+}
+function coerceLooseJson(raw2) {
+  let out = "";
+  let i = 0;
+  while (i < raw2.length) {
+    const c = charAt(raw2, i);
+    if (c === undefined)
+      break;
+    if (c === '"') {
+      out += c;
+      i += 1;
+      while (i < raw2.length) {
+        const d = charAt(raw2, i);
+        if (d === undefined)
+          break;
+        out += d;
+        i += 1;
+        if (d === "\\") {
+          const escaped = charAt(raw2, i);
+          if (escaped !== undefined) {
+            out += escaped;
+            i += 1;
+          }
+          continue;
+        }
+        if (d === '"')
+          break;
+      }
+      continue;
+    }
+    if (c === "'") {
+      i += 1;
+      let content = "";
+      while (i < raw2.length) {
+        const d = charAt(raw2, i);
+        if (d === undefined)
+          break;
+        if (d === "\\" && i + 1 < raw2.length) {
+          const next = charAt(raw2, i + 1);
+          if (next === undefined)
+            break;
+          if (next === "n")
+            content += `
+`;
+          else if (next === "t")
+            content += "\t";
+          else if (next === "r")
+            content += "\r";
+          else
+            content += next;
+          i += 2;
+          continue;
+        }
+        if (d === "'") {
+          i += 1;
+          break;
+        }
+        content += d;
+        i += 1;
+      }
+      out += JSON.stringify(content);
+      continue;
+    }
+    if (c === ",") {
+      let j = i + 1;
+      while (j < raw2.length) {
+        const ws = charAt(raw2, j);
+        if (ws === undefined || !/\s/.test(ws))
+          break;
+        j += 1;
+      }
+      const closer = charAt(raw2, j);
+      if (closer === "}" || closer === "]") {
+        i += 1;
+        continue;
+      }
+    }
+    out += c;
+    i += 1;
+  }
+  return out;
+}
+function tryParseJson(text3) {
+  try {
+    return JSON.parse(text3);
+  } catch {
+    return;
+  }
+}
+function closeTruncatedJson(raw2) {
+  let inString = false;
+  let escaped = false;
+  const stack = [];
+  for (let i = 0;i < raw2.length; i += 1) {
+    const c = charAt(raw2, i);
+    if (c === undefined)
+      break;
+    if (inString) {
+      if (escaped) {
+        escaped = false;
+        continue;
+      }
+      if (c === "\\") {
+        escaped = true;
+        continue;
+      }
+      if (c === '"')
+        inString = false;
+      continue;
+    }
+    if (c === '"') {
+      inString = true;
+      continue;
+    }
+    if (c === "{")
+      stack.push("{");
+    else if (c === "[")
+      stack.push("[");
+    else if (c === "}" || c === "]")
+      stack.pop();
+  }
+  let out = raw2;
+  if (inString) {
+    if (escaped)
+      out = out.slice(0, -1);
+    out += '"';
+  }
+  while (stack.length > 0) {
+    const open = stack.pop();
+    out += open === "{" ? "}" : "]";
+  }
+  return out;
+}
+function salvageAgentJsonText(text3) {
+  const trimmed = text3.trim();
+  const fenced = trimmed.match(/```(?:json)?\s*([\s\S]*?)```/);
+  const inner = fenced?.[1]?.trim() ?? trimmed;
+  const start = inner.indexOf("{");
+  if (start < 0)
+    return trimmed;
+  const fromBrace = inner.slice(start);
+  const lastBrace = fromBrace.lastIndexOf("}");
+  const candidates = lastBrace > 0 ? [fromBrace.slice(0, lastBrace + 1), fromBrace] : [fromBrace];
+  for (const candidate of candidates) {
+    const variants = [
+      candidate,
+      coerceLooseJson(candidate),
+      closeTruncatedJson(candidate),
+      closeTruncatedJson(coerceLooseJson(candidate))
+    ];
+    for (const variant of variants) {
+      if (tryParseJson(variant) !== undefined)
+        return variant;
+    }
+  }
+  return closeTruncatedJson(coerceLooseJson(fromBrace));
+}
+function clampNormCoord(n) {
+  if (!Number.isFinite(n))
+    return n;
+  return Math.min(1000, Math.max(0, n));
+}
+function normalizeVisionJson(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return value;
+  const out = { ...value };
+  if (typeof out.x === "number")
+    out.x = clampNormCoord(out.x);
+  if (typeof out.y === "number")
+    out.y = clampNormCoord(out.y);
+  if (typeof out.ms === "number" && Number.isFinite(out.ms)) {
+    out.ms = Math.min(1e4, Math.max(0, out.ms));
+  }
+  const reason = typeof out.reason === "string" ? out.reason.trim() : "";
+  const thoughts = typeof out.thoughts === "string" ? out.thoughts.trim() : "";
+  if (reason)
+    out.reason = reason;
+  if (thoughts)
+    out.thoughts = thoughts;
+  if (reason && !thoughts)
+    out.thoughts = reason;
+  if (thoughts && !reason)
+    out.reason = thoughts;
+  return out;
+}
+
 // src/domains/providers/vision-model.ts
 class AgentProviderError extends Error {
   constructor(message) {
@@ -57646,20 +57835,27 @@ function mapProviderError(label, error40) {
     }
     throw new AgentProviderError(`Model did not return JSON (got: ${snippet}${text3.length > 160 ? "\u2026" : ""})`);
   }
+  if (error40 instanceof exports_external.ZodError) {
+    const first = error40.issues[0];
+    const detail = first ? `${first.path.length > 0 ? `${first.path.join(".")}: ` : ""}${first.message}` : error40.message;
+    throw new AgentProviderError(`${label} JSON was not a valid action: ${detail}`);
+  }
   if (error40 instanceof Error) {
     throw new AgentProviderError(error40.message);
   }
   throw new AgentProviderError(String(error40));
 }
-function repairModelJsonText(text3) {
-  const trimmed = text3.trim();
-  const fenced = trimmed.match(/```(?:json)?\s*([\s\S]*?)```/);
-  const candidate = fenced?.[1]?.trim() ?? trimmed;
-  const start = candidate.indexOf("{");
-  const end = candidate.lastIndexOf("}");
-  if (start < 0 || end <= start)
-    return trimmed;
-  return candidate.slice(start, end + 1);
+function parseVisionSchema(schema, raw2, label) {
+  try {
+    return schema.parse(normalizeVisionJson(raw2));
+  } catch (error40) {
+    if (error40 instanceof exports_external.ZodError) {
+      const first = error40.issues[0];
+      const detail = first ? `${first.path.length > 0 ? `${first.path.join(".")}: ` : ""}${first.message}` : error40.message;
+      throw new AgentProviderError(`${label} JSON was not a valid action: ${detail}`);
+    }
+    throw error40;
+  }
 }
 async function completeWithAiSdk(input) {
   const run = async (prompt) => {
@@ -57669,7 +57865,7 @@ async function completeWithAiSdk(input) {
         schema: input.schema,
         system: input.system,
         maxOutputTokens: VISION_MAX_TOKENS,
-        experimental_repairText: async ({ text: text3 }) => repairModelJsonText(text3),
+        experimental_repairText: async ({ text: text3 }) => salvageAgentJsonText(text3),
         messages: [
           {
             role: "user",
@@ -57684,12 +57880,18 @@ async function completeWithAiSdk(input) {
           }
         ]
       });
-      return object3;
+      return parseVisionSchema(input.schema, object3, input.label);
     } catch (error40) {
+      if (error40 instanceof AgentProviderError)
+        throw error40;
       if (NoObjectGeneratedError.isInstance(error40) && error40.text?.trim()) {
         try {
-          return input.schema.parse(JSON.parse(repairModelJsonText(error40.text)));
-        } catch {}
+          const salvaged = salvageAgentJsonText(error40.text);
+          return parseVisionSchema(input.schema, JSON.parse(salvaged), input.label);
+        } catch (salvageError) {
+          if (salvageError instanceof AgentProviderError)
+            throw salvageError;
+        }
       }
       mapProviderError(input.label, error40);
     }
@@ -67601,108 +67803,37 @@ var google = createGoogle();
 
 // src/domains/providers/agent-json.ts
 function extractAgentJsonObject(text3, providerLabel) {
-  const trimmed = text3.trim();
-  const fenced = trimmed.match(/```(?:json)?\s*([\s\S]*?)```/);
-  const candidate = fenced?.[1]?.trim() ?? trimmed;
-  const start = candidate.indexOf("{");
-  const end = candidate.lastIndexOf("}");
-  if (start < 0 || end <= start) {
-    throw new AgentProviderError(`${providerLabel} did not return JSON (got: ${trimmed.replace(/\s+/g, " ").slice(0, 160)})`);
-  }
-  const slice = candidate.slice(start, end + 1);
+  const snippet = text3.trim().replace(/\s+/g, " ").slice(0, 160);
+  const fail = () => {
+    throw new AgentProviderError(`${providerLabel} did not return JSON (got: ${snippet})`);
+  };
+  const salvaged = salvageAgentJsonText(text3);
+  let parsed;
   try {
-    return JSON.parse(slice);
-  } catch (strictError) {
+    parsed = JSON.parse(salvaged);
+  } catch {
     try {
-      return JSON.parse(coerceLooseJson(slice));
+      parsed = JSON.parse(coerceLooseJson(salvaged));
     } catch {
-      throw strictError;
+      fail();
     }
   }
+  if (parsed === undefined || parsed === null || typeof parsed !== "object") {
+    fail();
+  }
+  return parsed;
 }
-function charAt(raw2, index) {
-  return raw2[index];
-}
-function coerceLooseJson(raw2) {
-  let out = "";
-  let i = 0;
-  while (i < raw2.length) {
-    const c = charAt(raw2, i);
-    if (c === undefined)
-      break;
-    if (c === '"') {
-      out += c;
-      i += 1;
-      while (i < raw2.length) {
-        const d = charAt(raw2, i);
-        if (d === undefined)
-          break;
-        out += d;
-        i += 1;
-        if (d === "\\") {
-          const escaped = charAt(raw2, i);
-          if (escaped !== undefined) {
-            out += escaped;
-            i += 1;
-          }
-          continue;
-        }
-        if (d === '"')
-          break;
-      }
-      continue;
-    }
-    if (c === "'") {
-      i += 1;
-      let content = "";
-      while (i < raw2.length) {
-        const d = charAt(raw2, i);
-        if (d === undefined)
-          break;
-        if (d === "\\" && i + 1 < raw2.length) {
-          const next = charAt(raw2, i + 1);
-          if (next === undefined)
-            break;
-          if (next === "n")
-            content += `
-`;
-          else if (next === "t")
-            content += "\t";
-          else if (next === "r")
-            content += "\r";
-          else
-            content += next;
-          i += 2;
-          continue;
-        }
-        if (d === "'") {
-          i += 1;
-          break;
-        }
-        content += d;
-        i += 1;
-      }
-      out += JSON.stringify(content);
-      continue;
-    }
-    if (c === ",") {
-      let j = i + 1;
-      while (j < raw2.length) {
-        const ws = charAt(raw2, j);
-        if (ws === undefined || !/\s/.test(ws))
-          break;
-        j += 1;
-      }
-      const closer = charAt(raw2, j);
-      if (closer === "}" || closer === "]") {
-        i += 1;
-        continue;
-      }
+function parseVisionObject(schema, raw2, providerLabel) {
+  try {
+    return schema.parse(normalizeVisionJson(raw2));
+  } catch (error40) {
+    if (error40 instanceof exports_external.ZodError) {
+      const first = error40.issues[0];
+      const detail = first ? `${first.path.length > 0 ? `${first.path.join(".")}: ` : ""}${first.message}` : error40.message;
+      throw new AgentProviderError(`${providerLabel} JSON was not a valid action: ${detail}`);
     }
-    out += c;
-    i += 1;
+    throw error40;
   }
-  return out;
 }
 
 // src/domains/providers/drivers/antigravity-vision.ts
@@ -67748,13 +67879,10 @@ ${result.stderr}`.trim();
     if (result.exitCode !== 0 && !result.stdout.trim()) {
       throw new AgentProviderError(combined ? `Antigravity CLI failed: ${combined.slice(0, 400)}` : `Antigravity CLI exited ${result.exitCode}`);
     }
-    return input.schema.parse(extractAgentJsonObject(result.stdout || combined, "Antigravity CLI"));
+    return parseVisionObject(input.schema, extractAgentJsonObject(result.stdout || combined, "Antigravity CLI"), "Antigravity CLI");
   } catch (error40) {
     if (error40 instanceof AgentProviderError)
       throw error40;
-    if (error40 instanceof exports_external.ZodError) {
-      throw new AgentProviderError(`Antigravity JSON was not a valid action: ${error40.message}`);
-    }
     if (error40 instanceof SyntaxError) {
       throw new AgentProviderError(`Antigravity CLI returned invalid JSON: ${error40.message}`);
     }
@@ -76312,13 +76440,10 @@ Screenshot file (open and look at it): ${shotName}`,
       imageBase64: image.base64,
       mediaType: image.mediaType
     });
-    return input.schema.parse(extractAgentJsonObject(stdout, "Cursor Agent CLI"));
+    return parseVisionObject(input.schema, extractAgentJsonObject(stdout, "Cursor Agent CLI"), "Cursor Agent CLI");
   } catch (error40) {
     if (error40 instanceof AgentProviderError)
       throw error40;
-    if (error40 instanceof exports_external.ZodError) {
-      throw new AgentProviderError(`Cursor JSON was not a valid action: ${error40.message}`);
-    }
     if (error40 instanceof SyntaxError) {
       throw new AgentProviderError(`Cursor Agent CLI returned invalid JSON: ${error40.message}`);
     }
@@ -97459,10 +97584,10 @@ var agentDecisionSchema = exports_external.object({
     exports_external.literal("done"),
     exports_external.literal("fail")
   ]),
-  x: exports_external.number().min(0).max(1000).optional(),
-  y: exports_external.number().min(0).max(1000).optional(),
+  x: exports_external.number().optional(),
+  y: exports_external.number().optional(),
   text: exports_external.string().optional(),
-  ms: exports_external.number().min(0).max(1e4).optional(),
+  ms: exports_external.number().optional(),
   reason: exports_external.string().min(1),
   thoughts: exports_external.string().min(1)
 });
@@ -97658,8 +97783,8 @@ function cleanPageSource(xml, window2) {
 
 // src/domains/devices/grounding.ts
 var groundResultSchema = exports_external.object({
-  x: exports_external.number().min(0).max(1000),
-  y: exports_external.number().min(0).max(1000)
+  x: exports_external.number(),
+  y: exports_external.number()
 });
 var GROUND_SYSTEM = `You locate UI elements on a mobile screen.
 Respond with ONLY JSON: {"x":0-1000,"y":0-1000} for the center of the best match.

package/package.json

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