@saptools/service-flow 0.1.10 → 0.1.12

package/dist/{chunk-LQT67AU5.js → chunk-MXYYARUP.js}

@@ -524,6 +524,7 @@ function summarizeExpression(text) {
 // src/parsers/outbound-call-parser.ts
 import fs6 from "fs/promises";
 import path7 from "path";
+import ts4 from "typescript";
 function lineOf3(text, idx) {
   return text.slice(0, idx).split("\n").length;
 }
@@ -627,32 +628,63 @@ async function parseOutboundCalls(repoPath, filePath) {
       confidence: 0.7,
       unresolvedReason: "External HTTP destination is outside indexed CAP services"
     });
-  for (const m of text.matchAll(
-    /cds\.services(?:\[['"]([^'"]+)['"]\]|\.(\w+))\.(\w+)\s*\(/g
-  ))
-    out.push({
-      callType: "local_service_call",
-      operationPathExpr: `/${m[3] ?? ""}`,
-      payloadSummary: m[1] ?? m[2],
-      sourceFile: normalizePath(filePath),
-      sourceLine: lineOf3(text, m.index ?? 0),
-      confidence: 0.75
-    });
+  out.push(...parseLocalServiceCalls(text, filePath));
   return out;
 }
+function parseLocalServiceCalls(text, filePath) {
+  const source = ts4.createSourceFile(filePath, text, ts4.ScriptTarget.Latest, true, filePath.endsWith(".ts") ? ts4.ScriptKind.TS : ts4.ScriptKind.JS);
+  const aliases = /* @__PURE__ */ new Map();
+  const calls = [];
+  const visit = (node) => {
+    if (ts4.isVariableDeclaration(node) && ts4.isIdentifier(node.name) && node.initializer) {
+      const origin = serviceLookup(node.initializer, aliases);
+      if (origin) aliases.set(node.name.text, { ...origin, chain: [...origin.chain, node.name.text] });
+    }
+    if (ts4.isCallExpression(node)) {
+      const parsed = serviceOperationCall(node.expression, aliases);
+      if (parsed && parsed.operation !== "entities") calls.push({
+        callType: "local_service_call",
+        operationPathExpr: `/${parsed.operation}`,
+        payloadSummary: parsed.service,
+        localServiceName: parsed.service,
+        localServiceLookup: parsed.lookup,
+        aliasChain: parsed.chain,
+        sourceFile: normalizePath(filePath),
+        sourceLine: lineOf3(text, node.getStart(source)),
+        confidence: 0.9
+      });
+    }
+    ts4.forEachChild(node, visit);
+  };
+  visit(source);
+  return calls;
+}
+function serviceLookup(expr, aliases) {
+  if (ts4.isIdentifier(expr)) return aliases.get(expr.text);
+  if (ts4.isPropertyAccessExpression(expr) && expr.expression.getText() === "cds.services") return { service: expr.name.text, lookup: expr.getText(), chain: [expr.getText()] };
+  if (ts4.isElementAccessExpression(expr) && expr.expression.getText() === "cds.services" && ts4.isStringLiteral(expr.argumentExpression)) return { service: expr.argumentExpression.text, lookup: expr.getText(), chain: [expr.getText()] };
+  return void 0;
+}
+function serviceOperationCall(expr, aliases) {
+  if (!ts4.isPropertyAccessExpression(expr)) return void 0;
+  const operation = expr.name.text;
+  const origin = serviceLookup(expr.expression, aliases);
+  if (!origin) return void 0;
+  return { ...origin, operation };
+}
 
 // src/parsers/service-binding-parser.ts
 import fs7 from "fs/promises";
 import path8 from "path";
-import ts4 from "typescript";
+import ts5 from "typescript";
 function lineOf4(sf, node) {
   return sf.getLineAndCharacterOfPosition(node.getStart(sf)).line + 1;
 }
 function stringValue(node) {
   if (!node) return void 0;
-  if (ts4.isStringLiteralLike(node) || ts4.isNoSubstitutionTemplateLiteral(node))
+  if (ts5.isStringLiteralLike(node) || ts5.isNoSubstitutionTemplateLiteral(node))
     return node.text;
-  if (ts4.isTemplateExpression(node))
+  if (ts5.isTemplateExpression(node))
     return node.getText().replace(/^`|`$/g, "");
   return node.getText();
 }
@@ -661,22 +693,22 @@ function placeholders(value) {
 }
 function connectFactFromCall(call) {
   const expr = call.expression;
-  if (!ts4.isPropertyAccessExpression(expr) || expr.name.text !== "to")
+  if (!ts5.isPropertyAccessExpression(expr) || expr.name.text !== "to")
     return void 0;
   const inner = expr.expression;
-  if (!ts4.isPropertyAccessExpression(inner) || inner.name.text !== "connect" || inner.expression.getText() !== "cds")
+  if (!ts5.isPropertyAccessExpression(inner) || inner.name.text !== "connect" || inner.expression.getText() !== "cds")
     return void 0;
   const first = call.arguments[0];
   if (!first) return void 0;
   const second = call.arguments[1];
-  const objectArg = ts4.isObjectLiteralExpression(first) ? first : second && ts4.isObjectLiteralExpression(second) ? second : void 0;
+  const objectArg = ts5.isObjectLiteralExpression(first) ? first : second && ts5.isObjectLiteralExpression(second) ? second : void 0;
   let alias;
   let aliasExpr;
-  if (ts4.isStringLiteralLike(first) || ts4.isNoSubstitutionTemplateLiteral(first))
+  if (ts5.isStringLiteralLike(first) || ts5.isNoSubstitutionTemplateLiteral(first))
     alias = first.text;
-  else if (!ts4.isObjectLiteralExpression(first))
+  else if (!ts5.isObjectLiteralExpression(first))
     aliasExpr = stringValue(first);
-  if ((ts4.isStringLiteralLike(first) || ts4.isNoSubstitutionTemplateLiteral(first)) && !objectArg)
+  if ((ts5.isStringLiteralLike(first) || ts5.isNoSubstitutionTemplateLiteral(first)) && !objectArg)
     return { alias: first.text, isDynamic: false, placeholders: [] };
   if (!objectArg && aliasExpr)
     return {
@@ -688,13 +720,13 @@ function connectFactFromCall(call) {
   let servicePathExpr;
   function visitObject(obj) {
     for (const prop of obj.properties) {
-      if (!ts4.isPropertyAssignment(prop)) continue;
-      const name = ts4.isIdentifier(prop.name) || ts4.isStringLiteralLike(prop.name) ? prop.name.text : void 0;
+      if (!ts5.isPropertyAssignment(prop)) continue;
+      const name = ts5.isIdentifier(prop.name) || ts5.isStringLiteralLike(prop.name) ? prop.name.text : void 0;
       if (name === "destination")
         destinationExpr = stringValue(prop.initializer);
       if (name === "path" || name === "servicePath")
         servicePathExpr = stringValue(prop.initializer);
-      if (ts4.isObjectLiteralExpression(prop.initializer))
+      if (ts5.isObjectLiteralExpression(prop.initializer))
         visitObject(prop.initializer);
     }
   }
@@ -714,8 +746,8 @@ function connectFactFromCall(call) {
   };
 }
 function unwrapCall(expr) {
-  if (ts4.isAwaitExpression(expr)) return unwrapCall(expr.expression);
-  if (ts4.isCallExpression(expr)) return expr;
+  if (ts5.isAwaitExpression(expr)) return unwrapCall(expr.expression);
+  if (ts5.isCallExpression(expr)) return expr;
   return void 0;
 }
 function findConnectInExpression(expr) {
@@ -727,8 +759,8 @@ function findConnectInExpression(expr) {
   let found;
   function visit(node) {
     if (found) return;
-    if (ts4.isCallExpression(node)) found = connectFactFromCall(node);
-    if (!found) ts4.forEachChild(node, visit);
+    if (ts5.isCallExpression(node)) found = connectFactFromCall(node);
+    if (!found) ts5.forEachChild(node, visit);
   }
   visit(expr);
   return found;
@@ -736,12 +768,12 @@ function findConnectInExpression(expr) {
 async function readSource(abs) {
   try {
     const text = await fs7.readFile(abs, "utf8");
-    return ts4.createSourceFile(
+    return ts5.createSourceFile(
       abs,
       text,
-      ts4.ScriptTarget.Latest,
+      ts5.ScriptTarget.Latest,
       true,
-      ts4.ScriptKind.TS
+      ts5.ScriptKind.TS
     );
   } catch {
     return void 0;
@@ -770,7 +802,7 @@ async function resolveImport(repoPath, fromFile, spec) {
 async function importsFor(repoPath, filePath, sf) {
   const imports = [];
   for (const stmt of sf.statements) {
-    if (!ts4.isImportDeclaration(stmt) || !ts4.isStringLiteralLike(stmt.moduleSpecifier))
+    if (!ts5.isImportDeclaration(stmt) || !ts5.isStringLiteralLike(stmt.moduleSpecifier))
       continue;
     const sourceFile = await resolveImport(
       repoPath,
@@ -786,7 +818,7 @@ async function importsFor(repoPath, filePath, sf) {
         sourceFile
       });
     const bindings = clause.namedBindings;
-    if (bindings && ts4.isNamedImports(bindings))
+    if (bindings && ts5.isNamedImports(bindings))
       for (const el of bindings.elements)
         imports.push({
           localName: el.name.text,
@@ -799,17 +831,17 @@ async function importsFor(repoPath, filePath, sf) {
 function exportedLocalNames(sf) {
   const exports = /* @__PURE__ */ new Map();
   for (const stmt of sf.statements) {
-    const direct = ts4.canHaveModifiers(stmt) ? ts4.getModifiers(stmt)?.some(
-      (m) => m.kind === ts4.SyntaxKind.ExportKeyword
+    const direct = ts5.canHaveModifiers(stmt) ? ts5.getModifiers(stmt)?.some(
+      (m) => m.kind === ts5.SyntaxKind.ExportKeyword
     ) ?? false : false;
-    if (direct && ts4.isFunctionDeclaration(stmt) && stmt.name)
+    if (direct && ts5.isFunctionDeclaration(stmt) && stmt.name)
       exports.set(stmt.name.text, stmt.name.text);
-    if (direct && ts4.isVariableStatement(stmt)) {
+    if (direct && ts5.isVariableStatement(stmt)) {
       for (const decl of stmt.declarationList.declarations)
-        if (ts4.isIdentifier(decl.name)) exports.set(decl.name.text, decl.name.text);
+        if (ts5.isIdentifier(decl.name)) exports.set(decl.name.text, decl.name.text);
     }
-    if (!ts4.isExportDeclaration(stmt) || !stmt.exportClause) continue;
-    if (!ts4.isNamedExports(stmt.exportClause)) continue;
+    if (!ts5.isExportDeclaration(stmt) || !stmt.exportClause) continue;
+    if (!ts5.isNamedExports(stmt.exportClause)) continue;
     for (const el of stmt.exportClause.elements)
       exports.set(el.name.text, el.propertyName?.text ?? el.name.text);
   }
@@ -823,18 +855,18 @@ async function helperBindings(repoPath, filePath) {
   const exportedLocals = exportedLocalNames(sf);
   const factsByLocal = /* @__PURE__ */ new Map();
   for (const stmt of sf.statements) {
-    if (ts4.isFunctionDeclaration(stmt) && stmt.name) {
+    if (ts5.isFunctionDeclaration(stmt) && stmt.name) {
       let fact;
       stmt.forEachChild(function visit(node) {
-        if (!fact && ts4.isReturnStatement(node) && node.expression)
+        if (!fact && ts5.isReturnStatement(node) && node.expression)
           fact = findConnectInExpression(node.expression);
-        if (!fact) ts4.forEachChild(node, visit);
+        if (!fact) ts5.forEachChild(node, visit);
       });
       if (fact) factsByLocal.set(stmt.name.text, { ...fact, sourceLine: lineOf4(sf, stmt) });
     }
-    if (ts4.isVariableStatement(stmt))
+    if (ts5.isVariableStatement(stmt))
       for (const decl of stmt.declarationList.declarations) {
-        if (!ts4.isIdentifier(decl.name) || !decl.initializer) continue;
+        if (!ts5.isIdentifier(decl.name) || !decl.initializer) continue;
         const fact = findConnectInExpression(decl.initializer);
         if (fact)
           factsByLocal.set(decl.name.text, {
@@ -875,7 +907,7 @@ async function parseServiceBindings(repoPath, filePath) {
     return helper ? { imp, helper } : void 0;
   }
   async function recordVariable(decl) {
-    if (!ts4.isIdentifier(decl.name) || !decl.initializer) return;
+    if (!ts5.isIdentifier(decl.name) || !decl.initializer) return;
     const call = unwrapCall(decl.initializer);
     if (!call) return;
     const direct = connectFactFromCall(call);
@@ -886,7 +918,7 @@ async function parseServiceBindings(repoPath, filePath) {
         sourceFile: normalizePath(filePath),
         sourceLine: lineOf4(sourceFileAst, decl)
       });
-    else if (ts4.isIdentifier(call.expression)) {
+    else if (ts5.isIdentifier(call.expression)) {
       const resolved = await importedHelper(call.expression.text);
       if (resolved)
         out.push({
@@ -913,14 +945,14 @@ async function parseServiceBindings(repoPath, filePath) {
     }
   }
   function recordDestructuredClassHelper(decl) {
-    if (!ts4.isObjectBindingPattern(decl.name) || !decl.initializer) return;
+    if (!ts5.isObjectBindingPattern(decl.name) || !decl.initializer) return;
     const call = unwrapCall(decl.initializer);
-    if (!call || !ts4.isPropertyAccessExpression(call.expression)) return;
+    if (!call || !ts5.isPropertyAccessExpression(call.expression)) return;
     const target = call.expression;
-    if (target.expression.kind !== ts4.SyntaxKind.ThisKeyword) return;
+    if (target.expression.kind !== ts5.SyntaxKind.ThisKeyword) return;
     for (const el of decl.name.elements) {
-      if (!ts4.isIdentifier(el.name)) continue;
-      const propertyName = el.propertyName && ts4.isIdentifier(el.propertyName) ? el.propertyName.text : el.name.text;
+      if (!ts5.isIdentifier(el.name)) continue;
+      const propertyName = el.propertyName && ts5.isIdentifier(el.propertyName) ? el.propertyName.text : el.name.text;
       const helper = classHelpers.find(
         (h) => h.helperName === target.name.text && h.propertyName === propertyName
       );
@@ -946,8 +978,8 @@ async function parseServiceBindings(repoPath, filePath) {
   }
   const declarations = [];
   function collectDeclarations(node) {
-    if (ts4.isVariableDeclaration(node)) declarations.push(node);
-    ts4.forEachChild(node, collectDeclarations);
+    if (ts5.isVariableDeclaration(node)) declarations.push(node);
+    ts5.forEachChild(node, collectDeclarations);
   }
   collectDeclarations(sourceFileAst);
   for (const decl of declarations) {
@@ -959,16 +991,16 @@ async function parseServiceBindings(repoPath, filePath) {
 function collectClassHelpers(sf) {
   const helpers = [];
   for (const stmt of sf.statements) {
-    if (!ts4.isClassDeclaration(stmt) || !stmt.name) continue;
+    if (!ts5.isClassDeclaration(stmt) || !stmt.name) continue;
     for (const member of stmt.members) {
       let visit2 = function(node) {
-        if (ts4.isVariableDeclaration(node) && ts4.isIdentifier(node.name) && node.initializer) {
+        if (ts5.isVariableDeclaration(node) && ts5.isIdentifier(node.name) && node.initializer) {
           const fact = findConnectInExpression(node.initializer);
           if (fact) bindings.set(node.name.text, fact);
         }
-        if (ts4.isReturnStatement(node) && node.expression && ts4.isObjectLiteralExpression(node.expression)) {
+        if (ts5.isReturnStatement(node) && node.expression && ts5.isObjectLiteralExpression(node.expression)) {
           for (const prop of node.expression.properties) {
-            if (ts4.isShorthandPropertyAssignment(prop)) {
+            if (ts5.isShorthandPropertyAssignment(prop)) {
               const fact = bindings.get(prop.name.text);
               if (fact)
                 helpers.push({
@@ -980,8 +1012,8 @@ function collectClassHelpers(sf) {
                   sourceLine: lineOf4(sf, prop)
                 });
             }
-            if (ts4.isPropertyAssignment(prop) && ts4.isIdentifier(prop.initializer)) {
-              const propertyName = ts4.isIdentifier(prop.name) || ts4.isStringLiteralLike(prop.name) ? prop.name.text : void 0;
+            if (ts5.isPropertyAssignment(prop) && ts5.isIdentifier(prop.initializer)) {
+              const propertyName = ts5.isIdentifier(prop.name) || ts5.isStringLiteralLike(prop.name) ? prop.name.text : void 0;
               const fact = propertyName ? bindings.get(prop.initializer.text) : void 0;
               if (propertyName && fact)
                 helpers.push({
@@ -995,15 +1027,15 @@ function collectClassHelpers(sf) {
             }
           }
         }
-        ts4.forEachChild(node, visit2);
+        ts5.forEachChild(node, visit2);
       };
       var visit = visit2;
-      if (!ts4.isPropertyDeclaration(member) || !member.initializer) continue;
-      if (!ts4.isIdentifier(member.name)) continue;
+      if (!ts5.isPropertyDeclaration(member) || !member.initializer) continue;
+      if (!ts5.isIdentifier(member.name)) continue;
       const className = stmt.name.text;
       const helperName = member.name.text;
       const initializer = member.initializer;
-      if (!ts4.isArrowFunction(initializer) && !ts4.isFunctionExpression(initializer))
+      if (!ts5.isArrowFunction(initializer) && !ts5.isFunctionExpression(initializer))
         continue;
       const bindings = /* @__PURE__ */ new Map();
       visit2(initializer);
@@ -1042,7 +1074,7 @@ function substituteVariables(template, vars) {
 // src/linker/service-resolver.ts
 function rows(db, operationPath, workspaceId) {
   return db.prepare(
-    `SELECT o.id operationId,r.name repoName,s.service_path servicePath,o.operation_path operationPath,o.operation_name operationName,o.source_file sourceFile,o.source_line sourceLine,0 score,'' reasons
+    `SELECT o.id operationId,r.name repoName,s.service_name serviceName,s.qualified_name qualifiedName,s.service_path servicePath,o.operation_path operationPath,o.operation_name operationName,o.source_file sourceFile,o.source_line sourceLine,0 score,'' reasons
        FROM cds_operations o JOIN cds_services s ON s.id=o.service_id JOIN repositories r ON r.id=s.repo_id
        WHERE (? IS NULL OR r.workspace_id=?) AND (o.operation_path=? OR o.operation_name=?) ORDER BY r.name,s.service_path,o.operation_name`
   ).all(
@@ -1066,7 +1098,7 @@ function resolveOperation(db, signals, workspaceId) {
       candidates: [],
       reasons: ["missing_operation_path"]
     };
-  const candidates = rows(db, signals.operationPath, workspaceId).map((c) => ({
+  const candidates = rows(db, signals.operationPath, workspaceId).filter((c) => matchesLocalRepo(db, c.operationId, signals.repoId)).map((c) => ({
     ...c,
     score: 0.2,
     reasons: ["operation_path_match"]
@@ -1078,7 +1110,7 @@ function resolveOperation(db, signals, workspaceId) {
       reasons: ["no_operation_candidates"]
     };
   const hasStrongSignal = Boolean(
-    signals.servicePath || signals.alias || signals.destination || signals.hasExplicitOverride
+    signals.servicePath || signals.serviceName || signals.alias || signals.destination || signals.hasExplicitOverride
   );
   for (const c of candidates) {
     if (signals.servicePath && c.servicePath === signals.servicePath) {
@@ -1089,9 +1121,25 @@ function resolveOperation(db, signals, workspaceId) {
       c.score -= 0.1;
       c.reasons.push("service_path_mismatch");
     }
+    if (signals.serviceName) {
+      const simple = signals.serviceName.split(".").at(-1) ?? signals.serviceName;
+      if (c.qualifiedName === signals.serviceName) {
+        c.score += 0.8;
+        c.reasons.push("exact_local_qualified_service_name");
+      } else if (c.serviceName === signals.serviceName || c.serviceName === simple) {
+        c.score += 0.75;
+        c.reasons.push("exact_local_simple_service_name");
+      } else if (c.servicePath === signals.serviceName || c.servicePath === `/${signals.serviceName}` || c.servicePath === `/${simple}`) {
+        c.score += 0.7;
+        c.reasons.push("exact_local_service_path");
+      } else if (c.servicePath.endsWith(`/${simple}`)) {
+        c.score += candidates.filter((candidate) => candidate.servicePath.endsWith(`/${simple}`)).length === 1 ? 0.65 : 0.2;
+        c.reasons.push("suffix_local_service_path");
+      } else c.reasons.push("local_service_name_mismatch");
+    }
     if (signals.hasExplicitOverride) {
       c.score += 0.2;
-      c.reasons.push("explicit_dynamic_override");
+      c.reasons.push(signals.repoId !== void 0 ? "explicit_local_service_call" : "explicit_dynamic_override");
     }
   }
   for (const c of candidates) c.score = Math.max(0, Math.min(1, c.score));
@@ -1112,7 +1160,7 @@ function resolveOperation(db, signals, workspaceId) {
       candidates,
       reasons: ["operation_path_only_has_no_strong_target_signal"]
     };
-  if (best && best.score >= 0.9 && best.servicePath === signals.servicePath && (best.operationPath === signals.operationPath || best.operationName === signals.operationPath.replace(/^\//, "")) && (!second || best.score - second.score >= 0.25))
+  if (best && best.score >= 0.9 && (best.servicePath === signals.servicePath || Boolean(signals.serviceName && !best.reasons.includes("local_service_name_mismatch"))) && (best.operationPath === signals.operationPath || best.operationName === signals.operationPath.replace(/^\//, "")) && (!second || best.score - second.score >= 0.25))
     return {
       status: "resolved",
       target: best,
@@ -1125,6 +1173,11 @@ function resolveOperation(db, signals, workspaceId) {
     reasons: ["candidate_score_below_resolution_threshold"]
   };
 }
+function matchesLocalRepo(db, operationId, repoId) {
+  if (repoId === void 0) return true;
+  const row = db.prepare("SELECT s.repo_id repoId FROM cds_operations o JOIN cds_services s ON s.id=o.service_id WHERE o.id=?").get(operationId);
+  return row?.repoId === repoId;
+}
 
 // src/linker/helper-package-linker.ts
 function normalizeName(value) {
@@ -1209,10 +1262,11 @@ function insertCallEdge(db, workspaceId, call, vars, generation) {
   const servicePath = applyVariables(call.servicePathExpr ?? call.requireServicePath, vars);
   const destination = call.destinationExpr ?? call.requireDestination;
   const isDynamic = Boolean(Number(call.isDynamic ?? 0));
-  const resolution = callType.startsWith("remote") ? resolveOperation(db, { servicePath, operationPath: op, alias: applyVariables(call.aliasExpr ?? call.alias, vars), destination: destination ? applyVariables(destination, vars) : void 0, isDynamic, hasExplicitOverride: Object.keys(vars).length > 0 }, workspaceId) : { status: "unresolved", candidates: [], reasons: [] };
+  const isOperationCall = callType.startsWith("remote") || callType === "local_service_call";
+  const resolution = isOperationCall ? resolveOperation(db, { servicePath, operationPath: op, serviceName: call.local_service_name, repoId: callType === "local_service_call" ? Number(call.repo_id) : void 0, alias: applyVariables(call.aliasExpr ?? call.alias, vars), destination: destination ? applyVariables(destination, vars) : void 0, isDynamic, hasExplicitOverride: Object.keys(vars).length > 0 || callType === "local_service_call" }, workspaceId) : { status: "unresolved", candidates: [], reasons: [] };
   const evidence = callEvidence(call, resolution, servicePath, op, destination ? applyVariables(destination, vars) : void 0);
   if (resolution.target) {
-    db.prepare("INSERT INTO graph_edges(workspace_id,edge_type,status,from_kind,from_id,to_kind,to_id,confidence,evidence_json,is_dynamic,generation) VALUES(?,?,?,?,?,?,?,?,?,?,?)").run(workspaceId, "REMOTE_CALL_RESOLVES_TO_OPERATION", "resolved", "call", String(call.id), "operation", String(resolution.target.operationId), resolution.target.score, JSON.stringify(evidence), isDynamic ? 1 : 0, generation);
+    db.prepare("INSERT INTO graph_edges(workspace_id,edge_type,status,from_kind,from_id,to_kind,to_id,confidence,evidence_json,is_dynamic,generation) VALUES(?,?,?,?,?,?,?,?,?,?,?)").run(workspaceId, callType === "local_service_call" ? "LOCAL_CALL_RESOLVES_TO_OPERATION" : "REMOTE_CALL_RESOLVES_TO_OPERATION", "resolved", "call", String(call.id), "operation", String(resolution.target.operationId), resolution.target.score, JSON.stringify(evidence), isDynamic ? 1 : 0, generation);
     return { status: "resolved" };
   }
   const edgeType = callType === "local_db_query" ? "HANDLER_RUNS_DB_QUERY" : callType === "external_http" ? "HANDLER_CALLS_EXTERNAL_HTTP" : callType === "async_emit" ? "HANDLER_EMITS_EVENT" : callType === "async_subscribe" ? "EVENT_CONSUMED_BY_HANDLER" : resolution.status === "dynamic" ? "DYNAMIC_EDGE_CANDIDATE" : "UNRESOLVED_EDGE";
@@ -1222,7 +1276,7 @@ function insertCallEdge(db, workspaceId, call, vars, generation) {
   return { status };
 }
 function callEvidence(call, resolution, servicePath, op, destination) {
-  return { sourceFile: call.source_file, sourceLine: call.source_line, file: call.source_file, line: call.source_line, repo: call.repoName, serviceAlias: call.alias, serviceAliasExpr: call.aliasExpr, destination, servicePath, operationPath: op, targetRepo: resolution.target?.repoName, targetOperation: resolution.target?.operationName, helperChain: call.helperChainJson ? JSON.parse(String(call.helperChainJson)) : void 0, candidates: resolution.candidates, candidateCount: resolution.candidates.length, resolutionStatus: resolution.status, resolutionReasons: resolution.reasons, analysisCompleteness: call.unresolved_reason ? "partial" : "complete", parserWarning: call.unresolved_reason ? { code: "parser_warning", message: call.unresolved_reason } : void 0 };
+  return { sourceFile: call.source_file, sourceLine: call.source_line, file: call.source_file, line: call.source_line, repo: call.repoName, serviceAlias: call.alias, serviceAliasExpr: call.aliasExpr, destination, servicePath, operationPath: op, localServiceName: call.local_service_name, localServiceLookup: call.local_service_lookup, aliasChain: call.alias_chain_json ? JSON.parse(String(call.alias_chain_json)) : void 0, transport: call.call_type === "local_service_call" ? "local" : void 0, targetRepo: resolution.target?.repoName, targetOperation: resolution.target?.operationName, helperChain: call.helperChainJson ? JSON.parse(String(call.helperChainJson)) : void 0, candidates: resolution.candidates, candidateCount: resolution.candidates.length, resolutionStatus: resolution.status, resolutionReasons: resolution.reasons, analysisCompleteness: call.unresolved_reason ? "partial" : "complete", parserWarning: call.unresolved_reason ? { code: "parser_warning", message: call.unresolved_reason } : void 0 };
 }
 function linkImplementations(db, workspaceId, generation) {
   const operations = db.prepare(`SELECT o.id operationId,o.operation_path operationPath,o.operation_name operationName,s.service_path servicePath,s.repo_id modelRepoId,r.name modelRepo,r.package_name modelPackage,r.kind modelKind FROM cds_operations o JOIN cds_services s ON s.id=o.service_id JOIN repositories r ON r.id=s.repo_id WHERE r.workspace_id=?`).all(workspaceId);
@@ -1259,12 +1313,42 @@ function linkImplementations(db, workspaceId, generation) {
 }
 function rankedImplementationCandidates(db, workspaceId, operation) {
   const rows2 = implementationCandidates(db, workspaceId, operation);
-  return rows2.map((row) => scoreImplementationCandidate(row, operation)).sort((a, b) => b.score - a.score || String(a.className).localeCompare(String(b.className)) || a.methodId - b.methodId);
+  return deduplicateCandidates(rows2.map((row) => scoreImplementationCandidate(row, operation))).sort((a, b) => b.score - a.score || String(a.className).localeCompare(String(b.className)) || a.methodId - b.methodId);
+}
+function deduplicateCandidates(rows2) {
+  const merged = /* @__PURE__ */ new Map();
+  for (const row of rows2) {
+    const key = [row.methodId, row.classId, row.handlerRepoId].join(":");
+    const registration = { file: row.registrationFile, line: row.registrationLine, kind: row.registrationKind, importSource: row.importSource };
+    const existing = merged.get(key);
+    if (!existing) {
+      merged.set(key, { ...row, registrations: [registration] });
+      continue;
+    }
+    existing.registrations = uniqueRegistrations([...existing.registrations ?? [], registration]);
+    existing.score = Math.max(existing.score, row.score);
+    existing.accepted = existing.accepted || row.accepted;
+    existing.acceptedReasons = [.../* @__PURE__ */ new Set([...existing.acceptedReasons, ...row.acceptedReasons])];
+    existing.rejectedReasons = [.../* @__PURE__ */ new Set([...existing.rejectedReasons, ...row.rejectedReasons])];
+  }
+  return [...merged.values()];
+}
+function uniqueRegistrations(rows2) {
+  const seen = /* @__PURE__ */ new Set();
+  return rows2.filter((row) => {
+    const key = JSON.stringify(row);
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
 }
 function implementationCandidates(db, workspaceId, operation) {
   const modelRepoGraphId = graphId(operation.modelRepoId);
   return db.prepare(`SELECT DISTINCT
       hm.id methodId,
+      hm.method_name methodName,
+      hm.decorator_value decoratorValue,
+      hm.decorator_raw_expression decoratorRawExpression,
       hc.id classId,
       hc.class_name className,
       hc.source_file sourceFile,
@@ -1291,7 +1375,7 @@ function implementationCandidates(db, workspaceId, operation) {
       CASE WHEN appRepo.id=handlerRepo.id THEN 1 ELSE 0 END sameRepoRegistration,
       CASE WHEN EXISTS (SELECT 1 FROM cds_services localService WHERE localService.repo_id=appRepo.id AND localService.service_path=?) THEN 1 ELSE 0 END localServicePathMatch,
       CASE WHEN EXISTS (SELECT 1 FROM cds_services localService WHERE localService.repo_id=appRepo.id) THEN 1 ELSE 0 END applicationHasLocalServices,
-      CASE WHEN EXISTS (SELECT 1 FROM handler_registrations localReg JOIN handler_classes localClass ON (localClass.id=localReg.handler_class_id OR localClass.class_name=localReg.class_name) JOIN handler_methods localMethod ON localMethod.handler_class_id=localClass.id WHERE localReg.repo_id=appRepo.id AND (localMethod.decorator_value=? OR localMethod.decorator_value=? OR localMethod.method_name=?)) THEN 1 ELSE 0 END applicationHasLocalRegistrationForOperation,
+      CASE WHEN EXISTS (SELECT 1 FROM handler_registrations localReg JOIN handler_classes localClass ON (localClass.id=localReg.handler_class_id OR localClass.class_name=localReg.class_name) JOIN handler_methods localMethod ON localMethod.handler_class_id=localClass.id WHERE localReg.repo_id=appRepo.id AND (localMethod.decorator_value=? OR localMethod.decorator_value=? OR localMethod.method_name=? OR localMethod.decorator_raw_expression LIKE ?)) THEN 1 ELSE 0 END applicationHasLocalRegistrationForOperation,
       CASE WHEN EXISTS (SELECT 1 FROM graph_edges dep WHERE dep.edge_type='REPO_IMPORTS_HELPER_PACKAGE' AND dep.status='resolved' AND dep.from_kind='repo' AND dep.from_id=CAST(appRepo.id AS TEXT) AND dep.to_id=?) THEN 1 ELSE 0 END appDependsOnModel,
       CASE WHEN EXISTS (SELECT 1 FROM graph_edges dep WHERE dep.edge_type='REPO_IMPORTS_HELPER_PACKAGE' AND dep.status='resolved' AND dep.from_kind='repo' AND dep.from_id=CAST(appRepo.id AS TEXT) AND dep.to_id=CAST(handlerRepo.id AS TEXT)) THEN 1 ELSE 0 END appDependsOnHandler,
       CASE WHEN EXISTS (SELECT 1 FROM graph_edges dep WHERE dep.edge_type='REPO_IMPORTS_HELPER_PACKAGE' AND dep.status='resolved' AND dep.from_kind='repo' AND dep.from_id=CAST(handlerRepo.id AS TEXT) AND dep.to_id=?) THEN 1 ELSE 0 END handlerDependsOnModel
@@ -1301,7 +1385,7 @@ function implementationCandidates(db, workspaceId, operation) {
     JOIN handler_registrations hr ON (hr.handler_class_id=hc.id OR (hr.class_name=hc.class_name AND (hr.repo_id=hc.repo_id OR hr.import_source IS NOT NULL)))
     JOIN repositories appRepo ON appRepo.id=hr.repo_id
     WHERE appRepo.workspace_id=?
-      AND (hm.decorator_value=? OR hm.decorator_value=? OR hm.method_name=?)`).all(
+      AND (hm.decorator_value=? OR hm.decorator_value=? OR hm.method_name=? OR hm.decorator_raw_expression LIKE ?)`).all(
     operation.modelRepoId,
     operation.modelRepo,
     operation.modelPackage,
@@ -1315,12 +1399,14 @@ function implementationCandidates(db, workspaceId, operation) {
     normalizedOperation(String(operation.operationPath ?? "")),
     operation.operationName,
     operation.operationName,
+    `%${upperFirst(normalizedOperation(String(operation.operationPath ?? operation.operationName ?? "")))}%`,
     modelRepoGraphId,
     modelRepoGraphId,
     workspaceId,
     normalizedOperation(String(operation.operationPath ?? "")),
     operation.operationName,
-    operation.operationName
+    operation.operationName,
+    `%${upperFirst(normalizedOperation(String(operation.operationPath ?? operation.operationName ?? "")))}%`
   );
 }
 function scoreImplementationCandidate(row, operation) {
@@ -1338,7 +1424,10 @@ function scoreImplementationCandidate(row, operation) {
   const importSource = typeof row.importSource === "string" && row.importSource.length > 0;
   const sameRepoRegistration = flag(row.sameRepoRegistration);
   const modelOriented = row.modelKind === "cap-db-model" || !applicationHasLocalRegistrationForOperation;
-  const methodMatches = true;
+  const methodSignal = implementationMethodSignal(row, operation);
+  const methodMatches = methodSignal.matches;
+  acceptedReasons.push(...methodSignal.acceptedReasons);
+  rejectedReasons.push(...methodSignal.rejectedReasons);
   const registeredAndLinked = sameRepoRegistration && importSource;
   const helperOwned = modelOriented && methodMatches && registeredAndLinked && sameRepoRegistration && !applicationHasLocalServices && !modelIsApplicationRepo && !modelIsHandlerRepo && !localServicePathMatch && !appDependsOnModel && !appDependsOnHandler && !handlerDependsOnModel;
   if (modelIsApplicationRepo) {
@@ -1379,7 +1468,7 @@ function scoreImplementationCandidate(row, operation) {
   const hasCrossPackage = appDependsOnModel && (modelIsHandlerRepo || appDependsOnHandler || !importSource);
   const contradicted = applicationHasLocalServices && !localServicePathMatch && !appDependsOnModel && !hasOwnership;
   if (!hasOwnership && !localServicePathMatch && !hasCrossPackage && !helperOwned) rejectedReasons.push("missing direct ownership, exact local service path, or validated cross-package dependency evidence");
-  const accepted = !contradicted && (hasOwnership || localServicePathMatch || hasCrossPackage || handlerDependsOnModel || helperOwned);
+  const accepted = methodMatches && !methodSignal.contradicted && !contradicted && (hasOwnership || localServicePathMatch || hasCrossPackage || handlerDependsOnModel || helperOwned);
   if (!accepted && rejectedReasons.length === 0) rejectedReasons.push("candidate did not meet implementation ownership policy");
   return { ...row, methodId: Number(row.methodId), score, accepted, acceptedReasons, rejectedReasons };
 }
@@ -1396,6 +1485,7 @@ function candidateEvidence(candidate, rank) {
     sourceFile: candidate.sourceFile,
     sourceLine: candidate.sourceLine,
     registration: { file: candidate.registrationFile, line: candidate.registrationLine, kind: candidate.registrationKind, importSource: candidate.importSource },
+    registrations: candidate.registrations ?? [],
     applicationPackage: { id: candidate.applicationRepoId, name: candidate.applicationRepo, packageName: candidate.applicationPackage },
     handlerPackage: { id: candidate.handlerRepoId, name: candidate.handlerRepo, packageName: candidate.handlerPackage },
     modelPackage: { id: candidate.modelRepoId, name: candidate.modelRepo, packageName: candidate.modelPackage },
@@ -1414,6 +1504,29 @@ function candidateEvidence(candidate, rank) {
     }
   };
 }
+function implementationMethodSignal(row, operation) {
+  const op = normalizedOperation(String(operation.operationPath ?? operation.operationName ?? ""));
+  const decorator = normalizeDecoratorOperation(typeof row.decoratorValue === "string" ? row.decoratorValue : void 0, typeof row.decoratorRawExpression === "string" ? row.decoratorRawExpression : void 0);
+  if (decorator && decorator === op) return { matches: true, contradicted: false, acceptedReasons: ["decorator targets operation"], rejectedReasons: [] };
+  if (decorator && decorator !== op) return { matches: false, contradicted: true, acceptedReasons: [], rejectedReasons: ["method_name_matches_but_decorator_targets_different_operation"] };
+  if (String(row.methodName ?? "") === op) return { matches: true, contradicted: false, acceptedReasons: ["method name fallback matched operation"], rejectedReasons: [] };
+  return { matches: false, contradicted: false, acceptedReasons: [], rejectedReasons: ["method name does not match operation"] };
+}
+function normalizeDecoratorOperation(value, raw) {
+  const candidate = value ?? raw?.split(".").filter(Boolean).at(-2);
+  if (!candidate) return void 0;
+  const cleaned = candidate.replace(/^['"`]|['"`]$/g, "");
+  for (const prefix of ["Func", "Action"]) {
+    if (cleaned.startsWith(prefix) && cleaned.length > prefix.length) return lowerFirst(cleaned.slice(prefix.length));
+  }
+  return normalizedOperation(cleaned);
+}
+function upperFirst(value) {
+  return value ? `${value[0]?.toUpperCase() ?? ""}${value.slice(1)}` : value;
+}
+function lowerFirst(value) {
+  return value ? `${value[0]?.toLowerCase() ?? ""}${value.slice(1)}` : value;
+}
 function flag(value) {
   return Boolean(Number(value ?? 0));
 }
@@ -1437,8 +1550,8 @@ function sourceFilesForStart(db, repoId, start) {
   const operation = normalizeOperation(start.operation ?? start.operationPath);
   if (!handler && !operation) return void 0;
   const rows2 = db.prepare(
-    `SELECT DISTINCT hc.source_file sourceFile
-       FROM handler_classes hc LEFT JOIN handler_methods hm ON hm.handler_class_id=hc.id
+    `SELECT DISTINCT hc.source_file sourceFile,s.id symbolId
+       FROM handler_classes hc LEFT JOIN handler_methods hm ON hm.handler_class_id=hc.id LEFT JOIN symbols s ON s.repo_id=hc.repo_id AND s.source_file=hc.source_file AND s.name=hm.method_name
        WHERE (? IS NULL OR hc.repo_id=?) AND (? IS NULL OR hc.class_name=? OR hm.method_name=?)
          AND (? IS NULL OR hm.decorator_value=? OR hm.method_name=?)
          AND (? IS NULL OR EXISTS (SELECT 1 FROM cds_services s JOIN cds_operations o ON o.service_id=s.id WHERE s.repo_id=hc.repo_id AND s.service_path=? AND (? IS NULL OR o.operation_path=? OR o.operation_name=? OR hm.decorator_value=? OR hm.method_name=?)))`
@@ -1459,15 +1572,16 @@ function sourceFilesForStart(db, repoId, start) {
     operation,
     operation
   );
-  if (rows2.length > 0) return new Set(rows2.map((row) => row.sourceFile).filter(Boolean));
+  if (rows2.length > 0) return { files: new Set(rows2.map((row) => row.sourceFile).filter(Boolean)), symbols: new Set(rows2.map((row) => Number(row.symbolId)).filter(Boolean)) };
   if (start.servicePath && operation) {
-    const implRows = db.prepare(`SELECT DISTINCT hc.source_file sourceFile
+    const implRows = db.prepare(`SELECT DISTINCT hc.source_file sourceFile,sym.id symbolId
       FROM cds_services s JOIN cds_operations o ON o.service_id=s.id
       JOIN graph_edges e ON e.edge_type='OPERATION_IMPLEMENTED_BY_HANDLER' AND e.status='resolved' AND e.from_kind='operation' AND e.from_id=CAST(o.id AS TEXT)
       JOIN handler_methods hm ON hm.id=CAST(e.to_id AS INTEGER)
       JOIN handler_classes hc ON hc.id=hm.handler_class_id
+      LEFT JOIN symbols sym ON sym.repo_id=hc.repo_id AND sym.source_file=hc.source_file AND sym.name=hm.method_name
       WHERE (? IS NULL OR s.repo_id=?) AND s.service_path=? AND (o.operation_path=? OR o.operation_name=?)`).all(repoId, repoId, start.servicePath, operation, operation);
-    if (implRows.length > 0) return new Set(implRows.map((row) => row.sourceFile).filter(Boolean));
+    if (implRows.length > 0) return { files: new Set(implRows.map((row) => row.sourceFile).filter(Boolean)), symbols: new Set(implRows.map((row) => Number(row.symbolId)).filter(Boolean)) };
   }
   return void 0;
 }
@@ -1476,7 +1590,8 @@ function startScope(db, start) {
     "SELECT id,name FROM repositories WHERE name=? OR package_name=?"
   ).get(start.repo, start.repo) : void 0;
   if (start.repo && !repo) return { repo, selectorMatched: false };
-  const sourceFiles = sourceFilesForStart(db, repo?.id, start);
+  const sourceScope = sourceFilesForStart(db, repo?.id, start);
+  const sourceFiles = sourceScope?.files;
   const hasSelector = Boolean(
     start.handler ?? start.operation ?? start.operationPath ?? start.servicePath
   );
@@ -1485,6 +1600,7 @@ function startScope(db, start) {
   return {
     repo,
     sourceFiles,
+    symbolIds: sourceScope?.symbols,
     selectorMatched: !hasSelector || sourceFiles !== void 0
   };
 }
@@ -1496,8 +1612,9 @@ function handlerFilesForOperation(db, operationId) {
   if (!op) return /* @__PURE__ */ new Set();
   const operation = normalizeOperation(op.operationPath ?? op.operationName);
   const rows2 = db.prepare(
-    `SELECT DISTINCT hc.source_file sourceFile FROM handler_classes hc
+    `SELECT DISTINCT hc.source_file sourceFile,sym.id symbolId FROM handler_classes hc
     JOIN handler_methods hm ON hm.handler_class_id=hc.id
+    LEFT JOIN symbols sym ON sym.repo_id=hc.repo_id AND sym.source_file=hc.source_file AND sym.name=hm.method_name
     WHERE hc.repo_id=? AND (hm.decorator_value=? OR hm.method_name=? OR hm.decorator_value=?)`
   ).all(op.repoId, operation, operation, op.operationName);
   return new Set(rows2.map((row) => row.sourceFile).filter(Boolean));
@@ -1513,8 +1630,8 @@ function handlerMethodNode(db, methodId) {
 function implementationScope(db, operationId) {
   const edge = implementationEdge(db, operationId);
   if (!edge || edge.status !== "resolved") return { files: /* @__PURE__ */ new Set(), edge };
-  const row = db.prepare("SELECT hc.repo_id repoId,hc.source_file sourceFile FROM handler_methods hm JOIN handler_classes hc ON hc.id=hm.handler_class_id WHERE hm.id=?").get(edge.to_id);
-  return { repoId: row?.repoId, files: new Set(row?.sourceFile ? [row.sourceFile] : []), edge };
+  const row = db.prepare("SELECT hc.repo_id repoId,hc.source_file sourceFile,s.id symbolId FROM handler_methods hm JOIN handler_classes hc ON hc.id=hm.handler_class_id LEFT JOIN symbols s ON s.repo_id=hc.repo_id AND s.source_file=hc.source_file AND s.name=hm.method_name WHERE hm.id=?").get(edge.to_id);
+  return { repoId: row?.repoId, files: new Set(row?.sourceFile ? [row.sourceFile] : []), symbolId: row?.symbolId, edge };
 }
 function includeCall(type, options) {
   if (!options.includeDb && type === "local_db_query") return false;
@@ -1559,6 +1676,12 @@ function evidenceWithRuntimeVariables(evidence, vars) {
   if (missing.length > 0) next.missingRuntimeVariables = [...new Set(missing)];
   return next;
 }
+function symbolNode(db, symbolId) {
+  const row = db.prepare(`SELECT s.id symbolId,s.name symbolName,s.qualified_name qualifiedName,s.source_file sourceFile,s.start_line startLine,s.end_line endLine,r.name repoName,r.id repoId FROM symbols s JOIN repositories r ON r.id=s.repo_id WHERE s.id=?`).get(symbolId);
+  if (!row) return void 0;
+  const fileName = String(row.sourceFile ?? "").split("/").at(-1) ?? String(row.sourceFile ?? "");
+  return { id: `symbol:${symbolId}`, kind: "symbol", label: `${fileName}:${String(row.qualifiedName ?? row.symbolName)}`, ...row };
+}
 function operationNode(db, operationId) {
   const row = db.prepare(`SELECT o.id operationId,o.operation_name operationName,o.operation_type operationType,o.operation_path operationPath,o.source_file sourceFile,o.source_line sourceLine,s.id serviceId,s.service_name serviceName,s.qualified_name qualifiedName,s.service_path servicePath,r.id repoId,r.name repoName FROM cds_operations o JOIN cds_services s ON s.id=o.service_id JOIN repositories r ON r.id=s.repo_id WHERE o.id=?`).get(operationId);
   if (!row) return void 0;
@@ -1612,10 +1735,12 @@ function trace(db, start, options) {
   const maxDepth = positiveDepth(options.depth);
   const edges = [];
   const nodes = /* @__PURE__ */ new Map();
-  const queue = scope.selectorMatched ? [{ repoId: scope.repo?.id, files: scope.sourceFiles, depth: 1 }] : [];
+  const queue = scope.selectorMatched ? [{ repoId: scope.repo?.id, files: scope.sourceFiles, symbolIds: scope.symbolIds, depth: 1 }] : [];
   if (start.servicePath && (start.operation ?? start.operationPath)) {
     const startOperation = normalizeOperation(start.operation ?? start.operationPath);
-    const row = db.prepare(`SELECT o.id operationId FROM cds_operations o JOIN cds_services s ON s.id=o.service_id WHERE s.service_path=? AND (o.operation_path=? OR o.operation_name=?) ORDER BY o.id LIMIT 1`).get(start.servicePath, startOperation, startOperation);
+    const startRows = db.prepare(`SELECT o.id operationId,r.name repoName,s.service_path servicePath,o.operation_path operationPath,o.operation_name operationName,o.source_file sourceFile,o.source_line sourceLine FROM cds_operations o JOIN cds_services s ON s.id=o.service_id JOIN repositories r ON r.id=s.repo_id WHERE (? IS NULL OR s.repo_id=?) AND s.service_path=? AND (o.operation_path=? OR o.operation_name=?) ORDER BY r.name,o.id LIMIT 2`).all(scope.repo?.id, scope.repo?.id, start.servicePath, startOperation, startOperation);
+    if (!scope.repo && startRows.length > 1) diagnostics.unshift({ severity: "warning", code: "trace_start_ambiguous", message: "Service/path trace start matched multiple repositories; add --repo to disambiguate", candidates: startRows });
+    const row = startRows.length === 1 ? startRows[0] : void 0;
     if (row?.operationId !== void 0) {
       const opId = String(row.operationId);
       const op = operationNode(db, opId);
@@ -1634,15 +1759,31 @@ function trace(db, start, options) {
   while (queue.length > 0) {
     const current = queue.shift();
     if (!current || current.depth > maxDepth) continue;
-    const key = `${current.repoId ?? "*"}:${[...current.files ?? /* @__PURE__ */ new Set(["*"])].sort().join(",")}`;
+    const key = `${current.repoId ?? "*"}:${[...current.symbolIds ?? /* @__PURE__ */ new Set(["*"])].sort().join(",")}:${[...current.files ?? /* @__PURE__ */ new Set(["*"])].sort().join(",")}`;
     if (seenScopes.has(key)) continue;
     seenScopes.add(key);
     const calls = db.prepare(
       `SELECT c.*,r.name repoName FROM outbound_calls c JOIN repositories r ON r.id=c.repo_id WHERE (? IS NULL OR c.repo_id=?) ORDER BY c.source_file,c.source_line`
     ).all(current.repoId, current.repoId);
     const filtered = calls.filter(
-      (c) => (!current.files || current.files.has(String(c.source_file))) && includeCall(String(c.call_type), options)
+      (c) => (!current.symbolIds || current.symbolIds.has(Number(c.source_symbol_id))) && (!current.files || current.files.has(String(c.source_file))) && includeCall(String(c.call_type), options)
     );
+    if (current.symbolIds && current.symbolIds.size > 0 && current.depth < maxDepth) {
+      const symbolRows = db.prepare(`SELECT sc.*,s.repo_id calleeRepoId,s.source_file calleeFile FROM symbol_calls sc LEFT JOIN symbols s ON s.id=sc.callee_symbol_id WHERE sc.caller_symbol_id IN (${[...current.symbolIds].map(() => "?").join(",")}) ORDER BY sc.source_file,sc.source_line`).all(...current.symbolIds);
+      for (const symbolCall of symbolRows) {
+        if (!symbolCall.callee_symbol_id) continue;
+        const nextSymbols = /* @__PURE__ */ new Set([Number(symbolCall.callee_symbol_id)]);
+        const nextFiles = /* @__PURE__ */ new Set([String(symbolCall.calleeFile)]);
+        const nextRepoId = Number(symbolCall.calleeRepoId);
+        const nextKey = `${nextRepoId}:${[...nextSymbols].join(",")}:${[...nextFiles].join(",")}`;
+        const calleeNode = symbolNode(db, Number(symbolCall.callee_symbol_id));
+        if (calleeNode) nodes.set(String(calleeNode.id), calleeNode);
+        const evidence = { ...JSON.parse(String(symbolCall.evidence_json || "{}")), sourceFile: symbolCall.source_file, sourceLine: symbolCall.source_line, calleeSymbolId: symbolCall.callee_symbol_id, calleeSymbolName: calleeNode?.symbolName, calleeSymbolFile: calleeNode?.sourceFile, resolutionStatus: symbolCall.status };
+        edges.push({ step: current.depth, type: "local_symbol_call", from: String(symbolCall.callee_expression), to: calleeNode?.label ? String(calleeNode.label) : `symbol:${String(symbolCall.callee_symbol_id)}`, evidence, confidence: Number(symbolCall.confidence ?? 0.8), unresolvedReason: String(symbolCall.status) === "resolved" ? void 0 : symbolCall.unresolved_reason ? String(symbolCall.unresolved_reason) : void 0 });
+        if (seenScopes.has(nextKey)) edges.push({ step: current.depth, type: "cycle", from: String(symbolCall.callee_expression), to: nextKey, evidence: { cycle: true, symbolCallId: symbolCall.id }, confidence: 1, unresolvedReason: "Cycle detected; downstream symbol already visited" });
+        else queue.push({ repoId: nextRepoId, files: nextFiles, symbolIds: nextSymbols, depth: current.depth + 1 });
+      }
+    }
     const graph = graphForCalls(
       db,
       filtered.map((c) => Number(c.id))
@@ -1678,7 +1819,7 @@ function trace(db, start, options) {
         edges.push({
           step: current.depth,
           type: String(call.call_type),
-          from: `${call.repoName}:${call.source_file}`,
+          from: `${call.repoName}:${call.source_file}:${call.source_line}`,
           to,
           evidence,
           confidence: Number(effectiveRow.confidence ?? call.confidence),
@@ -1692,7 +1833,7 @@ function trace(db, start, options) {
             const implTo = handlerNode?.label ? String(handlerNode.label) : `${implementation.edge.to_kind}:${implementation.edge.to_id}`;
             if (handlerNode) nodes.set(String(handlerNode.id), handlerNode);
             edges.push({
-              step: current.depth + 1,
+              step: current.depth,
               type: "operation_implemented_by_handler",
               from: to,
               to: implTo,
@@ -1703,14 +1844,15 @@ function trace(db, start, options) {
           }
           if (current.depth >= maxDepth) continue;
           const files = implementation.files.size > 0 ? implementation.files : handlerFilesForOperation(db, effectiveRow.to_id);
+          const symbolIds = implementation.symbolId ? /* @__PURE__ */ new Set([implementation.symbolId]) : void 0;
           if (implementation.edge?.status === "resolved" && files.size > 0) {
             const targetRepoId = implementation.repoId ?? db.prepare(
               "SELECT s.repo_id repoId FROM cds_operations o JOIN cds_services s ON s.id=o.service_id WHERE o.id=?"
             ).get(effectiveRow.to_id)?.repoId;
-            const nextKey = `${targetRepoId ?? "*"}:${[...files].sort().join(",")}`;
+            const nextKey = `${targetRepoId ?? "*"}:${[...symbolIds ?? /* @__PURE__ */ new Set(["*"])].sort().join(",")}:${[...files].sort().join(",")}`;
             if (seenScopes.has(nextKey))
               edges.push({
-                step: current.depth + 1,
+                step: current.depth,
                 type: "cycle",
                 from: to,
                 to: nextKey,
@@ -1722,6 +1864,7 @@ function trace(db, start, options) {
               queue.push({
                 repoId: targetRepoId,
                 files,
+                symbolIds,
                 depth: current.depth + 1
               });
           }
@@ -1750,4 +1893,4 @@ export {
   linkWorkspace,
   trace
 };
-//# sourceMappingURL=chunk-LQT67AU5.js.map
+//# sourceMappingURL=chunk-MXYYARUP.js.map