@yoqa/runner 0.3.17 → 0.3.19

package/dist/index.js

@@ -16801,7 +16801,7 @@ function getCatalogDb() {
 // package.json
 var package_default = {
   name: "@yoqa/runner",
-  version: "0.3.17",
+  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",
@@ -16896,11 +16896,458 @@ function abortAllMjpegProxies() {
 import { mkdir as mkdir3 } from "fs/promises";
 import { createServer as createServer2 } from "net";
 import { homedir as homedir6 } from "os";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 import { remote } from "webdriverio";
-var YOQA_ROOT4 = join6(homedir6(), ".yoqa");
+
+// src/domains/devices/application.ts
+import { mkdtemp as mkdtemp2, readFile, rm as rm2 } from "fs/promises";
+import { tmpdir as tmpdir2 } from "os";
+import { join as join6 } from "path";
+
+// src/domains/devices/android-identity.ts
+function matchAndroidAppiumIdentity(deviceId, connected, knownAvds = []) {
+  const id = deviceId.trim();
+  if (!id)
+    return {};
+  const bySerial = connected.find((device) => device.serial === id);
+  if (bySerial) {
+    return {
+      udid: bySerial.serial,
+      ...bySerial.avdName ? { avd: bySerial.avdName } : {}
+    };
+  }
+  const byAvd = connected.find((device) => device.avdName === id);
+  if (byAvd) {
+    return { udid: byAvd.serial, avd: byAvd.avdName ?? id };
+  }
+  if (knownAvds.includes(id)) {
+    return { avd: id };
+  }
+  return { udid: id };
+}
+function parseAdbEmuAvdName(stdout) {
+  const name = stdout.split(/\r?\n/).map((line) => line.trim()).find((line) => line && line !== "OK");
+  return name || null;
+}
+
+// src/domains/devices/application.ts
+async function runCommand3(command, options) {
+  try {
+    const proc = Bun.spawn(command, {
+      env: options?.env ? { ...process.env, ...options.env } : process.env,
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const [stdout, stderr, exitCode] = await Promise.all([
+      new Response(proc.stdout).text(),
+      new Response(proc.stderr).text(),
+      proc.exited
+    ]);
+    return { stdout, stderr, exitCode };
+  } catch {
+    return { stdout: "", stderr: `failed to spawn: ${command[0]}`, exitCode: 127 };
+  }
+}
+function androidSdkRoot() {
+  return resolveAndroidSdkRoot();
+}
+async function resolveTool(candidates) {
+  for (const candidate of candidates) {
+    if (!candidate)
+      continue;
+    const { exitCode } = await runCommand3(["test", "-x", candidate]);
+    if (exitCode === 0)
+      return candidate;
+  }
+  return null;
+}
+async function resolveAdb() {
+  const sdk = androidSdkRoot();
+  return resolveTool([...sdk ? [join6(sdk, "platform-tools/adb")] : [], "adb"]);
+}
+async function resolveEmulator() {
+  const sdk = androidSdkRoot();
+  return resolveTool([...sdk ? [join6(sdk, "emulator/emulator")] : [], "emulator"]);
+}
+function formatIosVersion(version2) {
+  const trimmed = version2.trim();
+  if (!trimmed)
+    return "iOS";
+  if (/^iOS\b/i.test(trimmed))
+    return trimmed;
+  return `iOS ${trimmed}`;
+}
+function formatAndroidVersion(apiOrVersion) {
+  const trimmed = apiOrVersion.trim();
+  if (!trimmed)
+    return "Android";
+  if (/^Android\b/i.test(trimmed))
+    return trimmed;
+  if (/^API\b/i.test(trimmed))
+    return trimmed;
+  if (/^\d+(\.\d+)?$/.test(trimmed))
+    return `API ${trimmed}`;
+  return `Android ${trimmed}`;
+}
+function titleCaseWords(value) {
+  return value.split(/\s+/).filter(Boolean).map((word) => {
+    if (/^[a-z]$/i.test(word))
+      return word.toUpperCase();
+    if (/^\d/.test(word))
+      return word;
+    return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
+  }).join(" ");
+}
+function runtimeVersionFromIdentifier(runtimeId) {
+  const match = runtimeId.match(/iOS-([\d-]+)$/i);
+  if (!match?.[1])
+    return "iOS";
+  return formatIosVersion(match[1].replace(/-/g, "."));
+}
+async function listIosSimulators(includeUnavailable) {
+  const { stdout, exitCode } = await runCommand3([
+    "xcrun",
+    "simctl",
+    "list",
+    "devices",
+    "available",
+    "-j"
+  ]);
+  if (exitCode !== 0)
+    return [];
+  let parsed;
+  try {
+    parsed = JSON.parse(stdout);
+  } catch {
+    return [];
+  }
+  const devices = [];
+  for (const [runtimeId, runtimeDevices] of Object.entries(parsed.devices ?? {})) {
+    if (!/iOS/i.test(runtimeId))
+      continue;
+    const osVersion = runtimeVersionFromIdentifier(runtimeId);
+    for (const device of runtimeDevices) {
+      if (!device.udid || !device.name)
+        continue;
+      if (device.isAvailable === false)
+        continue;
+      const state = device.state ?? "Unknown";
+      if (!includeUnavailable && state !== "Booted")
+        continue;
+      devices.push({
+        id: device.udid,
+        name: device.name,
+        osVersion,
+        platform: "ios",
+        kind: "simulator",
+        state,
+        model: device.deviceTypeIdentifier?.split(".").pop()?.replace(/-/g, " ")
+      });
+    }
+  }
+  return devices.sort((a, b) => {
+    if (a.state === "Booted" && b.state !== "Booted")
+      return -1;
+    if (b.state === "Booted" && a.state !== "Booted")
+      return 1;
+    return a.name.localeCompare(b.name);
+  });
+}
+function isPhoneOrTablet(deviceType) {
+  if (!deviceType)
+    return false;
+  return /^(iPhone|iPad)$/i.test(deviceType);
+}
+function physicalIosState(connection) {
+  const tunnel = connection?.tunnelState?.toLowerCase() ?? "";
+  if (tunnel.includes("connected"))
+    return "connected";
+  if (tunnel.includes("unavailable"))
+    return "unavailable";
+  if (tunnel.includes("disconnected"))
+    return "disconnected";
+  if (connection?.pairingState === "paired")
+    return "paired";
+  return tunnel || connection?.pairingState || "unknown";
+}
+async function listIosPhysicalDevices(includeUnavailable) {
+  const dir = await mkdtemp2(join6(tmpdir2(), "yoqa-devices-"));
+  const jsonPath = join6(dir, "devices.json");
+  try {
+    const { exitCode } = await runCommand3([
+      "xcrun",
+      "devicectl",
+      "list",
+      "devices",
+      "--json-output",
+      jsonPath
+    ]);
+    if (exitCode !== 0)
+      return [];
+    let parsed;
+    try {
+      parsed = JSON.parse(await readFile(jsonPath, "utf8"));
+    } catch {
+      return [];
+    }
+    const devices = [];
+    for (const item of parsed.result?.devices ?? []) {
+      const hardware = item.hardwareProperties;
+      const props = item.deviceProperties;
+      if (!hardware?.udid)
+        continue;
+      if (hardware.reality && hardware.reality !== "physical")
+        continue;
+      if (!isPhoneOrTablet(hardware.deviceType))
+        continue;
+      if (hardware.platform && !/^iOS$/i.test(hardware.platform))
+        continue;
+      const state = physicalIosState(item.connectionProperties);
+      if (!includeUnavailable && state === "unavailable")
+        continue;
+      const modelName = hardware.marketingName ?? hardware.productType ?? "iPhone";
+      const owner = props?.name?.trim() || undefined;
+      devices.push({
+        id: hardware.udid,
+        name: modelName,
+        owner,
+        osVersion: formatIosVersion(props?.osVersionNumber ?? ""),
+        platform: "ios",
+        kind: "physical",
+        state,
+        model: hardware.productType
+      });
+    }
+    return devices.sort((a, b) => a.name.localeCompare(b.name));
+  } finally {
+    await rm2(dir, { recursive: true, force: true });
+  }
+}
+async function listIosDevices(options = {}) {
+  const includeUnavailable = options.includeUnavailable ?? true;
+  const [physical, simulators] = await Promise.all([
+    listIosPhysicalDevices(includeUnavailable),
+    listIosSimulators(includeUnavailable)
+  ]);
+  return [...physical, ...simulators];
+}
+function parseAdbDevices(output) {
+  const lines = output.split(`
+`).map((line) => line.trim()).filter(Boolean);
+  const results = [];
+  for (const line of lines) {
+    if (line.startsWith("List of devices"))
+      continue;
+    const parts = line.split(/\s+/);
+    const serial = parts[0];
+    const state = parts[1];
+    if (!serial || !state)
+      continue;
+    const meta = {};
+    for (const part of parts.slice(2)) {
+      const eq2 = part.indexOf(":");
+      if (eq2 <= 0)
+        continue;
+      meta[part.slice(0, eq2)] = part.slice(eq2 + 1);
+    }
+    results.push({
+      serial,
+      state,
+      product: meta.product,
+      model: meta.model,
+      device: meta.device,
+      transportId: meta.transport_id
+    });
+  }
+  return results;
+}
+function humanizeAvdName(avdName) {
+  return titleCaseWords(avdName.replace(/_/g, " "));
+}
+function humanizeModel(model) {
+  if (!model)
+    return;
+  return titleCaseWords(model.replace(/_/g, " "));
+}
+async function findAvdConfigPath(avdName) {
+  const home = process.env.HOME ?? "";
+  const roots = [join6(home, ".android/avd"), join6(home, "Library/Android/sdk/.android/avd")];
+  for (const root of roots) {
+    const direct = join6(root, `${avdName}.avd`, "config.ini");
+    try {
+      await readFile(direct, "utf8");
+      return direct;
+    } catch {}
+    try {
+      const glob = new Bun.Glob("*.avd/config.ini");
+      for await (const match of glob.scan({ cwd: root, onlyFiles: true })) {
+        const path = join6(root, match);
+        const text2 = await readFile(path, "utf8");
+        const idLine = text2.split(`
+`).find((line) => line.startsWith("AvdId="));
+        const id = idLine?.slice("AvdId=".length).trim();
+        if (id === avdName)
+          return path;
+      }
+    } catch {}
+  }
+  return null;
+}
+async function readAvdConfig(avdName) {
+  const path = await findAvdConfigPath(avdName);
+  if (!path)
+    return { api: null, deviceName: null };
+  try {
+    const text2 = await readFile(path, "utf8");
+    const imageLine = text2.split(`
+`).find((line) => line.includes("system-images") && line.includes("android-"));
+    const apiMatch = imageLine?.match(/android-([\d.]+)/);
+    const deviceLine = text2.split(`
+`).find((entry) => entry.startsWith("hw.device.name="));
+    const deviceRaw = deviceLine?.slice("hw.device.name=".length).trim();
+    return {
+      api: apiMatch?.[1] ?? null,
+      deviceName: humanizeModel(deviceRaw) ?? null
+    };
+  } catch {
+    return { api: null, deviceName: null };
+  }
+}
+async function adbAvdName(adb, serial) {
+  const fromProp = await adbGetProp(adb, serial, "ro.boot.qemu.avd_name") ?? await adbGetProp(adb, serial, "ro.kernel.qemu.avd_name");
+  if (fromProp)
+    return fromProp;
+  const { stdout, exitCode } = await runCommand3([adb, "-s", serial, "emu", "avd", "name"]);
+  if (exitCode !== 0)
+    return null;
+  return parseAdbEmuAvdName(stdout);
+}
+async function adbGetProp(adb, serial, prop) {
+  const { stdout, exitCode } = await runCommand3([adb, "-s", serial, "shell", "getprop", prop]);
+  if (exitCode !== 0)
+    return null;
+  const value = stdout.trim();
+  return value || null;
+}
+async function listAndroidAdbDevices(adb) {
+  const { stdout, exitCode } = await runCommand3([adb, "devices", "-l"]);
+  if (exitCode !== 0) {
+    return { physical: [], runningEmulators: [], runningAvdNames: new Set };
+  }
+  const entries = parseAdbDevices(stdout);
+  const physical = [];
+  const runningEmulators = [];
+  const runningAvdNames = new Set;
+  for (const entry of entries) {
+    const isEmulator = entry.serial.startsWith("emulator-") || entry.product === "sdk_gphone";
+    if (isEmulator) {
+      const avdName = await adbAvdName(adb, entry.serial);
+      if (avdName)
+        runningAvdNames.add(avdName);
+      const avdConfig = avdName ? await readAvdConfig(avdName) : null;
+      const release2 = await adbGetProp(adb, entry.serial, "ro.build.version.release") ?? avdConfig?.api ?? null;
+      const model2 = humanizeModel(entry.model) ?? avdConfig?.deviceName ?? (avdName ? humanizeAvdName(avdName) : entry.serial);
+      runningEmulators.push({
+        id: avdName ?? entry.serial,
+        name: model2,
+        osVersion: formatAndroidVersion(release2 ?? ""),
+        platform: "android",
+        kind: "emulator",
+        state: entry.state === "device" ? "online" : entry.state,
+        model: avdName ?? entry.model
+      });
+      continue;
+    }
+    const release = await adbGetProp(adb, entry.serial, "ro.build.version.release");
+    const model = humanizeModel(entry.model) ?? await adbGetProp(adb, entry.serial, "ro.product.model") ?? entry.serial;
+    physical.push({
+      id: entry.serial,
+      name: model,
+      osVersion: formatAndroidVersion(release ?? ""),
+      platform: "android",
+      kind: "physical",
+      state: entry.state,
+      model: entry.model
+    });
+  }
+  return { physical, runningEmulators, runningAvdNames };
+}
+async function listAndroidAvds(emulatorBin, runningAvdNames, includeUnavailable) {
+  const { stdout, exitCode } = await runCommand3([emulatorBin, "-list-avds"]);
+  if (exitCode !== 0)
+    return [];
+  const names = stdout.split(`
+`).map((line) => line.trim()).filter(Boolean);
+  const devices = [];
+  for (const avdName of names) {
+    const isRunning = runningAvdNames.has(avdName);
+    if (!includeUnavailable && !isRunning)
+      continue;
+    if (isRunning)
+      continue;
+    const { api, deviceName } = await readAvdConfig(avdName);
+    devices.push({
+      id: avdName,
+      name: deviceName ?? humanizeAvdName(avdName),
+      osVersion: formatAndroidVersion(api ?? ""),
+      platform: "android",
+      kind: "emulator",
+      state: "offline",
+      model: avdName
+    });
+  }
+  return devices;
+}
+async function resolveAndroidAppiumIdentity(deviceId) {
+  const [adb, emulatorBin] = await Promise.all([resolveAdb(), resolveEmulator()]);
+  const connected = [];
+  if (adb) {
+    const { stdout, exitCode } = await runCommand3([adb, "devices", "-l"]);
+    if (exitCode === 0) {
+      for (const entry of parseAdbDevices(stdout)) {
+        const isEmulator = entry.serial.startsWith("emulator-") || entry.product === "sdk_gphone";
+        connected.push({
+          serial: entry.serial,
+          avdName: isEmulator ? await adbAvdName(adb, entry.serial) : null
+        });
+      }
+    }
+  }
+  const knownAvds = [];
+  if (emulatorBin) {
+    const { stdout, exitCode } = await runCommand3([emulatorBin, "-list-avds"]);
+    if (exitCode === 0) {
+      knownAvds.push(...stdout.split(`
+`).map((line) => line.trim()).filter(Boolean));
+    }
+  }
+  return matchAndroidAppiumIdentity(deviceId, connected, knownAvds);
+}
+async function listAndroidDevices(options = {}) {
+  const includeUnavailable = options.includeUnavailable ?? true;
+  const [adb, emulatorBin] = await Promise.all([resolveAdb(), resolveEmulator()]);
+  const adbResult = adb ? await listAndroidAdbDevices(adb) : { physical: [], runningEmulators: [], runningAvdNames: new Set };
+  const offlineAvds = emulatorBin != null ? await listAndroidAvds(emulatorBin, adbResult.runningAvdNames, includeUnavailable) : [];
+  const physical = includeUnavailable ? adbResult.physical : adbResult.physical.filter((device) => device.state === "device");
+  const emulators = [...adbResult.runningEmulators, ...offlineAvds].sort((a, b) => {
+    const aOnline = a.state === "online" ? 0 : 1;
+    const bOnline = b.state === "online" ? 0 : 1;
+    if (aOnline !== bOnline)
+      return aOnline - bOnline;
+    return a.name.localeCompare(b.name);
+  });
+  return [...physical, ...emulators];
+}
+async function listDevices(platform, options = {}) {
+  if (platform === "ios")
+    return listIosDevices(options);
+  return listAndroidDevices(options);
+}
+
+// src/domains/devices/session.ts
+var YOQA_ROOT4 = join7(homedir6(), ".yoqa");
 var DEFAULT_MJPEG_PORT = Number(process.env.YOQA_MJPEG_PORT ?? "9100");
-var SCREENSHOT_DIR = join6(YOQA_ROOT4, "runs", "screenshots");
+var SCREENSHOT_DIR = join7(YOQA_ROOT4, "runs", "screenshots");
 var MJPEG_SETTINGS_BASE = {
   mjpegServerScreenshotQuality: 35,
   mjpegScalingFactor: 50
@@ -17022,7 +17469,7 @@ function looksLikePhysicalIosUdid(udid) {
 }
 var PHYSICAL_IOS_SESSION_TIMEOUT_MS = 60000;
 var SIMULATOR_WDA_SESSION_TIMEOUT_MS = 600000;
-var SIMULATOR_WDA_DERIVED_DATA = join6(YOQA_ROOT4, "wda-sim");
+var SIMULATOR_WDA_DERIVED_DATA = join7(YOQA_ROOT4, "wda-sim");
 function iosSessionCreateTimeoutMs(deviceId) {
   return looksLikePhysicalIosUdid(deviceId) ? PHYSICAL_IOS_SESSION_TIMEOUT_MS : SIMULATOR_WDA_SESSION_TIMEOUT_MS;
 }
@@ -17033,18 +17480,17 @@ async function buildW3cCapabilities(options, mjpegPort) {
   const caps = {
     platformName,
     "appium:automationName": automationName,
-    "appium:udid": options.deviceId,
     "appium:newCommandTimeout": 3600,
     "appium:mjpegServerPort": mjpegPort,
     ...Object.fromEntries(Object.entries(merged).map(([key, value]) => key.includes(":") ? [key, value] : [`appium:${key}`, value]))
   };
-  if (options.platform === "ios" && options.bundleId && !caps["appium:bundleId"]) {
-    caps["appium:bundleId"] = options.bundleId;
-  }
-  if (options.platform === "android" && options.appPackage && !caps["appium:appPackage"]) {
-    caps["appium:appPackage"] = options.appPackage;
-  }
   if (options.platform === "ios") {
+    if (caps["appium:udid"] === undefined) {
+      caps["appium:udid"] = options.deviceId;
+    }
+    if (options.bundleId && !caps["appium:bundleId"]) {
+      caps["appium:bundleId"] = options.bundleId;
+    }
     const physical = looksLikePhysicalIosUdid(options.deviceId);
     if (physical) {
       const prep = await loadDevicePrep(options.deviceId);
@@ -17079,6 +17525,19 @@ async function buildW3cCapabilities(options, mjpegPort) {
       caps["appium:derivedDataPath"] = SIMULATOR_WDA_DERIVED_DATA;
     }
   }
+  if (options.platform === "android") {
+    const requested = String(caps["appium:udid"] ?? options.deviceId);
+    const identity = await resolveAndroidAppiumIdentity(requested);
+    if (identity.udid) {
+      caps["appium:udid"] = identity.udid;
+    }
+    if (identity.avd && caps["appium:avd"] === undefined) {
+      caps["appium:avd"] = identity.avd;
+    }
+    if (options.appPackage && !caps["appium:appPackage"]) {
+      caps["appium:appPackage"] = options.appPackage;
+    }
+  }
   return caps;
 }
 
@@ -17369,7 +17828,7 @@ async function createDeviceSession(options) {
   const screenshot = async () => {
     await mkdir3(SCREENSHOT_DIR, { recursive: true });
     const frame = await captureFrame();
-    const path = join6(SCREENSHOT_DIR, `shot_${Date.now()}_${crypto.randomUUID()}.png`);
+    const path = join7(SCREENSHOT_DIR, `shot_${Date.now()}_${crypto.randomUUID()}.png`);
     await Bun.write(path, Uint8Array.from(Buffer.from(frame.base64, "base64")));
     return { path, base64: frame.base64 };
   };
@@ -23799,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),
@@ -24193,8 +24652,13 @@ async function installBuildOnDevice(options) {
     }
     throw new Error(`Cannot install iOS build at ${build.path}. Use a .app on simulator or install .ipa via ideviceinstaller.`);
   }
+  const identity = await resolveAndroidAppiumIdentity(deviceId);
+  const serial = identity.udid;
+  if (!serial) {
+    throw new Error(`Android emulator ${deviceId} is not running. Boot it, then retry the install.`);
+  }
   const adb = Bun.which("adb") ?? "adb";
-  const proc = Bun.spawn([adb, "-s", deviceId, "install", "-r", build.path], {
+  const proc = Bun.spawn([adb, "-s", serial, "install", "-r", build.path], {
     stdout: "pipe",
     stderr: "pipe"
   });
@@ -25017,397 +25481,6 @@ function createCatalogRoutes() {
   return app;
 }
 
-// src/domains/devices/application.ts
-import { mkdtemp as mkdtemp2, readFile, rm as rm2 } from "fs/promises";
-import { tmpdir as tmpdir2 } from "os";
-import { join as join7 } from "path";
-async function runCommand3(command, options) {
-  try {
-    const proc = Bun.spawn(command, {
-      env: options?.env ? { ...process.env, ...options.env } : process.env,
-      stdout: "pipe",
-      stderr: "pipe"
-    });
-    const [stdout, stderr, exitCode] = await Promise.all([
-      new Response(proc.stdout).text(),
-      new Response(proc.stderr).text(),
-      proc.exited
-    ]);
-    return { stdout, stderr, exitCode };
-  } catch {
-    return { stdout: "", stderr: `failed to spawn: ${command[0]}`, exitCode: 127 };
-  }
-}
-function androidSdkRoot() {
-  return resolveAndroidSdkRoot();
-}
-async function resolveTool(candidates) {
-  for (const candidate of candidates) {
-    if (!candidate)
-      continue;
-    const { exitCode } = await runCommand3(["test", "-x", candidate]);
-    if (exitCode === 0)
-      return candidate;
-  }
-  return null;
-}
-async function resolveAdb() {
-  const sdk = androidSdkRoot();
-  return resolveTool([...sdk ? [join7(sdk, "platform-tools/adb")] : [], "adb"]);
-}
-async function resolveEmulator() {
-  const sdk = androidSdkRoot();
-  return resolveTool([...sdk ? [join7(sdk, "emulator/emulator")] : [], "emulator"]);
-}
-function formatIosVersion(version2) {
-  const trimmed = version2.trim();
-  if (!trimmed)
-    return "iOS";
-  if (/^iOS\b/i.test(trimmed))
-    return trimmed;
-  return `iOS ${trimmed}`;
-}
-function formatAndroidVersion(apiOrVersion) {
-  const trimmed = apiOrVersion.trim();
-  if (!trimmed)
-    return "Android";
-  if (/^Android\b/i.test(trimmed))
-    return trimmed;
-  if (/^API\b/i.test(trimmed))
-    return trimmed;
-  if (/^\d+(\.\d+)?$/.test(trimmed))
-    return `API ${trimmed}`;
-  return `Android ${trimmed}`;
-}
-function titleCaseWords(value) {
-  return value.split(/\s+/).filter(Boolean).map((word) => {
-    if (/^[a-z]$/i.test(word))
-      return word.toUpperCase();
-    if (/^\d/.test(word))
-      return word;
-    return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
-  }).join(" ");
-}
-function runtimeVersionFromIdentifier(runtimeId) {
-  const match2 = runtimeId.match(/iOS-([\d-]+)$/i);
-  if (!match2?.[1])
-    return "iOS";
-  return formatIosVersion(match2[1].replace(/-/g, "."));
-}
-async function listIosSimulators(includeUnavailable) {
-  const { stdout, exitCode } = await runCommand3([
-    "xcrun",
-    "simctl",
-    "list",
-    "devices",
-    "available",
-    "-j"
-  ]);
-  if (exitCode !== 0)
-    return [];
-  let parsed;
-  try {
-    parsed = JSON.parse(stdout);
-  } catch {
-    return [];
-  }
-  const devices = [];
-  for (const [runtimeId, runtimeDevices] of Object.entries(parsed.devices ?? {})) {
-    if (!/iOS/i.test(runtimeId))
-      continue;
-    const osVersion = runtimeVersionFromIdentifier(runtimeId);
-    for (const device of runtimeDevices) {
-      if (!device.udid || !device.name)
-        continue;
-      if (device.isAvailable === false)
-        continue;
-      const state = device.state ?? "Unknown";
-      if (!includeUnavailable && state !== "Booted")
-        continue;
-      devices.push({
-        id: device.udid,
-        name: device.name,
-        osVersion,
-        platform: "ios",
-        kind: "simulator",
-        state,
-        model: device.deviceTypeIdentifier?.split(".").pop()?.replace(/-/g, " ")
-      });
-    }
-  }
-  return devices.sort((a, b) => {
-    if (a.state === "Booted" && b.state !== "Booted")
-      return -1;
-    if (b.state === "Booted" && a.state !== "Booted")
-      return 1;
-    return a.name.localeCompare(b.name);
-  });
-}
-function isPhoneOrTablet(deviceType) {
-  if (!deviceType)
-    return false;
-  return /^(iPhone|iPad)$/i.test(deviceType);
-}
-function physicalIosState(connection) {
-  const tunnel = connection?.tunnelState?.toLowerCase() ?? "";
-  if (tunnel.includes("connected"))
-    return "connected";
-  if (tunnel.includes("unavailable"))
-    return "unavailable";
-  if (tunnel.includes("disconnected"))
-    return "disconnected";
-  if (connection?.pairingState === "paired")
-    return "paired";
-  return tunnel || connection?.pairingState || "unknown";
-}
-async function listIosPhysicalDevices(includeUnavailable) {
-  const dir = await mkdtemp2(join7(tmpdir2(), "yoqa-devices-"));
-  const jsonPath = join7(dir, "devices.json");
-  try {
-    const { exitCode } = await runCommand3([
-      "xcrun",
-      "devicectl",
-      "list",
-      "devices",
-      "--json-output",
-      jsonPath
-    ]);
-    if (exitCode !== 0)
-      return [];
-    let parsed;
-    try {
-      parsed = JSON.parse(await readFile(jsonPath, "utf8"));
-    } catch {
-      return [];
-    }
-    const devices = [];
-    for (const item of parsed.result?.devices ?? []) {
-      const hardware = item.hardwareProperties;
-      const props = item.deviceProperties;
-      if (!hardware?.udid)
-        continue;
-      if (hardware.reality && hardware.reality !== "physical")
-        continue;
-      if (!isPhoneOrTablet(hardware.deviceType))
-        continue;
-      if (hardware.platform && !/^iOS$/i.test(hardware.platform))
-        continue;
-      const state = physicalIosState(item.connectionProperties);
-      if (!includeUnavailable && state === "unavailable")
-        continue;
-      const modelName = hardware.marketingName ?? hardware.productType ?? "iPhone";
-      const owner = props?.name?.trim() || undefined;
-      devices.push({
-        id: hardware.udid,
-        name: modelName,
-        owner,
-        osVersion: formatIosVersion(props?.osVersionNumber ?? ""),
-        platform: "ios",
-        kind: "physical",
-        state,
-        model: hardware.productType
-      });
-    }
-    return devices.sort((a, b) => a.name.localeCompare(b.name));
-  } finally {
-    await rm2(dir, { recursive: true, force: true });
-  }
-}
-async function listIosDevices(options = {}) {
-  const includeUnavailable = options.includeUnavailable ?? true;
-  const [physical, simulators] = await Promise.all([
-    listIosPhysicalDevices(includeUnavailable),
-    listIosSimulators(includeUnavailable)
-  ]);
-  return [...physical, ...simulators];
-}
-function parseAdbDevices(output) {
-  const lines = output.split(`
-`).map((line) => line.trim()).filter(Boolean);
-  const results = [];
-  for (const line of lines) {
-    if (line.startsWith("List of devices"))
-      continue;
-    const parts = line.split(/\s+/);
-    const serial = parts[0];
-    const state = parts[1];
-    if (!serial || !state)
-      continue;
-    const meta = {};
-    for (const part of parts.slice(2)) {
-      const eq2 = part.indexOf(":");
-      if (eq2 <= 0)
-        continue;
-      meta[part.slice(0, eq2)] = part.slice(eq2 + 1);
-    }
-    results.push({
-      serial,
-      state,
-      product: meta.product,
-      model: meta.model,
-      device: meta.device,
-      transportId: meta.transport_id
-    });
-  }
-  return results;
-}
-function humanizeAvdName(avdName) {
-  return titleCaseWords(avdName.replace(/_/g, " "));
-}
-function humanizeModel(model) {
-  if (!model)
-    return;
-  return titleCaseWords(model.replace(/_/g, " "));
-}
-async function findAvdConfigPath(avdName) {
-  const home = process.env.HOME ?? "";
-  const roots = [join7(home, ".android/avd"), join7(home, "Library/Android/sdk/.android/avd")];
-  for (const root of roots) {
-    const direct = join7(root, `${avdName}.avd`, "config.ini");
-    try {
-      await readFile(direct, "utf8");
-      return direct;
-    } catch {}
-    try {
-      const glob = new Bun.Glob("*.avd/config.ini");
-      for await (const match2 of glob.scan({ cwd: root, onlyFiles: true })) {
-        const path = join7(root, match2);
-        const text2 = await readFile(path, "utf8");
-        const idLine = text2.split(`
-`).find((line) => line.startsWith("AvdId="));
-        const id = idLine?.slice("AvdId=".length).trim();
-        if (id === avdName)
-          return path;
-      }
-    } catch {}
-  }
-  return null;
-}
-async function readAvdConfig(avdName) {
-  const path = await findAvdConfigPath(avdName);
-  if (!path)
-    return { api: null, deviceName: null };
-  try {
-    const text2 = await readFile(path, "utf8");
-    const imageLine = text2.split(`
-`).find((line) => line.includes("system-images") && line.includes("android-"));
-    const apiMatch = imageLine?.match(/android-([\d.]+)/);
-    const deviceLine = text2.split(`
-`).find((entry) => entry.startsWith("hw.device.name="));
-    const deviceRaw = deviceLine?.slice("hw.device.name=".length).trim();
-    return {
-      api: apiMatch?.[1] ?? null,
-      deviceName: humanizeModel(deviceRaw) ?? null
-    };
-  } catch {
-    return { api: null, deviceName: null };
-  }
-}
-async function adbAvdName(adb, serial) {
-  const { stdout, exitCode } = await runCommand3([adb, "-s", serial, "emu", "avd", "name"]);
-  if (exitCode !== 0)
-    return null;
-  const name = stdout.trim().split(`
-`)[0]?.trim();
-  return name || null;
-}
-async function adbGetProp(adb, serial, prop) {
-  const { stdout, exitCode } = await runCommand3([adb, "-s", serial, "shell", "getprop", prop]);
-  if (exitCode !== 0)
-    return null;
-  const value = stdout.trim();
-  return value || null;
-}
-async function listAndroidAdbDevices(adb) {
-  const { stdout, exitCode } = await runCommand3([adb, "devices", "-l"]);
-  if (exitCode !== 0) {
-    return { physical: [], runningEmulators: [], runningAvdNames: new Set };
-  }
-  const entries = parseAdbDevices(stdout);
-  const physical = [];
-  const runningEmulators = [];
-  const runningAvdNames = new Set;
-  for (const entry of entries) {
-    const isEmulator = entry.serial.startsWith("emulator-") || entry.product === "sdk_gphone";
-    if (isEmulator) {
-      const avdName = await adbAvdName(adb, entry.serial);
-      if (avdName)
-        runningAvdNames.add(avdName);
-      const avdConfig = avdName ? await readAvdConfig(avdName) : null;
-      const release2 = await adbGetProp(adb, entry.serial, "ro.build.version.release") ?? avdConfig?.api ?? null;
-      const model2 = humanizeModel(entry.model) ?? avdConfig?.deviceName ?? (avdName ? humanizeAvdName(avdName) : entry.serial);
-      runningEmulators.push({
-        id: avdName ?? entry.serial,
-        name: model2,
-        osVersion: formatAndroidVersion(release2 ?? ""),
-        platform: "android",
-        kind: "emulator",
-        state: entry.state === "device" ? "online" : entry.state,
-        model: avdName ?? entry.model
-      });
-      continue;
-    }
-    const release = await adbGetProp(adb, entry.serial, "ro.build.version.release");
-    const model = humanizeModel(entry.model) ?? await adbGetProp(adb, entry.serial, "ro.product.model") ?? entry.serial;
-    physical.push({
-      id: entry.serial,
-      name: model,
-      osVersion: formatAndroidVersion(release ?? ""),
-      platform: "android",
-      kind: "physical",
-      state: entry.state,
-      model: entry.model
-    });
-  }
-  return { physical, runningEmulators, runningAvdNames };
-}
-async function listAndroidAvds(emulatorBin, runningAvdNames, includeUnavailable) {
-  const { stdout, exitCode } = await runCommand3([emulatorBin, "-list-avds"]);
-  if (exitCode !== 0)
-    return [];
-  const names = stdout.split(`
-`).map((line) => line.trim()).filter(Boolean);
-  const devices = [];
-  for (const avdName of names) {
-    const isRunning = runningAvdNames.has(avdName);
-    if (!includeUnavailable && !isRunning)
-      continue;
-    if (isRunning)
-      continue;
-    const { api, deviceName } = await readAvdConfig(avdName);
-    devices.push({
-      id: avdName,
-      name: deviceName ?? humanizeAvdName(avdName),
-      osVersion: formatAndroidVersion(api ?? ""),
-      platform: "android",
-      kind: "emulator",
-      state: "offline",
-      model: avdName
-    });
-  }
-  return devices;
-}
-async function listAndroidDevices(options = {}) {
-  const includeUnavailable = options.includeUnavailable ?? true;
-  const [adb, emulatorBin] = await Promise.all([resolveAdb(), resolveEmulator()]);
-  const adbResult = adb ? await listAndroidAdbDevices(adb) : { physical: [], runningEmulators: [], runningAvdNames: new Set };
-  const offlineAvds = emulatorBin != null ? await listAndroidAvds(emulatorBin, adbResult.runningAvdNames, includeUnavailable) : [];
-  const physical = includeUnavailable ? adbResult.physical : adbResult.physical.filter((device) => device.state === "device");
-  const emulators = [...adbResult.runningEmulators, ...offlineAvds].sort((a, b) => {
-    const aOnline = a.state === "online" ? 0 : 1;
-    const bOnline = b.state === "online" ? 0 : 1;
-    if (aOnline !== bOnline)
-      return aOnline - bOnline;
-    return a.name.localeCompare(b.name);
-  });
-  return [...physical, ...emulators];
-}
-async function listDevices(platform, options = {}) {
-  if (platform === "ios")
-    return listIosDevices(options);
-  return listAndroidDevices(options);
-}
-
 // src/interfaces/http/devices.ts
 function createDevicesRoutes() {
   const app = new Hono2;
@@ -57472,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).`;
   }
@@ -57505,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 {
@@ -57513,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",
@@ -57529,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);
     }
   };
@@ -57571,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();
@@ -57648,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.extraHeaders) {
+      for (const [key, value] of Object.entries(opts.extraHeaders)) {
+        if (value)
+          headers.set(key, value);
+      }
     }
-    if (!opts.disableThinking || !init?.body || typeof init.body !== "string") {
+    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,
@@ -96163,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) => {
@@ -96179,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) {
@@ -96197,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));
       }
     }
   }
@@ -96237,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) {
@@ -96365,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);
@@ -96390,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"
@@ -96470,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;