@moda-ai/cli 1.55.76 → 1.55.78

package/dist/{agent-gtq5t0av.js → agent-9bb3wryr.js}

@@ -1,8 +1,8 @@
 import {
   buildDoctorReport
-} from "./cli-ven3j7j1.js";
+} from "./cli-rp1079xm.js";
 import"./cli-rrggdmf8.js";
-import"./cli-09ym9jac.js";
+import"./cli-8y7tzqkf.js";
 import"./cli-mm48br00.js";
 import {
   readHarnessSyncState
@@ -95,7 +95,7 @@ async function buildAgentContext(context) {
   const graph = readHarnessGraphIfPresent(context.cwd);
   const reportState = readHarnessReportState(context.cwd);
   const syncState = readHarnessSyncState(context.cwd);
-  const harness = graph ? await import("./harness-esh9wa9a.js") : undefined;
+  const harness = graph ? await import("./harness-nryjq52p.js") : undefined;
   const topFindings = doctor.checks.filter((check) => check.status === "fail" || check.status === "warning").slice(0, 12).map(checkToFinding);
   const evidenceRefs = [
     ...doctor.checks.map(checkToEvidenceRef),

package/dist/{cli-09ym9jac.js → cli-8y7tzqkf.js}

@@ -5768,7 +5768,7 @@ async function runPromptSyncExclusive(flags, profileOptions, options) {
   const analyzedDefinitions = new Map;
   if (flags["no-analyze"] !== "true") {
     options.onProgress?.("Analyzing prompt sources before sync.");
-    const { analyzeHarnessPrompts } = await import("./harness-esh9wa9a.js");
+    const { analyzeHarnessPrompts } = await import("./harness-nryjq52p.js");
     const result = await analyzeHarnessPrompts({
       rootDir: process.cwd(),
       existing: established.flatMap((prompt) => prompt.sourceDefinition ? [prompt.sourceDefinition.source] : []),
@@ -5796,7 +5796,7 @@ async function runPromptSyncExclusive(flags, profileOptions, options) {
   const mergedSources = mergePromptSources(manifest.sources, extraSources);
   const manifestUpdate = stableJson(mergedSources) === stableJson(mergePromptSources(manifest.sources, [])) ? undefined : $stringify({ version: 2, prompt_paths: manifest.promptPaths, sources: mergedSources });
   const prompts = await discoverPrompts(extraSources);
-  const { checkPromptAttribution } = await import("./prompt-attribution-cswtxj5v.js");
+  const { checkPromptAttribution } = await import("./prompt-attribution-2srq4cp7.js");
   const attribution = checkPromptAttribution(process.cwd(), prompts.map((prompt) => prompt.key));
   const brokenAttribution = attribution.references.filter((reference) => reference.status === "missing");
   if (brokenAttribution.length) {
@@ -6102,7 +6102,7 @@ async function migratePromptManifest(options = {}) {
   let addedSources = [];
   let pendingSources = [];
   if (options.discover) {
-    const { analyzeHarnessPrompts } = await import("./harness-esh9wa9a.js");
+    const { analyzeHarnessPrompts } = await import("./harness-nryjq52p.js");
     const result = await analyzeHarnessPrompts({
       rootDir: root,
       existing: manifest.sources,

package/dist/{cli-5bh9tky2.js → cli-pqnd8are.js}

@@ -17654,7 +17654,7 @@ function toolResultIsPrompt(owner, pieces) {
   if (own.length === 0)
     return false;
   const text = withoutLabels(own.join(`
-`));
+`)).replace(/(^|[.!?;\n]\s*)[A-Za-z][\w-]*\s+(?:(?:was|were|is|are|has been|have been)\s+)?(?:saved|cleared|completed|created|updated|deleted|removed|scheduled|sent|loaded|finished|cancelled|canceled)\b(?=\s*(?:$|[.!?,;:(\n]))/gi, "$1");
   if (own.every((piece) => ERROR_TEXT.test(piece)) && !IMPERATIVE.test(text))
     return false;
   if (!hasDirective(text) && !IMPERATIVE.test(text))
@@ -19149,7 +19149,7 @@ async function runHarnessCommand(context) {
         throw new CliInputError("Focused remote prompt analysis is not supported yet.", "Use local --analyst=claude|codex|cursor|local-scan, or drop --concern for a full remote report.");
       }
       if (context.flags["github-actions"] === "true") {
-        const { runGithubActionsAnalyze } = await import("./harness-github-actions-d9tnwd05.js");
+        const { runGithubActionsAnalyze } = await import("./harness-github-actions-pdm6ee74.js");
         const result = await runGithubActionsAnalyze(rootDir, {
           writeReport: (report2) => {
             const normalized = normalizeHarnessReport(report2);
@@ -19295,8 +19295,8 @@ async function runHarnessCommand(context) {
         }
         const { artifacts, unknowns } = deterministicGraphItems(rootDir, promote === "all" ? undefined : promote);
         tagComponentStatus({ runtimeAgents: [], artifacts }, rootDir);
-        const { extractHarnessWithContext: extractHarnessWithContext2 } = await import("./index-vx8ym8p0.js");
-        const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-f89md6eg.js");
+        const { extractHarnessWithContext: extractHarnessWithContext2 } = await import("./index-xqa9km2a.js");
+        const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-ms5t7pph.js");
         let components = { runtimeAgents: [], artifacts: [], warnings: [] };
         if (promote === "all" || promote === "topology" || promote === "tools") {
           const { result, ctx } = extractHarnessWithContext2(rootDir);
@@ -19330,8 +19330,8 @@ async function runHarnessCommand(context) {
     }
     case "extract": {
       writeHumanProgress(context, "Harness extract: tracing model call sites (no LLM, no network)...");
-      const { extractHarnessWithContext: extractHarnessWithContext2, serializeExtractResult } = await import("./index-vx8ym8p0.js");
-      const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-f89md6eg.js");
+      const { extractHarnessWithContext: extractHarnessWithContext2, serializeExtractResult } = await import("./index-xqa9km2a.js");
+      const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-ms5t7pph.js");
       const { result, ctx } = extractHarnessWithContext2(rootDir, { fresh: true });
       const artifacts = deterministicArtifacts(rootDir);
       tagComponentStatus({ runtimeAgents: [], artifacts }, rootDir);
@@ -19942,6 +19942,79 @@ function modelIdsUsedInSource(rootDir, ids) {
       found.add(id);
   return found;
 }
+function deterministicOnlyArtifactTypes(raw = process.env.MODA_HARNESS_DETERMINISTIC_CONCERNS) {
+  const types = new Set;
+  for (const concern of String(raw ?? "").toLowerCase().split(",").map((value) => value.trim())) {
+    if (concern === "evals")
+      types.add("eval");
+    if (concern === "prompts")
+      types.add("prompt");
+  }
+  return types;
+}
+function mergeDeterministicReplacement(report, rootDir, options) {
+  const types = deterministicOnlyArtifactTypes();
+  const old = report.graph.artifacts.filter((artifact) => types.has(artifact.type));
+  if (old.length === 0) {
+    mergeDeterministicArtifacts(report.graph, rootDir, options);
+    return;
+  }
+  const ids = new Set(old.map((artifact) => artifact.id));
+  const agentLinks = report.graph.runtimeAgents.map((agent) => ({ id: agent.id, artifacts: [...agent.artifactIds ?? []] }));
+  const familyLinks = report.graph.agentFamilies.map((family) => ({ id: family.id, artifacts: [...family.sharedArtifactIds ?? []] }));
+  const edges = report.graph.relationships.filter((edge) => ids.has(edge.from) || ids.has(edge.to));
+  const removedClaims = report.claims?.filter((claim) => claim.kind === "artifact" && ids.has(claim.subjectId) || claim.kind === "relationship" && String(claim.subjectId).split("->").some((id) => ids.has(id))) ?? [];
+  const discardedCitations = new Set(removedClaims.flatMap((claim) => claim.citationIds ?? []));
+  const removedClaimSet = new Set(removedClaims);
+  if (report.claims)
+    report.claims = report.claims.filter((claim) => !removedClaimSet.has(claim));
+  const remainingCitations = new Set([...(report.claims ?? []).flatMap((claim) => claim.citationIds ?? []), ...(report.unknowns ?? []).flatMap((unknown) => unknown.citationIds ?? [])]);
+  report.citations = report.citations.filter((citation) => !discardedCitations.has(citation.id) || remainingCitations.has(citation.id));
+  const retainedCitationIds = new Set(report.citations.map((citation) => citation.id));
+  for (const unknown of report.unknowns ?? [])
+    unknown.citationIds = unknown.citationIds.filter((id) => retainedCitationIds.has(id));
+  removeArtifacts(report, ids);
+  mergeDeterministicArtifacts(report.graph, rootDir, options);
+  const replacements = new Map;
+  for (const artifact of old) {
+    const paths = artifactPaths(artifact);
+    const exact = report.graph.artifacts.filter((candidate) => candidate.type === artifact.type && artifactPaths(candidate).some((path) => paths.includes(path)));
+    const matches = exact.length ? exact : report.graph.artifacts.filter((candidate) => candidate.type === artifact.type && candidate.type === "eval" && artifactPaths(candidate).some((path) => paths.some((source) => evalSuiteKey(source) !== undefined && evalSuiteKey(source) === evalSuiteKey(path))));
+    replacements.set(artifact.id, matches);
+    const owners = new Set([...artifact.usedByAgentIds ?? [], ...artifact.ownedByAgentId ? [artifact.ownedByAgentId] : []]);
+    for (const link of agentLinks)
+      if (link.artifacts.includes(artifact.id))
+        owners.add(link.id);
+    for (const candidate of matches) {
+      candidate.usedByAgentIds = [...new Set([...candidate.usedByAgentIds ?? [], ...owners])];
+      if (candidate.usedByAgentIds.length === 1)
+        candidate.ownedByAgentId = candidate.usedByAgentIds[0];
+      else
+        delete candidate.ownedByAgentId;
+    }
+  }
+  const replace = (oldIds) => oldIds.flatMap((id) => replacements.get(id)?.map((artifact) => artifact.id) ?? (ids.has(id) ? [] : [id]));
+  for (const agent of report.graph.runtimeAgents) {
+    const original = agentLinks.find((link) => link.id === agent.id);
+    if (original)
+      agent.artifactIds = [...new Set([...agent.artifactIds ?? [], ...replace(original.artifacts)])];
+  }
+  for (const family of report.graph.agentFamilies) {
+    const original = familyLinks.find((link) => link.id === family.id);
+    if (original)
+      family.sharedArtifactIds = [...new Set([...family.sharedArtifactIds ?? [], ...replace(original.artifacts)])];
+  }
+  const seen = new Set(report.graph.relationships.map((edge) => `${edge.type}|${edge.from}|${edge.to}`));
+  for (const edge of edges)
+    for (const from of replace([edge.from]))
+      for (const to of replace([edge.to])) {
+        const key = `${edge.type}|${from}|${to}`;
+        if (!seen.has(key)) {
+          seen.add(key);
+          report.graph.relationships.push({ ...edge, from, to });
+        }
+      }
+}
 function removeArtifacts(report, ids) {
   const graph = report.graph;
   const keep = (id) => typeof id !== "string" || !ids.has(id);
@@ -19974,7 +20047,7 @@ function removeArtifacts(report, ids) {
 function repairExternalAnalystReport(report, rootDir, options = {}) {
   const normalized = normalizeHarnessReport(report);
   repairCitationLines(normalized, rootDir);
-  mergeDeterministicArtifacts(normalized.graph, rootDir, { concern: options.concern });
+  mergeDeterministicReplacement(normalized, rootDir, options);
   if (!options.concern || options.concern === "topology")
     mergeBoundRuntimeClasses(normalized.graph, rootDir);
   tagComponentStatus(normalized.graph, rootDir);
@@ -20041,6 +20114,33 @@ function repairExternalAnalystReport(report, rootDir, options = {}) {
   if (unverified.size > 0)
     removeArtifacts(normalized, unverified);
   deriveRelationshipsFromGraph(normalized.graph);
+  dropUnlocatedAgentCitations(normalized);
+  if ((normalized.claims?.length ?? 0) === 0 && deterministicOnlyArtifactTypes().has("eval")) {
+    const grounded = createHarnessReport({ graph: {
+      ...normalized.graph,
+      runtimeAgents: [],
+      agentFamilies: [],
+      artifacts: normalized.graph.artifacts.filter((artifact) => artifact.type === "eval")
+    }, rootDir });
+    const claim = grounded.claims.find((candidate) => candidate.kind === "artifact" && candidate.citationIds.length > 0 && candidate.citationIds.every((id) => {
+      const citation = grounded.citations.find((entry) => entry.id === id);
+      return citation?.line !== undefined && Boolean(citation.excerpt);
+    }));
+    if (claim) {
+      const usedIds = new Set(normalized.citations.map((citation) => citation.id));
+      const citationIds = claim.citationIds.slice(0, 1).map((id) => {
+        const citation = grounded.citations.find((entry) => entry.id === id);
+        let index = normalized.citations.length;
+        while (usedIds.has(`replacement_${index}`))
+          index++;
+        const replacementId = `replacement_${index}`;
+        usedIds.add(replacementId);
+        normalized.citations.push({ ...citation, id: replacementId });
+        return replacementId;
+      });
+      (normalized.claims ??= []).push({ ...claim, citationIds });
+    }
+  }
   repairReportSummaryCounts(normalized);
   if (options.concern) {
     normalized.source = {
@@ -20478,6 +20578,26 @@ function repairReportSummaryCounts(report) {
     unknownCount: graph.unknowns.length
   };
 }
+function dropUnlocatedAgentCitations(report) {
+  if (report.analyst?.mode !== "agent")
+    return;
+  const ids = new Set(report.citations.filter((citation) => (citation.type === "file" || citation.type === "generated_doc") && citation.line === undefined).map((citation) => citation.id));
+  if (ids.size === 0)
+    return;
+  report.citations = report.citations.filter((citation) => !ids.has(citation.id));
+  for (const unknown of report.unknowns ?? [])
+    unknown.citationIds = unknown.citationIds.filter((id) => !ids.has(id));
+  report.claims = (report.claims ?? []).flatMap((claim) => {
+    const citationIds = claim.citationIds.filter((id2) => !ids.has(id2));
+    if (citationIds.length || !claim.citationIds.some((id2) => ids.has(id2)))
+      return [{ ...claim, citationIds }];
+    const id = `unlocated_${claim.id}`;
+    if (!(report.unknowns ?? []).some((unknown) => unknown.id === id)) {
+      (report.unknowns ??= []).push({ id, question: `Verify source lines for ${claim.subjectId}: ${claim.title}`.slice(0, MAX_HARNESS_REPORT_SUMMARY_LENGTH), citationIds: [] });
+    }
+    return [];
+  });
+}
 function repairCitationLines(report, rootDir) {
   for (const citation of report.citations) {
     if (citation.type !== "file" && citation.type !== "generated_doc" || !citation.path || !citation.excerpt)
@@ -20500,6 +20620,11 @@ function repairCitationLines(report, rootDir) {
     if (!needle)
       continue;
     const sourceLines = lines.map((line, index) => ({ text: normalizeComparableLine(line), index })).filter((line) => line.text.length > 0);
+    const wholeLines = sourceLines.filter((line) => line.text === needle);
+    if (wholeLines.length === 1) {
+      citation.line = wholeLines[0].index + 1;
+      continue;
+    }
     const source = sourceLines.map((line) => line.text).join(" ");
     const match = source.indexOf(needle);
     if (match < 0 || source.indexOf(needle, match + 1) >= 0)
@@ -21238,20 +21363,20 @@ var CONCERN_PROMPT_SPECS = {
     largeRepoLine: "If the repository is very large, model runtime agents representatively rather than exhaustively, but never drop channel adapters, providers, frameworks, or deployments you have evidence for."
   },
   tools: {
-    mission: "Your single concern for this pass is TOOLS: the exhaustive tool inventory. Other concern passes cover agents/topology, prompts, and evals — you must not enumerate those.",
+    mission: "Your single concern for this pass is TOOLS & RUNTIME CONTROLS: the exhaustive tool inventory, guardrails, memory/session stores and retrieval indexes. Other concern passes cover agents/topology, prompts, and evals — you must not enumerate those.",
     taskLines: [
       "1. Exhaustively enumerate EVERY tool as its own `tool` graph artifact — the complete inventory, not a sample. This report feeds tool optimization, so a missing tool is a real defect.",
-      "2. Do NOT enumerate prompts, guardrails, or evals, and do not map agent topology beyond bare stubs needed for tool linkage."
+      "2. Also enumerate guardrails (guardrail), memory/session stores (memory) and retrieval indexes (retrieval_index), with source evidence. Do NOT enumerate prompts or evals, and do not map agent topology beyond bare stubs needed for linkage."
     ],
     protocolLines: [
       "- Tools: emit a `tool` artifact for EVERY tool definition — each `@function_tool` / `function_tool(...)`-decorated function, every hosted/first-party tool class (e.g. WebSearchTool, FileSearchTool, ComputerTool, CodeInterpreterTool, HostedMCPTool, ImageGenerationTool, LocalShellTool), and every `tool({...})` / `createTool(...)` / `new *Tool(...)` factory. Name each artifact after the tool/function and cite its definition line.",
       "- Populate usedByAgentIds on every tool artifact whenever the using agent is determinable (and ownedByAgentId when a single agent owns it).",
       `- ${CONCERN_AGENT_STUB_LINE}`,
-      "- Do NOT emit prompt, guardrail, eval, memory, or retrieval_index artifacts — other concern passes own those.",
+      "- Emit guardrail, memory and retrieval_index artifacts for runtime controls and stores. Do NOT emit prompt or eval artifacts — other concern passes own those.",
       CONCERN_CAPS_LINE
     ],
     contractLines: [
-      'Artifacts must include id, type:"tool", name, scope, usedByAgentIds, confidence, evidence, and optional sourcePath/contentHash/ownedByAgentId. Emit one artifact PER tool — enumerate them all.',
+      "Artifacts must include id, type (tool, guardrail, memory or retrieval_index), name, scope, usedByAgentIds, confidence, evidence, and optional sourcePath/contentHash/ownedByAgentId. Emit one artifact PER tool or runtime control/store — enumerate them all.",
       CONCERN_NO_TRANSCRIPTION_LINE,
       CONCERN_LOCATION_PIN_LINE,
       CONCERN_AGENT_STUB_LINE
@@ -27433,6 +27558,12 @@ var TOOL_FACTORY = /^(?:tool|dynamicTool|agentTool|createTool|defineTool)$/;
 var TOOL_MODULE = /^(?:ai|agents(?:\/.*)?|@cloudflare\/[\w-]+(?:\/.*)?|@mastra\/[\w-]+|@ai-sdk\/[\w-]+|@openai\/agents(?:-core)?|@langchain\/[\w-]+)$/;
 var MODEL_FACING_NAME = /^[A-Za-z_][\w.:-]{0,127}$/;
 var MAX_NAMES_PER_SITE = 64;
+var EVAL_PATH3 = /(?:^|\/)evals?\/|\.eval\.[cm]?[jt]sx?$/;
+function surfaceOf(rel2, pkg) {
+  const inside = pkg ? rel2.slice(pkg.length + 1) : rel2;
+  const dirs = posix3.dirname(inside).split("/").filter((part) => part && part !== ".");
+  return `${pkg}:${dirs.slice(0, 2).join("/")}`;
+}
 var MAX_TOOLS = 1e4;
 var MAX_EVIDENCE_PER_TOOL = 64;
 var MAX_DEFINITIONS_PER_TOOL = 64;
@@ -27467,18 +27598,22 @@ function emitTools(result, ctx, options = {}) {
     if (!result.warnings.includes(warning))
       result.warnings.push(warning);
   };
-  const add = (name, via, evidence, toolOwners, definition, displayName, enclosing) => {
+  const add = (name, via, evidence, toolOwners, definition, displayName, enclosing, surfaceHint) => {
     if (!MODEL_FACING_NAME.test(name))
       return;
-    const pkg = packageOf(evidence.path);
-    const key = name;
+    const definedIn = definition ? relPath(ctx.rootDir, definition.getSourceFile().fileName) : undefined;
+    const pkg = packageOf(definedIn ?? evidence.path);
+    const surface = surfaceHint ?? (definedIn && !EVAL_PATH3.test(definedIn) ? surfaceOf(definedIn, pkg) : undefined);
+    const tracedSurface = surfaceOf(evidence.path, pkg);
+    const matchingKey = `${name}\x00${tracedSurface}`;
+    const key = surface ? `${name}\x00${surface}` : found.has(matchingKey) ? matchingKey : `${name}\x01${pkg}`;
     let tool = found.get(key);
     if (!tool) {
       if (found.size >= MAX_TOOLS) {
         limit();
         return;
       }
-      tool = { name, status: enumerationRepository(ctx).status(evidence.path) === "defined_only" ? "defined_only" : "reachable", ...pkg ? { package: pkg } : {}, via, evidence: [], agents: [], calledFrom: [], definitions: [] };
+      tool = { name, status: enumerationRepository(ctx).status(evidence.path) === "defined_only" ? "defined_only" : "reachable", ...pkg ? { package: pkg } : {}, ...surface ? { surface } : {}, via, evidence: [], agents: [], calledFrom: [], definitions: [] };
       found.set(key, tool);
       ownersByTool.set(key, { direct: [], rpc: [], open: [] });
     }
@@ -27577,6 +27712,17 @@ function emitTools(result, ctx, options = {}) {
     };
     visit2(source);
   }
+  const targetFor = (name, path) => {
+    const candidates = [...found.values()].filter((tool) => tool.name === name && tool.surface);
+    const exact = candidates.filter((tool) => tool.definitions.some((definition) => definition.path === path));
+    if (exact.length === 1)
+      return exact[0];
+    const nearby = candidates.filter((tool) => tool.surface === surfaceOf(path, packageOf(path)));
+    if (nearby.length === 1)
+      return nearby[0];
+    const local = candidates.filter((tool) => (tool.package ?? "") === packageOf(path));
+    return local.length === 1 ? local[0] : candidates.length === 1 ? candidates[0] : undefined;
+  };
   for (const role of result.roles) {
     if (role.role !== "tools" || role.sink.isTest || skipPath(role.sink.path))
       continue;
@@ -27585,10 +27731,16 @@ function emitTools(result, ctx, options = {}) {
     for (const hit of toolNamesOf(role.tree).names) {
       if (skipPath(hit.path))
         continue;
-      add(hit.name, "tools-arg", { path: hit.path, line: hit.line, reason: `named in the tools argument of ${role.sink.callee} at ${role.sink.path}:${role.sink.line}` }, siteOwners, undefined, undefined, role.sink.enclosing);
+      const target = targetFor(hit.name, hit.path);
+      const ambiguous = !target && [...found.values()].some((tool) => tool.name === hit.name && tool.surface);
+      add(hit.name, "tools-arg", { path: hit.path, line: hit.line, reason: `named in the tools argument of ${role.sink.callee} at ${role.sink.path}:${role.sink.line}` }, ambiguous ? { direct: [], rpc: [], open: [] } : siteOwners, undefined, undefined, role.sink.enclosing, target?.surface);
     }
   }
+  joinSurfaces(found, ownersByTool);
   owners.indexAllowlists(new Set([...found.values()].map((tool) => tool.name)));
+  const surfacesByName = new Map;
+  for (const tool of found.values())
+    surfacesByName.set(tool.name, (surfacesByName.get(tool.name) ?? 0) + 1);
   const callOwners = new Map;
   for (const role of result.roles) {
     if (role.role !== "tools" || role.sink.isTest || skipPath(role.sink.path))
@@ -27597,24 +27749,86 @@ function emitTools(result, ctx, options = {}) {
     for (const hit of toolNamesOf(role.tree).names) {
       let owners2 = callOwners.get(hit.name);
       if (!owners2)
-        callOwners.set(hit.name, owners2 = new Set);
-      for (const id of ids)
-        owners2.add(id);
+        callOwners.set(hit.name, owners2 = []);
+      owners2.push({ pkg: packageOf(hit.path), surface: surfaceOf(hit.path, packageOf(hit.path)), ids });
     }
   }
   for (const [key, tool] of found) {
     const ids = new Set;
-    for (const name of owners.agentsFor(tool.name, ownersByTool.get(key))) {
+    const allowlistApplies = (allowlistPath) => targetFor(tool.name, allowlistPath) === tool || (surfacesByName.get(tool.name) ?? 1) === 1;
+    for (const name of owners.agentsFor(tool.name, ownersByTool.get(key), allowlistApplies)) {
       const classes = owners.classes.filter((entry) => entry.name === name);
       if (classes.length === 1)
         for (const id of agentForScope(`${classes[0].path}#${name}`))
           ids.add(id);
     }
-    for (const id of callOwners.get(tool.name) ?? [])
-      ids.add(id);
+    const single = (surfacesByName.get(tool.name) ?? 1) === 1;
+    for (const entry of callOwners.get(tool.name) ?? []) {
+      if (single || entry.surface === tool.surface || !tool.surface && entry.pkg === (tool.package ?? ""))
+        for (const id of entry.ids)
+          ids.add(id);
+    }
     tool.agents = [...ids].sort();
   }
-  return [...found.values()].sort((a, b) => a.name.localeCompare(b.name) || (a.package ?? "").localeCompare(b.package ?? ""));
+  assignToolIds(found.values());
+  return [...found.values()].sort((a, b) => a.name.localeCompare(b.name) || (a.package ?? "").localeCompare(b.package ?? "") || (a.surface ?? "").localeCompare(b.surface ?? ""));
+}
+function joinSurfaces(found, ownersByTool) {
+  for (const [key, pending] of [...found]) {
+    if (pending.surface)
+      continue;
+    const defined = [...found.entries()].filter(([, tool]) => tool.name === pending.name && tool.surface);
+    if (defined.length === 0)
+      continue;
+    const local = defined.filter(([, tool]) => (tool.package ?? "") === (pending.package ?? ""));
+    const matching = local.filter(([, tool]) => pending.evidence.some((entry) => surfaceOf(entry.path, pending.package ?? "") === tool.surface));
+    const selected = matching.length === 1 ? matching[0] : local.length === 1 ? local[0] : defined.length === 1 ? defined[0] : undefined;
+    if (!selected) {
+      if (pending.evidence.every((entry) => EVAL_PATH3.test(entry.path))) {
+        found.delete(key);
+        ownersByTool.delete(key);
+      }
+      continue;
+    }
+    const [targetKey, target] = selected;
+    for (const entry of pending.evidence) {
+      if (target.evidence.length >= MAX_EVIDENCE_PER_TOOL)
+        break;
+      if (!target.evidence.some((other) => other.path === entry.path && other.line === entry.line))
+        target.evidence.push(entry);
+    }
+    for (const entry of pending.calledFrom) {
+      if (!target.calledFrom.some((other) => other.path === entry.path && other.line === entry.line))
+        target.calledFrom.push(entry);
+    }
+    if (pending.status === "reachable")
+      target.status = "reachable";
+    target.displayName ??= pending.displayName;
+    const from = ownersByTool.get(key), into = ownersByTool.get(targetKey);
+    if (from && into) {
+      for (const field of ["direct", "rpc", "open"])
+        for (const agent2 of from[field])
+          if (!into[field].includes(agent2))
+            into[field].push(agent2);
+    }
+    found.delete(key);
+    ownersByTool.delete(key);
+  }
+}
+function assignToolIds(tools) {
+  const byName = new Map;
+  for (const tool of tools) {
+    let list = byName.get(tool.name);
+    if (!list)
+      byName.set(tool.name, list = []);
+    list.push(tool);
+  }
+  for (const list of byName.values()) {
+    list.sort((a, b) => Number(Boolean(a.package)) - Number(Boolean(b.package)) || (a.surface ?? "").localeCompare(b.surface ?? ""));
+    list.forEach((tool, index) => {
+      tool.id = toolArtifactId(tool.name, index === 0 ? undefined : tool.surface ?? surfaceOf(tool.evidence[0]?.path ?? "", tool.package ?? ""));
+    });
+  }
 }
 function registryEntryOf(object) {
   const parent = object.parent;
@@ -27747,9 +27961,9 @@ function emitToolsCached(result, ctx) {
   }
   return tools;
 }
-function toolArtifactId(name, pkg) {
+function toolArtifactId(name, surface) {
   const slug2 = (text) => text.replace(/[^A-Za-z0-9_.:-]+/g, "_");
-  return `tool.extract.${slug2(name)}`;
+  return surface ? `tool.extract.${slug2(name)}@${encodeURIComponent(surface)}` : `tool.extract.${slug2(name)}`;
 }
 function workspacePackages(rootDir) {
   const cache2 = new Map;
@@ -27768,16 +27982,15 @@ function workspacePackages(rootDir) {
 function toolDefinitionRefs(tools) {
   const out = [];
   for (const tool of tools) {
-    const definition = tool.definitions[0];
-    if (!definition)
-      continue;
-    out.push({
-      toolId: toolArtifactId(tool.name, tool.package),
-      name: tool.name,
-      definition: { path: definition.path, start: definition.start, end: definition.end, line: definition.line },
-      ...tool.agents.length > 0 ? { agentIds: [...tool.agents] } : {},
-      scope: definition.scope
-    });
+    for (const definition of tool.definitions) {
+      out.push({
+        toolId: tool.id ?? toolArtifactId(tool.name),
+        name: tool.name,
+        definition: { path: definition.path, start: definition.start, end: definition.end, line: definition.line },
+        ...tool.agents.length > 0 ? { agentIds: [...tool.agents] } : {},
+        scope: definition.scope
+      });
+    }
   }
   return out;
 }
@@ -27786,7 +27999,7 @@ function toolArtifacts(tools, runtimeAgents = []) {
   return tools.map((tool) => {
     const usedByAgentIds = [...new Set(tool.agents.filter((id) => knownIds.has(id)))];
     const artifact2 = {
-      id: toolArtifactId(tool.name, tool.package),
+      id: tool.id ?? toolArtifactId(tool.name),
       type: "tool",
       name: tool.name,
       status: tool.status,
@@ -29126,8 +29339,12 @@ function enumerateToolCatalog(result, ctx) {
     }
   }
   const merged = new Map;
+  const packageOf = workspacePackages(ctx.rootDir);
   for (const item of output.artifacts) {
-    const previous = merged.get(item.name);
+    const path = item.sourcePath ?? "";
+    const surface = surfaceOf(path, packageOf(path));
+    const key = `${item.name}\x00${surface}`;
+    const previous = merged.get(key);
     if (previous) {
       previous.usedByAgentIds = [...new Set([...previous.usedByAgentIds, ...item.usedByAgentIds])].sort();
       const seen = new Set(previous.evidence.map((e) => `${e.path}:${e.line}`));
@@ -29135,8 +29352,8 @@ function enumerateToolCatalog(result, ctx) {
       if (item.status === "in_prod" || item.status === "reachable" && previous.status === "defined_only")
         previous.status = item.status;
     } else {
-      item.id = `tool:catalog:${item.name}`;
-      merged.set(item.name, item);
+      item.id = `tool:catalog:${item.name}@${encodeURIComponent(surface)}`;
+      merged.set(key, item);
     }
   }
   output.artifacts = [...merged.values()];
@@ -29158,8 +29375,25 @@ function mergeEnumeratedComponents(artifacts, components) {
   const merged = new Map;
   const definitions = new Map;
   const registry = components.artifacts.filter((item) => item.type === "tool" && item.id.startsWith("tool.extract."));
+  const extractedByName = new Map;
+  for (const item of registry) {
+    let list = extractedByName.get(item.name);
+    if (!list)
+      extractedByName.set(item.name, list = []);
+    list.push(item);
+  }
+  const toolKey2 = (item) => {
+    if (registry.includes(item))
+      return `tool:${item.id}`;
+    const candidates = extractedByName.get(item.name) ?? [];
+    if (candidates.length === 0)
+      return item.id.startsWith("tool:catalog:") ? `tool:${item.id}` : `tool:${item.name}`;
+    const paths = new Set([item.sourcePath, ...item.evidence.map((entry) => entry.path)].filter(Boolean));
+    const target = candidates.find((candidate) => candidate.sourcePath && paths.has(candidate.sourcePath) || candidate.definitionVariants?.some((variant) => variant.sourcePath && paths.has(variant.sourcePath))) ?? candidates.find((candidate) => !candidate.id.includes("@")) ?? candidates[0];
+    return `tool:${target.id}`;
+  };
   for (const item of [...registry, ...artifacts, ...components.artifacts.filter((item2) => !registry.includes(item2))]) {
-    const key = item.type === "tool" ? `tool:${item.name}` : item.id;
+    const key = item.type === "tool" ? toolKey2(item) : item.id;
     if (item.type === "tool") {
       const own = item.definitionVariants ?? (item.body ? [{ sourcePath: item.sourcePath, body: item.body, evidence: item.evidence }] : []);
       let variants = definitions.get(key);
@@ -29201,4 +29435,4 @@ function mergeEnumeratedComponents(artifacts, components) {
   return { runtimeAgents, artifacts: output };
 }
 
-export { startRemoteAnalyze, pollRemoteAnalyzeUntilDone, isRecoverableRemoteRun, checkPromptMapping, safePromptEvidencePath, discoverHarnessPromptSources, valueChildren, selectKey, allValues, renderings, CALL_SINKS, registerCallSink, registerClassSink, isModelId, collectModels, modelArtifacts, modelUnknowns, collectModelLiterals, agentForScope, createAgentScopeResolver, enumerateAgents, toolNamesOf, EXTRACT_SCHEMA_VERSION, enumerateWorkflows, enumerateToolCatalog, ENUMERATORS, enumerateHarnessComponents, mergeEnumeratedComponents, clearExtractCache, extractHarness, extractHarnessWithContext, scopeOf, serializeExtractResult, runEnumerators, assignAgentIds, runHarnessCommand, writeHarnessAnalyzeResult, emitWrittenArtifacts, analyzeHarnessPrompts, isToolGroupPlaceholder, repairExternalAnalystReport, deriveRelationshipsFromGraph, deterministicArtifacts, deterministicGraphItems, mergeDeterministicArtifacts, analystRefutations, describeCodingAgentEvent, analystEventProgress, isRetryableExternalAnalystFailure, sleep, summarizeInvalidAnalystReport, isDeterministicLocalAnalyst, resolveHarnessAnalyzeConcern, resolveExternalHarnessAnalystInvocation, detectAvailableCodingAgents, codingAgentDisplayName, runCodingAgent, readOnlyClaudeExtraArgs, resolveAnalystModel, renderExternalHarnessAnalystPrompt, CONCERN_CANDIDATE_KINDS, SEED_CANDIDATE_KIND_LABELS, renderAnalystCandidateLines, renderAnalystSeedLines, truncateText, scanHarness, summarizeHarness, buildSourceSnapshot, writeHumanProgress, describeSyncIdentity, describeSyncTenantLabel, findFresherHarnessReports, writeHarnessArtifacts, assertHarnessGraphSyncQuality, graphForSync, inventoryFiles, numericEnv, numericEnvAllowZero, computeDeterministicFloor, stableId, titleFromId, promptNameFromPath };
+export { startRemoteAnalyze, pollRemoteAnalyzeUntilDone, isRecoverableRemoteRun, checkPromptMapping, safePromptEvidencePath, discoverHarnessPromptSources, valueChildren, selectKey, allValues, renderings, CALL_SINKS, registerCallSink, registerClassSink, isModelId, collectModels, modelArtifacts, modelUnknowns, collectModelLiterals, agentForScope, createAgentScopeResolver, enumerateAgents, toolNamesOf, EXTRACT_SCHEMA_VERSION, enumerateWorkflows, enumerateToolCatalog, ENUMERATORS, enumerateHarnessComponents, mergeEnumeratedComponents, clearExtractCache, extractHarness, extractHarnessWithContext, scopeOf, serializeExtractResult, runEnumerators, assignAgentIds, runHarnessCommand, writeHarnessAnalyzeResult, emitWrittenArtifacts, analyzeHarnessPrompts, isToolGroupPlaceholder, deterministicOnlyArtifactTypes, repairExternalAnalystReport, deriveRelationshipsFromGraph, deterministicArtifacts, deterministicGraphItems, mergeDeterministicArtifacts, analystRefutations, describeCodingAgentEvent, analystEventProgress, isRetryableExternalAnalystFailure, sleep, summarizeInvalidAnalystReport, isDeterministicLocalAnalyst, resolveHarnessAnalyzeConcern, resolveExternalHarnessAnalystInvocation, detectAvailableCodingAgents, codingAgentDisplayName, runCodingAgent, readOnlyClaudeExtraArgs, resolveAnalystModel, renderExternalHarnessAnalystPrompt, CONCERN_CANDIDATE_KINDS, SEED_CANDIDATE_KIND_LABELS, renderAnalystCandidateLines, renderAnalystSeedLines, truncateText, scanHarness, summarizeHarness, buildSourceSnapshot, writeHumanProgress, describeSyncIdentity, describeSyncTenantLabel, findFresherHarnessReports, writeHarnessArtifacts, assertHarnessGraphSyncQuality, graphForSync, inventoryFiles, numericEnv, numericEnvAllowZero, computeDeterministicFloor, stableId, titleFromId, promptNameFromPath };

package/dist/{cli-ven3j7j1.js → cli-rp1079xm.js}

@@ -4,7 +4,7 @@ import {
 } from "./cli-rrggdmf8.js";
 import {
   inspectPromptManifest
-} from "./cli-09ym9jac.js";
+} from "./cli-8y7tzqkf.js";
 import {
   readHarnessSyncState,
   renderDoctorHuman,
@@ -395,7 +395,7 @@ async function harnessCurrentCheck(cwd, manifestPath, manifestExists, tenantId)
     };
   }
   try {
-    const { scanHarness } = await import("./harness-esh9wa9a.js");
+    const { scanHarness } = await import("./harness-nryjq52p.js");
     const current = scanHarness({
       rootDir: cwd,
       scannerVersion: "doctor",

package/dist/cli.js

@@ -2975,25 +2975,25 @@ function leafManifestFields(leaf, commands) {
 import { fileURLToPath } from "url";
 import { realpathSync } from "fs";
 async function runPromptsCommand(...args) {
-  return (await import("./prompts-cn8a2cwp.js")).runPromptsCommand(...args);
+  return (await import("./prompts-tr91zg4n.js")).runPromptsCommand(...args);
 }
 async function runSkillsCommand(...args) {
   return (await import("./skills-knpeqryb.js")).runSkillsCommand(...args);
 }
 async function runHarnessCommand(...args) {
-  return (await import("./harness-esh9wa9a.js")).runHarnessCommand(...args);
+  return (await import("./harness-nryjq52p.js")).runHarnessCommand(...args);
 }
 async function runSyncCommand(...args) {
-  return (await import("./sync-ce5j09v7.js")).runSyncCommand(...args);
+  return (await import("./sync-nfdd69cw.js")).runSyncCommand(...args);
 }
 async function runRegistryCommand(...args) {
   return (await import("./registry-c64qr7ta.js")).runRegistryCommand(...args);
 }
 async function runDoctorCommand(...args) {
-  return (await import("./doctor-94cwvz8p.js")).runDoctorCommand(...args);
+  return (await import("./doctor-swctmdap.js")).runDoctorCommand(...args);
 }
 async function runStatusCommand(...args) {
-  return (await import("./doctor-94cwvz8p.js")).runStatusCommand(...args);
+  return (await import("./doctor-swctmdap.js")).runStatusCommand(...args);
 }
 async function runAuthCommand(...args) {
   return (await import("./profile-commands-1fdvrs5y.js")).runAuthCommand(...args);
@@ -3005,7 +3005,7 @@ async function runProfilesCommand(...args) {
   return (await import("./profile-commands-1fdvrs5y.js")).runProfilesCommand(...args);
 }
 async function runAgentCommand(...args) {
-  return (await import("./agent-gtq5t0av.js")).runAgentCommand(...args);
+  return (await import("./agent-9bb3wryr.js")).runAgentCommand(...args);
 }
 async function runProductionCommand(...args) {
   return (await import("./production-intelligence-f9sd68te.js")).runProductionCommand(...args);
@@ -6769,7 +6769,7 @@ var commandRegistry = createCommandRegistry([
     resetApiRequestCountBeforeRun: true,
     telemetry: "result-and-error",
     handler: async (context) => {
-      const { runInit } = await import("./index-p0cxzngv.js");
+      const { runInit } = await import("./index-y5ay9p49.js");
       if (context.outputMode === "agent-stream") {
         context.output.writeEvent({
           event: "started",

package/dist/{doctor-94cwvz8p.js → doctor-swctmdap.js}

@@ -3,9 +3,9 @@ import {
   promptsDiscoveredCheck,
   runDoctorCommand,
   runStatusCommand
-} from "./cli-ven3j7j1.js";
+} from "./cli-rp1079xm.js";
 import"./cli-rrggdmf8.js";
-import"./cli-09ym9jac.js";
+import"./cli-8y7tzqkf.js";
 import"./cli-mm48br00.js";
 import"./cli-k0vxtzxb.js";
 import"./cli-22yvg5kh.js";

package/dist/{harness-github-actions-d9tnwd05.js → harness-github-actions-pdm6ee74.js}

@@ -1,6 +1,6 @@
 import {
   buildSourceSnapshot
-} from "./cli-5bh9tky2.js";
+} from "./cli-pqnd8are.js";
 import"./cli-k0vxtzxb.js";
 import"./cli-97fnztpy.js";
 import"./cli-y333w08f.js";

package/dist/{harness-esh9wa9a.js → harness-nryjq52p.js}

@@ -15,6 +15,7 @@ import {
   detectAvailableCodingAgents,
   deterministicArtifacts,
   deterministicGraphItems,
+  deterministicOnlyArtifactTypes,
   emitWrittenArtifacts,
   findFresherHarnessReports,
   graphForSync,
@@ -46,7 +47,7 @@ import {
   writeHarnessAnalyzeResult,
   writeHarnessArtifacts,
   writeHumanProgress
-} from "./cli-5bh9tky2.js";
+} from "./cli-pqnd8are.js";
 import"./cli-k0vxtzxb.js";
 import"./cli-97fnztpy.js";
 import {
@@ -94,6 +95,7 @@ export {
   graphForSync,
   findFresherHarnessReports,
   emitWrittenArtifacts,
+  deterministicOnlyArtifactTypes,
   deterministicGraphItems,
   deterministicArtifacts,
   detectAvailableCodingAgents,

package/dist/{index-f89md6eg.js → index-ms5t7pph.js}

@@ -7,7 +7,7 @@ import {
   enumerateToolCatalog,
   enumerateWorkflows,
   mergeEnumeratedComponents
-} from "./cli-5bh9tky2.js";
+} from "./cli-pqnd8are.js";
 import"./cli-k0vxtzxb.js";
 import"./cli-97fnztpy.js";
 import"./cli-y333w08f.js";

package/dist/{index-vx8ym8p0.js → index-xqa9km2a.js}

@@ -21,7 +21,7 @@ import {
   serializeExtractResult,
   toolNamesOf,
   valueChildren
-} from "./cli-5bh9tky2.js";
+} from "./cli-pqnd8are.js";
 import"./cli-k0vxtzxb.js";
 import"./cli-97fnztpy.js";
 import"./cli-y333w08f.js";

package/dist/{index-p0cxzngv.js → index-y5ay9p49.js}

@@ -1,6 +1,6 @@
 import {
   buildDoctorReport
-} from "./cli-ven3j7j1.js";
+} from "./cli-rp1079xm.js";
 import {
   selectTenantAndCreateKey
 } from "./cli-n1406hqg.js";
@@ -20,7 +20,7 @@ import {
 import {
   initPrompts,
   runPromptSync
-} from "./cli-09ym9jac.js";
+} from "./cli-8y7tzqkf.js";
 import {
   agentsMdProblem,
   runSkillSync
@@ -46,7 +46,7 @@ import {
   runCodingAgent,
   runHarnessCommand,
   startRemoteAnalyze
-} from "./cli-5bh9tky2.js";
+} from "./cli-pqnd8are.js";
 import {
   canonicalText,
   renderInitBanner,

package/dist/{prompt-attribution-cswtxj5v.js → prompt-attribution-2srq4cp7.js}

@@ -1,7 +1,7 @@
 import {
   inventoryFiles,
   safePromptEvidencePath
-} from "./cli-5bh9tky2.js";
+} from "./cli-pqnd8are.js";
 import"./cli-k0vxtzxb.js";
 import"./cli-97fnztpy.js";
 import"./cli-y333w08f.js";

package/dist/prompt-source-mcp.js

@@ -3,7 +3,7 @@ import {
   checkPromptMapping,
   discoverHarnessPromptSources,
   safePromptEvidencePath
-} from "./cli-5bh9tky2.js";
+} from "./cli-pqnd8are.js";
 import"./cli-k0vxtzxb.js";
 import"./cli-97fnztpy.js";
 import"./cli-y333w08f.js";

package/dist/{prompts-cn8a2cwp.js → prompts-tr91zg4n.js}

@@ -9,7 +9,7 @@ import {
   runPromptSync,
   runPromptsCommand,
   writePromptSyncProgress
-} from "./cli-09ym9jac.js";
+} from "./cli-8y7tzqkf.js";
 import {
   promptSourceHashPayload
 } from "./cli-mm48br00.js";

package/dist/{sync-ce5j09v7.js → sync-nfdd69cw.js}

@@ -1,6 +1,6 @@
 import {
   runPromptsCommand
-} from "./cli-09ym9jac.js";
+} from "./cli-8y7tzqkf.js";
 import {
   runSkillsCommand
 } from "./cli-1smcq5pf.js";
@@ -10,7 +10,7 @@ import"./cli-hcwdz9sd.js";
 import"./cli-mm48br00.js";
 import {
   runHarnessCommand
-} from "./cli-5bh9tky2.js";
+} from "./cli-pqnd8are.js";
 import"./cli-k0vxtzxb.js";
 import"./cli-97fnztpy.js";
 import"./cli-y333w08f.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moda-ai/cli",
-  "version": "1.55.76",
+  "version": "1.55.78",
   "description": "CLI for Moda: production monitoring and evals for AI agents.",
   "type": "module",
   "bin": {

package/skills/integration/index.json

@@ -1,7 +1,7 @@
 {
   "schema_version": "moda.skill_index.v1",
-  "bundled_at": "2026-10-21T09:01:57.832Z",
-  "cli_version": "1.55.76",
+  "bundled_at": "2026-10-21T09:55:25.979Z",
+  "cli_version": "1.55.78",
   "skills": [
     {
       "id": "integration-cloudflare-think",