mobile-debug-mcp 0.34.0 → 0.36.0

package/dist/observe/ios.js

@@ -1,269 +1,13 @@
-import { randomUUID } from 'node:crypto';
 import { captureEvidence } from './evidence.js';
-import { spawn } from "child_process";
-import { remainingBudget } from '../utils/operation-budget.js';
-import { execCmd } from '../utils/exec.js';
-import { createObservationMeasurement } from './performance-metrics.js';
-import { promises as fs } from "fs";
-import { execCommand, getIOSDeviceMetadata, validateBundleId, getIdbCmd, getXcrunCmd, isIDBInstalled } from "../utils/ios/utils.js";
-import { createWriteStream, promises as fsPromises } from 'fs';
-import path from 'path';
-import { parseLogLine } from '../utils/android/utils.js';
-import { computeScreenFingerprint } from '../utils/ui/index.js';
-import { parsePngSize } from '../utils/image.js';
-import { deriveSnapshotMetadata } from './snapshot-metadata.js';
-const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
-let iosExecCommand = execCommand;
-export function _setIOSExecCommandForTests(fn) {
-    iosExecCommand = fn;
-}
-export function _resetIOSExecCommandForTests() {
-    iosExecCommand = execCommand;
-}
-function parseIDBFrame(frame) {
-    if (!frame)
-        return [0, 0, 0, 0];
-    if (typeof frame === 'string') {
-        const nums = frame.match(/-?\d+(?:\.\d+)?/g);
-        if (!nums || nums.length < 4)
-            return [0, 0, 0, 0];
-        const x = Number(nums[0]);
-        const y = Number(nums[1]);
-        const w = Number(nums[2]);
-        const h = Number(nums[3]);
-        return [Math.round(x), Math.round(y), Math.round(x + w), Math.round(y + h)];
-    }
-    const x = Number(frame.x || 0);
-    const y = Number(frame.y || 0);
-    const w = Number(frame.width || frame.w || 0);
-    const h = Number(frame.height || frame.h || 0);
-    return [Math.round(x), Math.round(y), Math.round(x + w), Math.round(y + h)];
-}
-function getCenter(bounds) {
-    const [x1, y1, x2, y2] = bounds;
-    return [Math.floor((x1 + x2) / 2), Math.floor((y1 + y2) / 2)];
-}
-function parseIOSNumber(value) {
-    if (typeof value === 'number' && Number.isFinite(value))
-        return value;
-    if (typeof value !== 'string')
-        return null;
-    const parsed = Number(value);
-    return Number.isFinite(parsed) ? parsed : null;
-}
-function normalizeIOSType(value) {
-    return typeof value === 'string' ? value.trim().toLowerCase() : '';
-}
-function inferIOSRole(type, traits) {
-    if (/slider|adjustable/.test(type) || traits.some((trait) => /adjustable|slider/.test(trait)))
-        return 'slider';
-    if (/stepper/.test(type))
-        return 'stepper';
-    if (/picker|pop up button|dropdown/.test(type))
-        return 'dropdown';
-    if (/segmented control/.test(type))
-        return 'segmented_control';
-    if (/button/.test(type) || traits.some((trait) => /button/.test(trait)))
-        return 'button';
-    if (/cell/.test(type))
-        return 'cell';
-    if (/switch/.test(type))
-        return 'switch';
-    if (/text field|textfield|search field/.test(type))
-        return 'text_field';
-    if (/image/.test(type))
-        return 'image';
-    if (/window|application|group|scroll view|collection view/.test(type))
-        return 'container';
-    return null;
-}
-function getIOSStableId(node) {
-    const candidates = [node.AXIdentifier, node.accessibilityIdentifier, node.identifier, node.AXUniqueId];
-    for (const candidate of candidates) {
-        if (typeof candidate === 'string' && candidate.trim().length > 0)
-            return candidate;
-    }
-    return null;
-}
-function buildIOSSelectorConfidence(source) {
-    switch (source) {
-        case 'identifier':
-            return { score: 1, reason: 'accessibility_identifier' };
-        case 'label':
-            return { score: 0.9, reason: 'label_match' };
-        case 'value':
-            return { score: 0.75, reason: 'value_match' };
-        case 'type':
-            return { score: 0.35, reason: 'type_match' };
-        default:
-            return null;
-    }
-}
-function buildIOSSelector(type, label, value, stableId) {
-    if (stableId)
-        return { value: stableId, confidence: buildIOSSelectorConfidence('identifier') };
-    if (label)
-        return { value: label, confidence: buildIOSSelectorConfidence('label') };
-    if (value)
-        return { value: value, confidence: buildIOSSelectorConfidence('value') };
-    if (type)
-        return { value: type, confidence: buildIOSSelectorConfidence('type') };
-    return null;
-}
-function buildIOSSemantic(type, traits, role, value) {
-    const semantic = {
-        is_clickable: traits.includes("UIAccessibilityTraitButton") || /adjustable|slider/.test(type) || type === "Button" || type === "Cell",
-        is_container: /window|application|group|scroll view|collection view/.test(type)
-    };
-    if (role === 'slider') {
-        semantic.semantic_role = 'slider';
-        semantic.adjustable = true;
-        semantic.supported_actions = ['adjust'];
-        semantic.state_shape = 'continuous';
-    }
-    else if (role === 'stepper') {
-        semantic.semantic_role = 'stepper';
-        semantic.adjustable = true;
-        semantic.supported_actions = ['increment', 'decrement'];
-        semantic.state_shape = 'discrete';
-    }
-    else if (role === 'dropdown') {
-        semantic.semantic_role = 'dropdown';
-        semantic.supported_actions = ['tap', 'expand'];
-        semantic.state_shape = 'semantic';
-    }
-    else if (role === 'segmented_control') {
-        semantic.semantic_role = 'segmented_control';
-        semantic.supported_actions = ['tap'];
-        semantic.state_shape = 'discrete';
-    }
-    else if (traits.some((trait) => /adjustable|slider/i.test(trait)) || /adjustable|slider/.test(type)) {
-        semantic.semantic_role = 'custom_adjustable';
-        semantic.adjustable = true;
-        semantic.supported_actions = ['adjust'];
-        semantic.state_shape = 'continuous';
-    }
-    else if (semantic.is_clickable) {
-        semantic.supported_actions = ['tap'];
-    }
-    if (semantic.state_shape === undefined && semantic.adjustable && value !== null) {
-        const numericValue = parseIOSNumber(value);
-        if (numericValue !== null && numericValue >= 0 && numericValue <= 1) {
-            semantic.state_shape = 'continuous';
-        }
-    }
-    return semantic;
-}
-function isIOSAdjustable(node, type, traits) {
-    return /slider|adjustable|stepper/i.test(type) || traits.some((trait) => /adjustable|slider/i.test(trait));
-}
-function extractIOSState(node, type, label, value, traits) {
-    const state = {};
-    const normalizedTraits = traits.map((trait) => String(trait).toLowerCase());
-    if (normalizedTraits.some((trait) => /selected/.test(trait))) {
-        state.selected = label || value || true;
-    }
-    if (normalizedTraits.some((trait) => /focused/.test(trait))) {
-        state.focused = true;
-    }
-    if (normalizedTraits.some((trait) => /enabled/.test(trait))) {
-        state.enabled = true;
-    }
-    if (normalizedTraits.some((trait) => /disabled/.test(trait))) {
-        state.enabled = false;
-    }
-    if (value && /textfield|search|text/i.test(type)) {
-        state.text_value = value;
-    }
-    if (isIOSAdjustable(node, type, traits)) {
-        const rawValue = parseIOSNumber(value);
-        if (rawValue !== null) {
-            state.raw_value = rawValue;
-            state.value = rawValue >= 0 && rawValue <= 1 ? Math.round(rawValue * 100) : rawValue;
-        }
-        else if (value) {
-            state.raw_value = value;
-            state.value = value;
-        }
-    }
-    else if (value) {
-        const numericValue = parseIOSNumber(value);
-        if (numericValue !== null) {
-            state.value = numericValue;
-            state.raw_value = numericValue;
-        }
-        else {
-            state.value = value;
-        }
-    }
-    return Object.keys(state).length > 0 ? state : null;
-}
-export function traverseIDBNode(node, elements, parentIndex = -1, depth = 0) {
-    if (!node)
-        return -1;
-    let currentIndex = -1;
-    const type = node.AXElementType || node.type || "unknown";
-    const label = node.AXLabel || node.label || null;
-    const value = node.AXValue || null;
-    const frame = node.AXFrame || node.frame;
-    const traits = node.AXTraits || [];
-    const state = extractIOSState(node, type, label, value, traits);
-    const normalizedType = normalizeIOSType(type);
-    const stableId = getIOSStableId(node);
-    const selector = buildIOSSelector(type, label, value, stableId);
-    const role = inferIOSRole(normalizedType, traits);
-    const semantic = buildIOSSemantic(normalizedType, traits, role, value);
-    const clickable = traits.includes("UIAccessibilityTraitButton") || type === "Button" || type === "Cell";
-    const isUseful = clickable || (label && label.length > 0) || (value && value.length > 0) || type === "Application" || type === "Window";
-    if (isUseful) {
-        const bounds = parseIDBFrame(frame);
-        const element = {
-            text: label,
-            contentDescription: value,
-            type: type,
-            resourceId: stableId,
-            clickable: clickable,
-            enabled: true,
-            visible: true,
-            bounds: bounds,
-            center: getCenter(bounds),
-            depth: depth,
-            state,
-            stable_id: stableId,
-            role,
-            test_tag: stableId,
-            selector,
-            semantic
-        };
-        if (parentIndex !== -1) {
-            element.parentId = parentIndex;
-        }
-        elements.push(element);
-        currentIndex = elements.length - 1;
-    }
-    const nextParentIndex = currentIndex !== -1 ? currentIndex : parentIndex;
-    const nextDepth = currentIndex !== -1 ? depth + 1 : depth;
-    const childrenIndices = [];
-    if (node.children && Array.isArray(node.children)) {
-        for (const child of node.children) {
-            const childIndex = traverseIDBNode(child, elements, nextParentIndex, nextDepth);
-            if (childIndex !== -1) {
-                childrenIndices.push(childIndex);
-            }
-        }
-    }
-    if (currentIndex !== -1 && childrenIndices.length > 0) {
-        elements[currentIndex].children = childrenIndices;
-    }
-    return currentIndex;
-}
-const iosActiveLogStreams = new Map();
-export function _setIOSActiveLogStream(sessionId, file, device) {
-    iosActiveLogStreams.set(sessionId, { proc: {}, file, device });
-}
-export function _clearIOSActiveLogStream(sessionId) {
-    iosActiveLogStreams.delete(sessionId);
-}
+import { getIOSDeviceMetadata } from "../utils/ios/utils.js";
+import { iosActiveLogStreams } from './ios/context.js';
+import { collectGetUITree } from './ios/ui-tree.js';
+import { collectGetLogs } from './ios/logs.js';
+import { collectCaptureScreenshot } from './ios/screenshot.js';
+import { collectGetScreenFingerprint } from './ios/fingerprint.js';
+import { startLogStream, stopLogStream, readLogStream, collectReadLogStream } from './ios/log-stream.js';
+export { traverseIDBNode } from './ios/ui-elements.js';
+export { _setIOSExecCommandForTests, _resetIOSExecCommandForTests, _setIOSActiveLogStream, _clearIOSActiveLogStream } from './ios/context.js';
 export class iOSObserve {
     getLogStreamDevice(sessionId = 'default') { return iosActiveLogStreams.get(sessionId)?.device ?? null; }
     async getDeviceMetadata(deviceId = "booted") {
@@ -272,463 +16,21 @@ export class iOSObserve {
     async getLogs(filters = {}) {
         return captureEvidence('logs', { platform: 'ios', id: filters.deviceId ?? '' }, () => this.collectGetLogs(filters));
     }
-    async collectGetLogs(filters = {}) {
-        const { appId, deviceId = 'booted', pid, tag, level, contains, since_seconds, limit } = filters;
-        const args = ['simctl', 'spawn', deviceId, 'log', 'show', '--style', 'syslog'];
-        // Default to last N seconds if no since_seconds provided; limit lines handled after parsing
-        const effectiveLimit = typeof limit === 'number' && limit > 0 ? limit : 50;
-        if (since_seconds) {
-            // log show accepts --last <time>
-            args.push('--last', `${since_seconds}s`);
-        }
-        else {
-            // default to last 60s to keep quick
-            args.push('--last', '60s');
-        }
-        let processNameUsed = undefined;
-        if (appId) {
-            validateBundleId(appId);
-            // prefer matching the simple process name (last segment of bundle id), but also match full bundle id in subsystem
-            const parts = appId.split('.');
-            const simpleName = parts[parts.length - 1];
-            processNameUsed = simpleName;
-            // predicate: match process by simple name or full bundle id, or subsystem contains bundle id
-            args.push('--predicate', `process == "${simpleName}" or process == "${appId}" or subsystem contains "${appId}"`);
-        }
-        else if (tag) {
-            // predicate by subsystem/category
-            args.push('--predicate', `subsystem contains "${tag}"`);
-        }
-        try {
-            // Attempt pid detection if appId provided and no explicit pid supplied — prefer process name derived from bundle id
-            let detectedPid = null;
-            if (appId && !pid) {
-                const parts = appId.split('.');
-                const simpleName = parts[parts.length - 1];
-                try {
-                    const pgrepRes = await iosExecCommand(['simctl', 'spawn', deviceId, 'pgrep', '-f', simpleName], deviceId);
-                    const out = pgrepRes && pgrepRes.output ? pgrepRes.output.trim() : '';
-                    const firstLine = out.split(/\r?\n/).find(Boolean);
-                    if (firstLine) {
-                        const n = Number(firstLine.trim());
-                        if (!isNaN(n) && n > 0)
-                            detectedPid = n;
-                    }
-                }
-                catch {
-                    // ignore pgrep failures — we'll fall back to process/bundle matching
-                }
-            }
-            const effectivePid = pid || detectedPid || null;
-            const result = await iosExecCommand(args, deviceId);
-            const device = await getIOSDeviceMetadata(deviceId);
-            const rawLines = result.output ? result.output.split(/\r?\n/).filter(Boolean) : [];
-            // Parse lines into structured entries. iOS log format: timestamp [PID:tid] <level> subsystem:category: message
-            const parsed = rawLines.map(line => {
-                // Example: 2023-08-12 12:34:56.789012+0000  pid  <Debug>  MyApp[123:456]  <info>  MySubsystem: MyCategory: Message here
-                // Simpler approach: try to extract ISO timestamp at start
-                let ts = null;
-                const tsMatch = line.match(/^(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}(?:\.\d+)?)/);
-                if (tsMatch) {
-                    const d = new Date(tsMatch[1]);
-                    if (!isNaN(d.getTime()))
-                        ts = d.toISOString();
-                }
-                // level mapping
-                let lvl = 'INFO';
-                const lvlMatch = line.match(/\b(Debug|Info|Default|Error|Fault|Warning)\b/i);
-                if (lvlMatch) {
-                    const map = { 'debug': 'DEBUG', 'info': 'INFO', 'default': 'DEBUG', 'error': 'ERROR', 'fault': 'ERROR', 'warning': 'WARN' };
-                    lvl = map[(lvlMatch[1] || '').toLowerCase()] || 'INFO';
-                }
-                // subsystem/category -> tag
-                let tagVal = '';
-                const tagMatch = line.match(/\s([A-Za-z0-9_./-]+):\s/);
-                if (tagMatch)
-                    tagVal = tagMatch[1];
-                // pid extraction
-                let pidNum = null;
-                const pidMatch = line.match(/\[(\d+):\d+\]/);
-                if (pidMatch)
-                    pidNum = Number(pidMatch[1]);
-                // message: extract robustly after the subsystem/category token when available
-                let message = line;
-                if (tagMatch) {
-                    // tagMatch[0] includes the delimiter (e.g. " MySubsystem: ") — use it to find the message start
-                    const marker = tagMatch[0];
-                    const idx = line.indexOf(marker);
-                    if (idx !== -1) {
-                        message = line.slice(idx + marker.length).trim();
-                    }
-                    else {
-                        // fallback: try to trim off common prefixes (timestamp, pid, level) and keep the rest
-                        const afterPidMatch = line.match(/\]\s+/);
-                        if (afterPidMatch) {
-                            const afterPidIdx = line.indexOf(afterPidMatch[0]) + afterPidMatch[0].length;
-                            message = line.slice(afterPidIdx).trim();
-                        }
-                        else {
-                            // remove leading level tokens like <Debug> and keep remainder
-                            message = line.replace(/^.*?<.*?>\s*/, '').trim();
-                        }
-                    }
-                }
-                else {
-                    // No tag found — strip obvious prefixes and keep remainder (preserve colons in message)
-                    message = line.replace(/^.*?<.*?>\s*/, '').trim();
-                }
-                return { timestamp: ts, level: lvl, tag: tagVal, pid: pidNum, message };
-            });
-            // Apply contains filter
-            let filtered = parsed;
-            if (contains)
-                filtered = filtered.filter(e => e.message && e.message.includes(contains));
-            // Apply since_seconds already applied by log show, but double-check timestamps
-            if (since_seconds) {
-                const sinceMs = Date.now() - (since_seconds * 1000);
-                filtered = filtered.filter(e => e.timestamp && (new Date(e.timestamp).getTime() >= sinceMs));
-            }
-            // level filter
-            if (level) {
-                const L = level.toUpperCase();
-                filtered = filtered.filter(e => e.level && e.level.toUpperCase() === L);
-            }
-            // tag filter
-            if (tag)
-                filtered = filtered.filter(e => e.tag && e.tag.includes(tag));
-            // pid filter (use detected/effective pid if available)
-            const pidToFilter = effectivePid;
-            if (pidToFilter)
-                filtered = filtered.filter(e => e.pid === pidToFilter);
-            // If appId present but no predicate returned lines, try substring match
-            if (appId && filtered.length === 0) {
-                const matched = parsed.filter(e => (e.message && e.message.includes(appId)) || (e.tag && e.tag.includes(appId)) || (e.message && processNameUsed && e.message.includes(processNameUsed)));
-                if (matched.length > 0)
-                    filtered = matched;
-            }
-            // Order oldest -> newest
-            filtered.sort((a, b) => {
-                const ta = a.timestamp ? new Date(a.timestamp).getTime() : 0;
-                const tb = b.timestamp ? new Date(b.timestamp).getTime() : 0;
-                return ta - tb;
-            });
-            const source = pidToFilter ? 'pid' : (appId ? 'process' : 'broad');
-            const meta = { appIdProvided: !!appId, processNameUsed: processNameUsed || null, detectedPid: detectedPid || null, filters: { tag, level, contains, since_seconds, limit: effectiveLimit }, pidExplicit: !!pid };
-            const limited = filtered.slice(-Math.max(0, effectiveLimit));
-            return { device, logs: limited, logCount: limited.length, source, meta };
-        }
-        catch (err) {
-            console.error('iOS getLogs failed:', err);
-            const device = await getIOSDeviceMetadata(deviceId);
-            return { device, logs: [], logCount: 0, source: 'broad', meta: { error: err instanceof Error ? err.message : String(err) } };
-        }
-    }
+    async collectGetLogs(filters = {}) { return collectGetLogs(filters); }
     async captureScreenshot(deviceId = "booted") {
         return captureEvidence('screenshot', { platform: 'ios', id: deviceId ?? '' }, () => this.collectCaptureScreenshot(deviceId));
     }
-    async collectCaptureScreenshot(deviceId = "booted") {
-        const device = await getIOSDeviceMetadata(deviceId);
-        const tmpFile = `/tmp/mcp-ios-screenshot-${randomUUID()}.png`;
-        try {
-            await iosExecCommand(['simctl', 'io', deviceId, 'screenshot', tmpFile], deviceId);
-            const buffer = await fs.readFile(tmpFile);
-            const base64 = buffer.toString('base64');
-            const dims = parsePngSize(buffer);
-            // Try to generate WebP (preferred) and JPEG fallback using sharp (in-process, cross-platform)
-            try {
-                const sharpModule = await import('sharp');
-                const sharp = sharpModule && sharpModule.default ? sharpModule.default : sharpModule;
-                const img = sharp(buffer);
-                const meta = await img.metadata().catch((err) => { console.error('sharp.metadata failed:', err); return {}; });
-                // If image has alpha channel, prefer lossless PNG to preserve transparency
-                const hasAlpha = !!meta.hasAlpha || (meta.channels && meta.channels > 3);
-                // Generate WebP and JPEG buffers; log failures
-                let webpBuf = null;
-                let jpegBuf = null;
-                try {
-                    webpBuf = await img.webp({ quality: 80 }).toBuffer();
-                }
-                catch (err) {
-                    console.error('WebP conversion failed (iOS):', err instanceof Error ? err.message : String(err));
-                    webpBuf = null;
-                }
-                try {
-                    jpegBuf = await img.jpeg({ quality: 80 }).toBuffer();
-                }
-                catch (err) {
-                    console.error('JPEG conversion failed (iOS):', err instanceof Error ? err.message : String(err));
-                    jpegBuf = null;
-                }
-                await fs.rm(tmpFile).catch(() => { });
-                if (hasAlpha) {
-                    // preserve alpha: return PNG if WebP not available
-                    if (webpBuf) {
-                        return { device, screenshot: webpBuf.toString('base64'), screenshot_mime: 'image/webp', screenshot_fallback: base64, screenshot_fallback_mime: 'image/png', resolution: { width: dims.width, height: dims.height } };
-                    }
-                    // if webp unavailable, return original PNG
-                    return { device, screenshot: base64, screenshot_mime: 'image/png', resolution: { width: dims.width, height: dims.height } };
-                }
-                // No alpha: prefer webp, fall back to jpeg
-                if (webpBuf) {
-                    return { device, screenshot: webpBuf.toString('base64'), screenshot_mime: 'image/webp', screenshot_fallback: jpegBuf ? jpegBuf.toString('base64') : undefined, screenshot_fallback_mime: jpegBuf ? 'image/jpeg' : undefined, resolution: { width: dims.width, height: dims.height } };
-                }
-                if (jpegBuf) {
-                    return { device, screenshot: jpegBuf.toString('base64'), screenshot_mime: 'image/jpeg', resolution: { width: dims.width, height: dims.height } };
-                }
-            }
-            catch (err) {
-                console.error('Screenshot conversion pipeline failed (iOS):', err instanceof Error ? err.message : String(err));
-                // fall through to png fallback
-            }
-            await fs.rm(tmpFile).catch(() => { });
-            return {
-                device,
-                screenshot: base64,
-                screenshot_mime: 'image/png',
-                resolution: { width: dims.width, height: dims.height },
-            };
-        }
-        catch (e) {
-            await fs.rm(tmpFile).catch(() => { });
-            throw new Error(`Failed to capture screenshot: ${e instanceof Error ? e.message : String(e)}`);
-        }
-    }
+    async collectCaptureScreenshot(deviceId = "booted") { return collectCaptureScreenshot(deviceId); }
     async getUITree(deviceId = "booted") {
         return captureEvidence('ui_tree', { platform: 'ios', id: deviceId ?? '' }, () => this.collectGetUITree(deviceId));
     }
-    async collectGetUITree(deviceId = "booted") {
-        const measurement = createObservationMeasurement('ios');
-        let device;
-        try {
-            device = await measurement.timed('metadata_ms', () => getIOSDeviceMetadata(deviceId));
-        }
-        catch (error) {
-            measurement.setOutcome('unavailable');
-            measurement.finish();
-            throw error;
-        }
-        const deviceKey = `ios:${device.id}`;
-        const idbExists = await measurement.timed('capability_check_ms', () => isIDBInstalled());
-        if (!idbExists) {
-            const snapshotMetadata = deriveSnapshotMetadata(deviceKey, null, 'ui_tree');
-            measurement.setOutcome('unavailable');
-            measurement.finish();
-            return {
-                device,
-                screen: "",
-                resolution: { width: 0, height: 0 },
-                elements: [],
-                ...snapshotMetadata,
-                error: "iOS UI tree retrieval requires 'idb' (iOS Device Bridge). Please install it via Homebrew: `brew tap facebook/fb && brew install idb-companion` and `pip3 install fb-idb`."
-            };
-        }
-        const targetUdid = (device.id && device.id !== 'booted') ? device.id : undefined;
-        let jsonContent = null;
-        let attempts = 0;
-        const maxAttempts = 3;
-        while (attempts < maxAttempts) {
-            remainingBudget();
-            attempts++;
-            try {
-                await measurement.timed('observation_wait_ms', () => delay(Math.min(remainingBudget(300 + (attempts * 100)), 300 + (attempts * 100))));
-                remainingBudget();
-                const args = ['ui', 'describe-all', '--json'];
-                if (targetUdid) {
-                    args.push('--udid', targetUdid);
-                }
-                const output = await measurement.physicalRead(async () => {
-                    const result = await execCmd(getIdbCmd(), args, { timeout: remainingBudget() });
-                    if (result.stderr === 'ACTION_TIMEOUT')
-                        throw new Error('ACTION_TIMEOUT');
-                    if (result.exitCode !== 0)
-                        throw new Error(`idb failed (code ${result.exitCode}): ${result.stderr}`);
-                    if (!result.stdout.trim())
-                        throw new Error('Empty idb UI tree output');
-                    return result.stdout;
-                });
-                if (output && output.trim().length > 0) {
-                    jsonContent = await measurement.timed('parse_ms', async () => JSON.parse(output));
-                    break; // Success
-                }
-            }
-            catch (e) {
-                if (e instanceof Error && e.message === 'ACTION_TIMEOUT')
-                    throw e;
-                console.error(`Attempt ${attempts} failed: ${e}`);
-            }
-            if (attempts === maxAttempts) {
-                const snapshotMetadata = deriveSnapshotMetadata(deviceKey, null, 'ui_tree');
-                measurement.setOutcome('unavailable');
-                measurement.finish();
-                return {
-                    device,
-                    screen: "",
-                    resolution: { width: 0, height: 0 },
-                    elements: [],
-                    ...snapshotMetadata,
-                    error: `Failed to retrieve valid UI dump after ${maxAttempts} attempts.`
-                };
-            }
-        }
-        try {
-            const elements = await measurement.timed('conversion_ms', async () => {
-                const parsed = [];
-                if (Array.isArray(jsonContent)) {
-                    for (const node of jsonContent)
-                        traverseIDBNode(node, parsed);
-                }
-                else {
-                    traverseIDBNode(jsonContent, parsed);
-                }
-                return parsed;
-            });
-            let width = 0;
-            let height = 0;
-            if (elements.length > 0) {
-                const rootBounds = elements[0].bounds;
-                width = rootBounds[2] - rootBounds[0];
-                height = rootBounds[3] - rootBounds[1];
-            }
-            const snapshotMetadata = deriveSnapshotMetadata(deviceKey, {
-                screen: "",
-                resolution: { width, height },
-                elements
-            }, 'ui_tree');
-            measurement.setOutcome('observed');
-            const response = measurement.bindObservation({
-                device,
-                screen: "",
-                resolution: { width, height },
-                elements,
-                ...snapshotMetadata
-            });
-            measurement.finish();
-            return response;
-        }
-        catch (e) {
-            const snapshotMetadata = deriveSnapshotMetadata(deviceKey, null, 'ui_tree');
-            measurement.setOutcome('unavailable');
-            measurement.finish();
-            return {
-                device,
-                screen: "",
-                resolution: { width: 0, height: 0 },
-                elements: [],
-                ...snapshotMetadata,
-                error: `Failed to parse idb output: ${e instanceof Error ? e.message : String(e)}`
-            };
-        }
-    }
+    async collectGetUITree(deviceId = "booted") { return collectGetUITree(deviceId); }
     async getScreenFingerprint(deviceId = 'booted') {
         return captureEvidence('fingerprint', { platform: 'ios', id: deviceId ?? '' }, () => this.collectGetScreenFingerprint(deviceId));
     }
-    async collectGetScreenFingerprint(deviceId = 'booted') {
-        try {
-            const tree = await this.getUITree(deviceId);
-            if (!tree || tree.error)
-                return { fingerprint: null, error: tree && tree.error };
-            return { ...computeScreenFingerprint(tree, null, 'ios', 50), captured_at_ms: tree.captured_at_ms };
-        }
-        catch (e) {
-            return { fingerprint: null, error: e instanceof Error ? e.message : String(e) };
-        }
-    }
-    async startLogStream(bundleId, deviceId = 'booted', sessionId = 'default') {
-        try {
-            const simple = bundleId.split('.').pop() || bundleId;
-            const predicate = `process == "${simple}" or process == "${bundleId}" or subsystem contains "${bundleId}"`;
-            if (iosActiveLogStreams.has(sessionId)) {
-                try {
-                    iosActiveLogStreams.get(sessionId).proc.kill();
-                }
-                catch { }
-                iosActiveLogStreams.delete(sessionId);
-            }
-            const args = ['simctl', 'spawn', deviceId, 'log', 'stream', '--style', 'syslog', '--predicate', predicate];
-            const proc = spawn(getXcrunCmd(), args);
-            const tmpDir = process.env.TMPDIR || '/tmp';
-            const file = path.join(tmpDir, `mobile-debug-ios-log-${sessionId}.ndjson`);
-            const stream = createWriteStream(file, { flags: 'a' });
-            proc.stdout.on('data', (chunk) => {
-                const text = chunk.toString();
-                const lines = text.split(/\r?\n/).filter(Boolean);
-                for (const l of lines) {
-                    const entry = parseLogLine(l);
-                    stream.write(JSON.stringify(entry) + '\n');
-                }
-            });
-            proc.stderr.on('data', (chunk) => {
-                const text = chunk.toString();
-                const lines = text.split(/\r?\n/).filter(Boolean);
-                for (const l of lines) {
-                    const entry = { timestamp: '', level: 'E', tag: 'xcrun', message: l };
-                    stream.write(JSON.stringify(entry) + '\n');
-                }
-            });
-            proc.on('close', () => {
-                stream.end();
-                if (iosActiveLogStreams.get(sessionId)?.proc === proc)
-                    iosActiveLogStreams.delete(sessionId);
-            });
-            iosActiveLogStreams.set(sessionId, { proc, file, device: { platform: 'ios', id: deviceId ?? '' } });
-            return { success: true, stream_started: true };
-        }
-        catch {
-            return { success: false, error: 'log_stream_start_failed' };
-        }
-    }
-    async stopLogStream(sessionId = 'default') {
-        const entry = iosActiveLogStreams.get(sessionId);
-        if (!entry)
-            return { success: true };
-        try {
-            entry.proc.kill();
-        }
-        catch { }
-        iosActiveLogStreams.delete(sessionId);
-        return { success: true };
-    }
-    async readLogStream(sessionId = 'default', limit = 100, since) {
-        return captureEvidence('logs', this.getLogStreamDevice(sessionId), () => this.collectReadLogStream(sessionId, limit, since));
-    }
-    async collectReadLogStream(sessionId = 'default', limit = 100, since) {
-        const entry = iosActiveLogStreams.get(sessionId);
-        if (!entry)
-            return { entries: [] };
-        try {
-            const data = await fsPromises.readFile(entry.file, 'utf8').catch(() => '');
-            if (!data)
-                return { entries: [], crash_summary: { crash_detected: false } };
-            const lines = data.split(/\r?\n/).filter(Boolean);
-            const parsed = lines.map(l => {
-                try {
-                    return JSON.parse(l);
-                }
-                catch {
-                    return { message: l, _iso: null, crash: false };
-                }
-            });
-            let filtered = parsed;
-            if (since) {
-                let sinceMs = null;
-                if (/^\d+$/.test(since))
-                    sinceMs = Number(since);
-                else {
-                    const sDate = new Date(since);
-                    if (!isNaN(sDate.getTime()))
-                        sinceMs = sDate.getTime();
-                }
-                if (sinceMs !== null) {
-                    filtered = parsed.filter(p => p._iso && (new Date(p._iso).getTime() >= sinceMs));
-                }
-            }
-            const entries = filtered.slice(-Math.max(0, limit));
-            const crashEntry = entries.find(e => e.crash);
-            const crash_summary = crashEntry ? { crash_detected: true, exception: crashEntry.exception, sample: crashEntry.message } : { crash_detected: false };
-            return { entries, crash_summary };
-        }
-        catch {
-            return { entries: [], crash_summary: { crash_detected: false } };
-        }
-    }
+    async collectGetScreenFingerprint(deviceId = 'booted') { return collectGetScreenFingerprint(this, deviceId); }
+    async startLogStream(bundleId, deviceId = 'booted', sessionId = 'default') { return startLogStream(bundleId, deviceId, sessionId); }
+    async stopLogStream(sessionId = 'default') { return stopLogStream(sessionId); }
+    async readLogStream(sessionId = 'default', limit = 100, since) { return readLogStream(sessionId, limit, since); }
+    async collectReadLogStream(sessionId = 'default', limit = 100, since) { return collectReadLogStream(sessionId, limit, since); }
 }