farai 0.3.6 → 0.3.7

package/dist/cli/index.js

@@ -6490,6 +6490,8 @@ function ensureDefaultConfig() {
       servers[id2] = defaults[id2];
     if (needsMigration && isLegacyPwnoMcpDefault(servers["pwno-mcp"]))
       delete servers["pwno-mcp"];
+    if (needsMigration && isLegacyDefaultPlaywright(servers["playwright"]))
+      servers["playwright"] = defaults["playwright"];
     writeConfig({
       ...current,
       configVersion: CURRENT_CONFIG_VERSION,
@@ -6506,10 +6508,21 @@ function isLegacyPwnoMcpDefault(entry) {
     return false;
   return entry.args.includes("ghcr.io/pwno-io/pwno-mcp:v0.2.1") && entry.args.includes("--stdio");
 }
+function isLegacyDefaultPlaywright(entry) {
+  if (!entry || entry.command !== "playwright-mcp" || !Array.isArray(entry.args))
+    return false;
+  const args = entry.args.map(String);
+  if (!args.includes("--headless"))
+    return false;
+  const execIndex = args.indexOf("--executable-path");
+  if (execIndex >= 0 && args[execIndex + 1] && args[execIndex + 1] !== "/usr/bin/chromium")
+    return false;
+  return true;
+}
 function positiveInteger(value) {
   return typeof value === "number" && Number.isInteger(value) && value >= 0 ? value : undefined;
 }
-var DEFAULT_TRANSPARENT_PROXY_PORTS, CONFIG_MAX_BYTES, LSP_SERVER_IDS, CURRENT_CONFIG_VERSION = 4, DEFAULT_CONFIG_TEMPLATE;
+var DEFAULT_TRANSPARENT_PROXY_PORTS, CONFIG_MAX_BYTES, LSP_SERVER_IDS, CURRENT_CONFIG_VERSION = 7, DEFAULT_CONFIG_TEMPLATE;
 var init_config = __esm(() => {
   init_mcp_builtins();
   init_credential_store();
@@ -6547,8 +6560,8 @@ autoStartProxy = true
 port = 31337
 
 [mcp_servers.playwright]
-command = "playwright-mcp"
-args = ["--headless", "--browser", "chromium", "--executable-path", "/usr/bin/chromium", "--no-sandbox", "--ignore-https-errors", "--isolated"]
+command = "xvfb-run"
+args = ["-a", "playwright-mcp", "--browser", "chromium", "--no-sandbox", "--ignore-https-errors", "--isolated"]
 run_in_container = true
 enabled = true
 required = false
@@ -8784,8 +8797,8 @@ var init_process_output = __esm(() => {
 
 // src/version.ts
 function resolveFaraiVersion() {
-  if ("0.3.6")
-    return "0.3.6";
+  if ("0.3.7")
+    return "0.3.7";
   try {
     const parsed = JSON.parse(readBoundedFileTextSync(new URL("../package.json", import.meta.url), 1024 * 1024, "package metadata"));
     if (typeof parsed.version === "string" && parsed.version)
@@ -28695,6 +28708,12 @@ function compactError2(value) {
 async function runAdb(context, argline, timeoutMs, maxBytes = 2000000) {
   return backend(context).exec(argline, timeoutMs, context.signal, maxBytes);
 }
+async function runAdbChecked(context, argline, timeoutMs, maxBytes = 2000000) {
+  const result = await runAdb(context, argline, timeoutMs, maxBytes);
+  if (adbUnavailable(result))
+    throw new Error("adb is not available in the container");
+  return result;
+}
 function adbEnvPrefix() {
   const parts = ADB_SERVER_ENV.filter((name) => (process.env[name] ?? "").trim()).map((name) => `${name}=${shellQuote7(process.env[name].trim())}`);
   return parts.length ? `${parts.join(" ")} ` : "";
@@ -28733,12 +28752,10 @@ function parseDevices(stdout) {
   return devices;
 }
 async function resolveDevice(context, serial, timeoutMs = 15000) {
-  const provided = serial?.trim();
+  const provided = typeof serial === "string" ? serial.trim() : "";
   if (provided)
     return provided;
-  const result = await runAdb(context, `${adbBase()} devices -l`, timeoutMs);
-  if (adbUnavailable(result))
-    throw new Error("adb is not available in the container");
+  const result = await runAdbChecked(context, `${adbBase()} devices -l`, timeoutMs);
   const online = parseDevices(result.stdout).filter((device) => device.state === "device");
   if (online.length === 0)
     throw new Error("no android device is connected; use android_connect to attach one over tcp/ip");
@@ -28784,9 +28801,7 @@ var init_device = __esm(() => {
       assertObject(args, "args");
       const raw = asString(args.address, "address").trim();
       const address = /:\d+$/.test(raw) ? raw : `${raw}:5555`;
-      const result = await runAdb(context, `${adbBase()} connect ${shellQuote7(address)}`, 30000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const result = await runAdbChecked(context, `${adbBase()} connect ${shellQuote7(address)}`, 30000);
       const text2 = `${result.stdout}${result.stderr}`.trim();
       const ok = /connected to/i.test(text2) && !/cannot|failed|unable|refused/i.test(text2);
       return {
@@ -28815,9 +28830,7 @@ var init_device = __esm(() => {
     renderModel: defaultModelRenderer,
     run: async (args, context) => {
       assertObject(args, "args");
-      const result = await runAdb(context, `${adbBase()} devices -l`, 15000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const result = await runAdbChecked(context, `${adbBase()} devices -l`, 15000);
       const devices = parseDevices(result.stdout);
       const online = devices.filter((device) => device.state === "device");
       const output = devices.length ? devices.map((device) => `${device.serial}	${device.state}${device.model ? `	model:${device.model}` : ""}`).join(`
@@ -28855,10 +28868,8 @@ var init_device = __esm(() => {
     run: async (args, context) => {
       assertObject(args, "args");
       const command = asString(args.command, "command");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
-      const result = await runAdb(context, `${adbPrefix(serial)} shell ${shellQuote7(command)}`, 60000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const serial = await resolveDevice(context, args.serial);
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} shell ${shellQuote7(command)}`, 60000);
       const output = `${result.stdout}${result.stderr ? `
 ${result.stderr}` : ""}`.trim();
       return {
@@ -28897,11 +28908,9 @@ ${result.stderr}` : ""}`.trim();
     renderModel: defaultModelRenderer,
     run: async (args, context) => {
       assertObject(args, "args");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const thirdParty = args.thirdPartyOnly === true;
-      const result = await runAdb(context, `${adbPrefix(serial)} shell pm list packages${thirdParty ? " -3" : ""}`, 30000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} shell pm list packages${thirdParty ? " -3" : ""}`, 30000);
       const filter = typeof args.filter === "string" ? args.filter.trim().toLowerCase() : "";
       let packages = result.stdout.split(`
 `).map((line) => line.replace(/^package:/, "").trim()).filter(Boolean);
@@ -28938,12 +28947,10 @@ ${result.stderr}` : ""}`.trim();
     renderModel: defaultModelRenderer,
     run: async (args, context) => {
       assertObject(args, "args");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const props = ["ro.build.version.release", "ro.build.version.sdk", "ro.product.model", "ro.product.manufacturer", "ro.product.cpu.abi", "ro.build.type"];
       const command = `${adbPrefix(serial)} shell ${shellQuote7(`for p in ${props.join(" ")}; do echo "$p=$(getprop $p)"; done; echo su=$(command -v su || echo none)`)}`;
-      const result = await runAdb(context, command, 30000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const result = await runAdbChecked(context, command, 30000);
       const info = {};
       for (const line of result.stdout.split(`
 `)) {
@@ -28990,13 +28997,11 @@ ${result.stderr}` : ""}`.trim();
     renderModel: defaultModelRenderer,
     run: async (args, context) => {
       assertObject(args, "args");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const lines = typeof args.lines === "number" && Number.isInteger(args.lines) ? Math.max(1, Math.min(5000, args.lines)) : 200;
       const tag = typeof args.tag === "string" && args.tag.trim() ? args.tag.trim() : "";
       const filter = tag ? ` -s ${shellQuote7(tag)}` : "";
-      const result = await runAdb(context, `${adbPrefix(serial)} logcat -d -t ${lines}${filter}`, 30000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} logcat -d -t ${lines}${filter}`, 30000);
       const output = result.stdout.trim();
       return {
         ok: result.exitCode === 0,
@@ -29043,11 +29048,9 @@ function appLifecycleTool(name, verb) {
     run: async (args, context) => {
       assertObject(args, "args");
       const pkg = sanitizePackage(asString(args.package, "package"));
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const shell = verb === "start" ? `monkey -p ${shellQuote7(pkg)} -c android.intent.category.LAUNCHER 1` : `am force-stop ${shellQuote7(pkg)}`;
-      const result = await runAdb(context, `${adbPrefix(serial)} shell ${shellQuote7(shell)}`, 30000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} shell ${shellQuote7(shell)}`, 30000);
       const output = `${result.stdout}${result.stderr ? `
 ${result.stderr}` : ""}`.trim();
       const ok = result.exitCode === 0 && !/error|no activities found/i.test(output);
@@ -29094,10 +29097,8 @@ var init_app = __esm(() => {
     run: async (args, context) => {
       assertObject(args, "args");
       const pkg = sanitizePackage(asString(args.package, "package"));
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
-      const pathResult = await runAdb(context, `${adbPrefix(serial)} shell pm path ${shellQuote7(pkg)}`, 30000);
-      if (adbUnavailable(pathResult))
-        throw new Error("adb is not available in the container");
+      const serial = await resolveDevice(context, args.serial);
+      const pathResult = await runAdbChecked(context, `${adbPrefix(serial)} shell pm path ${shellQuote7(pkg)}`, 30000);
       const remotes = pathResult.stdout.split(`
 `).map((line) => line.replace(/^package:/, "").trim()).filter(Boolean);
       if (remotes.length === 0)
@@ -29151,10 +29152,8 @@ var init_app = __esm(() => {
     run: async (args, context) => {
       assertObject(args, "args");
       const apkPath = asString(args.apkPath, "apkPath").trim();
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
-      const result = await runAdb(context, `${adbPrefix(serial)} install -r ${shellQuote7(apkPath)}`, 120000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const serial = await resolveDevice(context, args.serial);
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} install -r ${shellQuote7(apkPath)}`, 120000);
       const text2 = `${result.stdout}${result.stderr}`.trim();
       const ok = /success/i.test(text2);
       return {
@@ -29199,11 +29198,9 @@ var init_app = __esm(() => {
       assertObject(args, "args");
       const uri = asString(args.uri, "uri").trim();
       const pkg = typeof args.package === "string" && args.package.trim() ? sanitizePackage(args.package) : "";
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const shell = `am start -a android.intent.action.VIEW -d ${shellQuote7(uri)}${pkg ? ` ${shellQuote7(pkg)}` : ""}`;
-      const result = await runAdb(context, `${adbPrefix(serial)} shell ${shellQuote7(shell)}`, 30000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} shell ${shellQuote7(shell)}`, 30000);
       const output = `${result.stdout}${result.stderr ? `
 ${result.stderr}` : ""}`.trim();
       const ok = result.exitCode === 0 && !/error|exception/i.test(output);
@@ -29247,11 +29244,9 @@ ${result.stderr}` : ""}`.trim();
       assertObject(args, "args");
       const path = asString(args.path, "path").trim();
       const pkg = typeof args.package === "string" && args.package.trim() ? sanitizePackage(args.package) : "";
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const shell = pkg ? `run-as ${shellQuote7(pkg)} cat ${shellQuote7(path)}` : `cat ${shellQuote7(path)}`;
-      const result = await runAdb(context, `${adbPrefix(serial)} shell ${shellQuote7(shell)}`, 30000, 4000000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} shell ${shellQuote7(shell)}`, 30000, 4000000);
       const ok = result.exitCode === 0 && !/no such file|permission denied|not debuggable|run-as:/i.test(result.stderr);
       return {
         ok,
@@ -29606,9 +29601,7 @@ function findUiNode(nodes, selector) {
 }
 async function dumpHierarchy(context, serial) {
   const remote = "/sdcard/farai_uidump.xml";
-  const dump = await runAdb(context, `${adbPrefix(serial)} shell uiautomator dump ${remote}`, 30000);
-  if (adbUnavailable(dump))
-    throw new Error("adb is not available in the container");
+  const dump = await runAdbChecked(context, `${adbPrefix(serial)} shell uiautomator dump ${remote}`, 30000);
   const read = await runAdb(context, `${adbPrefix(serial)} shell cat ${remote}`, 20000, 8000000);
   const xml = read.stdout.trim();
   if (!xml.includes("<hierarchy") && !xml.includes("<node")) {
@@ -29650,7 +29643,7 @@ var init_ui = __esm(() => {
     renderModel: defaultModelRenderer,
     run: async (args, context) => {
       assertObject(args, "args");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const xml = await dumpHierarchy(context, serial);
       const all = parseUiNodes(xml);
       const clickableOnly = args.clickableOnly !== false;
@@ -29685,7 +29678,7 @@ var init_ui = __esm(() => {
     renderModel: defaultModelRenderer,
     run: async (args, context) => {
       assertObject(args, "args");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const xml = await dumpHierarchy(context, serial);
       return {
         ok: true,
@@ -29714,13 +29707,11 @@ var init_ui = __esm(() => {
     renderModel: defaultModelRenderer,
     run: async (args, context) => {
       assertObject(args, "args");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const remote = "/sdcard/farai_screen.png";
       const local = `android/screenshots/${Date.now()}.png`;
       await runAdb(context, `mkdir -p android/screenshots`, 1e4);
-      const cap = await runAdb(context, `${adbPrefix(serial)} shell screencap -p ${remote}`, 30000);
-      if (adbUnavailable(cap))
-        throw new Error("adb is not available in the container");
+      const cap = await runAdbChecked(context, `${adbPrefix(serial)} shell screencap -p ${remote}`, 30000);
       const pull = await runAdb(context, `${adbPrefix(serial)} pull ${remote} ${shellQuote7(local)}`, 40000);
       const ok = pull.exitCode === 0;
       return {
@@ -29766,10 +29757,8 @@ var init_ui = __esm(() => {
       const y = Number(args.y);
       if (!Number.isInteger(x) || !Number.isInteger(y))
         throw new Error("x and y must be integers");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
-      const result = await runAdb(context, `${adbPrefix(serial)} shell input tap ${x} ${y}`, 20000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const serial = await resolveDevice(context, args.serial);
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} shell input tap ${x} ${y}`, 20000);
       return {
         ok: result.exitCode === 0,
         summary: `tapped ${x},${y}`,
@@ -29824,7 +29813,7 @@ var init_ui = __esm(() => {
       };
       if (!selector.resourceId && !selector.text && !selector.contentDesc)
         throw new Error("provide at least one of resourceId, text, or contentDesc");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const xml = await dumpHierarchy(context, serial);
       const node = findUiNode(parseUiNodes(xml), selector);
       if (!node)
@@ -29875,11 +29864,9 @@ var init_ui = __esm(() => {
     run: async (args, context) => {
       assertObject(args, "args");
       const text2 = asString(args.text, "text");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const escaped = text2.replace(/(["\\$`])/g, "\\$1").replace(/ /g, "%s");
-      const result = await runAdb(context, `${adbPrefix(serial)} shell input text ${shellQuote7(escaped)}`, 20000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} shell input text ${shellQuote7(escaped)}`, 20000);
       return {
         ok: result.exitCode === 0,
         summary: `typed ${text2.length} char(s)`,
@@ -29938,11 +29925,9 @@ var init_ui = __esm(() => {
       if (coords.some((value) => !Number.isInteger(value)))
         throw new Error("x1, y1, x2, y2 must be integers");
       const duration = typeof args.durationMs === "number" && Number.isInteger(args.durationMs) ? Math.max(50, Math.min(1e4, args.durationMs)) : 300;
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const [x1, y1, x2, y2] = coords;
-      const result = await runAdb(context, `${adbPrefix(serial)} shell input swipe ${x1} ${y1} ${x2} ${y2} ${duration}`, 20000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} shell input swipe ${x1} ${y1} ${x2} ${y2} ${duration}`, 20000);
       return {
         ok: result.exitCode === 0,
         summary: `swiped ${x1},${y1} -> ${x2},${y2}`,
@@ -29995,10 +29980,8 @@ var init_ui = __esm(() => {
       const code = KEYEVENTS[key] ?? (/^\d+$/.test(key) ? Number(key) : undefined);
       if (code === undefined)
         throw new Error(`unknown key "${key}"; use a named key or a numeric keycode`);
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
-      const result = await runAdb(context, `${adbPrefix(serial)} shell input keyevent ${code}`, 20000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const serial = await resolveDevice(context, args.serial);
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} shell input keyevent ${code}`, 20000);
       return {
         ok: result.exitCode === 0,
         summary: `sent key ${key} (${code})`,
@@ -30028,10 +30011,8 @@ var init_ui = __esm(() => {
     renderModel: defaultModelRenderer,
     run: async (args, context) => {
       assertObject(args, "args");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
-      const result = await runAdb(context, `${adbPrefix(serial)} shell wm size`, 20000);
-      if (adbUnavailable(result))
-        throw new Error("adb is not available in the container");
+      const serial = await resolveDevice(context, args.serial);
+      const result = await runAdbChecked(context, `${adbPrefix(serial)} shell wm size`, 20000);
       const size = /(\d+)x(\d+)/.exec(result.stdout);
       return {
         ok: result.exitCode === 0,
@@ -30096,7 +30077,7 @@ var init_ui = __esm(() => {
       if (!selector.resourceId && !selector.text && !selector.contentDesc)
         throw new Error("provide at least one of resourceId, text, or contentDesc");
       const timeoutSeconds = typeof args.timeoutSeconds === "number" && Number.isInteger(args.timeoutSeconds) ? Math.max(1, Math.min(120, args.timeoutSeconds)) : 15;
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const deadline = Date.now() + timeoutSeconds * 1000;
       let attempts = 0;
       while (Date.now() < deadline) {
@@ -30381,7 +30362,7 @@ var init_frida = __esm(() => {
     renderModel: defaultModelRenderer,
     run: async (args, context) => {
       assertObject(args, "args");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const version = await backend(context).exec("frida --version 2>/dev/null || true", 15000, context.signal);
       const fridaTools = version.stdout.trim();
       const binary = await runAdb(context, `${adbPrefix(serial)} shell ls ${DEVICE_SERVER_PATH} 2>/dev/null`, 15000);
@@ -30429,7 +30410,7 @@ var init_frida = __esm(() => {
       const requested = typeof args.version === "string" && args.version.trim() ? args.version.trim() : "";
       if (requested && !/^\d+(\.\d+){1,3}$/.test(requested))
         throw new Error("version must look like 16.5.9");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const steps = [];
       let version = (await backend(context).exec("frida --version 2>/dev/null", 15000, context.signal)).stdout.trim();
       if (requested || !version) {
@@ -30449,9 +30430,7 @@ var init_frida = __esm(() => {
             serial
           }
         };
-      const abiResult = await runAdb(context, `${adbPrefix(serial)} shell getprop ro.product.cpu.abi`, 15000);
-      if (adbUnavailable(abiResult))
-        throw new Error("adb is not available in the container");
+      const abiResult = await runAdbChecked(context, `${adbPrefix(serial)} shell getprop ro.product.cpu.abi`, 15000);
       const abi = abiResult.stdout.trim().replace(/\r/g, "");
       const arch = ABI_MAP[abi];
       if (!arch)
@@ -30511,7 +30490,7 @@ var init_frida = __esm(() => {
     renderModel: defaultModelRenderer,
     run: async (args, context) => {
       assertObject(args, "args");
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const listFlag = args.applicationsOnly === true ? "-ai" : "-a";
       const deviceFlag = `-D ${shellQuote7(serial)}`;
       const result = await backend(context).exec(`${adbEnvPrefix()}frida-ps ${listFlag} ${deviceFlag} 2>&1`, 40000, context.signal);
@@ -30573,7 +30552,7 @@ var init_frida = __esm(() => {
       const target = asString(args.target, "target").trim();
       const mode = args.mode === "spawn" ? "spawn" : "attach";
       const durationSeconds = typeof args.durationSeconds === "number" && Number.isInteger(args.durationSeconds) ? Math.max(1, Math.min(600, args.durationSeconds)) : 15;
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       await writeAsset(context, RUNNER_PATH, FRIDA_RUNNER);
       const command = fridaRunCommand(serial, mode, target, scriptPath, durationSeconds);
       if (args.background === true) {
@@ -30650,7 +30629,7 @@ ${messages.map((m) => JSON.stringify(m)).join(`
         throw new Error(`unknown bypass type: ${type}; use ssl or root`);
       const pkg = asString(args.package, "package").trim();
       const durationSeconds = typeof args.durationSeconds === "number" && Number.isInteger(args.durationSeconds) ? Math.max(1, Math.min(600, args.durationSeconds)) : 30;
-      const serial = await resolveDevice(context, typeof args.serial === "string" ? args.serial : undefined);
+      const serial = await resolveDevice(context, args.serial);
       const scriptPath = `${ASSET_DIR}/scripts/bypass_${type}.js`;
       await writeAsset(context, RUNNER_PATH, FRIDA_RUNNER);
       await writeAsset(context, scriptPath, script);
@@ -32484,7 +32463,7 @@ function normalizeModelsDevProviderHint(providerID, profile) {
   if (providerID !== DEFAULT_PROVIDER_ID)
     return providerID;
   if (!profile && resolveModel().baseUrl === DEFAULT_MODEL_BASE_URL)
-    return DEFAULT_SOURCE_PROVIDER_ID;
+    return DEFAULT_MODEL_PROVIDER_ID;
   return;
 }
 function readRecentModelSelections() {
@@ -32961,7 +32940,7 @@ function ensureConcrete(resolved) {
 function modelsDevCachePath() {
   return join18(globalDataDir(), "cache", "models-dev.json");
 }
-var DEFAULT_PROVIDER_ID = "default", DEFAULT_SOURCE_PROVIDER_ID, MODELS_DEV_URL = "https://models.dev/api.json", MODELS_DEV_CACHE_TTL_MS, MODELS_DEV_STALE_TTL_MS, MODELS_DEV_FETCH_TIMEOUT_MS = 4000, MODELS_DEV_MAX_BYTES, RECENT_MODEL_LIMIT = 12, modelsDevRefreshes;
+var DEFAULT_PROVIDER_ID = "default", MODELS_DEV_URL = "https://models.dev/api.json", MODELS_DEV_CACHE_TTL_MS, MODELS_DEV_STALE_TTL_MS, MODELS_DEV_FETCH_TIMEOUT_MS = 4000, MODELS_DEV_MAX_BYTES, RECENT_MODEL_LIMIT = 12, modelsDevRefreshes;
 var init_model_catalog = __esm(() => {
   init_default_model();
   init_global_config();
@@ -32973,7 +32952,6 @@ var init_model_catalog = __esm(() => {
   init_file_read();
   init_atomic_file();
   init_private_path();
-  DEFAULT_SOURCE_PROVIDER_ID = DEFAULT_MODEL_PROVIDER_ID;
   MODELS_DEV_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
   MODELS_DEV_STALE_TTL_MS = 30 * 24 * 60 * 60 * 1000;
   MODELS_DEV_MAX_BYTES = 16 * 1024 * 1024;
@@ -46172,20 +46150,23 @@ function readSignal() {
     }
   }
   if (Listener) {
-    const sSlot = this.observers ? this.observers.length : 0;
-    if (!Listener.sources) {
-      Listener.sources = [this];
-      Listener.sourceSlots = [sSlot];
-    } else {
-      Listener.sources.push(this);
-      Listener.sourceSlots.push(sSlot);
-    }
-    if (!this.observers) {
-      this.observers = [Listener];
-      this.observerSlots = [Listener.sources.length - 1];
-    } else {
-      this.observers.push(Listener);
-      this.observerSlots.push(Listener.sources.length - 1);
+    const observers = this.observers;
+    if (!observers || observers[observers.length - 1] !== Listener) {
+      const sSlot = observers ? observers.length : 0;
+      if (!Listener.sources) {
+        Listener.sources = [this];
+        Listener.sourceSlots = [sSlot];
+      } else {
+        Listener.sources.push(this);
+        Listener.sourceSlots.push(sSlot);
+      }
+      if (!observers) {
+        this.observers = [Listener];
+        this.observerSlots = [Listener.sources.length - 1];
+      } else {
+        observers.push(Listener);
+        this.observerSlots.push(Listener.sources.length - 1);
+      }
     }
   }
   if (runningTransition && Transition.sources.has(this))
@@ -46331,10 +46312,13 @@ function createComputation(fn, init, pure, state = STALE, options) {
     const ordinary = ExternalSourceConfig.factory(sourceFn, trigger);
     onCleanup(() => ordinary.dispose());
     let inTransition;
+    let trackedOrdinary = false;
     const triggerInTransition = () => startTransition(trigger).then(() => {
       if (inTransition) {
         inTransition.dispose();
         inTransition = undefined;
+        if (!trackedOrdinary)
+          trigger();
       }
     });
     c.fn = (x) => {
@@ -46344,6 +46328,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
           inTransition = ExternalSourceConfig.factory(sourceFn, triggerInTransition);
         return inTransition.track(x);
       }
+      trackedOrdinary = true;
       return ordinary.track(x);
     };
   }
@@ -46624,7 +46609,15 @@ function resolveChildren(children2) {
     const results = [];
     for (let i = 0;i < children2.length; i++) {
       const result = resolveChildren(children2[i]);
-      Array.isArray(result) ? results.push.apply(results, result) : results.push(result);
+      if (Array.isArray(result)) {
+        if (result.length < 32768)
+          results.push.apply(results, result);
+        else
+          for (let j = 0;j < result.length; j++)
+            results.push(result[j]);
+      } else {
+        results.push(result);
+      }
     }
     return results;
   }
@@ -46892,16 +46885,18 @@ function splitProps(props, ...keys) {
   const len = keys.length;
   if (SUPPORTS_PROXY && $PROXY in props) {
     const blocked = len > 1 ? keys.flat() : keys[0];
+    const claimed = new Set;
     const res = keys.map((k) => {
+      const owned = k.filter((property) => !claimed.has(property) && (claimed.add(property), true));
       return new Proxy({
         get(property) {
-          return k.includes(property) ? props[property] : undefined;
+          return owned.includes(property) ? props[property] : undefined;
         },
         has(property) {
-          return k.includes(property) && property in props;
+          return owned.includes(property) && property in props;
         },
         keys() {
-          return k.filter((property) => (property in props));
+          return owned.filter((property) => (property in props));
         }
       }, propTraps);
     });
@@ -48193,11 +48188,20 @@ function wrap$1(value) {
       value: p = new Proxy(value, proxyTraps$1)
     });
     if (!Array.isArray(value)) {
-      const keys = Object.keys(value), desc = Object.getOwnPropertyDescriptors(value);
+      const keys = Object.keys(value), desc = Object.getOwnPropertyDescriptors(value), proto = Object.getPrototypeOf(value);
+      const isClass = proto !== null && value !== null && typeof value === "object" && !Array.isArray(value) && proto !== Object.prototype;
+      if (isClass) {
+        const descriptors = Object.getOwnPropertyDescriptors(proto);
+        keys.push(...Object.keys(descriptors));
+        Object.assign(desc, descriptors);
+      }
       for (let i = 0, l = keys.length;i < l; i++) {
         const prop = keys[i];
+        if (isClass && prop === "constructor")
+          continue;
         if (desc[prop].get) {
           Object.defineProperty(value, prop, {
+            configurable: true,
             enumerable: desc[prop].enumerable,
             get: desc[prop].get.bind(p)
           });
@@ -48279,6 +48283,9 @@ function ownKeys(target) {
   return Reflect.ownKeys(target);
 }
 function setProperty(state, property, value, deleting = false) {
+  if (property === "__proto__") {
+    return;
+  }
   if (!deleting && state[property] === value)
     return;
   const prev = state[property], len = state.length;
@@ -48305,9 +48312,14 @@ function mergeStoreNode(state, value) {
   const keys = Object.keys(value);
   for (let i = 0;i < keys.length; i += 1) {
     const key = keys[i];
+    if (isUnsafeKey$1(key))
+      continue;
     setProperty(state, key, value[key]);
   }
 }
+function isUnsafeKey$1(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function updateArray(current, next) {
   if (typeof next === "function")
     next = next(current);
@@ -48330,6 +48342,9 @@ function updatePath(current, path, traversed = []) {
   if (path.length > 1) {
     part = path.shift();
     const partType = typeof part, isArray = Array.isArray(current);
+    if (partType === "string" && (part === "__proto__" || path.length > 1 && isUnsafeKey$1(part))) {
+      return;
+    }
     if (Array.isArray(part)) {
       for (let i = 0;i < part.length; i++) {
         updatePath(current, [part[i]].concat(path), traversed);
@@ -48383,7 +48398,12 @@ function createStore(...[store, options]) {
   }
   return [wrappedStore, setStore];
 }
+function isUnsafeKey(property) {
+  return property === "__proto__" || property === "constructor" || property === "prototype";
+}
 function applyState(target, parent, property, merge, key) {
+  if (isUnsafeKey(property))
+    return;
   const previous = parent[property];
   if (target === previous)
     return;
@@ -48449,6 +48469,8 @@ function applyState(target, parent, property, merge, key) {
   }
   const targetKeys = Object.keys(target);
   for (let i = 0, len = targetKeys.length;i < len; i++) {
+    if (isUnsafeKey(targetKeys[i]))
+      continue;
     applyState(target[targetKeys[i]], previous, targetKeys[i], merge, key);
   }
   const previousKeys = Object.keys(previous);
@@ -48507,7 +48529,7 @@ var init_store2 = __esm(() => {
         return value;
       if (!tracked) {
         const desc = Object.getOwnPropertyDescriptor(target, property);
-        if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get))
+        if (getListener() && (typeof value !== "function" || Object.prototype.hasOwnProperty.call(target, property)) && !(desc && desc.get))
           value = getNode(nodes, property, value)();
       }
       return isWrappable(value) ? wrap$1(value) : value;
@@ -48534,6 +48556,8 @@ var init_store2 = __esm(() => {
       if (property === $RAW)
         return target;
       const value = target[property];
+      if (property === $PROXY || property === $TRACK || property === $NODE || property === $HAS || property === "__proto__")
+        return value;
       let proxy;
       return isWrappable(value) ? producers.get(value) || (producers.set(value, proxy = new Proxy(value, setterTraps)), proxy) : value;
     },
@@ -76437,5 +76461,5 @@ Examples:
 `);
 }
 
-//# debugId=80A953E297D3B0EB64756E2164756E21
+//# debugId=63285462E91F7E5864756E2164756E21
 //# sourceMappingURL=index.js.map