fix(native): report why a selected plist cannot be inspected
`inspect_plist` turned a missing selected plist, a directory, or a file that is not a property list into a generic execution failure that advised retrying and running `rea doctor`. A bare Mach-O without Contents/Info.plist failed the same way. Check the resolved path before running plutil and keep plutil's decode diagnostic. A caller-selected path now fails as invalid input naming the path and the reason; a missing default Info.plist is unavailable for the target. The CLI no longer sends Contents/Info.plist as an explicit selection, so its default matches the MCP default. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
cfd2b0c75d
commit
0674facd46
@@ -28,6 +28,7 @@ import type { EvidenceLocation } from "../domain/evidence.js";
|
||||
import {
|
||||
AnalysisCancelledError,
|
||||
AnalysisCapabilityUnavailableError,
|
||||
AnalysisInputError,
|
||||
AnalysisOutputError,
|
||||
} from "../domain/analysisErrorCore.js";
|
||||
import { ProviderAdapterError } from "../domain/providerAdapterError.js";
|
||||
@@ -419,6 +420,8 @@ class NativeMacOSClient implements AnalysisClient {
|
||||
);
|
||||
const plist = await resolvePlistPath(this.target, requested);
|
||||
if (!plist.ok) return plist;
|
||||
const selected = await requireRegularPlist(plist.value, requested);
|
||||
if (!selected.ok) return selected;
|
||||
const classified = await this.#run(
|
||||
"inspect_plist",
|
||||
"file",
|
||||
@@ -445,9 +448,17 @@ class NativeMacOSClient implements AnalysisClient {
|
||||
"inspect_plist",
|
||||
"plutil",
|
||||
["-convert", "xml1", "-o", "-", "--", plist.value],
|
||||
{ signal },
|
||||
{ signal, acceptNonZero: !jsonDecoded },
|
||||
);
|
||||
if (xml !== undefined && !xml.ok) return xml;
|
||||
if (xml !== undefined && xml.value.exitCode !== 0)
|
||||
return err(
|
||||
unreadablePlist(
|
||||
plist.value,
|
||||
requested,
|
||||
`plutil could not decode it as a property list (${plutilDiagnostic(xml.value.stderr, plist.value)})`,
|
||||
),
|
||||
);
|
||||
const parsed =
|
||||
xml === undefined
|
||||
? parsePlistJson(json.value.stdout)
|
||||
@@ -637,6 +648,57 @@ const parseEntitlements = (output: string): JsonValue | null => {
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* Report a plist that cannot be decoded as the caller's selection, or as the
|
||||
* target's missing default, rather than as a failed tool run.
|
||||
*/
|
||||
const unreadablePlist = (
|
||||
path: string,
|
||||
requested: string | undefined,
|
||||
reason: string,
|
||||
): AnalysisError => {
|
||||
const sentence = reason.endsWith(".") ? reason : `${reason}.`;
|
||||
return requested === undefined
|
||||
? new AnalysisCapabilityUnavailableError(
|
||||
IDENTITY.id,
|
||||
"inspect_plist",
|
||||
`The target has no readable Contents/Info.plist at ${path}: ${sentence} Pass path to inspect another plist.`,
|
||||
)
|
||||
: new AnalysisInputError("inspect_plist", undefined, [
|
||||
{
|
||||
path: ["path"],
|
||||
reason: "invalid_value",
|
||||
message: `Cannot inspect ${path}: ${sentence}`,
|
||||
},
|
||||
]);
|
||||
};
|
||||
|
||||
/** plutil prefixes its diagnostic with the path the message already names. */
|
||||
const plutilDiagnostic = (stderr: string, path: string): string => {
|
||||
const text = stderr.trim();
|
||||
return text.startsWith(`${path}: `) ? text.slice(path.length + 2) : text;
|
||||
};
|
||||
|
||||
const requireRegularPlist = async (
|
||||
path: string,
|
||||
requested: string | undefined,
|
||||
): Promise<Result<null, AnalysisError>> => {
|
||||
try {
|
||||
if ((await stat(path)).isFile()) return ok(null);
|
||||
return err(unreadablePlist(path, requested, "it is not a regular file"));
|
||||
} catch (cause: unknown) {
|
||||
if (
|
||||
cause instanceof Error &&
|
||||
"code" in cause &&
|
||||
(cause.code === "ENOENT" || cause.code === "ENOTDIR")
|
||||
)
|
||||
return err(unreadablePlist(path, requested, "no file exists there"));
|
||||
return err(
|
||||
new ProviderAdapterError(IDENTITY.id, "inspect_plist", { cause }),
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const resolvePlistPath = async (
|
||||
target: BinaryTarget,
|
||||
requested: string | undefined,
|
||||
|
||||
Reference in New Issue
Block a user