@moda-ai/cli 1.55.77 → 1.55.79

package/dist/{agent-wrc7kn21.js → agent-3acxyetj.js}

@@ -1,8 +1,8 @@
 import {
   buildDoctorReport
-} from "./cli-37gk6etv.js";
+} from "./cli-w5en52xc.js";
 import"./cli-rrggdmf8.js";
-import"./cli-0799n1ej.js";
+import"./cli-m82f9yqj.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-gkc072np.js") : undefined;
+  const harness = graph ? await import("./harness-dbkbs04z.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-0799n1ej.js → cli-m82f9yqj.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-gkc072np.js");
+    const { analyzeHarnessPrompts } = await import("./harness-dbkbs04z.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-jqer74f1.js");
+  const { checkPromptAttribution } = await import("./prompt-attribution-mxmgv3bt.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-gkc072np.js");
+    const { analyzeHarnessPrompts } = await import("./harness-dbkbs04z.js");
     const result = await analyzeHarnessPrompts({
       rootDir: root,
       existing: manifest.sources,

package/dist/{cli-t8mvqe7n.js → cli-qa0rbdjd.js}

@@ -15932,9 +15932,50 @@ function detectDependencies(input) {
 import { createHash as createHash4 } from "node:crypto";
 import { readFileSync as readFileSync6 } from "node:fs";
 import { join as join7 } from "node:path";
+
+// ../../packages/harness-bundle/src/detect/links.ts
+function resolveBundleLink(link, links, opts = {}) {
+  const via = [];
+  let hops = 0;
+  const walk = (base, target2, top) => {
+    if (target2.startsWith("/"))
+      return;
+    const out = [...base];
+    const segments = target2.split("/").filter((segment) => segment !== "" && segment !== ".");
+    for (let i = 0;i < segments.length; i++) {
+      const segment = segments[i];
+      if (segment === "..") {
+        if (out.length === 0)
+          return;
+        out.pop();
+        continue;
+      }
+      out.push(segment);
+      const path = out.join("/");
+      const next = links.get(path);
+      if (next === undefined || top && opts.followLast === false && i === segments.length - 1)
+        continue;
+      if (++hops > 40)
+        return;
+      via.push(path);
+      const resolved2 = walk(out.slice(0, -1), next, false);
+      if (!resolved2)
+        return;
+      out.splice(0, out.length, ...resolved2);
+    }
+    return out;
+  };
+  const target = links.get(link);
+  if (target === undefined)
+    return;
+  const resolved = walk(link.split("/").slice(0, -1), target, true);
+  return resolved ? { path: resolved.length > 0 ? resolved.join("/") : ".", via } : undefined;
+}
+
+// ../../packages/harness-bundle/src/register/harness-digest.ts
 var WORKSPACE_INPUT = /^(?:package\.json|bun\.lockb?|package-lock\.json|npm-shrinkwrap\.json|pnpm-lock\.yaml|pnpm-workspace\.yaml|yarn\.lock|\.yarnrc\.yml|turbo\.json|nx\.json|lerna\.json|tsconfig[\w.-]*\.json|pyproject\.toml|uv\.lock|poetry\.lock|Pipfile(?:\.lock)?|requirements[\w.-]*\.txt|go\.(?:mod|sum|work)|Cargo\.(?:toml|lock)|Gemfile(?:\.lock)?|\.nvmrc|\.node-version|\.python-version|\.tool-versions|(?:tsup|vite|rollup|esbuild|webpack|babel|swc)\.config\.[\w.]+)$/;
 var RUNTIME_CATEGORIES = new Set(["prompt", "schema", "migration", "seed_data", "api_spec"]);
-var INERT = new Set(["doc", "test", "ci"]);
+var INERT = new Set(["test", "ci"]);
 var INERT_DIR = /(^|\/)(\.github|\.gitlab|\.circleci|\.buildkite|\.devcontainer|\.vscode|\.idea|\.cursor|\.claude|\.codex|\.windsurf|\.agents|\.husky|\.changeset|evals?|evaluations?|benchmarks?|\.?screenshots?|[\w.-]+-out)(\/|$)/;
 function harnessFiles(manifest, map, read) {
   const paths = new Set(manifest.files.map((f) => f.path));
@@ -15991,6 +16032,7 @@ function harnessDigest(manifest, map, filesDir) {
     }
   };
   const byPath = new Map(manifest.files.map((f) => [f.path, f]));
+  const links = new Map(manifest.files.flatMap((f) => f.symlinkTarget !== undefined ? [[f.path, f.symlinkTarget]] : []));
   const hash = createHash4("sha256");
   hash.update(JSON.stringify({
     v: 1,
@@ -16002,12 +16044,37 @@ function harnessDigest(manifest, map, filesDir) {
   }));
   for (const path of harnessFiles(manifest, map, read)) {
     const f = byPath.get(path);
-    if (f)
-      hash.update(`
+    if (!f)
+      continue;
+    hash.update(`
 ${f.path}\x00${f.sha256}\x00${f.executable ? 1 : 0}\x00${f.symlinkTarget ?? ""}`);
+    for (const t of f.symlinkTarget !== undefined ? linkTargets(f, byPath, links) : [])
+      hash.update(`\x00->${t.path}\x00${t.sha256}\x00${t.executable ? 1 : 0}`);
   }
   return `sha256:${hash.digest("hex")}`;
 }
+function linkTargets(link, byPath, links) {
+  const out = new Map;
+  const seen = new Set;
+  const visit = (from) => {
+    if (seen.has(from))
+      return;
+    seen.add(from);
+    const target = resolveBundleLink(from, links)?.path;
+    if (target === undefined)
+      return;
+    const exact = byPath.get(target);
+    const hits = exact ? [exact] : [...byPath.values()].filter((f) => target === "." || f.path.startsWith(`${target}/`));
+    for (const f of hits) {
+      if (f.symlinkTarget !== undefined)
+        visit(f.path);
+      else
+        out.set(f.path, f);
+    }
+  };
+  visit(link.path);
+  return [...out.values()].sort((a, b) => a.path < b.path ? -1 : 1);
+}
 function wranglerAssetDirs(configPath, text) {
   const dir = dirname5(configPath);
   const raw = [];
@@ -16120,7 +16187,8 @@ function registrationBody(collected, options) {
     manifestBytes: collected.manifestFile.bytes,
     ...collected.dependencyMapFile ? { dependencyMapSha256: collected.dependencyMapFile.sha256, dependencyMapBytes: collected.dependencyMapFile.bytes } : {},
     ...gitFields(collected.manifest),
-    ...options.imageRef ? { imageRef: options.imageRef } : {}
+    ...options.imageRef ? { imageRef: options.imageRef } : {},
+    ...collected.manifest.harnessDigest ? { harnessDigest: collected.manifest.harnessDigest } : {}
   };
 }
 async function uploadRegistration(collected, options, client) {
@@ -16236,10 +16304,13 @@ async function registerCollected(context, options, collected) {
     }, profileOptions)),
     complete: async (id) => await callControlAPI(`/harness-registrations/${encodeURIComponent(id)}/complete`, { method: "POST" }, profileOptions, { timeoutMs: 300000 })
   };
-  const { registration: completed } = await uploadRegistration(collected, options, client);
+  const uploaded = await uploadRegistration(collected, options, client);
+  const { deduplicated } = uploaded;
+  const completed = deduplicated ? await callControlAPI(`/harness-registrations/${encodeURIComponent(uploaded.registration.id)}`, {}, profileOptions).catch(() => ({ ...uploaded.registration, checklistIncomplete: true })) : uploaded.registration;
   await withFullChecklist(completed, profileOptions);
   const dashboardUrl = `${resolveModaBaseUrl(profileOptions)}${completed.dashboardPath}`;
-  emit(context, { ...report, dryRun: false, registration: { ...completed, dashboardUrl } }, renderRegisterReport(report, { ...completed, dashboardUrl }), completed.status === "failed" ? "error" : undefined);
+  const shown = { ...completed, dashboardUrl, ...deduplicated ? { unchanged: true } : {} };
+  emit(context, { ...report, dryRun: false, registration: shown }, renderRegisterReport(report, shown), completed.status === "failed" ? "error" : undefined);
   return { exitCode: completed.status === "failed" ? 1 : 0 };
 }
 async function runHarnessRegistration(context) {
@@ -16540,6 +16611,8 @@ function renderRegistrationStatus(registration) {
     `  Harness   ${registration.harnessName} (${registration.mode} mode)`,
     `  Status    ${registration.status}`
   ];
+  if (registration.unchanged)
+    lines.push("  Unchanged nothing the harness depends on changed since this registration, so no new one was created");
   if (registration.failureReason)
     lines.push(`  Reason    ${registration.failureReason}`);
   if (registration.git?.commit)
@@ -17654,7 +17727,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 +19222,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-551gfrhe.js");
+        const { runGithubActionsAnalyze } = await import("./harness-github-actions-amef13q6.js");
         const result = await runGithubActionsAnalyze(rootDir, {
           writeReport: (report2) => {
             const normalized = normalizeHarnessReport(report2);
@@ -19295,8 +19368,8 @@ async function runHarnessCommand(context) {
         }
         const { artifacts, unknowns } = deterministicGraphItems(rootDir, promote === "all" ? undefined : promote);
         tagComponentStatus({ runtimeAgents: [], artifacts }, rootDir);
-        const { extractHarnessWithContext: extractHarnessWithContext2 } = await import("./index-skaf1djt.js");
-        const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-05gdag9e.js");
+        const { extractHarnessWithContext: extractHarnessWithContext2 } = await import("./index-4jaj5eyb.js");
+        const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-0w2wddj1.js");
         let components = { runtimeAgents: [], artifacts: [], warnings: [] };
         if (promote === "all" || promote === "topology" || promote === "tools") {
           const { result, ctx } = extractHarnessWithContext2(rootDir);
@@ -19330,8 +19403,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-skaf1djt.js");
-      const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-05gdag9e.js");
+      const { extractHarnessWithContext: extractHarnessWithContext2, serializeExtractResult } = await import("./index-4jaj5eyb.js");
+      const { enumerateHarnessComponents, mergeEnumeratedComponents } = await import("./index-0w2wddj1.js");
       const { result, ctx } = extractHarnessWithContext2(rootDir, { fresh: true });
       const artifacts = deterministicArtifacts(rootDir);
       tagComponentStatus({ runtimeAgents: [], artifacts }, rootDir);
@@ -27558,6 +27631,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;
@@ -27592,18 +27671,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: [] });
     }
@@ -27702,6 +27785,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;
@@ -27710,10 +27804,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))
@@ -27722,24 +27822,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;
@@ -27872,9 +28034,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;
@@ -27893,16 +28055,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;
 }
@@ -27911,7 +28072,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,
@@ -29251,8 +29412,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}`));
@@ -29260,8 +29425,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()];
@@ -29283,8 +29448,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);

package/dist/{cli-37gk6etv.js → cli-w5en52xc.js}

@@ -4,7 +4,7 @@ import {
 } from "./cli-rrggdmf8.js";
 import {
   inspectPromptManifest
-} from "./cli-0799n1ej.js";
+} from "./cli-m82f9yqj.js";
 import {
   readHarnessSyncState,
   renderDoctorHuman,
@@ -395,7 +395,7 @@ async function harnessCurrentCheck(cwd, manifestPath, manifestExists, tenantId)
     };
   }
   try {
-    const { scanHarness } = await import("./harness-gkc072np.js");
+    const { scanHarness } = await import("./harness-dbkbs04z.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-8n2ctn3g.js")).runPromptsCommand(...args);
+  return (await import("./prompts-tc7fntm5.js")).runPromptsCommand(...args);
 }
 async function runSkillsCommand(...args) {
   return (await import("./skills-knpeqryb.js")).runSkillsCommand(...args);
 }
 async function runHarnessCommand(...args) {
-  return (await import("./harness-gkc072np.js")).runHarnessCommand(...args);
+  return (await import("./harness-dbkbs04z.js")).runHarnessCommand(...args);
 }
 async function runSyncCommand(...args) {
-  return (await import("./sync-e71ew4yt.js")).runSyncCommand(...args);
+  return (await import("./sync-chceab5e.js")).runSyncCommand(...args);
 }
 async function runRegistryCommand(...args) {
   return (await import("./registry-c64qr7ta.js")).runRegistryCommand(...args);
 }
 async function runDoctorCommand(...args) {
-  return (await import("./doctor-7bd2q83j.js")).runDoctorCommand(...args);
+  return (await import("./doctor-txsjyfes.js")).runDoctorCommand(...args);
 }
 async function runStatusCommand(...args) {
-  return (await import("./doctor-7bd2q83j.js")).runStatusCommand(...args);
+  return (await import("./doctor-txsjyfes.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-wrc7kn21.js")).runAgentCommand(...args);
+  return (await import("./agent-3acxyetj.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-smy7hrm5.js");
+      const { runInit } = await import("./index-xb4svyw4.js");
       if (context.outputMode === "agent-stream") {
         context.output.writeEvent({
           event: "started",

package/dist/{doctor-7bd2q83j.js → doctor-txsjyfes.js}

@@ -3,9 +3,9 @@ import {
   promptsDiscoveredCheck,
   runDoctorCommand,
   runStatusCommand
-} from "./cli-37gk6etv.js";
+} from "./cli-w5en52xc.js";
 import"./cli-rrggdmf8.js";
-import"./cli-0799n1ej.js";
+import"./cli-m82f9yqj.js";
 import"./cli-mm48br00.js";
 import"./cli-k0vxtzxb.js";
 import"./cli-22yvg5kh.js";

package/dist/{harness-gkc072np.js → harness-dbkbs04z.js}

@@ -47,7 +47,7 @@ import {
   writeHarnessAnalyzeResult,
   writeHarnessArtifacts,
   writeHumanProgress
-} from "./cli-t8mvqe7n.js";
+} from "./cli-qa0rbdjd.js";
 import"./cli-k0vxtzxb.js";
 import"./cli-97fnztpy.js";
 import {

package/dist/{harness-github-actions-551gfrhe.js → harness-github-actions-amef13q6.js}

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

package/dist/{index-05gdag9e.js → index-0w2wddj1.js}

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

package/dist/{index-skaf1djt.js → index-4jaj5eyb.js}

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

package/dist/{index-smy7hrm5.js → index-xb4svyw4.js}

@@ -1,6 +1,6 @@
 import {
   buildDoctorReport
-} from "./cli-37gk6etv.js";
+} from "./cli-w5en52xc.js";
 import {
   selectTenantAndCreateKey
 } from "./cli-n1406hqg.js";
@@ -20,7 +20,7 @@ import {
 import {
   initPrompts,
   runPromptSync
-} from "./cli-0799n1ej.js";
+} from "./cli-m82f9yqj.js";
 import {
   agentsMdProblem,
   runSkillSync
@@ -46,7 +46,7 @@ import {
   runCodingAgent,
   runHarnessCommand,
   startRemoteAnalyze
-} from "./cli-t8mvqe7n.js";
+} from "./cli-qa0rbdjd.js";
 import {
   canonicalText,
   renderInitBanner,

package/dist/{prompt-attribution-jqer74f1.js → prompt-attribution-mxmgv3bt.js}

@@ -1,7 +1,7 @@
 import {
   inventoryFiles,
   safePromptEvidencePath
-} from "./cli-t8mvqe7n.js";
+} from "./cli-qa0rbdjd.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-t8mvqe7n.js";
+} from "./cli-qa0rbdjd.js";
 import"./cli-k0vxtzxb.js";
 import"./cli-97fnztpy.js";
 import"./cli-y333w08f.js";

package/dist/{prompts-8n2ctn3g.js → prompts-tc7fntm5.js}

@@ -9,7 +9,7 @@ import {
   runPromptSync,
   runPromptsCommand,
   writePromptSyncProgress
-} from "./cli-0799n1ej.js";
+} from "./cli-m82f9yqj.js";
 import {
   promptSourceHashPayload
 } from "./cli-mm48br00.js";

package/dist/{sync-e71ew4yt.js → sync-chceab5e.js}

@@ -1,6 +1,6 @@
 import {
   runPromptsCommand
-} from "./cli-0799n1ej.js";
+} from "./cli-m82f9yqj.js";
 import {
   runSkillsCommand
 } from "./cli-1smcq5pf.js";
@@ -10,7 +10,7 @@ import"./cli-hcwdz9sd.js";
 import"./cli-mm48br00.js";
 import {
   runHarnessCommand
-} from "./cli-t8mvqe7n.js";
+} from "./cli-qa0rbdjd.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.77",
+  "version": "1.55.79",
   "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:26:39.170Z",
-  "cli_version": "1.55.77",
+  "bundled_at": "2026-10-21T10:41:36.841Z",
+  "cli_version": "1.55.79",
   "skills": [
     {
       "id": "integration-cloudflare-think",