@saptools/service-flow 0.1.48 → 0.1.50

package/dist/cli.js

@@ -14,8 +14,9 @@ import {
   parseOutboundCalls,
   parsePackageJson,
   parseServiceBindings,
+  parseVars,
   trace
-} from "./chunk-EGY2A4AT.js";
+} from "./chunk-52OUS3MO.js";
 
 // src/cli.ts
 import { Command } from "commander";
@@ -101,7 +102,7 @@ CREATE TABLE IF NOT EXISTS cds_services (id INTEGER PRIMARY KEY, repo_id INTEGER
 CREATE TABLE IF NOT EXISTS cds_operations (id INTEGER PRIMARY KEY, service_id INTEGER NOT NULL, operation_type TEXT NOT NULL, operation_name TEXT NOT NULL, operation_path TEXT NOT NULL, params_json TEXT NOT NULL, return_type TEXT, source_file TEXT NOT NULL, source_line INTEGER NOT NULL, provenance TEXT NOT NULL DEFAULT 'direct', base_operation_id INTEGER, FOREIGN KEY(service_id) REFERENCES cds_services(id) ON DELETE CASCADE, FOREIGN KEY(base_operation_id) REFERENCES cds_operations(id) ON DELETE SET NULL);
 CREATE TABLE IF NOT EXISTS symbols (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, file_id INTEGER, kind TEXT NOT NULL, name TEXT NOT NULL, qualified_name TEXT NOT NULL, exported INTEGER NOT NULL, start_line INTEGER NOT NULL, end_line INTEGER NOT NULL, start_offset INTEGER, end_offset INTEGER, source_file TEXT, exported_name TEXT, evidence_json TEXT, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(file_id) REFERENCES files(id) ON DELETE CASCADE);
 CREATE TABLE IF NOT EXISTS handler_classes (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, symbol_id INTEGER, class_name TEXT NOT NULL, source_file TEXT NOT NULL, source_line INTEGER NOT NULL, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(symbol_id) REFERENCES symbols(id) ON DELETE SET NULL);
-CREATE TABLE IF NOT EXISTS handler_methods (id INTEGER PRIMARY KEY, handler_class_id INTEGER NOT NULL, method_name TEXT NOT NULL, decorator_kind TEXT NOT NULL, decorator_value TEXT, decorator_raw_expression TEXT NOT NULL, source_file TEXT NOT NULL, source_line INTEGER NOT NULL, FOREIGN KEY(handler_class_id) REFERENCES handler_classes(id) ON DELETE CASCADE);
+CREATE TABLE IF NOT EXISTS handler_methods (id INTEGER PRIMARY KEY, handler_class_id INTEGER NOT NULL, method_name TEXT NOT NULL, decorator_kind TEXT NOT NULL, decorator_value TEXT, decorator_raw_expression TEXT NOT NULL, decorator_resolution_json TEXT NOT NULL DEFAULT '{}', source_file TEXT NOT NULL, source_line INTEGER NOT NULL, FOREIGN KEY(handler_class_id) REFERENCES handler_classes(id) ON DELETE CASCADE);
 CREATE TABLE IF NOT EXISTS handler_registrations (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, handler_class_id INTEGER, class_name TEXT, import_source TEXT, registration_file TEXT NOT NULL, registration_line INTEGER NOT NULL, registration_kind TEXT NOT NULL, confidence REAL NOT NULL, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(handler_class_id) REFERENCES handler_classes(id) ON DELETE SET NULL);
 CREATE TABLE IF NOT EXISTS service_bindings (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, symbol_id INTEGER, variable_name TEXT NOT NULL, alias TEXT, alias_expr TEXT, destination_expr TEXT, service_path_expr TEXT, is_dynamic INTEGER NOT NULL, placeholders_json TEXT NOT NULL, source_file TEXT NOT NULL, source_line INTEGER NOT NULL, helper_chain_json TEXT, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(symbol_id) REFERENCES symbols(id) ON DELETE SET NULL);
 CREATE TABLE IF NOT EXISTS outbound_calls (id INTEGER PRIMARY KEY, repo_id INTEGER NOT NULL, source_symbol_id INTEGER, call_type TEXT NOT NULL, service_binding_id INTEGER, method TEXT, operation_path_expr TEXT, query_entity TEXT, event_name_expr TEXT, payload_summary TEXT, source_file TEXT NOT NULL, source_line INTEGER NOT NULL, confidence REAL NOT NULL, unresolved_reason TEXT, local_service_name TEXT, local_service_lookup TEXT, alias_chain_json TEXT, evidence_json TEXT, external_target_kind TEXT, external_target_id TEXT, external_target_label TEXT, external_target_dynamic INTEGER NOT NULL DEFAULT 0, FOREIGN KEY(repo_id) REFERENCES repositories(id) ON DELETE CASCADE, FOREIGN KEY(source_symbol_id) REFERENCES symbols(id) ON DELETE SET NULL, FOREIGN KEY(service_binding_id) REFERENCES service_bindings(id) ON DELETE SET NULL);
@@ -120,8 +121,11 @@ CREATE VIRTUAL TABLE IF NOT EXISTS search_index USING fts5(kind, name, path, rep
 `;
 
 // src/db/migrations.ts
-var CURRENT_SCHEMA_VERSION = 9;
+var CURRENT_SCHEMA_VERSION = 10;
 var columns = {
+  handler_methods: [
+    { name: "decorator_resolution_json", ddl: "ALTER TABLE handler_methods ADD COLUMN decorator_resolution_json TEXT NOT NULL DEFAULT '{}'" }
+  ],
   service_bindings: [
     { name: "helper_chain_json", ddl: "ALTER TABLE service_bindings ADD COLUMN helper_chain_json TEXT" },
     { name: "alias_expr", ddl: "ALTER TABLE service_bindings ADD COLUMN alias_expr TEXT" }
@@ -210,7 +214,7 @@ function migrate(db) {
 // package.json
 var package_default = {
   name: "@saptools/service-flow",
-  version: "0.1.48",
+  version: "0.1.50",
   description: "Trace SAP CAP service-to-service flows across multi-repository workspaces with runtime-aware graph resolution",
   type: "module",
   publishConfig: {
@@ -518,7 +522,7 @@ function insertHandler(db, repoId, h) {
     ).get(repoId, sid, h.className, h.sourceFile, h.sourceLine)?.id
   );
   const stmt = db.prepare(
-    "INSERT INTO handler_methods(handler_class_id,method_name,decorator_kind,decorator_value,decorator_raw_expression,source_file,source_line) VALUES(?,?,?,?,?,?,?)"
+    "INSERT INTO handler_methods(handler_class_id,method_name,decorator_kind,decorator_value,decorator_raw_expression,decorator_resolution_json,source_file,source_line) VALUES(?,?,?,?,?,?,?,?)"
   );
   for (const m of h.methods)
     stmt.run(
@@ -527,6 +531,7 @@ function insertHandler(db, repoId, h) {
       m.decoratorKind,
       m.decoratorValue,
       m.decoratorRawExpression,
+      JSON.stringify(m.decoratorResolution),
       m.sourceFile,
       m.sourceLine
     );
@@ -554,11 +559,15 @@ function insertRegistrations(db, repoId, rows) {
 }
 function insertBindings(db, repoId, rows) {
   const stmt = db.prepare(
-    "INSERT INTO service_bindings(repo_id,variable_name,alias,alias_expr,destination_expr,service_path_expr,is_dynamic,placeholders_json,source_file,source_line,helper_chain_json) VALUES(?,?,?,?,?,?,?,?,?,?,?)"
+    "INSERT INTO service_bindings(repo_id,symbol_id,variable_name,alias,alias_expr,destination_expr,service_path_expr,is_dynamic,placeholders_json,source_file,source_line,helper_chain_json) VALUES(?,(SELECT id FROM symbols WHERE repo_id=? AND source_file=? AND start_line<=? AND end_line>=? ORDER BY (end_line-start_line),id LIMIT 1),?,?,?,?,?,?,?,?,?,?)"
   );
   for (const r of rows)
     stmt.run(
       repoId,
+      repoId,
+      r.sourceFile,
+      r.sourceLine,
+      r.sourceLine,
       r.variableName,
       r.alias,
       r.aliasExpr,
@@ -612,9 +621,14 @@ function resolveSymbolCallTarget(db, repoId, r) {
 }
 function insertCalls(db, repoId, rows) {
   const stmt = db.prepare(
-    "INSERT INTO outbound_calls(repo_id,source_symbol_id,call_type,method,operation_path_expr,query_entity,event_name_expr,payload_summary,source_file,source_line,confidence,unresolved_reason,local_service_name,local_service_lookup,alias_chain_json,evidence_json,external_target_kind,external_target_id,external_target_label,external_target_dynamic,service_binding_id) VALUES(?,COALESCE((SELECT id FROM symbols WHERE repo_id=? AND source_file=? AND qualified_name=? ORDER BY id LIMIT 1),(SELECT id FROM symbols WHERE repo_id=? AND source_file=? AND start_line<=? AND end_line>=? ORDER BY (end_line-start_line),id LIMIT 1)),?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,(SELECT id FROM service_bindings WHERE repo_id=? AND variable_name=? AND source_file=? ORDER BY CASE WHEN source_line<=? THEN 0 ELSE 1 END, ABS(source_line-?) ASC, id DESC LIMIT 1))"
+    "INSERT INTO outbound_calls(repo_id,source_symbol_id,call_type,method,operation_path_expr,query_entity,event_name_expr,payload_summary,source_file,source_line,confidence,unresolved_reason,local_service_name,local_service_lookup,alias_chain_json,evidence_json,external_target_kind,external_target_id,external_target_label,external_target_dynamic,service_binding_id) VALUES(?,COALESCE((SELECT id FROM symbols WHERE repo_id=? AND source_file=? AND qualified_name=? ORDER BY id LIMIT 1),(SELECT id FROM symbols WHERE repo_id=? AND source_file=? AND start_line<=? AND end_line>=? ORDER BY (end_line-start_line),id LIMIT 1)),?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
   );
-  for (const r of rows)
+  for (const r of rows) {
+    const binding = resolvePersistedBinding(db, repoId, r);
+    const evidence = {
+      ...r.evidence ?? {},
+      serviceBindingResolution: binding.evidence
+    };
     stmt.run(
       repoId,
       repoId,
@@ -633,21 +647,146 @@ function insertCalls(db, repoId, rows) {
       r.sourceFile,
       r.sourceLine,
       r.confidence,
-      r.unresolvedReason,
+      r.unresolvedReason ?? binding.unresolvedReason,
       r.localServiceName,
       r.localServiceLookup,
       r.aliasChain ? JSON.stringify(r.aliasChain) : null,
-      r.evidence ? JSON.stringify(r.evidence) : null,
+      JSON.stringify(evidence),
       r.externalTarget?.kind ?? null,
       r.externalTarget?.stableId ?? null,
       r.externalTarget?.label ?? null,
       r.externalTarget?.dynamic ? 1 : 0,
-      repoId,
-      r.serviceVariableName,
-      r.sourceFile,
-      r.sourceLine,
-      r.sourceLine
+      binding.bindingId
     );
+  }
+}
+function resolvePersistedBinding(db, repoId, call) {
+  if (!call.serviceVariableName)
+    return { bindingId: null, evidence: { status: "not_applicable", candidateCount: 0 } };
+  const candidates = bindingCandidates(db, repoId, call);
+  const prior = candidates.filter((candidate) => candidate.sourceLine <= call.sourceLine);
+  const families = new Set(prior.map(bindingSignature));
+  if (prior.length > 0 && families.size === 1) {
+    const selected = prior.at(-1);
+    return {
+      bindingId: selected?.id ?? null,
+      evidence: bindingEvidence("selected", prior, selected)
+    };
+  }
+  if (prior.length > 1) {
+    return {
+      bindingId: null,
+      unresolvedReason: "ambiguous_service_binding_candidates",
+      evidence: bindingEvidence("ambiguous", prior)
+    };
+  }
+  if (candidates.length > 0) {
+    return {
+      bindingId: null,
+      unresolvedReason: "service_binding_declared_after_call",
+      evidence: bindingEvidence("rejected_future_binding", candidates)
+    };
+  }
+  return {
+    bindingId: null,
+    evidence: bindingEvidence("unrecoverable", [])
+  };
+}
+function bindingCandidates(db, repoId, call) {
+  const ownerId = callSymbolId(db, repoId, call);
+  const rows = db.prepare(`
+    SELECT id,symbol_id symbolId,variable_name variableName,alias,alias_expr aliasExpr,
+      destination_expr destinationExpr,service_path_expr servicePathExpr,
+      source_file sourceFile,source_line sourceLine,helper_chain_json helperChainJson
+    FROM service_bindings
+    WHERE repo_id=? AND variable_name=? AND source_file=?
+      AND (? IS NULL OR symbol_id IS NULL OR symbol_id=?)
+    ORDER BY source_line,id
+  `).all(
+    repoId,
+    call.serviceVariableName,
+    call.sourceFile,
+    ownerId,
+    ownerId
+  );
+  return rows.flatMap((row) => {
+    if (typeof row.id !== "number" || typeof row.variableName !== "string" || typeof row.sourceFile !== "string" || typeof row.sourceLine !== "number")
+      return [];
+    return [{
+      id: row.id,
+      symbolId: nullableNumber(row.symbolId),
+      variableName: row.variableName,
+      alias: nullableString(row.alias),
+      aliasExpr: nullableString(row.aliasExpr),
+      destinationExpr: nullableString(row.destinationExpr),
+      servicePathExpr: nullableString(row.servicePathExpr),
+      sourceFile: row.sourceFile,
+      sourceLine: row.sourceLine,
+      helperChainJson: nullableString(row.helperChainJson)
+    }];
+  });
+}
+function nullableString(value) {
+  return value === null || typeof value === "string" ? value : void 0;
+}
+function nullableNumber(value) {
+  return value === null || typeof value === "number" ? value : void 0;
+}
+function callSymbolId(db, repoId, call) {
+  const row = db.prepare(`
+    SELECT id FROM symbols
+    WHERE repo_id=? AND source_file=?
+      AND ((? IS NOT NULL AND qualified_name=?)
+        OR (start_line<=? AND end_line>=?))
+    ORDER BY CASE WHEN qualified_name=? THEN 0 ELSE 1 END,
+      (end_line-start_line),id
+    LIMIT 1
+  `).get(
+    repoId,
+    call.sourceFile,
+    call.sourceSymbolQualifiedName,
+    call.sourceSymbolQualifiedName,
+    call.sourceLine,
+    call.sourceLine,
+    call.sourceSymbolQualifiedName
+  );
+  return typeof row?.id === "number" ? row.id : void 0;
+}
+function bindingEvidence(status, candidates, selected) {
+  return {
+    status,
+    candidateCount: candidates.length,
+    selectedBindingId: selected?.id,
+    sourceOrderRule: "binding_source_line_must_not_follow_call",
+    candidates: candidates.map((candidate) => ({
+      bindingId: candidate.id,
+      symbolId: candidate.symbolId,
+      variableName: candidate.variableName,
+      alias: candidate.alias,
+      aliasExpr: candidate.aliasExpr,
+      destinationExpr: candidate.destinationExpr,
+      servicePathExpr: candidate.servicePathExpr,
+      sourceFile: candidate.sourceFile,
+      sourceLine: candidate.sourceLine,
+      helperChain: parseBindingChain(candidate.helperChainJson)
+    }))
+  };
+}
+function bindingSignature(candidate) {
+  return JSON.stringify([
+    candidate.alias,
+    candidate.aliasExpr,
+    candidate.destinationExpr,
+    candidate.servicePathExpr
+  ]);
+}
+function parseBindingChain(value) {
+  if (!value) return void 0;
+  try {
+    return JSON.parse(value);
+  } catch {
+    return void 0;
+  }
 }
 
 // src/discovery/classify-repository.ts
@@ -1434,6 +1573,9 @@ function parserQualityDiagnostics(db, strict, options) {
     implementationCandidateQuality(db, Boolean(options.detail)),
     classInstanceNoiseQuality(db),
     contextualBindingPropagationQuality(db),
+    serviceBindingQuality(db, Boolean(options.detail)),
+    decoratorResolutionQuality(db),
+    handlerRegistrationPairingQuality(db),
     nestedThisReceiverQuality(db),
     wrapperPathPropagationQuality(db),
     remoteQueryTargetQuality(db),
@@ -1524,9 +1666,18 @@ function addImplementationCategory(grouped, row) {
   const key = [category, baseOperation, reason, family].join("\0");
   const current = grouped.get(key) ?? { category, baseOperation, reason, candidateFamily: family, count: 0, servicePaths: [], examples: [] };
   const hintSuggestions = implementationSuggestions(evidence);
+  const candidates = asRecords(evidence.candidates);
   current.count += 1;
   current.servicePaths.push(String(row.servicePath ?? evidence.servicePath ?? ""));
-  current.examples.push({ servicePath: row.servicePath, operation: row.operationName, status: row.status, reason: row.unresolvedReason, implementationHintSuggestions: hintSuggestions });
+  current.examples.push({
+    servicePath: row.servicePath,
+    operation: row.operationName,
+    status: row.status,
+    reason: row.unresolvedReason,
+    candidateCount: candidates.length,
+    candidateEvidence: candidates.slice(0, 3),
+    implementationHintSuggestions: hintSuggestions
+  });
   grouped.set(key, current);
 }
 function implementationSuggestions(evidence) {
@@ -1628,6 +1779,128 @@ function contextualBindingPropagationQuality(db) {
   const opportunities = db.prepare("SELECT c.source_file sourceFile,c.source_line sourceLine,json_extract(c.evidence_json,'$.receiver') receiverName,c.operation_path_expr operationPath FROM outbound_calls c WHERE c.call_type='remote_action' AND json_extract(c.evidence_json,'$.receiver') IS NOT NULL AND c.service_binding_id IS NULL ORDER BY c.source_file,c.source_line LIMIT 8").all();
   return { severity: missing.count + opportunities.length > 0 ? "warning" : "info", code: "strict_contextual_binding_propagation_quality", message: "Contextual service-client propagation opportunities for trace-time helper resolution", calleeSymbolsMissingParameterMetadata: missing.count, traceTimeContextualOpportunities: opportunities.length, examples: opportunities };
 }
+function serviceBindingQuality(db, detail) {
+  const rows = db.prepare(`
+    SELECT c.source_file sourceFile,c.source_line sourceLine,
+      c.unresolved_reason unresolvedReason,c.evidence_json evidenceJson,
+      s.evidence_json symbolEvidenceJson
+    FROM outbound_calls c
+    LEFT JOIN symbols s ON s.id=c.source_symbol_id
+    WHERE c.call_type='remote_action'
+      AND c.operation_path_expr IS NOT NULL
+      AND c.service_binding_id IS NULL
+    ORDER BY c.source_file,c.source_line
+  `).all();
+  const groups = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    const category = bindingCategory(row);
+    groups.set(category, [...groups.get(category) ?? [], bindingExample(row)]);
+  }
+  const categories = [...groups.entries()].map(([category, examples]) => ({
+    category,
+    count: examples.length,
+    severity: "warning",
+    suggestedAction: bindingCategoryAction(category),
+    examples: examples.slice(0, 3),
+    expandedExamples: detail ? examples : void 0
+  }));
+  return {
+    severity: rows.length > 0 ? "warning" : "info",
+    code: "strict_service_binding_quality",
+    message: "Remote service-client binding quality aggregate",
+    total: rows.length,
+    categories
+  };
+}
+function bindingCategory(row) {
+  const evidence = parseObject(row.evidenceJson);
+  const resolution = parseObject(evidence.serviceBindingResolution);
+  if (resolution.status === "rejected_future_binding") return "direct_binding_missing";
+  if (resolution.status === "ambiguous") return "ambiguous_binding_candidates";
+  const receiver = evidence.receiver;
+  const symbolEvidence = parseObject(row.symbolEvidenceJson);
+  if (symbolHasReceiverParameter(symbolEvidence, receiver))
+    return "contextual_binding_recoverable";
+  if (!Array.isArray(symbolEvidence.parameterBindings))
+    return "missing_symbol_parameter_metadata";
+  return "unrecoverable_binding";
+}
+function symbolHasReceiverParameter(evidence, receiver) {
+  if (typeof receiver !== "string" || !Array.isArray(evidence.parameterBindings))
+    return false;
+  return asRecords(evidence.parameterBindings).some((binding) => {
+    if (binding.kind === "identifier") return binding.name === receiver;
+    if (binding.kind === "object_pattern")
+      return asRecords(binding.properties).some((property) => property.local === receiver);
+    return asRecords(binding.elements).some((element) => element.local === receiver);
+  });
+}
+function bindingExample(row) {
+  const evidence = parseObject(row.evidenceJson);
+  return {
+    sourceFile: row.sourceFile,
+    sourceLine: row.sourceLine,
+    receiver: evidence.receiver,
+    unresolvedReason: row.unresolvedReason,
+    bindingResolution: evidence.serviceBindingResolution
+  };
+}
+function bindingCategoryAction(category) {
+  if (category === "direct_binding_missing")
+    return "Move the binding before the call or bind the call to an earlier immutable client.";
+  if (category === "contextual_binding_recoverable")
+    return "Trace from the caller so parameter binding evidence can be applied.";
+  if (category === "ambiguous_binding_candidates")
+    return "Split mutable client alternatives or add a statically unique client assignment.";
+  if (category === "missing_symbol_parameter_metadata")
+    return "Use named or destructured parameters on an indexed helper symbol.";
+  return "Add a direct CAP client binding or statically provable helper-return binding.";
+}
+function decoratorResolutionQuality(db) {
+  const aggregate = db.prepare(`SELECT
+      SUM(CASE WHEN json_extract(decorator_resolution_json,'$.resolutionKind')
+        IN ('const_identifier','enum_member','const_object_property','generated_constant_name') THEN 1 ELSE 0 END) resolvedFromConstants,
+      SUM(CASE WHEN json_extract(decorator_resolution_json,'$.resolutionKind')
+        ='unresolved' THEN 1 ELSE 0 END) unresolvedExpressions
+    FROM handler_methods`).get();
+  const unresolved = Number(aggregate.unresolvedExpressions ?? 0);
+  const examples = db.prepare(`SELECT hm.method_name methodName,
+      hm.decorator_raw_expression rawExpression,
+      json_extract(hm.decorator_resolution_json,'$.unresolvedReason') unresolvedReason,
+      hm.source_file sourceFile,hm.source_line sourceLine
+    FROM handler_methods hm
+    WHERE json_extract(hm.decorator_resolution_json,'$.resolutionKind')='unresolved'
+    ORDER BY hm.source_file,hm.source_line LIMIT 5`).all();
+  return {
+    severity: unresolved > 0 ? "warning" : "info",
+    code: "strict_decorator_resolution_quality",
+    message: "Handler decorator string-resolution aggregate",
+    resolvedFromConstants: Number(aggregate.resolvedFromConstants ?? 0),
+    unresolvedExpressions: unresolved,
+    unresolvedExamples: examples
+  };
+}
+function handlerRegistrationPairingQuality(db) {
+  const mismatch = db.prepare(`SELECT COUNT(*) count
+    FROM handler_registrations hr
+    JOIN handler_classes hc ON hc.id=hr.handler_class_id
+    WHERE hr.handler_class_id IS NOT NULL
+      AND (hc.repo_id<>hr.repo_id OR hc.class_name<>hr.class_name)`).get();
+  const prevented = db.prepare(`SELECT COUNT(*) count
+    FROM handler_registrations hr
+    JOIN handler_classes exactClass ON exactClass.id=hr.handler_class_id
+    JOIN handler_classes otherClass ON otherClass.class_name=hr.class_name
+      AND otherClass.repo_id<>hr.repo_id
+    WHERE hr.handler_class_id IS NOT NULL AND hr.import_source IS NOT NULL`).get();
+  const mismatched = Number(mismatch.count ?? 0);
+  return {
+    severity: mismatched > 0 ? "error" : "info",
+    code: "strict_handler_registration_pairing_quality",
+    message: "Handler registration and class ownership aggregate",
+    mismatchedExactRegistrations: mismatched,
+    preventedSyntheticCrossRepositoryPairs: Number(prevented.count ?? 0)
+  };
+}
 function wrapperPathPropagationQuality(db) {
   const examples = db.prepare("SELECT source_file sourceFile,source_line sourceLine,json_extract(evidence_json,'$.receiver') receiverName,json_extract(evidence_json,'$.operationPathExpression') pathIdentifier FROM outbound_calls WHERE call_type='remote_action' AND unresolved_reason='dynamic_operation_path_identifier' ORDER BY source_file,source_line LIMIT 5").all();
   return { severity: examples.length > 0 ? "warning" : "info", code: "strict_wrapper_path_propagation_quality", message: "Dynamic path sends where send({ path }) used a path identifier", dynamicPathIdentifierCalls: examples.length, examples };
@@ -1699,10 +1972,33 @@ function externalHttpTargetQuality(db) {
   return { severity: bad > 0 ? "warning" : "info", code: "strict_external_http_target_quality", message: "External HTTP semantic target aggregate", totalExternalHttpCalls: Number(row.total ?? 0), numericTargetCount: Number(row.numericTargets ?? 0), invalidOrMissingExternalTargetEvidence: Number(row.invalidEvidence ?? 0) };
 }
 function odataInvocationResolutionQuality(db) {
-  const rows = db.prepare("SELECT c.operation_path_expr operationPathExpr,e.status status FROM outbound_calls c JOIN graph_edges e ON e.from_kind='call' AND e.from_id=CAST(c.id AS TEXT) WHERE c.call_type='remote_action' AND c.operation_path_expr LIKE '%(%'").all();
+  const rows = db.prepare(`SELECT c.operation_path_expr operationPathExpr,
+    c.source_file sourceFile,c.source_line sourceLine,e.id graphEdgeId,
+    e.status status,e.evidence_json evidenceJson
+    FROM outbound_calls c JOIN graph_edges e
+      ON e.from_kind='call' AND e.from_id=CAST(c.id AS TEXT)
+    WHERE c.call_type='remote_action' AND c.operation_path_expr LIKE '%(%'
+    ORDER BY c.source_file,c.source_line`).all();
   const unresolved = rows.filter((row) => row.status === "unresolved" && normalizeODataOperationInvocationPath(row.operationPathExpr)?.wasInvocation).length;
   const ambiguous = rows.filter((row) => row.status === "ambiguous" && normalizeODataOperationInvocationPath(row.operationPathExpr)?.wasInvocation).length;
-  return { severity: unresolved + ambiguous > 0 ? "warning" : "info", code: "strict_odata_invocation_resolution_quality", message: "OData invocation-path resolution quality aggregate", totalInvocationRemoteActions: rows.length, resolvedInvocationCalls: rows.filter((row) => row.status === "resolved").length, dynamicInvocationCalls: rows.filter((row) => row.status === "dynamic").length, ambiguousInvocationCalls: rows.filter((row) => row.status === "ambiguous").length, unresolvedInvocationCalls: rows.filter((row) => row.status === "unresolved").length, ambiguousNormalizedCalls: ambiguous, unresolvedNormalizedCallsWithIndexedCandidates: unresolved };
+  const examples = rows.filter((row) => row.status === "ambiguous" || row.status === "unresolved").map(odataInvocationExample).slice(0, 5);
+  return { severity: unresolved + ambiguous > 0 ? "warning" : "info", code: "strict_odata_invocation_resolution_quality", message: "OData invocation-path resolution quality aggregate", totalInvocationRemoteActions: rows.length, resolvedInvocationCalls: rows.filter((row) => row.status === "resolved").length, dynamicInvocationCalls: rows.filter((row) => row.status === "dynamic").length, ambiguousInvocationCalls: rows.filter((row) => row.status === "ambiguous").length, unresolvedInvocationCalls: rows.filter((row) => row.status === "unresolved").length, ambiguousNormalizedCalls: ambiguous, unresolvedNormalizedCallsWithIndexedCandidates: unresolved, examples };
+}
+function odataInvocationExample(row) {
+  const evidence = parseObject(row.evidenceJson);
+  const normalized = normalizeODataOperationInvocationPath(row.operationPathExpr);
+  return {
+    sourceFile: row.sourceFile,
+    sourceLine: row.sourceLine,
+    graphEdgeId: row.graphEdgeId,
+    status: row.status,
+    rawPath: row.operationPathExpr,
+    normalizedOperationPath: normalized?.wasInvocation ? normalized.normalizedOperationPath : void 0,
+    indexedOperationCandidateCount: evidence.indexedOperationCandidateCount,
+    candidateScores: evidence.candidateScores,
+    entityOperationPrecedence: evidence.entityOperationPrecedence,
+    resolutionReasons: evidence.resolutionReasons
+  };
 }
 function identityAliasBindingQuality(db) {
   const examples = db.prepare("SELECT c.source_file sourceFile,c.source_line sourceLine FROM outbound_calls c WHERE c.call_type='remote_action' AND c.service_binding_id IS NULL AND json_extract(c.evidence_json,'$.receiver') IS NOT NULL ORDER BY c.source_file,c.source_line LIMIT 5").all();
@@ -1729,16 +2025,6 @@ function asRecords(value) {
   return Array.isArray(value) ? value.filter((item) => Boolean(item && typeof item === "object" && !Array.isArray(item))) : [];
 }
 
-// src/trace/selectors.ts
-function parseVars(values) {
-  const out = {};
-  for (const value of values ?? []) {
-    const [key, ...rest] = value.split("=");
-    if (key && rest.length > 0) out[key] = rest.join("=");
-  }
-  return out;
-}
-
 // src/output/table-output.ts
 function location(evidence) {
   const file = evidence.file ?? evidence.sourceFile ?? evidence.handlerSourceFile ?? evidence.operationSourceFile ?? evidence.registrationSourceFile;
@@ -1755,8 +2041,8 @@ function renderTraceTable(result) {
   const lines = ["Step  Type                 From                                To                                  Evidence"];
   for (const e of result.edges) {
     lines.push(`${String(e.step).padEnd(5)} ${e.type.padEnd(20)} ${e.from.slice(0, 34).padEnd(35)} ${e.to.slice(0, 35).padEnd(36)} ${location(e.evidence)}`);
-    const hint = firstHint(e.evidence);
-    if (e.unresolvedReason && hint) lines.push(`      try ${hint}`);
+    if (e.unresolvedReason)
+      lines.push(...hintLines(e.evidence).map((hint) => `      ${hint}`));
   }
   if (result.diagnostics.length > 0) lines.push("", "Diagnostics:", ...result.diagnostics.flatMap(diagnosticLines));
   return `${lines.join("\n")}
@@ -1764,14 +2050,20 @@ function renderTraceTable(result) {
 }
 function diagnosticLines(diagnostic) {
   const first = `${String(diagnostic.severity ?? "info")} ${String(diagnostic.code ?? "diagnostic")} ${String(diagnostic.message ?? "")}`;
-  const hint = firstHint(diagnostic);
-  return hint ? [first, `  try ${hint}`] : [first];
+  return [first, ...hintLines(diagnostic).map((hint) => `  ${hint}`)];
 }
-function firstHint(evidence) {
+function hintLines(evidence) {
   const suggestions = evidence.implementationHintSuggestions;
-  if (!Array.isArray(suggestions)) return void 0;
-  const first = suggestions.find((item) => Boolean(item) && typeof item === "object");
-  return typeof first?.cli === "string" ? first.cli : void 0;
+  if (!Array.isArray(suggestions)) return [];
+  const hints = suggestions.flatMap((item) => isRecord(item) && typeof item.cli === "string" ? [item.cli] : []);
+  const unique = [...new Set(hints)];
+  const shown = unique.slice(0, 3).map((hint) => `try ${hint}`);
+  if (unique.length > shown.length)
+    shown.push(`... ${unique.length - shown.length} more hint(s) available in JSON`);
+  return shown;
+}
+function isRecord(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 
 // src/output/json-output.ts
@@ -1843,11 +2135,11 @@ function cliHints(value) {
 function cliHintsFromSuggestions(value) {
   if (!Array.isArray(value)) return [];
   return value.flatMap((item) => {
-    if (!isRecord(item)) return [];
+    if (!isRecord2(item)) return [];
     return typeof item.cli === "string" ? [item.cli] : [];
   });
 }
-function isRecord(value) {
+function isRecord2(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function cappedHints(hints) {