@saptools/service-flow 0.1.2 → 0.1.3

package/dist/{chunk-6U4QKQEL.js → chunk-SIKIGT42.js}

@@ -369,34 +369,81 @@ function lineOf3(text, idx) {
 function firstArg2(body, key) {
   return new RegExp(`${key}\\s*:\\s*([^,}\\n]+)`).exec(body)?.[1]?.trim();
 }
+function matchingParen(text, open) {
+  let depth = 0;
+  let quote;
+  let escaped = false;
+  for (let i = open; i < text.length; i += 1) {
+    const ch = text[i] ?? "";
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (ch === "\\") escaped = true;
+      else if (ch === quote) quote = void 0;
+      continue;
+    }
+    if (ch === '"' || ch === "'" || ch === "`") {
+      quote = ch;
+      continue;
+    }
+    if (ch === "(") depth += 1;
+    if (ch === ")") {
+      depth -= 1;
+      if (depth === 0) return i;
+    }
+  }
+  return -1;
+}
+function argumentForCall(expr, marker) {
+  const idx = expr.indexOf(marker);
+  if (idx < 0) return void 0;
+  const open = expr.indexOf("(", idx + marker.length);
+  if (open < 0) return void 0;
+  const close = matchingParen(expr, open);
+  return close > open ? expr.slice(open + 1, close).trim() : void 0;
+}
+function entityFromArg(arg) {
+  if (!arg) return void 0;
+  const first = arg.split(",")[0]?.trim();
+  if (!first) return void 0;
+  return stripQuotes(first).replace(/^this\./, "");
+}
+function extractQueryEntity(expr) {
+  return entityFromArg(argumentForCall(expr, "SELECT.one.from")) ?? entityFromArg(argumentForCall(expr, "SELECT.from")) ?? entityFromArg(argumentForCall(expr, "INSERT.into")) ?? entityFromArg(argumentForCall(expr, "UPDATE")) ?? entityFromArg(argumentForCall(expr, "DELETE.from"));
+}
 async function parseOutboundCalls(repoPath, filePath) {
   const text = await fs6.readFile(path7.join(repoPath, filePath), "utf8");
   const out = [];
   for (const m of text.matchAll(/(\w+)\.send\s*\(\s*\{([\s\S]*?)\}\s*\)/g)) {
     const body = m[2] ?? "";
     const query = firstArg2(body, "query");
-    const op = firstArg2(body, "path");
+    const op = firstArg2(body, "path") ?? firstArg2(body, "event");
     out.push({
       callType: query ? "remote_query" : "remote_action",
       serviceVariableName: m[1],
       method: stripQuotes(firstArg2(body, "method") ?? "POST"),
-      operationPathExpr: op ? stripQuotes(op) : void 0,
-      queryEntity: /SELECT(?:\.one)?\.from\(([\w.]+)\)/.exec(query ?? "")?.[1],
+      operationPathExpr: op ? `/${stripQuotes(op).replace(/^\//, "")}` : void 0,
+      queryEntity: extractQueryEntity(query ?? ""),
       payloadSummary: summarizeExpression(body),
       sourceFile: normalizePath(filePath),
       sourceLine: lineOf3(text, m.index ?? 0),
       confidence: op || query ? 0.8 : 0.4
     });
   }
-  for (const m of text.matchAll(/cds\.run\s*\(([\s\S]*?)\)/g))
+  for (const m of text.matchAll(/cds\.run\s*\(/g)) {
+    const open = (m.index ?? 0) + m[0].lastIndexOf("(");
+    const close = matchingParen(text, open);
+    const expr = close > open ? text.slice(open + 1, close) : "";
+    const entity = extractQueryEntity(expr);
     out.push({
       callType: "local_db_query",
-      queryEntity: /(?:SELECT(?:\.one)?\.from|INSERT\.into|UPDATE|DELETE\.from)\(([\w.]+)\)/.exec(m[1] ?? "")?.[1],
-      payloadSummary: summarizeExpression(m[1] ?? ""),
+      queryEntity: entity,
+      payloadSummary: summarizeExpression(expr),
       sourceFile: normalizePath(filePath),
       sourceLine: lineOf3(text, m.index ?? 0),
-      confidence: 0.85
+      confidence: entity ? 0.9 : 0.55,
+      unresolvedReason: entity ? void 0 : "Could not resolve CAP query target entity from nested expression"
     });
+  }
   for (const m of text.matchAll(
     /(\w+)\.(emit|publish|on)\s*\(\s*(['"`])([^'"`]+)\3/g
   ))
@@ -436,67 +483,246 @@ async function parseOutboundCalls(repoPath, filePath) {
 // src/parsers/service-binding-parser.ts
 import fs7 from "fs/promises";
 import path8 from "path";
-function lineOf4(text, idx) {
-  return text.slice(0, idx).split("\n").length;
+import ts3 from "typescript";
+function lineOf4(sf, node) {
+  return sf.getLineAndCharacterOfPosition(node.getStart(sf)).line + 1;
+}
+function stringValue(node) {
+  if (!node) return void 0;
+  if (ts3.isStringLiteralLike(node) || ts3.isNoSubstitutionTemplateLiteral(node))
+    return node.text;
+  if (ts3.isTemplateExpression(node))
+    return node.getText().replace(/^`|`$/g, "");
+  return node.getText();
 }
 function placeholders(value) {
   return [...(value ?? "").matchAll(/\$\{\s*(\w+)\s*\}/g)].map((m) => m[1] ?? "").filter(Boolean);
 }
+function connectFactFromCall(call) {
+  const expr = call.expression;
+  if (!ts3.isPropertyAccessExpression(expr) || expr.name.text !== "to")
+    return void 0;
+  const inner = expr.expression;
+  if (!ts3.isPropertyAccessExpression(inner) || inner.name.text !== "connect" || inner.expression.getText() !== "cds")
+    return void 0;
+  const first = call.arguments[0];
+  if (!first) return void 0;
+  if (ts3.isStringLiteralLike(first) || ts3.isNoSubstitutionTemplateLiteral(first))
+    return { alias: first.text, isDynamic: false, placeholders: [] };
+  if (!ts3.isObjectLiteralExpression(first))
+    return {
+      servicePathExpr: first.getText(),
+      isDynamic: true,
+      placeholders: []
+    };
+  let destinationExpr;
+  let servicePathExpr;
+  function visitObject(obj) {
+    for (const prop of obj.properties) {
+      if (!ts3.isPropertyAssignment(prop)) continue;
+      const name = ts3.isIdentifier(prop.name) || ts3.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 (ts3.isObjectLiteralExpression(prop.initializer))
+        visitObject(prop.initializer);
+    }
+  }
+  visitObject(first);
+  const ph = [
+    ...placeholders(destinationExpr),
+    ...placeholders(servicePathExpr)
+  ];
+  return {
+    destinationExpr,
+    servicePathExpr,
+    isDynamic: ph.length > 0 || !destinationExpr && !servicePathExpr,
+    placeholders: ph
+  };
+}
+function unwrapCall(expr) {
+  if (ts3.isAwaitExpression(expr)) return unwrapCall(expr.expression);
+  if (ts3.isCallExpression(expr)) return expr;
+  return void 0;
+}
+function findConnectInExpression(expr) {
+  const direct = unwrapCall(expr);
+  if (direct) {
+    const fact = connectFactFromCall(direct);
+    if (fact) return fact;
+  }
+  let found;
+  function visit(node) {
+    if (found) return;
+    if (ts3.isCallExpression(node)) found = connectFactFromCall(node);
+    if (!found) ts3.forEachChild(node, visit);
+  }
+  visit(expr);
+  return found;
+}
+async function readSource(abs) {
+  try {
+    const text = await fs7.readFile(abs, "utf8");
+    return ts3.createSourceFile(
+      abs,
+      text,
+      ts3.ScriptTarget.Latest,
+      true,
+      ts3.ScriptKind.TS
+    );
+  } catch {
+    return void 0;
+  }
+}
+async function resolveImport(repoPath, fromFile, spec) {
+  if (!spec.startsWith(".")) return void 0;
+  const base = path8.resolve(repoPath, path8.dirname(fromFile), spec);
+  for (const candidate of [
+    base,
+    `${base}.ts`,
+    `${base}.js`,
+    path8.join(base, "index.ts"),
+    path8.join(base, "index.js")
+  ]) {
+    try {
+      const st = await fs7.stat(candidate);
+      if (st.isFile()) return normalizePath(path8.relative(repoPath, candidate));
+    } catch {
+    }
+  }
+  return void 0;
+}
+async function importsFor(repoPath, filePath, sf) {
+  const imports = [];
+  for (const stmt of sf.statements) {
+    if (!ts3.isImportDeclaration(stmt) || !ts3.isStringLiteralLike(stmt.moduleSpecifier))
+      continue;
+    const sourceFile = await resolveImport(
+      repoPath,
+      filePath,
+      stmt.moduleSpecifier.text
+    );
+    const clause = stmt.importClause;
+    if (!clause) continue;
+    if (clause.name)
+      imports.push({
+        localName: clause.name.text,
+        exportedName: "default",
+        sourceFile
+      });
+    const bindings = clause.namedBindings;
+    if (bindings && ts3.isNamedImports(bindings))
+      for (const el of bindings.elements)
+        imports.push({
+          localName: el.name.text,
+          exportedName: el.propertyName?.text ?? el.name.text,
+          sourceFile
+        });
+  }
+  return imports;
+}
+async function helperBindings(repoPath, filePath) {
+  const sf = await readSource(path8.join(repoPath, filePath));
+  if (!sf) return [];
+  const sourceFileAst = sf;
+  const out = [];
+  for (const stmt of sf.statements) {
+    const exported = ts3.canHaveModifiers(stmt) ? ts3.getModifiers(stmt)?.some(
+      (m) => m.kind === ts3.SyntaxKind.ExportKeyword
+    ) ?? false : false;
+    if (ts3.isFunctionDeclaration(stmt) && stmt.name) {
+      let fact;
+      stmt.forEachChild(function visit(node) {
+        if (!fact && ts3.isReturnStatement(node) && node.expression)
+          fact = findConnectInExpression(node.expression);
+        if (!fact) ts3.forEachChild(node, visit);
+      });
+      if (fact && exported)
+        out.push({
+          ...fact,
+          exportedName: stmt.name.text,
+          sourceFile: normalizePath(filePath),
+          sourceLine: lineOf4(sf, stmt)
+        });
+    }
+    if (ts3.isVariableStatement(stmt))
+      for (const decl of stmt.declarationList.declarations) {
+        if (!ts3.isIdentifier(decl.name) || !decl.initializer) continue;
+        const fact = findConnectInExpression(decl.initializer);
+        if (fact && exported)
+          out.push({
+            ...fact,
+            exportedName: decl.name.text,
+            sourceFile: normalizePath(filePath),
+            sourceLine: lineOf4(sourceFileAst, decl)
+          });
+      }
+  }
+  return out;
+}
 async function parseServiceBindings(repoPath, filePath) {
-  const text = await fs7.readFile(path8.join(repoPath, filePath), "utf8");
+  const sf = await readSource(path8.join(repoPath, filePath));
+  if (!sf) return [];
+  const sourceFileAst = sf;
   const out = [];
-  for (const m of text.matchAll(
-    /(?:const|let|this\.)\s*(\w+)\s*=\s*(?:await\s*)?cds\.connect\.to\((['"`])([^'"`]+)\2\)/g
-  ))
-    out.push({
-      variableName: m[1] ?? "service",
-      alias: m[3],
-      isDynamic: false,
-      placeholders: [],
-      sourceFile: normalizePath(filePath),
-      sourceLine: lineOf4(text, m.index ?? 0)
-    });
-  for (const m of text.matchAll(
-    /(?:const|let|this\.)\s*(\w+)\s*=\s*(?:await\s*)?cds\.connect\.to\(\{([\s\S]*?)\}\s*\)/g
-  )) {
-    const body = m[2] ?? "";
-    const destination = /destination\s*:\s*([^,\n]+)/.exec(body)?.[1];
-    const servicePath = /path\s*:\s*([^,\n]+)/.exec(body)?.[1];
-    const dest = destination ? stripQuotes(destination.trim()) : void 0;
-    const svc = servicePath ? stripQuotes(servicePath.trim()) : void 0;
-    const ph = [...placeholders(dest), ...placeholders(svc)];
-    out.push({
-      variableName: m[1] ?? "service",
-      destinationExpr: dest,
-      servicePathExpr: svc,
-      isDynamic: ph.length > 0,
-      placeholders: ph,
-      sourceFile: normalizePath(filePath),
-      sourceLine: lineOf4(text, m.index ?? 0)
-    });
+  const imports = await importsFor(repoPath, filePath, sf);
+  const helperCache = /* @__PURE__ */ new Map();
+  async function importedHelper(localName) {
+    const imp = imports.find((i) => i.localName === localName && i.sourceFile);
+    if (!imp?.sourceFile) return void 0;
+    if (!helperCache.has(imp.sourceFile))
+      helperCache.set(
+        imp.sourceFile,
+        await helperBindings(repoPath, imp.sourceFile)
+      );
+    const helper = helperCache.get(imp.sourceFile)?.find((h) => h.exportedName === imp.exportedName);
+    return helper ? { imp, helper } : void 0;
   }
-  for (const m of text.matchAll(
-    /(?:function\s+(\w+)\s*\([^)]*\)\s*\{[\s\S]*?return|const\s+(\w+)\s*=\s*(?:async\s*)?\([^)]*\)\s*=>)\s+(?:await\s*)?cds\.connect\.to\((['"`])([^'"`]+)\3\)/g
-  ))
-    out.push({
-      variableName: m[1] ?? m[2] ?? "connect",
-      alias: m[4],
-      isDynamic: false,
-      placeholders: [],
-      sourceFile: normalizePath(filePath),
-      sourceLine: lineOf4(text, m.index ?? 0)
-    });
-  const helperAliases = new Map(out.filter((b) => b.alias).map((b) => [b.variableName, b]));
-  for (const m of text.matchAll(/(?:const|let)\s+(\w+)\s*=\s*(?:await\s*)?(\w+)\s*\(/g)) {
-    const helper = helperAliases.get(m[2] ?? "");
-    if (!helper) continue;
-    out.push({
-      ...helper,
-      variableName: m[1] ?? "service",
-      sourceFile: normalizePath(filePath),
-      sourceLine: lineOf4(text, m.index ?? 0)
-    });
+  async function recordVariable(decl) {
+    if (!ts3.isIdentifier(decl.name) || !decl.initializer) return;
+    const call = unwrapCall(decl.initializer);
+    if (!call) return;
+    const direct = connectFactFromCall(call);
+    if (direct)
+      out.push({
+        variableName: decl.name.text,
+        ...direct,
+        sourceFile: normalizePath(filePath),
+        sourceLine: lineOf4(sourceFileAst, decl)
+      });
+    else if (ts3.isIdentifier(call.expression)) {
+      const resolved = await importedHelper(call.expression.text);
+      if (resolved)
+        out.push({
+          variableName: decl.name.text,
+          alias: resolved.helper.alias,
+          destinationExpr: resolved.helper.destinationExpr,
+          servicePathExpr: resolved.helper.servicePathExpr,
+          isDynamic: resolved.helper.isDynamic,
+          placeholders: resolved.helper.placeholders,
+          sourceFile: normalizePath(filePath),
+          sourceLine: lineOf4(sourceFileAst, decl),
+          helperChain: [
+            {
+              callerVariable: decl.name.text,
+              importedHelper: call.expression.text,
+              importSource: resolved.imp.sourceFile,
+              exportedSymbol: resolved.imp.exportedName,
+              helperSourceFile: resolved.helper.sourceFile,
+              helperSourceLine: resolved.helper.sourceLine
+            }
+          ]
+        });
+    }
+  }
+  const declarations = [];
+  function collectDeclarations(node) {
+    if (ts3.isVariableDeclaration(node)) declarations.push(node);
+    ts3.forEachChild(node, collectDeclarations);
   }
+  collectDeclarations(sourceFileAst);
+  for (const decl of declarations) await recordVariable(decl);
   return out;
 }
 
@@ -510,28 +736,82 @@ function applyVariables(template, vars) {
 }
 
 // src/linker/service-resolver.ts
-function findOperation(db, servicePath, operationPath, workspaceId) {
-  if (!operationPath) return void 0;
-  const row = 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 r.workspace_id=?)
-         AND (? IS NULL OR s.service_path=?)
-         AND (o.operation_path=? OR o.operation_name=?)
-       ORDER BY CASE WHEN s.service_path=? THEN 0 ELSE 1 END
-       LIMIT 1`
-  ).get(
+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
+       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(
     workspaceId,
     workspaceId,
-    servicePath,
-    servicePath,
     operationPath,
-    operationPath.replace(/^\//, ""),
-    servicePath
+    operationPath.replace(/^\//, "")
+  );
+}
+function resolveOperation(db, signals, workspaceId) {
+  if (!signals.operationPath)
+    return {
+      status: "unresolved",
+      candidates: [],
+      reasons: ["missing_operation_path"]
+    };
+  const candidates = rows(db, signals.operationPath, workspaceId).map((c) => ({
+    ...c,
+    score: 0.2,
+    reasons: ["operation_path_match"]
+  }));
+  if (candidates.length === 0)
+    return {
+      status: "unresolved",
+      candidates: [],
+      reasons: ["no_operation_candidates"]
+    };
+  const hasStrongSignal = Boolean(
+    signals.servicePath || signals.alias || signals.destination || signals.hasExplicitOverride
+  );
+  for (const c of candidates) {
+    if (signals.servicePath && c.servicePath === signals.servicePath) {
+      c.score += 0.75;
+      c.reasons.push("exact_service_path");
+    }
+    if (signals.servicePath && c.servicePath !== signals.servicePath) {
+      c.score -= 0.1;
+      c.reasons.push("service_path_mismatch");
+    }
+    if (signals.hasExplicitOverride) {
+      c.score += 0.2;
+      c.reasons.push("explicit_dynamic_override");
+    }
+  }
+  candidates.sort(
+    (a, b) => b.score - a.score || a.repoName.localeCompare(b.repoName)
   );
-  return row;
+  const best = candidates[0];
+  const second = candidates[1];
+  if (signals.isDynamic && !signals.hasExplicitOverride && !signals.servicePath)
+    return {
+      status: "dynamic",
+      candidates,
+      reasons: ["dynamic_target_without_override"]
+    };
+  if (!hasStrongSignal)
+    return {
+      status: candidates.length > 1 ? "ambiguous" : "unresolved",
+      candidates,
+      reasons: ["operation_path_only_has_no_strong_target_signal"]
+    };
+  if (best && best.score >= 0.9 && (!second || best.score - second.score >= 0.25))
+    return {
+      status: "resolved",
+      target: best,
+      candidates,
+      reasons: best.reasons
+    };
+  return {
+    status: candidates.length > 1 ? "ambiguous" : "unresolved",
+    candidates,
+    reasons: ["candidate_score_below_resolution_threshold"]
+  };
 }
 
 // src/linker/helper-package-linker.ts
@@ -571,7 +851,7 @@ function linkWorkspace(db, workspaceId, vars = {}) {
   let edges = linkHelperPackages(db, workspaceId);
   let unresolved = 0;
   const calls = db.prepare(
-    `SELECT c.*,r.name repoName,b.alias,b.destination_expr destinationExpr,b.service_path_expr servicePathExpr,b.is_dynamic isDynamic,b.placeholders_json placeholdersJson,req.service_path requireServicePath,req.destination requireDestination FROM outbound_calls c JOIN repositories r ON r.id=c.repo_id LEFT JOIN service_bindings b ON b.id=c.service_binding_id LEFT JOIN cds_requires req ON req.repo_id=c.repo_id AND req.alias=b.alias WHERE r.workspace_id=?`
+    `SELECT c.*,r.name repoName,b.alias,b.destination_expr destinationExpr,b.service_path_expr servicePathExpr,b.is_dynamic isDynamic,b.placeholders_json placeholdersJson,b.helper_chain_json helperChainJson,req.service_path requireServicePath,req.destination requireDestination FROM outbound_calls c JOIN repositories r ON r.id=c.repo_id LEFT JOIN service_bindings b ON b.id=c.service_binding_id LEFT JOIN cds_requires req ON req.repo_id=c.repo_id AND req.alias=b.alias WHERE r.workspace_id=?`
   ).all(workspaceId);
   for (const call of calls) {
     const callType = String(call.call_type);
@@ -580,16 +860,38 @@ function linkWorkspace(db, workspaceId, vars = {}) {
       call.servicePathExpr ?? call.requireServicePath,
       vars
     );
-    const target = callType.startsWith("remote") ? findOperation(db, servicePath, op, workspaceId) : void 0;
+    const destination = call.destinationExpr ?? call.requireDestination;
+    const isDynamic = Boolean(Number(call.isDynamic ?? 0));
+    const resolution = callType.startsWith("remote") ? resolveOperation(
+      db,
+      {
+        servicePath,
+        operationPath: op,
+        alias: call.alias,
+        destination,
+        isDynamic,
+        hasExplicitOverride: Object.keys(vars).length > 0
+      },
+      workspaceId
+    ) : { status: "unresolved", candidates: [], reasons: [] };
+    const target = resolution.target;
     const evidence = {
       sourceFile: call.source_file,
       sourceLine: call.source_line,
+      file: call.source_file,
+      line: call.source_line,
+      repo: call.repoName,
       serviceAlias: call.alias,
-      destination: call.destinationExpr ?? call.requireDestination,
+      destination,
       servicePath,
       operationPath: op,
       targetRepo: target?.repoName,
-      targetOperation: target?.operationName
+      targetOperation: 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
     };
     if (target) {
       db.prepare(
@@ -601,13 +903,13 @@ function linkWorkspace(db, workspaceId, vars = {}) {
         String(call.id),
         "operation",
         String(target.operationId),
-        call.isDynamic ? 0.6 : 0.9,
+        target.score,
         JSON.stringify(evidence),
-        call.isDynamic ? 1 : 0
+        isDynamic ? 1 : 0
       );
       edges += 1;
     } else {
-      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" : call.isDynamic ? "DYNAMIC_EDGE_CANDIDATE" : "UNRESOLVED_EDGE";
+      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";
       db.prepare(
         "INSERT INTO graph_edges(workspace_id,edge_type,from_kind,from_id,to_kind,to_id,confidence,evidence_json,is_dynamic,unresolved_reason) VALUES(?,?,?,?,?,?,?,?,?,?)"
       ).run(
@@ -619,8 +921,10 @@ function linkWorkspace(db, workspaceId, vars = {}) {
         String(call.event_name_expr ?? call.query_entity ?? op ?? call.id),
         Number(call.confidence ?? 0.2),
         JSON.stringify(evidence),
-        call.isDynamic ? 1 : 0,
-        String(call.unresolved_reason ?? "No indexed target operation matched")
+        isDynamic || resolution.status === "dynamic" ? 1 : 0,
+        String(
+          call.unresolved_reason ?? (resolution.status === "ambiguous" ? "Ambiguous operation candidates require a strong service signal" : resolution.status === "dynamic" ? "Dynamic target requires runtime variable overrides" : "No indexed target operation matched")
+        )
       );
       edges += 1;
       unresolved += edgeType === "UNRESOLVED_EDGE" ? 1 : 0;
@@ -641,29 +945,52 @@ function sourceFilesForStart(db, repoId, start) {
   const handler = start.handler;
   const operation = normalizeOperation(start.operation ?? start.operationPath);
   if (!handler && !operation) return void 0;
-  const rows = db.prepare(`SELECT DISTINCT hc.source_file sourceFile
+  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
        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=?)`).all(repoId, repoId, handler, handler, handler, operation, operation, operation);
-  if (rows.length === 0) return void 0;
-  return new Set(rows.map((row) => row.sourceFile).filter(Boolean));
+         AND (? IS NULL OR hm.decorator_value=? OR hm.method_name=?)`
+  ).all(
+    repoId,
+    repoId,
+    handler,
+    handler,
+    handler,
+    operation,
+    operation,
+    operation
+  );
+  if (rows2.length === 0) return void 0;
+  return new Set(rows2.map((row) => row.sourceFile).filter(Boolean));
 }
 function startScope(db, start) {
-  const repo = start.repo ? db.prepare("SELECT id,name FROM repositories WHERE name=? OR package_name=?").get(start.repo, start.repo) : void 0;
+  const repo = start.repo ? db.prepare(
+    "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 hasSelector = Boolean(start.handler ?? start.operation ?? start.operationPath);
-  return { repo, sourceFiles, selectorMatched: !hasSelector || sourceFiles !== void 0 };
+  const hasSelector = Boolean(
+    start.handler ?? start.operation ?? start.operationPath
+  );
+  return {
+    repo,
+    sourceFiles,
+    selectorMatched: !hasSelector || sourceFiles !== void 0
+  };
 }
 function handlerFilesForOperation(db, operationId) {
-  const op = db.prepare(`SELECT o.operation_name operationName,o.operation_path operationPath,s.repo_id repoId
-    FROM cds_operations o JOIN cds_services s ON s.id=o.service_id WHERE o.id=?`).get(operationId);
+  const op = db.prepare(
+    `SELECT o.operation_name operationName,o.operation_path operationPath,s.repo_id repoId
+    FROM cds_operations o JOIN cds_services s ON s.id=o.service_id WHERE o.id=?`
+  ).get(operationId);
   if (!op) return /* @__PURE__ */ new Set();
   const operation = normalizeOperation(op.operationPath ?? op.operationName);
-  const rows = db.prepare(`SELECT DISTINCT hc.source_file sourceFile FROM handler_classes hc
+  const rows2 = db.prepare(
+    `SELECT DISTINCT hc.source_file sourceFile FROM handler_classes hc
     JOIN handler_methods hm ON hm.handler_class_id=hc.id
-    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(rows.map((row) => row.sourceFile).filter(Boolean));
+    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));
 }
 function includeCall(type, options) {
   if (!options.includeDb && type === "local_db_query") return false;
@@ -674,48 +1001,145 @@ function includeCall(type, options) {
 function graphForCalls(db, callIds) {
   const map = /* @__PURE__ */ new Map();
   if (callIds.length === 0) return map;
-  const rows = db.prepare(`SELECT * FROM graph_edges WHERE from_kind='call' AND from_id IN (${callIds.map(() => "?").join(",")}) ORDER BY id`).all(...callIds);
-  for (const row of rows) {
+  const rows2 = db.prepare(
+    `SELECT * FROM graph_edges WHERE from_kind='call' AND from_id IN (${callIds.map(() => "?").join(",")}) ORDER BY id`
+  ).all(...callIds);
+  for (const row of rows2) {
     const id = Number(row.from_id);
     map.set(id, [...map.get(id) ?? [], row]);
   }
   return map;
 }
+function candidatesFromEvidence(evidence) {
+  return Array.isArray(evidence.candidates) ? evidence.candidates.filter(
+    (candidate) => typeof candidate === "object" && candidate !== null
+  ) : [];
+}
+function evidenceWithRuntimeVariables(evidence, vars) {
+  if (!vars || Object.keys(vars).length === 0) return evidence;
+  const servicePath = typeof evidence.servicePath === "string" ? applyVariables(evidence.servicePath, vars) : void 0;
+  const operationPath = typeof evidence.operationPath === "string" ? applyVariables(evidence.operationPath, vars) : void 0;
+  const candidates = candidatesFromEvidence(evidence);
+  const matched = servicePath ? candidates.find((candidate) => candidate.servicePath === servicePath) : void 0;
+  return {
+    ...evidence,
+    servicePath: servicePath ?? evidence.servicePath,
+    operationPath: operationPath ?? evidence.operationPath,
+    runtimeVariablesApplied: true,
+    runtimeResolvedCandidate: matched ? {
+      repoName: matched.repoName,
+      servicePath: matched.servicePath,
+      operationPath: matched.operationPath,
+      operationName: matched.operationName,
+      score: matched.score
+    } : void 0
+  };
+}
+function edgeTarget(row, evidence) {
+  const runtimeCandidate = evidence.runtimeResolvedCandidate;
+  if (runtimeCandidate?.servicePath && runtimeCandidate.operationPath)
+    return `${runtimeCandidate.servicePath}${runtimeCandidate.operationPath}`;
+  const servicePath = typeof evidence.servicePath === "string" ? evidence.servicePath : void 0;
+  const operationPath = typeof evidence.operationPath === "string" ? evidence.operationPath : void 0;
+  const targetOperation = typeof evidence.targetOperation === "string" ? evidence.targetOperation : void 0;
+  const targetRepo = typeof evidence.targetRepo === "string" ? evidence.targetRepo : "";
+  return servicePath && operationPath ? `${servicePath}${operationPath}` : targetOperation ? `${targetRepo}:${targetOperation}` : row.to_id;
+}
 function trace(db, start, options) {
   const scope = startScope(db, start);
-  const diagnostics = db.prepare("SELECT severity,code,message,source_file sourceFile,source_line sourceLine FROM diagnostics WHERE (? IS NULL OR repo_id=?)").all(scope.repo?.id, scope.repo?.id);
-  if (!scope.selectorMatched) diagnostics.unshift({ severity: "warning", code: "trace_start_not_found", message: "No handler source matched the requested trace start selector" });
+  const diagnostics = db.prepare(
+    "SELECT severity,code,message,source_file sourceFile,source_line sourceLine FROM diagnostics WHERE (? IS NULL OR repo_id=?)"
+  ).all(scope.repo?.id, scope.repo?.id);
+  if (!scope.selectorMatched)
+    diagnostics.unshift({
+      severity: "warning",
+      code: "trace_start_not_found",
+      message: "No handler source matched the requested trace start selector"
+    });
   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 seenScopes = /* @__PURE__ */ new Set();
+  const seenEdges = /* @__PURE__ */ new Set();
   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(",")}:${current.depth}`;
+    const key = `${current.repoId ?? "*"}:${[...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));
-    const graph = graphForCalls(db, filtered.map((c) => Number(c.id)));
+    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)
+    );
+    const graph = graphForCalls(
+      db,
+      filtered.map((c) => Number(c.id))
+    );
     for (const call of filtered) {
       const callNode = `call:${call.id}`;
-      nodes.set(callNode, { id: callNode, kind: "outbound_call", repo: call.repoName, file: call.source_file, line: call.source_line, callType: call.call_type });
+      nodes.set(callNode, {
+        id: callNode,
+        kind: "outbound_call",
+        repo: call.repoName,
+        file: call.source_file,
+        line: call.source_line,
+        callType: call.call_type
+      });
       const graphRows = graph.get(Number(call.id)) ?? [];
       for (const row of graphRows) {
-        const evidence = JSON.parse(String(row.evidence_json || "{}"));
+        if (seenEdges.has(Number(row.id))) continue;
+        seenEdges.add(Number(row.id));
+        const rawEvidence = JSON.parse(
+          String(row.evidence_json || "{}")
+        );
+        const evidence = evidenceWithRuntimeVariables(
+          rawEvidence,
+          options.vars
+        );
         const targetNode = `${row.to_kind}:${row.to_id}`;
-        nodes.set(targetNode, { id: targetNode, kind: row.to_kind, label: row.to_id, ...evidence });
-        const servicePath = typeof evidence.servicePath === "string" ? evidence.servicePath : void 0;
-        const operationPath = typeof evidence.operationPath === "string" ? evidence.operationPath : void 0;
-        const targetOperation = typeof evidence.targetOperation === "string" ? evidence.targetOperation : void 0;
-        const targetRepo = typeof evidence.targetRepo === "string" ? evidence.targetRepo : "";
-        const to = servicePath && operationPath ? `${servicePath}${operationPath}` : targetOperation ? `${targetRepo}:${targetOperation}` : row.to_id;
-        edges.push({ step: current.depth, type: String(call.call_type), from: `${call.repoName}:${call.source_file}`, to, evidence, confidence: Number(row.confidence ?? call.confidence), unresolvedReason: row.unresolved_reason });
+        nodes.set(targetNode, {
+          id: targetNode,
+          kind: row.to_kind,
+          label: row.to_id,
+          ...evidence
+        });
+        const to = edgeTarget(row, evidence);
+        edges.push({
+          step: current.depth,
+          type: String(call.call_type),
+          from: `${call.repoName}:${call.source_file}`,
+          to,
+          evidence,
+          confidence: Number(row.confidence ?? call.confidence),
+          unresolvedReason: row.unresolved_reason
+        });
         if (row.to_kind === "operation" && current.depth < maxDepth) {
           const files = handlerFilesForOperation(db, row.to_id);
-          if (files.size > 0) queue.push({ files, depth: current.depth + 1 });
+          if (files.size > 0) {
+            const targetRepoId = 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(row.to_id)?.repoId;
+            const nextKey = `${targetRepoId ?? "*"}:${[...files].sort().join(",")}`;
+            if (seenScopes.has(nextKey))
+              edges.push({
+                step: current.depth + 1,
+                type: "cycle",
+                from: to,
+                to: nextKey,
+                evidence: { ...evidence, cycle: true },
+                confidence: 1,
+                unresolvedReason: "Cycle detected; downstream scope already visited"
+              });
+            else
+              queue.push({
+                repoId: targetRepoId,
+                files,
+                depth: current.depth + 1
+              });
+          }
         }
       }
     }
@@ -739,4 +1163,4 @@ export {
   linkWorkspace,
   trace
 };
-//# sourceMappingURL=chunk-6U4QKQEL.js.map
+//# sourceMappingURL=chunk-SIKIGT42.js.map