Declare the missing trace composition and correct call graph prerequisites to require address resolution plus the selected relationship direction. Report forward/backward modes and the actual default independently, preserving missing operations, owner failure reasons and direct partial outcomes. Share the direction-to-provider mapping across runtime and discovery, reuse the mode evaluator, select defaults by name, and check composition coverage against every canonical enhanced contract. Keep same-endpoint traces callable without relationship reads. Adapt the missing trace-composition correction proposed in PR #4729 and complete the directly related ownership/refactoring and sibling graph correction. Validation: 75 source tests and 76 public MCP/schema tests passed; full static/architecture checks, docs and test discovery passed. Controlled SDK/provider workflows verified unchanged catalogs and normalized traces. Small whole-session costs were recorded, with no speedup claim. No native-engine, CLI, Linux/Windows or model tool-selection qualification. Fixes #4687 Fixes #5068 Co-authored-by: AHMED <aptech356@gmail.com>
290 lines
9.2 KiB
TypeScript
290 lines
9.2 KiB
TypeScript
import type { CallRelationshipDirection } from "../contracts/enhancedInputs.js";
|
|
import { CALL_RELATIONSHIP_TRAVERSALS } from "./CallRelationshipTraversal.js";
|
|
import type {
|
|
AnalysisExecution,
|
|
AnalysisOperation,
|
|
ExecutionOptions,
|
|
} from "./AnalysisProvider.js";
|
|
import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
|
|
import { AnalysisCancelledError } from "../domain/analysisErrorCore.js";
|
|
import type { AnalysisError } from "../domain/analysisErrorBase.js";
|
|
import { parseRelatedAddresses } from "../domain/hopperValues.js";
|
|
import type { JsonValue } from "../domain/jsonValue.js";
|
|
import { err, ok, type Result } from "../domain/result.js";
|
|
import type { EnhancedResult } from "./EnhancedToolTypes.js";
|
|
import { resolveProcedureAddress } from "./ProcedureAddressResolution.js";
|
|
import type { RelationshipCoverage } from "../domain/relationshipCoverage.js";
|
|
|
|
type AnalysisCall = (
|
|
name: AnalysisOperation,
|
|
arguments_: Readonly<Record<string, JsonValue>>,
|
|
signal?: AbortSignal,
|
|
selectorOrigin?: ExecutionOptions["selectorOrigin"],
|
|
) => Promise<Result<JsonValue, AnalysisError>>;
|
|
|
|
type RelationshipCall = (
|
|
name: AnalysisOperation,
|
|
arguments_: Readonly<Record<string, JsonValue>>,
|
|
signal?: AbortSignal,
|
|
selectorOrigin?: ExecutionOptions["selectorOrigin"],
|
|
) => Promise<Result<AnalysisExecution, AnalysisError>>;
|
|
|
|
export interface CallPathTraceInput {
|
|
readonly start: string;
|
|
readonly goal?: string | undefined;
|
|
readonly direction: CallRelationshipDirection;
|
|
}
|
|
|
|
interface TraceState {
|
|
readonly visited: Map<
|
|
string,
|
|
{ readonly depth: number; readonly path: string[] }
|
|
>;
|
|
readonly queue: string[];
|
|
readonly edges: Map<
|
|
string,
|
|
{
|
|
readonly source_address: string;
|
|
readonly target_address: string;
|
|
readonly discovery_depth: number;
|
|
}
|
|
>;
|
|
readonly failures: Array<{
|
|
readonly address: string;
|
|
readonly error: ReturnType<typeof projectAnalysisError>;
|
|
}>;
|
|
readonly residual: Set<string>;
|
|
readonly limitations: Set<string>;
|
|
readonly relationshipCoverage: Map<string, RelationshipCoverage>;
|
|
queueIndex: number;
|
|
traversalPath: string[];
|
|
}
|
|
|
|
interface AddressExpansion {
|
|
readonly input: CallPathTraceInput;
|
|
readonly state: TraceState;
|
|
readonly address: string;
|
|
readonly current: { readonly depth: number; readonly path: string[] };
|
|
readonly signal?: AbortSignal;
|
|
}
|
|
|
|
interface DiscoveredEdge {
|
|
readonly address: string;
|
|
readonly relatedAddress: string;
|
|
readonly discoveryDepth: number;
|
|
}
|
|
|
|
/** Trace direct caller/callee relationships until the graph is exhausted or the goal is reached. */
|
|
export const traceCallPath = async (
|
|
call: AnalysisCall,
|
|
callRelationship: RelationshipCall,
|
|
input: CallPathTraceInput,
|
|
signal?: AbortSignal,
|
|
): EnhancedResult => {
|
|
const start = await resolveProcedureAddress(call, input.start, signal);
|
|
if (!start.ok) return start;
|
|
let goal: string | undefined;
|
|
if (input.goal !== undefined) {
|
|
const resolved = await resolveProcedureAddress(call, input.goal, signal);
|
|
if (!resolved.ok) return resolved;
|
|
goal = resolved.value;
|
|
}
|
|
const resolvedInput = {
|
|
start: start.value,
|
|
...(goal === undefined ? {} : { goal }),
|
|
direction: input.direction,
|
|
};
|
|
if (isAborted(signal))
|
|
return err(new AnalysisCancelledError("trace_call_path"));
|
|
const state = createTraceState(resolvedInput);
|
|
while (
|
|
state.queueIndex < state.queue.length &&
|
|
state.traversalPath.length === 0
|
|
) {
|
|
if (isAborted(signal))
|
|
return err(new AnalysisCancelledError("trace_call_path"));
|
|
const address = state.queue[state.queueIndex++];
|
|
if (address === undefined) break;
|
|
const current = state.visited.get(address);
|
|
if (current === undefined) continue;
|
|
const expanded = await expandAddress(callRelationship, {
|
|
input: resolvedInput,
|
|
state,
|
|
address,
|
|
current,
|
|
...(signal === undefined ? {} : { signal }),
|
|
});
|
|
if (!expanded.ok) return expanded;
|
|
if (expanded.value) break;
|
|
}
|
|
if (isAborted(signal))
|
|
return err(new AnalysisCancelledError("trace_call_path"));
|
|
return ok(projectTrace(resolvedInput, state));
|
|
};
|
|
|
|
const createTraceState = (input: CallPathTraceInput): TraceState => ({
|
|
visited: new Map([[input.start, { depth: 0, path: [input.start] }]]),
|
|
queue: [input.start],
|
|
edges: new Map(),
|
|
failures: [],
|
|
residual: new Set(),
|
|
limitations: new Set(),
|
|
relationshipCoverage: new Map(),
|
|
queueIndex: 0,
|
|
traversalPath: input.goal === input.start ? [input.start] : [],
|
|
});
|
|
|
|
const expandAddress = async (
|
|
call: RelationshipCall,
|
|
expansion: AddressExpansion,
|
|
): Promise<Result<boolean, AnalysisError>> => {
|
|
const { input, state, address, current, signal } = expansion;
|
|
const { relation, operation: tool } =
|
|
CALL_RELATIONSHIP_TRAVERSALS[input.direction];
|
|
const result = await call(tool, { procedure: address }, signal, "provider");
|
|
if (!result.ok) {
|
|
if (
|
|
result.error._tag === "AnalysisCancelledError" ||
|
|
signal?.aborted === true
|
|
)
|
|
return result;
|
|
}
|
|
if (isAborted(signal))
|
|
return err(new AnalysisCancelledError("trace_call_path"));
|
|
if (!result.ok) {
|
|
state.failures.push({
|
|
address,
|
|
error: projectAnalysisError(result.error),
|
|
});
|
|
state.residual.add(`Call relationships were unavailable for ${address}.`);
|
|
return ok(false);
|
|
}
|
|
const related = parseRelatedAddresses(result.value.result, relation, tool);
|
|
if (!related.ok) {
|
|
state.failures.push({
|
|
address,
|
|
error: projectAnalysisError(related.error),
|
|
});
|
|
state.residual.add(`Call relationships were unreadable for ${address}.`);
|
|
return ok(false);
|
|
}
|
|
for (const limitation of result.value.limitations)
|
|
state.limitations.add(limitation);
|
|
const coverage = result.value.relationshipCoverage ?? {
|
|
status: "unknown",
|
|
reason: "Provider did not report relationship coverage.",
|
|
};
|
|
state.relationshipCoverage.set(address, coverage);
|
|
for (const diagnostic of "diagnostics" in coverage &&
|
|
Array.isArray(coverage.diagnostics)
|
|
? coverage.diagnostics
|
|
: [])
|
|
state.limitations.add(diagnostic);
|
|
if (coverage.status === "partial")
|
|
for (const limitation of coverage.limitations)
|
|
state.residual.add(
|
|
`Call relationships for ${address} are limited: ${limitation}`,
|
|
);
|
|
else if (coverage.status === "unknown")
|
|
state.residual.add(
|
|
`Call relationship coverage is unknown for ${address}: ${coverage.reason}`,
|
|
);
|
|
for (const relatedAddress of sortedUniqueAddresses(related.value)) {
|
|
recordEdge(input, state, {
|
|
address,
|
|
relatedAddress,
|
|
discoveryDepth: current.depth + 1,
|
|
});
|
|
const path = state.visited.get(relatedAddress)?.path ?? [
|
|
...current.path,
|
|
relatedAddress,
|
|
];
|
|
if (state.visited.has(relatedAddress)) {
|
|
if (relatedAddress === input.goal) {
|
|
state.traversalPath = path;
|
|
return ok(true);
|
|
}
|
|
continue;
|
|
}
|
|
state.visited.set(relatedAddress, {
|
|
depth: current.depth + 1,
|
|
path,
|
|
});
|
|
if (relatedAddress === input.goal) {
|
|
state.traversalPath = path;
|
|
return ok(true);
|
|
}
|
|
state.queue.push(relatedAddress);
|
|
}
|
|
return ok(false);
|
|
};
|
|
|
|
const recordEdge = (
|
|
input: CallPathTraceInput,
|
|
state: TraceState,
|
|
edge: DiscoveredEdge,
|
|
): void => {
|
|
const sourceAddress =
|
|
input.direction === "forward" ? edge.address : edge.relatedAddress;
|
|
const targetAddress =
|
|
input.direction === "forward" ? edge.relatedAddress : edge.address;
|
|
const edgeKey = `${sourceAddress}\u0000${targetAddress}`;
|
|
if (state.edges.has(edgeKey)) return;
|
|
state.edges.set(edgeKey, {
|
|
source_address: sourceAddress,
|
|
target_address: targetAddress,
|
|
discovery_depth: edge.discoveryDepth,
|
|
});
|
|
};
|
|
|
|
const projectTrace = (input: CallPathTraceInput, state: TraceState) => ({
|
|
start: input.start,
|
|
goal: input.goal ?? null,
|
|
direction: input.direction,
|
|
goal_status:
|
|
input.goal === undefined
|
|
? "not_requested"
|
|
: state.traversalPath.length > 0
|
|
? "reached"
|
|
: state.residual.size > 0
|
|
? "unknown"
|
|
: "not_reached",
|
|
nodes: [...state.visited.entries()]
|
|
.map(([address, { depth }]) => ({ address, depth }))
|
|
.sort(
|
|
(left, right) =>
|
|
left.depth - right.depth || compareAddress(left.address, right.address),
|
|
),
|
|
edges: [...state.edges.values()].sort(
|
|
(left, right) =>
|
|
left.discovery_depth - right.discovery_depth ||
|
|
compareAddress(left.source_address, right.source_address) ||
|
|
compareAddress(left.target_address, right.target_address),
|
|
),
|
|
traversal_path: state.traversalPath,
|
|
failures: state.failures,
|
|
traversal: {
|
|
nodes_visited: state.visited.size,
|
|
},
|
|
relationship_coverage: Object.fromEntries(
|
|
[...state.relationshipCoverage.entries()].sort(([left], [right]) =>
|
|
compareAddress(left, right),
|
|
),
|
|
),
|
|
truncated: state.residual.size > 0,
|
|
residual_unknowns: [...state.residual],
|
|
limitations: [
|
|
"Direct provider call relationships may omit unresolved indirect calls.",
|
|
...state.limitations,
|
|
],
|
|
});
|
|
|
|
const compareAddress = (left: string, right: string): number =>
|
|
left < right ? -1 : left > right ? 1 : 0;
|
|
|
|
const sortedUniqueAddresses = (addresses: readonly string[]): string[] =>
|
|
[...new Set(addresses)].sort(compareAddress);
|
|
|
|
const isAborted = (signal: AbortSignal | undefined): boolean =>
|
|
signal?.aborted === true;
|