rea-agents 6.5.0 → 6.7.0

package/dist/adb/AdbShellOutput.js

@@ -1,10 +1,3 @@
-/**
- * Parsers for fixed observation commands REA runs through `adb shell`.
- *
- * Formats follow toybox output on Android 8+ (verified against an Android 14
- * emulator). Unparseable lines are retained rather than dropped so callers
- * can see the format drift instead of silently losing rows.
- */
 const PROCESS_LINE = /^(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/u;
 /** Parse `ps -A` output; the header line is preserved verbatim as `columns`. */
 export const parseProcessListOutput = (stdout) => {
@@ -83,6 +76,7 @@ const SIZE_PAIR = /^Physical size:\s+(\d+)x(\d+)$/u;
 const SIZE_OVERRIDE = /^Override size:\s+(\d+)x(\d+)$/u;
 const DENSITY_PHYSICAL = /^Physical density:\s+(\d+)$/u;
 const DENSITY_OVERRIDE = /^Override density:\s+(\d+)$/u;
+const DENSITY_BARE = /^(\d+)$/u;
 /** Parse `wm size` output into physical and optional override sizes. */
 export const parseWmSizeOutput = (stdout) => {
     let physical = null;
@@ -104,10 +98,16 @@ export const parseWmSizeOutput = (stdout) => {
     }
     return { physical, override };
 };
-/** Parse `wm density` output. Older builds print a bare number. */
+/**
+ * Parse `wm density` output. Current builds print labeled physical and
+ * optional override lines; older builds print the physical density as a
+ * bare number on its own line (morluto/rea#3942). A labeled declaration
+ * wins over a bare one so a mixed dump cannot downgrade the physical value.
+ */
 export const parseWmDensityOutput = (stdout) => {
     let physical = null;
     let override = null;
+    let bare = null;
     for (const line of stdout.split(/\r?\n/u)) {
         const trimmed = line.trim();
         const physicalMatch = DENSITY_PHYSICAL.exec(trimmed);
@@ -116,21 +116,74 @@ export const parseWmDensityOutput = (stdout) => {
         const overrideMatch = DENSITY_OVERRIDE.exec(trimmed);
         if (overrideMatch !== null)
             override = Number(overrideMatch[1]);
+        const bareMatch = DENSITY_BARE.exec(trimmed);
+        if (bareMatch !== null && bare === null)
+            bare = Number(bareMatch[1]);
     }
-    return { physical, override };
+    return { physical: physical ?? bare, override };
 };
-/** Parse focus declarations from `dumpsys window windows` or `displays`. */
+/** Own declaration identity and omission before deriving a singular summary. */
 export const parseWindowFocusOutput = (stdout) => {
-    let focusedWindow = null;
-    let focusedApp = null;
+    const contexts = [];
+    const observedLines = [];
+    let current;
     for (const line of stdout.split(/\r?\n/u)) {
         const trimmed = line.trim();
-        if (focusedWindow === null && trimmed.startsWith("mCurrentFocus="))
-            focusedWindow = trimmed.slice("mCurrentFocus=".length).trim();
-        if (focusedApp === null && trimmed.startsWith("mFocusedApp="))
-            focusedApp = trimmed.slice("mFocusedApp=".length).trim();
+        if (trimmed.startsWith("Display:")) {
+            current = {
+                scope: "display",
+                display_id: /^Display:\s+mDisplayId=(-?[0-9]+)(?:\s|$)/u.exec(trimmed)?.[1] ??
+                    null,
+                header_line: line,
+                declarations: [],
+            };
+            contexts.push(current);
+            observedLines.push(line);
+            continue;
+        }
+        const field = trimmed.startsWith("mCurrentFocus=")
+            ? "mCurrentFocus"
+            : trimmed.startsWith("mFocusedApp=")
+                ? "mFocusedApp"
+                : undefined;
+        if (field === undefined)
+            continue;
+        if (current === undefined) {
+            current = {
+                scope: "unscoped",
+                display_id: null,
+                header_line: null,
+                declarations: [],
+            };
+            contexts.push(current);
+        }
+        const value = trimmed.slice(field.length + 1).trim();
+        current.declarations.push({
+            field,
+            value: value === "null" ? null : value,
+            raw_line: line,
+        });
+        observedLines.push(line);
     }
-    return { focusedWindow, focusedApp };
+    const windows = contexts.length === 1
+        ? contexts[0].declarations.filter(({ field }) => field === "mCurrentFocus")
+        : [];
+    const apps = contexts.length === 1
+        ? contexts[0].declarations.filter(({ field }) => field === "mFocusedApp")
+        : [];
+    const declared = contexts.some(({ declarations }) => declarations.length > 0);
+    const summary = !declared
+        ? "unavailable"
+        : contexts.length === 1 && windows.length <= 1 && apps.length <= 1
+            ? "single_context"
+            : "ambiguous";
+    return {
+        focused_window: summary === "single_context" ? (windows[0]?.value ?? null) : null,
+        focused_app: summary === "single_context" ? (apps[0]?.value ?? null) : null,
+        focus_summary: summary,
+        focus_contexts: contexts,
+        observed_lines: observedLines,
+    };
 };
 const DETAIL_LINE = /^\s+([A-Za-z][A-Za-z0-9_]*)=(.*)$/u;
 /**
@@ -149,9 +202,12 @@ export const parseDumpsysPackageOutput = (stdout) => {
         pkgFlags: null,
     };
     let inPermissions = false;
+    let hasPermissionsSection = false;
     let permissions = 0;
+    let parsedPackageAvailable = null;
     for (const line of stdout.split(/\r?\n/u)) {
         if (line.trim().startsWith("requested permissions:")) {
+            hasPermissionsSection = true;
             inPermissions = true;
             continue;
         }
@@ -167,12 +223,18 @@ export const parseDumpsysPackageOutput = (stdout) => {
             continue;
         const key = match[1];
         const value = match[2].trim();
-        if (key === "versionName" && details.versionName === null)
+        if (key === "pkg" && parsedPackageAvailable === null) {
+            if (value === "null")
+                parsedPackageAvailable = false;
+            else if (value.startsWith("Package{") && value.endsWith("}"))
+                parsedPackageAvailable = true;
+        }
+        else if (key === "versionName" && details.versionName === null)
             details.versionName = value === "" ? null : value;
         else if (key === "versionCode" && details.versionCode === null) {
-            const parsed = /^(\d+)/u.exec(value);
+            const parsed = /^(-?\d+)/u.exec(value);
             if (parsed !== null)
-                details.versionCode = Number(parsed[1]);
+                details.versionCode = parsed[1];
         }
         else if (key === "firstInstallTime" && details.firstInstallTime === null)
             details.firstInstallTime = value === "" ? null : value;
@@ -189,7 +251,16 @@ export const parseDumpsysPackageOutput = (stdout) => {
         else if (key === "pkgFlags" && details.pkgFlags === null)
             details.pkgFlags = value === "" ? null : value;
     }
-    return { ...details, requestedPermissions: permissions };
+    // `dumpsys` omits this section both for known-empty inventories and when
+    // Package Manager has no parsed package; only the former is a known zero.
+    const requestedPermissions = parsedPackageAvailable === false
+        ? null
+        : hasPermissionsSection
+            ? permissions
+            : parsedPackageAvailable === true
+                ? 0
+                : null;
+    return { ...details, requestedPermissions };
 };
 /**
  * Parse `settings get` output. Android prints the literal string `null` for

package/dist/android/AndroidTargetSnapshot.js

@@ -4,13 +4,13 @@ import { join } from "node:path";
 import { Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { AnalysisInputError, AnalysisCapabilityUnavailableError, } from "../domain/analysisErrorCore.js";
-import { openRegularFile, sameRegularFileState, } from "../filesystem/RegularFile.js";
+import { openRegularFile, assertRegularFileActive, sameRegularFileState, } from "../filesystem/RegularFile.js";
 /** Bind decompiler input to the admitted artifact, even if the original changes. */
 export const snapshotAndroidTarget = async (path, sha256, root, operation, signal) => {
     const snapshot = join(root, "target.apk");
     try {
         await copyAndroidSnapshot(path, snapshot, sha256, signal);
-        signal?.throwIfAborted();
+        assertRegularFileActive(signal);
         await chmod(snapshot, 0o400);
         return snapshot;
     }
@@ -31,7 +31,7 @@ export const snapshotAndroidEngine = async (source, sha256, root, operation, sig
     const path = join(root, "engine.jar");
     try {
         const observed = await copyAndroidSnapshot(source, path, sha256, signal);
-        signal?.throwIfAborted();
+        assertRegularFileActive(signal);
         await chmod(path, 0o400);
         return { path, sha256: observed };
     }
@@ -42,7 +42,7 @@ export const snapshotAndroidEngine = async (source, sha256, root, operation, sig
     }
 };
 const copyAndroidSnapshot = async (sourcePath, snapshotPath, expectedSha256, signal) => {
-    signal?.throwIfAborted();
+    assertRegularFileActive(signal);
     const source = await openRegularFile(sourcePath, {
         symlinks: "follow",
         signal,
@@ -55,7 +55,7 @@ const copyAndroidSnapshot = async (sourcePath, snapshotPath, expectedSha256, sig
     const hash = createHash("sha256");
     try {
         const initial = await source.stat();
-        signal?.throwIfAborted();
+        assertRegularFileActive(signal);
         const digest = new Transform({
             transform(chunk, _encoding, callback) {
                 copiedBytes += chunk.length;
@@ -69,7 +69,7 @@ const copyAndroidSnapshot = async (sourcePath, snapshotPath, expectedSha256, sig
         });
         try {
             destination = await open(snapshotPath, "wx", 0o600);
-            signal?.throwIfAborted();
+            assertRegularFileActive(signal);
             inputStream = source.createReadStream({
                 start: 0,
                 end: initial.size,
@@ -77,7 +77,7 @@ const copyAndroidSnapshot = async (sourcePath, snapshotPath, expectedSha256, sig
             });
             outputStream = destination.createWriteStream({ autoClose: false });
             await pipeline(inputStream, digest, outputStream, { signal });
-            signal?.throwIfAborted();
+            assertRegularFileActive(signal);
             await verifySourceState(source, sourcePath, initial, copiedBytes);
             const observedSha256 = hash.digest("hex");
             if (observedSha256 !== expectedSha256)

package/dist/android/JadxAnalysis.js

@@ -1,7 +1,6 @@
 import { androidResultSchemas } from "../domain/android/androidAnalysis.js";
-import { AnalysisCapabilityUnavailableError, AnalysisInputError, AnalysisOutputError, } from "../domain/analysisErrorCore.js";
+import { AnalysisInputError, AnalysisOutputError, } from "../domain/analysisErrorCore.js";
 import { jadxAppSchema, jadxClassPageSchema, jadxClassSchema, jadxLoadSchema, jadxMethodSchema, jadxXrefsSchema, normalizeJadxText, } from "./JadxProtocol.js";
-import { JADX_RELEASE } from "./JadxRelease.js";
 const methodsOf = (summary) => {
     const seen = new Map();
     return summary.methods.map((method) => {
@@ -60,39 +59,43 @@ const inspectPackage = async (tools, loaded, engine) => {
     });
 };
 const searchClasses = async (tools, request, loaded, engine) => {
-    const classes = [];
+    const matches = [];
     const pageSize = 4096;
-    let total;
+    let offset = 0;
     do {
         const page = jadxClassPageSchema.parse(await tools.json("list_classes", {
-            offset: classes.length,
+            query: request.input.query,
+            offset,
             limit: pageSize,
         }));
-        if ((total !== undefined && total !== page.total) ||
-            page.offset !== classes.length ||
+        if (page.total_classes !== loaded.class_count ||
+            page.offset !== offset ||
             page.limit !== pageSize ||
-            page.items.length > pageSize)
+            page.next_offset < offset ||
+            page.next_offset > loaded.class_count ||
+            page.items.length > pageSize ||
+            page.items.length > page.next_offset - offset ||
+            (request.input.query === "" &&
+                page.items.length !== page.next_offset - offset) ||
+            page.items.some((name) => !name.includes(request.input.query)))
             throw new AnalysisOutputError(request.operation, "JADX class pagination changed identity or counts");
-        total = page.total;
-        classes.push(...page.items);
-        if (classes.length > total ||
-            (page.items.length === 0 && classes.length < total))
+        if ((offset < loaded.class_count && page.next_offset === offset) ||
+            (page.next_offset < loaded.class_count && page.items.length !== pageSize))
             throw new AnalysisOutputError(request.operation, "JADX class pagination is incomplete");
-    } while (classes.length < total);
-    if (total !== loaded.class_count)
-        throw new AnalysisOutputError(request.operation, "JADX class inventory count differs from the loaded class count");
+        matches.push(...page.items);
+        offset = page.next_offset;
+    } while (offset < loaded.class_count);
     const occurrences = new Map();
-    for (const name of classes)
+    for (const name of matches)
         occurrences.set(name, (occurrences.get(name) ?? 0) + 1);
-    const matchingNames = classes.filter((name) => name.includes(request.input.query));
     const duplicateNames = [...occurrences]
-        .filter(([name, count]) => count > 1 && name.includes(request.input.query))
+        .filter(([, count]) => count > 1)
         .map(([name, count]) => ({ name, occurrences: count }));
     return androidResultSchemas.search_android_classes.parse({
         engine,
         query: request.input.query,
-        total_classes: total,
-        matches: matchingNames,
+        total_classes: loaded.class_count,
+        matches,
         duplicate_names: duplicateNames,
         coverage: "complete",
     });
@@ -108,8 +111,7 @@ const inspectMethod = async (tools, request, summary, engine) => {
     if (candidates.length > 1 && request.input.overload_index === undefined)
         inputFailure(request, "overload_index", `Select one of ${candidates.length} overloads: ${candidates.map((method) => `${method.overload_index}: ${method.reported_signature}`).join("; ")}`);
     const index = request.input.overload_index ?? 0;
-    const selected = candidates[index];
-    if (selected === undefined)
+    const selected = candidates[index] ??
         inputFailure(request, "overload_index", `Index ${index} is outside the ${candidates.length} matching overloads.`);
     const body = jadxMethodSchema.parse(await tools.json("get_method_body", {
         class_name: summary.full_name,
@@ -120,23 +122,16 @@ const inspectMethod = async (tools, request, summary, engine) => {
     if (body.class_name !== summary.full_name ||
         body.method_name !== request.input.method_name ||
         body.overload_index !== index ||
-        body.overload_count !== candidates.length)
+        body.overload_count !== candidates.length ||
+        body.dex_descriptor !== selected.dex_descriptor)
         throw new AnalysisOutputError(request.operation, "JADX returned a different method or overload inventory");
-    if (body.body.startsWith("// ERROR:"))
-        throw new AnalysisOutputError(request.operation, `JADX did not produce method source: ${body.body}`);
-    if (body.mode === "smali" && candidates.length > 1)
-        throw new AnalysisCapabilityUnavailableError("jadx", request.operation, `JADX ${JADX_RELEASE.version} smali fallback joins all same-name overloads for ${summary.full_name}.${request.input.method_name}; it cannot establish source for only overload ${index}.`);
     return androidResultSchemas.inspect_android_method.parse({
         engine,
         class_name: summary.full_name,
         method: selected,
         overload_count: candidates.length,
         representation: body.mode,
-        body_status: body.body.length === 0 ||
-            body.body ===
-                "// method exists but has no decompiled body (native/abstract)"
-            ? "not_available"
-            : "available",
+        body_status: body.body.length === 0 ? "not_available" : "available",
         fell_back: body.fell_back,
         markers: body.markers,
         source: normalizeJadxText(body.body),