fix(native): distinguish batch selectors from resolved entries

This commit is contained in:
N0zoM1z0
2026-10-09 19:09:30 +08:00
parent 6cc817e8bd
commit bfaa5a6c2c
9 changed files with 281 additions and 13 deletions
+44 -2
View File
@@ -254,20 +254,33 @@ export class EnhancedTools {
): EnhancedResult {
const items = await Promise.all(
addresses.map(async (address) => {
const resolved = await resolveProcedureAddress(
this.#call.bind(this),
address,
signal,
);
const procedure = resolved.ok
? await this.#batchProcedureIdentity(resolved.value, signal)
: {
status: "unknown" as const,
error: projectAnalysisError(resolved.error),
};
const result = await this.#call(
"procedure_pseudo_code",
{ procedure: address },
{ procedure: resolved.ok ? resolved.value : address },
signal,
);
if (!result.ok)
return {
address,
procedure,
status: "error" as const,
error: projectAnalysisError(result.error),
};
if (typeof result.value !== "string" || result.value.length === 0)
return {
address,
procedure,
status: "error" as const,
error: projectAnalysisError(
new AnalysisOutputError(
@@ -276,7 +289,12 @@ export class EnhancedTools {
),
),
};
return { address, status: "ok" as const, pseudocode: result.value };
return {
address,
procedure,
status: "ok" as const,
pseudocode: result.value,
};
}),
);
const succeeded = items.filter(({ status }) => status === "ok").length;
@@ -288,6 +306,30 @@ export class EnhancedTools {
});
}
async #batchProcedureIdentity(address: string, signal?: AbortSignal) {
const observed = await this.#call("address_name", { address }, signal);
const named =
observed.ok &&
(typeof observed.value === "string" || observed.value === null);
return {
status: "resolved" as const,
address,
name: named ? observed.value : null,
...(named
? {}
: {
name_error: projectAnalysisError(
observed.ok
? new AnalysisOutputError(
"address_name",
"provider returned an invalid entry label",
)
: observed.error,
),
}),
};
}
async #callGraph(
input: {
readonly address: string;