@yoqa/runner 0.3.18 → 0.3.19

package/dist/index.js

@@ -16801,7 +16801,7 @@ function getCatalogDb() {
 // package.json
 var package_default = {
   name: "@yoqa/runner",
-  version: "0.3.18",
+  version: "0.3.19",
   description: "Yoqa local runner \u2014 Appium + catalog HTTP API (Bun). Start with yoqa serve or the yoqa-runner bin.",
   license: "UNLICENSED",
   type: "module",
@@ -24258,7 +24258,7 @@ var probeProviderResponseSchema = exports_external.object({
 var providerModelSchema = exports_external.object({
   id: exports_external.string().min(1),
   name: exports_external.string().min(1),
-  tier: exports_external.enum(["free", "paid"]).optional()
+  provider: exports_external.string().min(1).optional()
 });
 var listProviderModelsResponseSchema = exports_external.object({
   models: exports_external.array(providerModelSchema),
@@ -57545,6 +57545,9 @@ function formatProviderHttpError(label, status, body) {
   if (label === "OpenCode" && (body.includes("unknown variant `image_url`") || body.includes("No endpoints found that support image input") || body.includes("expected `text`"))) {
     return `This OpenCode model does not accept screenshots (text-only). In Settings \u2192 Provider, set the default model to ${EXAMPLE_OPENCODE_VISION_MODEL} (or another vision-capable model). deepseek-v4-flash-free and big-pickle are text-only on Zen.`;
   }
+  if (label === "OpenCode" && (body.includes("output_config.format") || body.includes("BedrockException") && body.includes("Extra inputs are not permitted"))) {
+    return "LiteLLM/Bedrock rejected JSON schema mode for this model (output_config.format). Restart the Yoqa runner and retry \u2014 LiteLLM vision now asks for JSON in the prompt only.";
+  }
   if (label === "OpenCode" && status >= 500 && (body.includes("Internal server error") || body.includes('"type":"error"'))) {
     return `OpenCode Zen returned an internal error for this vision request. Many free models reject screenshots. In Settings \u2192 Provider, set the default model to ${EXAMPLE_OPENCODE_VISION_MODEL} (or another vision-capable model).`;
   }
@@ -57578,6 +57581,16 @@ function mapProviderError(label, error40) {
   }
   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);
+}
 async function completeWithAiSdk(input) {
   const run = async (prompt) => {
     try {
@@ -57586,6 +57599,7 @@ async function completeWithAiSdk(input) {
         schema: input.schema,
         system: input.system,
         maxOutputTokens: VISION_MAX_TOKENS,
+        experimental_repairText: async ({ text: text3 }) => repairModelJsonText(text3),
         messages: [
           {
             role: "user",
@@ -57602,6 +57616,11 @@ async function completeWithAiSdk(input) {
       });
       return object3;
     } catch (error40) {
+      if (NoObjectGeneratedError.isInstance(error40) && error40.text?.trim()) {
+        try {
+          return input.schema.parse(JSON.parse(repairModelJsonText(error40.text)));
+        } catch {}
+      }
       mapProviderError(input.label, error40);
     }
   };
@@ -57644,41 +57663,58 @@ function openCodeAuthPaths() {
   paths.push(join9(homedir8(), ".local", "share", "opencode", "auth.json"));
   return paths;
 }
-async function readOpenCodeCliAuthKey() {
+function apiKeyFromOpenCodeAuthEntry(value) {
+  if (!value || typeof value !== "object")
+    return null;
+  const entry = value;
+  for (const field of ["key", "apiKey", "token"]) {
+    const candidate = entry[field];
+    if (typeof candidate === "string" && candidate.trim())
+      return candidate.trim();
+  }
+  return null;
+}
+async function readOpenCodeCliAuthJson() {
   for (const path of openCodeAuthPaths()) {
     try {
       const file2 = Bun.file(path);
       if (!await file2.exists())
         continue;
       const json3 = await file2.json();
-      if (!json3 || typeof json3 !== "object")
+      if (!json3 || typeof json3 !== "object" || Array.isArray(json3))
         continue;
-      const record2 = json3;
-      const opencode = record2.opencode;
-      if (opencode && typeof opencode === "object") {
-        const entry = opencode;
-        for (const field of ["key", "apiKey", "token"]) {
-          const value = entry[field];
-          if (typeof value === "string" && value.trim())
-            return value.trim();
-        }
-      }
-      for (const value of Object.values(record2)) {
-        if (!value || typeof value !== "object")
-          continue;
-        const entry = value;
-        const key = entry.key ?? entry.apiKey ?? entry.token;
-        if (typeof key === "string" && key.trim()) {
-          const type = typeof entry.type === "string" ? entry.type.toLowerCase() : "";
-          if (!type || type.includes("api") || type.includes("key") || type === "opencode") {
-            return key.trim();
-          }
-        }
-      }
+      return json3;
     } catch {}
   }
   return null;
 }
+async function readOpenCodeCliAuthKeyForProvider(providerId) {
+  const record2 = await readOpenCodeCliAuthJson();
+  if (!record2)
+    return null;
+  return apiKeyFromOpenCodeAuthEntry(record2[providerId]);
+}
+async function readOpenCodeCliAuthKey() {
+  const record2 = await readOpenCodeCliAuthJson();
+  if (!record2)
+    return null;
+  const zen = apiKeyFromOpenCodeAuthEntry(record2.opencode);
+  if (zen)
+    return zen;
+  for (const value of Object.values(record2)) {
+    const key = apiKeyFromOpenCodeAuthEntry(value);
+    if (!key)
+      continue;
+    if (!value || typeof value !== "object")
+      continue;
+    const entry = value;
+    const type = typeof entry.type === "string" ? entry.type.toLowerCase() : "";
+    if (!type || type.includes("api") || type.includes("key") || type === "opencode") {
+      return key;
+    }
+  }
+  return null;
+}
 async function resolveOpenAiCompatibleKey(auth) {
   if (auth.apiKey?.trim())
     return auth.apiKey.trim();
@@ -57721,18 +57757,34 @@ function withOpenCodeRequestHooks(opts) {
   const fetchImpl = opts.fetchImpl ?? globalThis.fetch;
   return async (input, init) => {
     const headers = new Headers(init?.headers);
-    if (opts.authHeaders?.Authorization) {
-      headers.set("Authorization", opts.authHeaders.Authorization);
+    if (opts.authHeaders) {
+      for (const [key, value] of Object.entries(opts.authHeaders)) {
+        if (value)
+          headers.set(key, value);
+      }
     }
-    if (!opts.disableThinking || !init?.body || typeof init.body !== "string") {
+    if (opts.extraHeaders) {
+      for (const [key, value] of Object.entries(opts.extraHeaders)) {
+        if (value)
+          headers.set(key, value);
+      }
+    }
+    const rawBody = init?.body;
+    const shouldRewriteBody = (opts.disableThinking || Boolean(opts.stripResponseFormat)) && typeof rawBody === "string";
+    if (!shouldRewriteBody || typeof rawBody !== "string") {
       return fetchImpl(input, { ...init, headers });
     }
     try {
-      const parsed = JSON.parse(init.body);
+      const parsed = JSON.parse(rawBody);
       if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
         return fetchImpl(input, { ...init, headers });
       }
-      const body = { ...parsed, thinking: { type: "disabled" } };
+      const parsedBody = { ...parsed };
+      if (opts.disableThinking) {
+        parsedBody.thinking = { type: "disabled" };
+      }
+      const { response_format: _responseFormat, ...withoutFormat } = parsedBody;
+      const body = opts.stripResponseFormat ? withoutFormat : parsedBody;
       return fetchImpl(input, {
         ...init,
         headers,
@@ -96236,12 +96288,144 @@ var openaiDriver = {
   }
 };
 
+// src/domains/providers/drivers/opencode-config.ts
+import { homedir as homedir10 } from "os";
+import { join as join13 } from "path";
+var OPENAI_COMPATIBLE_PACKAGES = new Set([
+  "@ai-sdk/openai-compatible",
+  "@ai-sdk/openai",
+  "@ai-sdk/azure"
+]);
+function asRecord3(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return null;
+  return value;
+}
+function isOpenAiCompatibleNpm(npm) {
+  const trimmed = npm.trim();
+  if (!trimmed)
+    return true;
+  if (OPENAI_COMPATIBLE_PACKAGES.has(trimmed))
+    return true;
+  return trimmed.includes("openai-compatible");
+}
+function interpolateOpenCodeTemplate(value, env) {
+  return value.replace(/\{env:([A-Za-z_][A-Za-z0-9_]*)\}/g, (_full, name31) => {
+    return env[name31]?.trim() || process.env[name31]?.trim() || "";
+  }).trim();
+}
+function openCodeConfigPaths() {
+  const paths = [];
+  const xdg = process.env.XDG_CONFIG_HOME?.trim();
+  if (xdg)
+    paths.push(join13(xdg, "opencode", "opencode.json"));
+  paths.push(join13(homedir10(), ".config", "opencode", "opencode.json"));
+  return paths;
+}
+function parseOpenCodeCompatibleProvider(config2, providerId) {
+  const root = asRecord3(config2);
+  const providers2 = asRecord3(root?.provider);
+  const entry = asRecord3(providers2?.[providerId]);
+  if (!entry)
+    return null;
+  const npm = typeof entry.npm === "string" ? entry.npm : "";
+  if (!isOpenAiCompatibleNpm(npm))
+    return null;
+  const options = asRecord3(entry.options);
+  const baseURLRaw = typeof options?.baseURL === "string" ? options.baseURL.trim() : "";
+  if (!baseURLRaw)
+    return null;
+  const apiKeyTemplate = typeof options?.apiKey === "string" ? options.apiKey : null;
+  const headers = {};
+  const headerBag = asRecord3(options?.headers);
+  if (headerBag) {
+    for (const [key, value] of Object.entries(headerBag)) {
+      if (typeof value === "string" && value.trim())
+        headers[key] = value;
+    }
+  }
+  return {
+    providerId,
+    baseURL: baseURLRaw.replace(/\/$/, ""),
+    apiKeyTemplate,
+    headers
+  };
+}
+function resolveOpenCodeCompatibleAuth(input) {
+  const parsed = parseOpenCodeCompatibleProvider(input.config, input.providerId);
+  const override = input.overrideBaseUrl?.trim().replace(/\/$/, "") || null;
+  if (!parsed && !(override && input.providerId === "litellm"))
+    return null;
+  const baseURL = override || parsed?.baseURL || null;
+  if (!baseURL)
+    return null;
+  const headers = {};
+  if (parsed) {
+    for (const [key, value] of Object.entries(parsed.headers)) {
+      const interpolated = interpolateOpenCodeTemplate(value, input.env);
+      if (interpolated)
+        headers[key] = interpolated;
+    }
+  }
+  const fromTemplate = parsed?.apiKeyTemplate ? interpolateOpenCodeTemplate(parsed.apiKeyTemplate, input.env) : "";
+  const envKeyName = `${input.providerId.replace(/-/g, "_").toUpperCase()}_API_KEY`;
+  const apiKey = fromTemplate || input.env[envKeyName]?.trim() || process.env[envKeyName]?.trim() || input.storedKey?.trim() || null;
+  return { baseURL, apiKey, headers };
+}
+async function loadOpenCodeUserConfig() {
+  for (const path of openCodeConfigPaths()) {
+    try {
+      const file2 = Bun.file(path);
+      if (!await file2.exists())
+        continue;
+      return await file2.json();
+    } catch {}
+  }
+  return null;
+}
+
 // src/domains/providers/drivers/opencode.ts
-var OPENCODE_FREE_MODEL_IDS = new Set(["big-pickle"]);
 var OPENCODE_DEFAULT_VISION_MODEL = "mimo-v2.5-free";
-function isOpenCodeFreeModel(id) {
-  const normalized = id.trim().toLowerCase();
-  return OPENCODE_FREE_MODEL_IDS.has(normalized) || normalized.endsWith("-free");
+var OPENCODE_PROVIDER_LABELS = {
+  "amazon-bedrock": "Amazon Bedrock",
+  anthropic: "Anthropic",
+  azure: "Azure OpenAI",
+  "github-copilot": "GitHub Copilot",
+  google: "Google",
+  "google-vertex": "Google Vertex AI",
+  groq: "Groq",
+  litellm: "LiteLLM",
+  ollama: "Ollama",
+  openai: "OpenAI",
+  opencode: "OpenCode Zen",
+  "opencode-go": "OpenCode Go",
+  openrouter: "OpenRouter",
+  xai: "xAI",
+  zenmux: "ZenMux"
+};
+function humanizeOpenCodeProvider(providerId) {
+  const known = OPENCODE_PROVIDER_LABELS[providerId];
+  if (known)
+    return known;
+  return providerId.split(/[-_]/).filter(Boolean).map((part) => {
+    if (part.toLowerCase() === "ai")
+      return "AI";
+    return part.charAt(0).toUpperCase() + part.slice(1);
+  }).join(" ");
+}
+function parseOpenCodeModelSlug(slug) {
+  const trimmed = slug.trim();
+  const sep = trimmed.indexOf("/");
+  if (sep <= 0 || sep === trimmed.length - 1) {
+    return { providerId: "opencode", modelId: trimmed };
+  }
+  return {
+    providerId: trimmed.slice(0, sep),
+    modelId: trimmed.slice(sep + 1)
+  };
+}
+function isOpenCodeZenModel(slug) {
+  return parseOpenCodeModelSlug(slug).providerId === "opencode";
 }
 function humanizeModelId(id) {
   return id.split(/[-_]/).filter(Boolean).map((part) => {
@@ -96252,11 +96436,13 @@ function humanizeModelId(id) {
     return part.charAt(0).toUpperCase() + part.slice(1);
   }).join(" ");
 }
-function toOpenCodeModelEntry(id) {
+function toOpenCodeModelEntry(slug) {
+  const trimmed = slug.trim();
+  const { providerId, modelId } = parseOpenCodeModelSlug(trimmed);
   return {
-    id,
-    name: humanizeModelId(id),
-    tier: isOpenCodeFreeModel(id) ? "free" : "paid"
+    id: trimmed,
+    name: humanizeModelId(modelId),
+    provider: humanizeOpenCodeProvider(providerId)
   };
 }
 function openCodeServerAuthHeaders(password) {
@@ -96270,18 +96456,14 @@ function resolveOpenCodeServerPassword(env) {
   return env.OPENCODE_SERVER_PASSWORD?.trim() || env.SERVER_PASSWORD?.trim() || process.env.OPENCODE_SERVER_PASSWORD?.trim() || process.env.SERVER_PASSWORD?.trim() || null;
 }
 function stripOpenCodeModelSlug(slug) {
-  const trimmed = slug.trim();
-  const sep = trimmed.indexOf("/");
-  if (sep <= 0 || sep === trimmed.length - 1)
-    return trimmed;
-  return trimmed.slice(sep + 1);
+  return parseOpenCodeModelSlug(slug).modelId;
 }
 function parseModelsPayload(json3) {
   const models = [];
   if (json3 && typeof json3 === "object" && "data" in json3 && Array.isArray(json3.data)) {
     for (const item of json3.data) {
       if (item && typeof item === "object" && "id" in item && typeof item.id === "string") {
-        models.push(toOpenCodeModelEntry(stripOpenCodeModelSlug(item.id)));
+        models.push(toOpenCodeModelEntry(item.id));
       }
     }
   }
@@ -96310,44 +96492,84 @@ async function listOpenCodeModelsFromCli(binaryPath) {
     const slug = line.trim();
     if (!slug || /\s/.test(slug))
       continue;
-    const id = stripOpenCodeModelSlug(slug);
-    if (!id || seen.has(id))
+    if (seen.has(slug))
       continue;
-    seen.add(id);
-    models.push(toOpenCodeModelEntry(id));
+    seen.add(slug);
+    models.push(toOpenCodeModelEntry(slug));
   }
   return {
     models,
     detail: `${models.length} models from opencode CLI`
   };
 }
+async function resolveCompatibleOpenCodeVision(providerId, auth) {
+  const config2 = await loadOpenCodeUserConfig();
+  const storedKey = await readOpenCodeCliAuthKeyForProvider(providerId);
+  return resolveOpenCodeCompatibleAuth({
+    providerId,
+    config: config2,
+    env: auth.env,
+    storedKey,
+    overrideBaseUrl: auth.baseUrl
+  });
+}
 var opencodeDriver = {
   kind: "opencode",
   label: "OpenCode",
-  description: "OpenCode Zen (OpenAI-compatible). Paste a Zen API key for vision runs.",
+  description: "OpenCode Zen or LiteLLM (OpenAI-compatible). Paste a Zen API key for Zen; LiteLLM uses opencode.json.",
   defaultBinary: "opencode",
   authModes: ["cli", "api_key"],
-  envHints: ["OPENCODE_API_KEY", "OPENCODE_ZEN_API_KEY", "OPENCODE_SERVER_PASSWORD"],
-  loginInstructions: "Paste a Zen API key from https://opencode.ai for vision. Local `opencode serve` is not OpenAI-compatible.",
+  envHints: [
+    "OPENCODE_API_KEY",
+    "OPENCODE_ZEN_API_KEY",
+    "OPENCODE_SERVER_PASSWORD",
+    "LITELLM_API_KEY"
+  ],
+  loginInstructions: "Paste a Zen API key from https://opencode.ai for Zen vision. LiteLLM uses ~/.config/opencode/opencode.json plus CLI auth or LITELLM_API_KEY. Local `opencode serve` is not OpenAI-compatible.",
   capabilities: { vision: true },
   vision: createSdkVisionPort({
     label: "OpenCode",
     defaultModel: OPENCODE_DEFAULT_VISION_MODEL,
     createModel: async (auth, modelId) => {
-      const apiKey = await resolveOpenAiCompatibleKey(auth);
-      if (!apiKey) {
-        throw new AgentProviderError("OpenCode vision needs a Zen API key. Local `opencode serve` returns a web UI for /v1 (not chat completions). Paste a key from https://opencode.ai in Settings \u2192 Provider, or set OPENCODE_API_KEY.");
+      if (isOpenCodeZenModel(modelId)) {
+        const apiKey = await resolveOpenAiCompatibleKey(auth);
+        if (!apiKey) {
+          throw new AgentProviderError("OpenCode vision needs a Zen API key. Local `opencode serve` returns a web UI for /v1 (not chat completions). Paste a key from https://opencode.ai in Settings \u2192 Provider, or set OPENCODE_API_KEY.");
+        }
+        const baseURL = auth.baseUrl?.trim().replace(/\/$/, "") || "https://opencode.ai/zen/v1";
+        return createOpenAI({
+          apiKey,
+          baseURL,
+          name: "opencode",
+          fetch: withOpenCodeRequestHooks({
+            disableThinking: true,
+            authHeaders: null
+          })
+        }).chat(stripOpenCodeModelSlug(modelId));
+      }
+      const { providerId } = parseOpenCodeModelSlug(modelId);
+      const providerLabel = humanizeOpenCodeProvider(providerId);
+      const compatible = await resolveCompatibleOpenCodeVision(providerId, auth);
+      if (compatible?.apiKey) {
+        return createOpenAI({
+          apiKey: compatible.apiKey,
+          baseURL: compatible.baseURL,
+          name: providerId,
+          fetch: withOpenCodeRequestHooks({
+            disableThinking: false,
+            stripResponseFormat: true,
+            authHeaders: null,
+            extraHeaders: Object.keys(compatible.headers).length > 0 ? compatible.headers : null
+          })
+        }).chat(stripOpenCodeModelSlug(modelId));
       }
-      const baseURL = auth.baseUrl?.trim().replace(/\/$/, "") || "https://opencode.ai/zen/v1";
-      return createOpenAI({
-        apiKey,
-        baseURL,
-        name: "opencode",
-        fetch: withOpenCodeRequestHooks({
-          disableThinking: true,
-          authHeaders: null
-        })
-      }).chat(modelId);
+      if (compatible && !compatible.apiKey) {
+        throw new AgentProviderError(`${providerLabel} vision needs an API key. OpenCode stores it in auth.json after login, or set ${providerId.replace(/-/g, "_").toUpperCase()}_API_KEY in Settings \u2192 Provider.`);
+      }
+      if (providerId === "litellm") {
+        throw new AgentProviderError("Yoqa vision can use LiteLLM via OpenCode. Add provider.litellm.options.baseURL in ~/.config/opencode/opencode.json, then pick litellm/\u2026 in Settings \u2192 Provider.");
+      }
+      throw new AgentProviderError(`Yoqa vision uses OpenCode Zen or LiteLLM. "${modelId}" is a ${providerLabel} model. Pick an OpenCode Zen or LiteLLM model in Settings \u2192 Provider.`);
     }
   }),
   async probe(binaryPath) {
@@ -96438,6 +96660,10 @@ var opencodeDriver = {
   async listModels(input) {
     const key = resolveOpenCodeKey(input);
     const serverUrl = input.serverUrl?.trim() || null;
+    const cli = await listOpenCodeModelsFromCli(input.binaryPath);
+    if (cli.models.length > 0) {
+      return { models: cli.models, message: cli.detail };
+    }
     if (serverUrl) {
       try {
         const password = resolveOpenCodeServerPassword(input.env);
@@ -96463,14 +96689,10 @@ var opencodeDriver = {
         label: "OpenCode"
       });
       return {
-        models: (result.models ?? []).map((id) => toOpenCodeModelEntry(stripOpenCodeModelSlug(id))),
+        models: (result.models ?? []).map((id) => toOpenCodeModelEntry(id)),
         message: result.ok ? `${result.models?.length ?? 0} models available` : result.message
       };
     }
-    const cli = await listOpenCodeModelsFromCli(input.binaryPath);
-    if (cli.models.length > 0) {
-      return { models: cli.models, message: cli.detail };
-    }
     return {
       models: [],
       message: "Add OPENCODE_API_KEY, a server URL, or install the opencode CLI to list models"
@@ -96543,10 +96765,10 @@ import {
   randomBytes
 } from "crypto";
 import { chmodSync, existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync, writeFileSync } from "fs";
-import { homedir as homedir10 } from "os";
-import { dirname as dirname3, join as join13 } from "path";
-var YOQA_ROOT5 = join13(homedir10(), ".yoqa");
-var KEY_PATH = join13(YOQA_ROOT5, ".provider-key");
+import { homedir as homedir11 } from "os";
+import { dirname as dirname3, join as join14 } from "path";
+var YOQA_ROOT5 = join14(homedir11(), ".yoqa");
+var KEY_PATH = join14(YOQA_ROOT5, ".provider-key");
 var ALGORITHM = "aes-256-gcm";
 var IV_LENGTH = 12;
 var KEY_LENGTH = 32;

package/package.json

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